diff options
| author | Robert Nagy <robert@openbsd.org> | 2022-12-01 14:19:28 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2022-12-02 11:30:41 +0000 |
| commit | 38f51ce15f179deb81fc7e8fef54c18920d68883 (patch) | |
| tree | 859903bc113a4b6ef74777dad363a650c37efe81 | |
| parent | 5f133158977beddaea45ca212980edd177411345 (diff) | |
| download | ports-38f51ce15f179deb81fc7e8fef54c18920d68883.tar.gz ports-38f51ce15f179deb81fc7e8fef54c18920d68883.zip | |
www/iridium: update to 2022.11.107
326 files changed, 2395 insertions, 1812 deletions
diff --git a/www/iridium/Makefile b/www/iridium/Makefile index 92501c7988de..d6f9c04396b6 100644 --- a/www/iridium/Makefile +++ b/www/iridium/Makefile @@ -1,5 +1,5 @@ PORTNAME= iridium -PORTVERSION= 2022.10.106.1 +PORTVERSION= 2022.11.107 CATEGORIES= www wayland MASTER_SITES= https://downloads.iridiumbrowser.de/source/ PKGNAMESUFFIX= -browser @@ -28,7 +28,9 @@ BUILD_DEPENDS= bash:shells/bash \ ${LOCALBASE}/share/usbids/usb.ids:misc/usbids \ ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR} \ ${LOCALBASE}/include/va/va.h:multimedia/libva \ - ${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-dri + ${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-dri \ + ${LOCALBASE}/libdata/pkgconfig/Qt5Core.pc:devel/qt5-core \ + ${LOCALBASE}/libdata/pkgconfig/Qt5Widgets.pc:x11-toolkits/qt5-widgets LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-atk \ libatspi.so:accessibility/at-spi2-core \ @@ -67,7 +69,7 @@ RUN_DEPENDS= xdg-open:devel/xdg-utils \ noto-basic>0:x11-fonts/noto-basic USES= bison compiler:c++17-lang cpe desktop-file-utils gl gnome iconv jpeg \ - localbase:ldflags ninja perl5 pkgconfig python:3.7+,build shebangfix \ + localbase:ldflags ninja perl5 pkgconfig python:3.7+,build qt:5 shebangfix \ tar:xz xorg CPE_VENDOR= google @@ -78,12 +80,14 @@ USE_LDCONFIG= ${DATADIR} USE_PERL5= build USE_XORG= x11 xcb xcomposite xcursor xext xdamage xfixes xi \ xorgproto xrandr xrender xscrnsaver xtst +USE_QT= buildtools:build SHEBANG_FILES= chrome/tools/build/linux/chrome-wrapper buildtools/linux64/clang-format MAKE_ARGS= -C out/${BUILDTYPE} ALL_TARGET= chrome -BINARY_ALIAS= python3=${PYTHON_CMD} +BINARY_ALIAS= python3=${PYTHON_CMD} \ + moc=${PREFIX}/bin/moc-qt5 # TODO bz@ : install libwidevinecdm.so (see third_party/widevine/cdm/BUILD.gn) # @@ -115,6 +119,7 @@ GN_ARGS+= clang_use_chrome_plugins=false \ 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 86cfcca15e52..38deeadbb2b2 100644 --- a/www/iridium/distinfo +++ b/www/iridium/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1667814684 -SHA256 (iridium-browser-2022.10.106.1.tar.xz) = 6f8b9706f58e05d9e08a56701ca3618a2489a76fcd1b03ab5a45f5e844e47c36 -SIZE (iridium-browser-2022.10.106.1.tar.xz) = 1333421304 +TIMESTAMP = 1669891478 +SHA256 (iridium-browser-2022.11.107.tar.xz) = 7795b28672850fd4218138d6d9242fe246160065a474b26448733af08975e6ff +SIZE (iridium-browser-2022.11.107.tar.xz) = 1409151040 SHA256 (disable-privacy-sandbox.patch) = 9797e71f4a6700d9a675ec90c9b03487532de68af568fd010eec3fc0cd97c4de SIZE (disable-privacy-sandbox.patch) = 4772 diff --git a/www/iridium/files/patch-BUILD.gn b/www/iridium/files/patch-BUILD.gn index 41a0ab1bfd11..6e7fb90c2fc5 100644 --- a/www/iridium/files/patch-BUILD.gn +++ b/www/iridium/files/patch-BUILD.gn @@ -1,6 +1,6 @@ ---- BUILD.gn.orig 2022-10-05 07:34:01 UTC +--- BUILD.gn.orig 2022-12-01 10:35:46 UTC +++ BUILD.gn -@@ -53,7 +53,7 @@ declare_args() { +@@ -59,7 +59,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) -@@ -83,7 +83,6 @@ group("gn_all") { +@@ -89,7 +89,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", -@@ -441,7 +440,7 @@ group("gn_all") { +@@ -447,7 +446,7 @@ group("gn_all") { ] } @@ -26,7 +26,7 @@ deps += [ "//third_party/breakpad:breakpad_unittests", "//third_party/breakpad:core-2-minidump", -@@ -642,6 +641,15 @@ group("gn_all") { +@@ -648,6 +647,15 @@ group("gn_all") { deps += [ "//gpu/tools/compositor_model_bench" ] } @@ -42,7 +42,7 @@ if (is_mac) { deps += [ "//third_party/breakpad:crash_inspector", -@@ -690,7 +698,7 @@ group("gn_all") { +@@ -696,7 +704,7 @@ group("gn_all") { host_os == "win") { deps += [ "//chrome/test/mini_installer:mini_installer_tests" ] } @@ -51,7 +51,16 @@ deps += [ "//third_party/breakpad:symupload($host_toolchain)" ] } -@@ -1202,7 +1210,7 @@ if (!is_ios) { +@@ -1123,7 +1131,7 @@ if (!is_ios) { + ] + } + +- if (!is_chromeos_ash && !is_ios && !is_fuchsia && !is_android && !is_castos) { ++ if (!is_chromeos_ash && !is_ios && !is_fuchsia && !is_android && !is_castos && !is_bsd) { + # WPT Webdriver tests runner + # chrome/test/chromedriver/test/run_webdriver_tests.py + script_test("webdriver_wpt_tests") { +@@ -1218,7 +1226,7 @@ if (!is_ios) { data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ] } @@ -60,7 +69,7 @@ data_deps += [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } -@@ -1211,7 +1219,7 @@ if (!is_ios) { +@@ -1227,7 +1235,7 @@ if (!is_ios) { data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } @@ -69,7 +78,7 @@ data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } -@@ -1654,7 +1662,7 @@ group("chromium_builder_perf") { +@@ -1668,7 +1676,7 @@ group("chromium_builder_perf") { data_deps += [ "//chrome/test:performance_browser_tests" ] } diff --git a/www/iridium/files/patch-ash_display_mirror__window__controller.cc b/www/iridium/files/patch-ash_display_mirror__window__controller.cc index 663486914e6d..2496639afee7 100644 --- a/www/iridium/files/patch-ash_display_mirror__window__controller.cc +++ b/www/iridium/files/patch-ash_display_mirror__window__controller.cc @@ -1,8 +1,8 @@ ---- ash/display/mirror_window_controller.cc.orig 2022-04-01 07:48:30 UTC +--- ash/display/mirror_window_controller.cc.orig 2022-12-01 10:35:46 UTC +++ ash/display/mirror_window_controller.cc -@@ -296,7 +296,11 @@ void MirrorWindowController::UpdateWindow( - return info.id() == iter->first; - }) == display_info_list.end()) { +@@ -295,7 +295,11 @@ void MirrorWindowController::UpdateWindow( + if (!base::Contains(display_info_list, iter->first, + &display::ManagedDisplayInfo::id)) { CloseAndDeleteHost(iter->second, true); +#if defined(__llvm__) + mirroring_host_info_map_.erase(iter++); diff --git a/www/iridium/files/patch-base_BUILD.gn b/www/iridium/files/patch-base_BUILD.gn index ae3b1f61ce44..17173f34fa30 100644 --- a/www/iridium/files/patch-base_BUILD.gn +++ b/www/iridium/files/patch-base_BUILD.gn @@ -1,4 +1,4 @@ ---- base/BUILD.gn.orig 2022-10-05 07:34:01 UTC +--- base/BUILD.gn.orig 2022-12-01 10:35:46 UTC +++ base/BUILD.gn @@ -162,7 +162,7 @@ buildflag_header("ios_cronet_buildflags") { flags = [ "CRONET_BUILD=$is_cronet_build" ] @@ -9,29 +9,31 @@ buildflag_header("message_pump_buildflags") { header = "message_pump_buildflags.h" header_dir = "base/message_loop" -@@ -1031,7 +1031,7 @@ mixed_component("base") { +@@ -1035,7 +1035,7 @@ mixed_component("base") { "timer/hi_res_timer_manager_posix.cc", ] - if (!is_nacl && !is_apple) { + if (!is_nacl && !is_apple && !is_bsd) { sources += [ - "profiler/stack_copier_signal.cc", - "profiler/stack_copier_signal.h", -@@ -1040,6 +1040,12 @@ mixed_component("base") { + "profiler/stack_base_address_posix.cc", + "profiler/stack_base_address_posix.h", +@@ -1046,6 +1046,14 @@ mixed_component("base") { "profiler/thread_delegate_posix.h", ] } + + if (is_bsd) { + sources += [ ++ "profiler/stack_base_address_posix.cc", ++ "profiler/stack_base_address_posix.h", + "profiler/stack_sampler_posix.cc", + ] + } } if (is_win) { -@@ -1541,11 +1547,23 @@ mixed_component("base") { +@@ -1557,11 +1565,23 @@ mixed_component("base") { # Needed for <atomic> if using newer C++ library than sysroot, except if # building inside the cros_sdk environment - use host_toolchain as a # more robust check for this. @@ -55,17 +57,17 @@ + if (use_allocator_shim) { sources += [ - "allocator/allocator_shim.cc", -@@ -1573,7 +1591,7 @@ mixed_component("base") { + "allocator/partition_allocator/shim/allocator_shim.cc", +@@ -1589,7 +1609,7 @@ mixed_component("base") { ] configs += [ "//base/allocator:mac_no_default_new_delete_symbols" ] } - if (is_chromeos || is_linux) { + if (is_chromeos || (is_linux && !is_bsd)) { sources += [ - "allocator/allocator_shim_override_cpp_symbols.h", - "allocator/allocator_shim_override_glibc_weak_symbols.h", -@@ -1629,7 +1647,7 @@ mixed_component("base") { + "allocator/partition_allocator/shim/allocator_shim_override_cpp_symbols.h", + "allocator/partition_allocator/shim/allocator_shim_override_glibc_weak_symbols.h", +@@ -1643,7 +1663,7 @@ mixed_component("base") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -74,7 +76,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -2211,6 +2229,42 @@ mixed_component("base") { +@@ -2216,6 +2236,42 @@ mixed_component("base") { } } @@ -117,7 +119,7 @@ # iOS if (is_ios) { sources -= [ -@@ -2310,7 +2364,7 @@ mixed_component("base") { +@@ -2313,7 +2369,7 @@ mixed_component("base") { } if (dep_libevent) { @@ -126,7 +128,7 @@ } if (use_libevent) { -@@ -3545,7 +3599,7 @@ test("base_unittests") { +@@ -3565,7 +3621,7 @@ test("base_unittests") { } } @@ -135,16 +137,16 @@ sources += [ "debug/proc_maps_linux_unittest.cc", "files/scoped_file_linux_unittest.cc", -@@ -3593,7 +3647,7 @@ test("base_unittests") { +@@ -3613,7 +3669,7 @@ test("base_unittests") { "posix/file_descriptor_shuffle_unittest.cc", "posix/unix_domain_socket_unittest.cc", ] - if (!is_nacl && !is_apple) { + if (!is_nacl && !is_apple && !is_bsd) { sources += [ + "profiler/stack_base_address_posix_unittest.cc", "profiler/stack_copier_signal_unittest.cc", - "profiler/thread_delegate_posix_unittest.cc", -@@ -3603,7 +3657,7 @@ test("base_unittests") { +@@ -3624,7 +3680,7 @@ test("base_unittests") { # Allow more direct string conversions on platforms with native utf8 # strings @@ -153,7 +155,7 @@ defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -3791,7 +3845,7 @@ test("base_unittests") { +@@ -3812,7 +3868,7 @@ test("base_unittests") { } } 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 7a16a6f85476..bdbfdd035891 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,6 +1,6 @@ ---- base/allocator/partition_allocator/partition_address_space.cc.orig 2022-10-05 07:34:01 UTC +--- base/allocator/partition_allocator/partition_address_space.cc.orig 2022-12-01 10:35:46 UTC +++ base/allocator/partition_allocator/partition_address_space.cc -@@ -238,7 +238,7 @@ void PartitionAddressSpace::UninitConfigurablePoolForT +@@ -261,7 +261,7 @@ void PartitionAddressSpace::UninitConfigurablePoolForT setup_.configurable_pool_ = 0; } diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc.cc b/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc.cc deleted file mode 100644 index 5ffea8d69797..000000000000 --- a/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc.cc +++ /dev/null @@ -1,17 +0,0 @@ ---- base/allocator/partition_allocator/partition_alloc.cc.orig 2022-10-05 07:34:01 UTC -+++ base/allocator/partition_allocator/partition_alloc.cc -@@ -63,8 +63,14 @@ void PartitionAllocGlobalInit(OomFunction on_out_of_me - "maximum direct mapped allocation"); - - // Check that some of our zanier calculations worked out as expected. -+#if defined(__i386__) && defined(OS_FREEBSD) -+ // alignof(std::max_align_t) is only 4 on FreeBSD/i386 -+ static_assert(internal::kSmallestBucket >= internal::kAlignment, -+ "generic smallest bucket"); -+#else - static_assert(internal::kSmallestBucket == internal::kAlignment, - "generic smallest bucket"); -+#endif - static_assert(internal::kMaxBucketed == 917504, "generic max bucketed"); - STATIC_ASSERT_OR_PA_CHECK( - internal::MaxSystemPagesPerRegularSlotSpan() <= 16, 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 00bceb14ac93..560917f3801b 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,4 +1,4 @@ ---- base/allocator/partition_allocator/partition_alloc_config.h.orig 2022-10-05 07:34:01 UTC +--- base/allocator/partition_allocator/partition_alloc_config.h.orig 2022-12-01 10:35:46 UTC +++ base/allocator/partition_allocator/partition_alloc_config.h @@ -76,7 +76,7 @@ static_assert(sizeof(void*) != 8, ""); @@ -9,7 +9,7 @@ #define PA_HAS_LINUX_KERNEL #endif -@@ -195,7 +195,7 @@ constexpr bool kUseLazyCommit = false; +@@ -197,7 +197,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 -@@ -235,7 +235,7 @@ constexpr bool kUseLazyCommit = false; +@@ -238,7 +238,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 847dbd39091e..460caf0032f1 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-10-05 07:34:01 UTC +--- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2022-12-01 10:35:46 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; +@@ -272,7 +272,7 @@ constexpr size_t kNumPools = 3; // Special-case Android and iOS, which incur test failures with larger // GigaCage. Regardless, allocating >8GiB with malloc() on these platforms is // unrealistic as of 2022. diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__forward.h b/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__forward.h new file mode 100644 index 000000000000..d2bd4a2be37a --- /dev/null +++ b/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__forward.h @@ -0,0 +1,16 @@ +--- base/allocator/partition_allocator/partition_alloc_forward.h.orig 2022-12-01 10:35:46 UTC ++++ base/allocator/partition_allocator/partition_alloc_forward.h +@@ -25,9 +25,13 @@ namespace internal { + // the second one 16. We could technically return something different for + // malloc() and operator new(), but this would complicate things, and most of + // our allocations are presumably coming from operator new() anyway. ++#if defined(__i386__) && defined(OS_FREEBSD) ++constexpr size_t kAlignment = 8; ++#else + constexpr size_t kAlignment = + std::max(alignof(max_align_t), + static_cast<size_t>(__STDCPP_DEFAULT_NEW_ALIGNMENT__)); ++#endif + static_assert(kAlignment <= 16, + "PartitionAlloc doesn't support a fundamental alignment larger " + "than 16 bytes."); diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_partition__page.h b/www/iridium/files/patch-base_allocator_partition__allocator_partition__page.h index 3b248067a37d..78ebbf6ab9d1 100644 --- a/www/iridium/files/patch-base_allocator_partition__allocator_partition__page.h +++ b/www/iridium/files/patch-base_allocator_partition__allocator_partition__page.h @@ -1,14 +1,6 @@ ---- base/allocator/partition_allocator/partition_page.h.orig 2022-10-05 07:34:01 UTC +--- base/allocator/partition_allocator/partition_page.h.orig 2022-12-01 10:35:46 UTC +++ base/allocator/partition_allocator/partition_page.h -@@ -131,13 +131,14 @@ struct SlotSpanMetadata { - PartitionBucket<thread_safe>* const bucket = nullptr; - - // CHECK()ed in AllocNewSlotSpan(). --#if defined(PA_HAS_64_BITS_POINTERS) && BUILDFLAG(IS_APPLE) -+#if (defined(PA_HAS_64_BITS_POINTERS) && BUILDFLAG(IS_APPLE)) || \ -+ (BUILDFLAG(IS_FREEBSD) && defined(__i386__)) - // System page size is not a constant on Apple OSes, but is either 4 or 16kiB - // (1 << 12 or 1 << 14), as checked in PartitionRoot::Init(). And +@@ -144,7 +144,7 @@ struct SlotSpanMetadata { // PartitionPageSize() is 4 times the OS page size. static constexpr size_t kMaxSlotsPerSlotSpan = 4 * (1 << 14) / kSmallestBucket; @@ -17,13 +9,3 @@ // System page size can be 4, 16, or 64 kiB on Linux on arm64. 64 kiB is // currently (kMaxSlotsPerSlotSpanBits == 13) not supported by the code, // so we use the 16 kiB maximum (64 kiB will crash). -@@ -151,7 +152,9 @@ struct SlotSpanMetadata { - #endif // defined(PA_HAS_64_BITS_POINTERS) && BUILDFLAG(IS_APPLE) - // The maximum number of bits needed to cover all currently supported OSes. - static constexpr size_t kMaxSlotsPerSlotSpanBits = 13; -+#if !BUILDFLAG(IS_FREEBSD) && defined(__i386__) - static_assert(kMaxSlotsPerSlotSpan < (1 << kMaxSlotsPerSlotSpanBits), ""); -+#endif - - // |marked_full| isn't equivalent to being full. Slot span is marked as full - // iff it isn't on the active slot span list (or any other list). 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 836a01cee4d1..3efecadd5033 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-10-30 12:20:09 UTC +--- base/allocator/partition_allocator/partition_root.cc.orig 2022-12-01 10:35:46 UTC +++ base/allocator/partition_allocator/partition_root.cc -@@ -33,7 +33,7 @@ +@@ -41,7 +41,7 @@ #include "wow64apiset.h" #endif @@ -9,7 +9,7 @@ #include <pthread.h> #endif -@@ -230,7 +230,7 @@ void PartitionAllocMallocInitOnce() { +@@ -238,7 +238,7 @@ void PartitionAllocMallocInitOnce() { if (!g_global_init_called.compare_exchange_strong(expected, true)) return; @@ -18,16 +18,16 @@ // When fork() is called, only the current thread continues to execute in the // child process. If the lock is held, but *not* by this thread when fork() is // called, we have a deadlock. -@@ -321,7 +321,7 @@ static size_t PartitionPurgeSlotSpan( +@@ -331,7 +331,7 @@ static size_t PartitionPurgeSlotSpan( constexpr size_t kMaxSlotCount = (PartitionPageSize() * kMaxPartitionPagesPerRegularSlotSpan) / - MaxPurgeableSlotSize(); + MinPurgeableSlotSize(); -#elif BUILDFLAG(IS_APPLE) || (BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)) +#elif BUILDFLAG(IS_APPLE) || ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)) // 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 -@@ -709,7 +709,7 @@ void PartitionRoot<thread_safe>::Init(PartitionOptions +@@ -734,7 +734,7 @@ void PartitionRoot<thread_safe>::Init(PartitionOptions // apple OSes. PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) || (internal::SystemPageSize() == (size_t{1} << 14))); diff --git a/www/iridium/files/patch-base_base__paths__posix.cc b/www/iridium/files/patch-base_base__paths__posix.cc index afa431009616..685f852f9b76 100644 --- a/www/iridium/files/patch-base_base__paths__posix.cc +++ b/www/iridium/files/patch-base_base__paths__posix.cc @@ -1,4 +1,4 @@ ---- base/base_paths_posix.cc.orig 2022-10-05 07:34:01 UTC +--- base/base_paths_posix.cc.orig 2022-12-01 10:35:46 UTC +++ base/base_paths_posix.cc @@ -15,6 +15,7 @@ #include <ostream> @@ -84,10 +84,10 @@ + kvm_close(kd); + if (!ret) { +#endif -+ if ((cpath = getenv("CHROME_EXE_PATH")) != NULL) ++ if ((cpath = getenv("IRIDIUM_EXE_PATH")) != NULL) + *result = FilePath(cpath); + else -+ *result = FilePath("/usr/local/chrome/chrome"); ++ *result = FilePath("/usr/local/iridium/iridium"); + return true; +#if !BUILDFLAG(IS_AIX) + } diff --git a/www/iridium/files/patch-base_debug_stack__trace__posix.cc b/www/iridium/files/patch-base_debug_stack__trace__posix.cc index a4b5269bca67..683bd2b2ae1f 100644 --- a/www/iridium/files/patch-base_debug_stack__trace__posix.cc +++ b/www/iridium/files/patch-base_debug_stack__trace__posix.cc @@ -1,4 +1,4 @@ ---- base/debug/stack_trace_posix.cc.orig 2022-10-05 07:34:01 UTC +--- base/debug/stack_trace_posix.cc.orig 2022-12-01 10:35:46 UTC +++ base/debug/stack_trace_posix.cc @@ -39,7 +39,7 @@ #include <AvailabilityMacros.h> @@ -9,7 +9,7 @@ #include "base/debug/proc_maps_linux.h" #endif -@@ -698,6 +698,9 @@ class SandboxSymbolizeHelper { +@@ -699,6 +699,9 @@ class SandboxSymbolizeHelper { // for the modules that are loaded in the current process. // Returns true on success. bool CacheMemoryRegions() { @@ -19,7 +19,7 @@ // Reads /proc/self/maps. std::string contents; if (!ReadProcMaps(&contents)) { -@@ -715,6 +718,7 @@ class SandboxSymbolizeHelper { +@@ -716,6 +719,7 @@ class SandboxSymbolizeHelper { is_initialized_ = true; return true; @@ -27,7 +27,7 @@ } // Opens all object files and caches their file descriptors. -@@ -871,7 +875,7 @@ size_t CollectStackTrace(void** trace, size_t count) { +@@ -872,7 +876,7 @@ size_t CollectStackTrace(void** trace, size_t count) { // If we do not have unwind tables, then try tracing using frame pointers. return base::debug::TraceStackFramePointers(const_cast<const void**>(trace), count, 0); diff --git a/www/iridium/files/patch-base_files_file__path__watcher__bsd.cc b/www/iridium/files/patch-base_files_file__path__watcher__bsd.cc index cc36b8b6dcf2..70f8d2563573 100644 --- a/www/iridium/files/patch-base_files_file__path__watcher__bsd.cc +++ b/www/iridium/files/patch-base_files_file__path__watcher__bsd.cc @@ -1,4 +1,4 @@ ---- base/files/file_path_watcher_bsd.cc.orig 2022-03-28 18:11:04 UTC +--- base/files/file_path_watcher_bsd.cc.orig 2022-12-01 10:35:46 UTC +++ base/files/file_path_watcher_bsd.cc @@ -0,0 +1,54 @@ +// Copyright 2021 The Chromium Authors. All rights reserved. @@ -50,7 +50,7 @@ +} // namespace + +FilePathWatcher::FilePathWatcher() { -+ sequence_checker_.DetachFromSequence(); ++ DETACH_FROM_SEQUENCE(sequence_checker_); + impl_ = std::make_unique<FilePathWatcherImpl>(); +} + 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 68bd0ae78688..88a9844ce448 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-10-05 07:34:01 UTC +--- base/files/file_util_unittest.cc.orig 2022-12-01 10:35:46 UTC +++ base/files/file_util_unittest.cc -@@ -3522,7 +3522,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) { +@@ -3549,7 +3549,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"; -@@ -4245,7 +4245,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles +@@ -4272,7 +4272,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles NULL); #else size_t bytes_written = diff --git a/www/iridium/files/patch-base_i18n_icu__util.cc b/www/iridium/files/patch-base_i18n_icu__util.cc index e3900550db39..ca38b330732a 100644 --- a/www/iridium/files/patch-base_i18n_icu__util.cc +++ b/www/iridium/files/patch-base_i18n_icu__util.cc @@ -1,4 +1,4 @@ ---- base/i18n/icu_util.cc.orig 2022-10-05 07:34:01 UTC +--- base/i18n/icu_util.cc.orig 2022-12-01 10:35:46 UTC +++ base/i18n/icu_util.cc @@ -53,7 +53,7 @@ #include "third_party/icu/source/common/unicode/unistr.h" @@ -9,7 +9,7 @@ BUILDFLAG(IS_CHROMEOS) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) #include "third_party/icu/source/i18n/unicode/timezone.h" #endif -@@ -325,7 +325,7 @@ void InitializeIcuTimeZone() { +@@ -344,7 +344,7 @@ void InitializeIcuTimeZone() { FuchsiaIntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization(); icu::TimeZone::adoptDefault( icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id))); diff --git a/www/iridium/files/patch-base_native__library__unittest.cc b/www/iridium/files/patch-base_native__library__unittest.cc index 8738d64c2045..055b7b4f439e 100644 --- a/www/iridium/files/patch-base_native__library__unittest.cc +++ b/www/iridium/files/patch-base_native__library__unittest.cc @@ -1,6 +1,6 @@ ---- base/native_library_unittest.cc.orig 2022-03-28 18:11:04 UTC +--- base/native_library_unittest.cc.orig 2022-12-01 10:35:46 UTC +++ base/native_library_unittest.cc -@@ -119,7 +119,7 @@ TEST(NativeLibraryTest, LoadLibrary) { +@@ -134,7 +134,7 @@ TEST(NativeLibraryTest, LoadLibrary) { // versions with respect to symbol resolution scope. // TSan and MSan error out on RTLD_DEEPBIND, https://crbug.com/705255 #if !BUILDFLAG(IS_ANDROID) && !defined(THREAD_SANITIZER) && \ diff --git a/www/iridium/files/patch-base_process_memory.cc b/www/iridium/files/patch-base_process_memory.cc index db25f3dd4dc4..10a5e5425971 100644 --- a/www/iridium/files/patch-base_process_memory.cc +++ b/www/iridium/files/patch-base_process_memory.cc @@ -1,6 +1,6 @@ ---- base/process/memory.cc.orig 2022-10-05 07:34:01 UTC +--- base/process/memory.cc.orig 2022-12-01 10:35:46 UTC +++ base/process/memory.cc -@@ -29,7 +29,7 @@ namespace base { +@@ -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. diff --git a/www/iridium/files/patch-base_process_process__metrics.cc b/www/iridium/files/patch-base_process_process__metrics.cc index 2398f6259a1d..6a119d9b8e96 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-10-05 07:34:01 UTC +--- base/process/process_metrics.cc.orig 2022-12-01 10:35:46 UTC +++ base/process/process_metrics.cc @@ -17,7 +17,7 @@ namespace base { namespace { @@ -27,16 +27,23 @@ Value meminfo = memory_info_.ToValue(); Value vmstat = vmstat_info_.ToValue(); meminfo.MergeDictionary(&vmstat); -@@ -99,7 +99,7 @@ std::unique_ptr<ProcessMetrics> ProcessMetrics::Create +@@ -99,7 +99,6 @@ std::unique_ptr<ProcessMetrics> ProcessMetrics::Create #endif // !BUILDFLAG(IS_MAC) } -#if !BUILDFLAG(IS_FREEBSD) || !BUILDFLAG(IS_POSIX) -+#if !BUILDFLAG(IS_FREEBSD) - double ProcessMetrics::GetPlatformIndependentCPUUsage() { - TimeDelta cumulative_cpu = GetCumulativeCPUUsage(); + double ProcessMetrics::GetPlatformIndependentCPUUsage( + TimeDelta cumulative_cpu) { TimeTicks time = TimeTicks::Now(); -@@ -150,7 +150,7 @@ double ProcessMetrics::GetPreciseCPUUsage() { +@@ -126,7 +125,6 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage( + double ProcessMetrics::GetPlatformIndependentCPUUsage() { + return GetPlatformIndependentCPUUsage(GetCumulativeCPUUsage()); + } +-#endif + + #if BUILDFLAG(IS_WIN) + double ProcessMetrics::GetPreciseCPUUsage(TimeDelta cumulative_cpu) { +@@ -157,7 +155,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 27bdfe62aaa4..e94ede6b9ee6 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-10-05 07:34:01 UTC +--- base/process/process_metrics.h.orig 2022-12-01 10:35:46 UTC +++ base/process/process_metrics.h @@ -36,7 +36,7 @@ #endif @@ -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; -@@ -155,7 +155,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -165,7 +165,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 -@@ -238,7 +238,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -248,7 +248,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; -@@ -259,7 +259,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -269,7 +269,7 @@ class BASE_EXPORT ProcessMetrics { #endif // !BUILDFLAG(IS_MAC) #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -54,7 +54,7 @@ int CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups); #endif #if BUILDFLAG(IS_APPLE) -@@ -270,7 +270,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -280,7 +280,7 @@ class BASE_EXPORT ProcessMetrics { #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -63,7 +63,7 @@ CPU::CoreType GetCoreType(uint32_t core_index); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_AIX) -@@ -284,9 +284,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -294,9 +294,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 +73,7 @@ #if BUILDFLAG(IS_WIN) TimeTicks last_cpu_time_for_precise_cpu_usage_; -@@ -294,7 +292,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -304,7 +302,7 @@ class BASE_EXPORT ProcessMetrics { #endif #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -82,7 +82,7 @@ // Same thing for idle wakeups. TimeTicks last_idle_wakeups_time_; uint64_t last_absolute_idle_wakeups_; -@@ -337,7 +335,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de +@@ -347,7 +345,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 +91,7 @@ // Data about system-wide memory consumption. Values are in KB. Available on // Windows, Mac, Linux, Android and Chrome OS. // -@@ -372,7 +370,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -382,7 +380,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -100,7 +100,7 @@ // This provides an estimate of available memory as described here: // https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773 // NOTE: this is ONLY valid in kernels 3.14 and up. Its value will always -@@ -387,7 +385,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -397,7 +395,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { #endif #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -109,7 +109,7 @@ int buffers = 0; int cached = 0; int active_anon = 0; -@@ -424,7 +422,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK +@@ -434,7 +432,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK // BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -118,7 +118,7 @@ // Parse the data found in /proc/<pid>/stat and return the sum of the // CPU-related ticks. Returns -1 on parse error. // Exposed for testing. -@@ -611,7 +609,7 @@ class BASE_EXPORT SystemMetrics { +@@ -621,7 +619,7 @@ class BASE_EXPORT SystemMetrics { FRIEND_TEST_ALL_PREFIXES(SystemMetricsTest, SystemMetrics); size_t committed_memory_; diff --git a/www/iridium/files/patch-base_process_process__metrics__freebsd.cc b/www/iridium/files/patch-base_process_process__metrics__freebsd.cc index c0ed225bef18..cf0839c0c5a1 100644 --- a/www/iridium/files/patch-base_process_process__metrics__freebsd.cc +++ b/www/iridium/files/patch-base_process_process__metrics__freebsd.cc @@ -1,4 +1,4 @@ ---- base/process/process_metrics_freebsd.cc.orig 2022-10-05 07:34:01 UTC +--- base/process/process_metrics_freebsd.cc.orig 2022-12-01 10:35:46 UTC +++ base/process/process_metrics_freebsd.cc @@ -3,20 +3,39 @@ // found in the LICENSE file. @@ -42,31 +42,37 @@ // static std::unique_ptr<ProcessMetrics> ProcessMetrics::CreateProcessMetrics( -@@ -26,17 +45,18 @@ std::unique_ptr<ProcessMetrics> ProcessMetrics::Create +@@ -24,22 +43,19 @@ std::unique_ptr<ProcessMetrics> ProcessMetrics::Create + return WrapUnique(new ProcessMetrics(process)); + } - double ProcessMetrics::GetPlatformIndependentCPUUsage() { +-double ProcessMetrics::GetPlatformIndependentCPUUsage() { ++TimeDelta ProcessMetrics::GetCumulativeCPUUsage() { struct kinfo_proc info; - int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_PID, process_}; - size_t length = sizeof(info); + size_t length = sizeof(struct kinfo_proc); ++ struct timeval tv; + int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process_ }; + if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0) - return 0; -+ return 0.0; ++ return TimeDelta(); - return (info.ki_pctcpu / FSCALE) * 100.0; -+ return static_cast<double>((info.ki_pctcpu * 100.0) / FSCALE); ++ return Microseconds(info.ki_runtime); } - TimeDelta ProcessMetrics::GetCumulativeCPUUsage() { +-TimeDelta ProcessMetrics::GetCumulativeCPUUsage() { - NOTREACHED(); -+ NOTIMPLEMENTED(); - return TimeDelta(); +- return TimeDelta(); +-} +- + bool ProcessMetrics::GetIOCounters(IoCounters* io_counters) const { + return false; } - -@@ -67,4 +87,221 @@ size_t GetSystemCommitCharge() { +@@ -67,4 +83,221 @@ size_t GetSystemCommitCharge() { return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize); } diff --git a/www/iridium/files/patch-base_profiler_sampling__profiler__thread__token.cc b/www/iridium/files/patch-base_profiler_sampling__profiler__thread__token.cc new file mode 100644 index 000000000000..cb3fb8690d86 --- /dev/null +++ b/www/iridium/files/patch-base_profiler_sampling__profiler__thread__token.cc @@ -0,0 +1,20 @@ +--- base/profiler/sampling_profiler_thread_token.cc.orig 2022-12-01 10:35:46 UTC ++++ base/profiler/sampling_profiler_thread_token.cc +@@ -6,7 +6,7 @@ + + #include "build/build_config.h" + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include <pthread.h> + + #include "base/profiler/stack_base_address_posix.h" +@@ -19,7 +19,7 @@ SamplingProfilerThreadToken GetSamplingProfilerCurrent + PlatformThreadId id = PlatformThread::CurrentId(); + #if BUILDFLAG(IS_ANDROID) + return {id, pthread_self()}; +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + absl::optional<uintptr_t> maybe_stack_base = + GetThreadStackBaseAddress(id, pthread_self()); + // GetThreadStackBaseAddress should only return nullopt on Android, so diff --git a/www/iridium/files/patch-base_profiler_sampling__profiler__thread__token.h b/www/iridium/files/patch-base_profiler_sampling__profiler__thread__token.h new file mode 100644 index 000000000000..e27fb55decad --- /dev/null +++ b/www/iridium/files/patch-base_profiler_sampling__profiler__thread__token.h @@ -0,0 +1,20 @@ +--- base/profiler/sampling_profiler_thread_token.h.orig 2022-12-01 10:35:46 UTC ++++ base/profiler/sampling_profiler_thread_token.h +@@ -11,7 +11,7 @@ + + #if BUILDFLAG(IS_ANDROID) + #include <pthread.h> +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include <stdint.h> + #endif + +@@ -25,7 +25,7 @@ struct SamplingProfilerThreadToken { + PlatformThreadId id; + #if BUILDFLAG(IS_ANDROID) + pthread_t pthread_id; +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // Due to the sandbox, we can only retrieve the stack base address for the + // current thread. We must grab it during + // GetSamplingProfilerCurrentThreadToken() and not try to get it later. diff --git a/www/iridium/files/patch-base_profiler_stack__base__address__posix.cc b/www/iridium/files/patch-base_profiler_stack__base__address__posix.cc new file mode 100644 index 000000000000..c6502df1d258 --- /dev/null +++ b/www/iridium/files/patch-base_profiler_stack__base__address__posix.cc @@ -0,0 +1,44 @@ +--- base/profiler/stack_base_address_posix.cc.orig 2022-12-01 10:35:46 UTC ++++ base/profiler/stack_base_address_posix.cc +@@ -15,6 +15,10 @@ + #include "base/files/scoped_file.h" + #endif + ++#if BUILDFLAG(IS_BSD) ++#include <pthread_np.h> ++#endif ++ + #if BUILDFLAG(IS_CHROMEOS) + extern "C" void* __libc_stack_end; + #endif +@@ -42,15 +46,30 @@ absl::optional<uintptr_t> GetAndroidMainThreadStackBas + #endif + + uintptr_t GetThreadStackBaseAddressImpl(pthread_t pthread_id) { ++#if BUILDFLAG(IS_OPENBSD) ++ stack_t ss; ++ void *address; ++ size_t size; ++ if (pthread_stackseg_np(pthread_id, &ss) != 0) ++ return 0; ++ size = ss.ss_size; ++ address = (void*)((size_t) ss.ss_sp - ss.ss_size); ++#else + pthread_attr_t attr; ++#if BUILDFLAG(IS_FREEBSD) ++ pthread_attr_init(&attr); ++ pthread_attr_get_np(pthread_id, &attr); ++#else + // This will crash on ChromeOS & Linux if we are in the sandbox and pthread_id + // refers to a different thread, due to the use of sched_getaffinity(). + pthread_getattr_np(pthread_id, &attr); + // See crbug.com/617730 for limitations of this approach on Linux. ++#endif + void* address; + size_t size; + pthread_attr_getstack(&attr, &address, &size); + pthread_attr_destroy(&attr); ++#endif + const uintptr_t base_address = reinterpret_cast<uintptr_t>(address) + size; + return base_address; + } diff --git a/www/iridium/files/patch-base_profiler_thread__delegate__posix.cc b/www/iridium/files/patch-base_profiler_thread__delegate__posix.cc new file mode 100644 index 000000000000..8433915218f7 --- /dev/null +++ b/www/iridium/files/patch-base_profiler_thread__delegate__posix.cc @@ -0,0 +1,20 @@ +--- base/profiler/thread_delegate_posix.cc.orig 2022-12-01 10:35:46 UTC ++++ base/profiler/thread_delegate_posix.cc +@@ -13,7 +13,7 @@ + #include "build/build_config.h" + #include "third_party/abseil-cpp/absl/types/optional.h" + +-#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) ++#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) + #include "base/profiler/stack_base_address_posix.h" + #endif + +@@ -22,7 +22,7 @@ namespace base { + std::unique_ptr<ThreadDelegatePosix> ThreadDelegatePosix::Create( + SamplingProfilerThreadToken thread_token) { + absl::optional<uintptr_t> base_address; +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + base_address = thread_token.stack_base_address; + #else + base_address = diff --git a/www/iridium/files/patch-base_rand__util.h b/www/iridium/files/patch-base_rand__util.h index 34547895ab20..7e9392dfa146 100644 --- a/www/iridium/files/patch-base_rand__util.h +++ b/www/iridium/files/patch-base_rand__util.h @@ -1,6 +1,6 @@ ---- base/rand_util.h.orig 2022-10-05 07:34:01 UTC +--- base/rand_util.h.orig 2022-12-01 10:35:46 UTC +++ base/rand_util.h -@@ -80,7 +80,7 @@ void RandomShuffle(Itr first, Itr last) { +@@ -89,7 +89,7 @@ void RandomShuffle(Itr first, Itr last) { std::shuffle(first, last, RandomBitGenerator()); } diff --git a/www/iridium/files/patch-base_rand__util__posix.cc b/www/iridium/files/patch-base_rand__util__posix.cc index 7802c8f04468..898bd98ace02 100644 --- a/www/iridium/files/patch-base_rand__util__posix.cc +++ b/www/iridium/files/patch-base_rand__util__posix.cc @@ -1,4 +1,4 @@ ---- base/rand_util_posix.cc.orig 2022-10-05 07:34:01 UTC +--- base/rand_util_posix.cc.orig 2022-12-01 10:35:46 UTC +++ base/rand_util_posix.cc @@ -22,7 +22,7 @@ #include "base/time/time.h" @@ -9,7 +9,7 @@ #include "third_party/lss/linux_syscall_support.h" #elif BUILDFLAG(IS_MAC) // TODO(crbug.com/995996): Waiting for this header to appear in the iOS SDK. -@@ -39,6 +39,7 @@ static constexpr int kOpenFlags = O_RDONLY; +@@ -46,6 +46,7 @@ static constexpr int kOpenFlags = O_RDONLY; static constexpr int kOpenFlags = O_RDONLY | O_CLOEXEC; #endif @@ -17,7 +17,7 @@ // We keep the file descriptor for /dev/urandom around so we don't need to // reopen it (which is expensive), and since we may not even be able to reopen // it if we are later put in a sandbox. This class wraps the file descriptor so -@@ -56,10 +57,11 @@ class URandomFd { +@@ -63,10 +64,11 @@ class URandomFd { private: const int fd_; }; @@ -30,15 +30,15 @@ // TODO(pasko): Unify reading kernel version numbers in: // mojo/core/channel_linux.cc // chrome/browser/android/seccomp_support_detector.cc -@@ -144,6 +146,7 @@ void ConfigureRandBytesFieldTrial() { - // (https://chromium-review.googlesource.com/c/chromium/src/+/1545096) and land - // it or some form of it. +@@ -172,6 +174,7 @@ bool UseBoringSSLForRandBytes() { + } // namespace internal + void RandBytes(void* output, size_t output_length) { +#if !BUILDFLAG(IS_BSD) - #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_ANDROID)) && \ - !BUILDFLAG(IS_NACL) -@@ -172,11 +175,16 @@ void RandBytes(void* output, size_t output_length) { + #if !BUILDFLAG(IS_NACL) + // The BoringSSL experiment takes priority over everything else. + if (internal::UseBoringSSLForRandBytes()) { +@@ -210,11 +213,16 @@ void RandBytes(void* output, size_t output_length) { const bool success = ReadFromFD(urandom_fd, static_cast<char*>(output), output_length); CHECK(success); diff --git a/www/iridium/files/patch-base_third__party_symbolize_symbolize.cc b/www/iridium/files/patch-base_third__party_symbolize_symbolize.cc deleted file mode 100644 index b50fb8ca7218..000000000000 --- a/www/iridium/files/patch-base_third__party_symbolize_symbolize.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- base/third_party/symbolize/symbolize.cc.orig 2022-03-28 18:11:04 UTC -+++ base/third_party/symbolize/symbolize.cc -@@ -114,7 +114,7 @@ _END_GOOGLE_NAMESPACE_ - #if defined(HAVE_DLFCN_H) - #include <dlfcn.h> - #endif --#if BUILDFLAG(IS_OPENBSD) -+#if defined(__OpenBSD__) - #include <sys/exec_elf.h> - #else - #include <elf.h> diff --git a/www/iridium/files/patch-base_threading_platform__thread__posix.cc b/www/iridium/files/patch-base_threading_platform__thread__posix.cc index 26de09a430fb..bde1550ac046 100644 --- a/www/iridium/files/patch-base_threading_platform__thread__posix.cc +++ b/www/iridium/files/patch-base_threading_platform__thread__posix.cc @@ -1,21 +1,21 @@ ---- base/threading/platform_thread_posix.cc.orig 2022-10-05 07:34:01 UTC +--- base/threading/platform_thread_posix.cc.orig 2022-12-01 10:35:46 UTC +++ base/threading/platform_thread_posix.cc -@@ -76,7 +76,7 @@ void* ThreadFunc(void* params) { +@@ -77,7 +77,7 @@ void* ThreadFunc(void* params) { if (!thread_params->joinable) base::DisallowSingleton(); -#if !BUILDFLAG(IS_NACL) +#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD) - #if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) + #if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && BUILDFLAG(STARSCAN) partition_alloc::internal::PCScan::NotifyThreadCreated( partition_alloc::internal::GetStackPointer()); -@@ -371,6 +371,9 @@ namespace internal { - void SetCurrentThreadTypeImpl(ThreadType thread_type, +@@ -374,6 +374,9 @@ void SetCurrentThreadTypeImpl(ThreadType thread_type, MessagePumpType pump_type_hint) { #if BUILDFLAG(IS_NACL) -+ NOTIMPLEMENTED(); + NOTIMPLEMENTED(); +// avoid pledge(2) violation +#elif BUILDFLAG(IS_BSD) - NOTIMPLEMENTED(); ++ NOTIMPLEMENTED(); #else if (internal::SetCurrentThreadTypeForPlatform(thread_type, pump_type_hint)) + return; diff --git a/www/iridium/files/patch-base_trace__event_malloc__dump__provider.cc b/www/iridium/files/patch-base_trace__event_malloc__dump__provider.cc index 51351ba7b885..a7c2c0d7ffaf 100644 --- a/www/iridium/files/patch-base_trace__event_malloc__dump__provider.cc +++ b/www/iridium/files/patch-base_trace__event_malloc__dump__provider.cc @@ -1,4 +1,4 @@ ---- base/trace_event/malloc_dump_provider.cc.orig 2022-10-05 07:34:01 UTC +--- base/trace_event/malloc_dump_provider.cc.orig 2022-12-01 10:35:46 UTC +++ base/trace_event/malloc_dump_provider.cc @@ -24,6 +24,8 @@ @@ -9,7 +9,7 @@ #else #include <malloc.h> #endif -@@ -185,7 +187,7 @@ void ReportAppleAllocStats(size_t* total_virtual_size, +@@ -186,7 +188,7 @@ void ReportAppleAllocStats(size_t* total_virtual_size, #if (BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && BUILDFLAG(IS_ANDROID)) || \ (!BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && !BUILDFLAG(IS_WIN) && \ @@ -18,7 +18,7 @@ void ReportMallinfoStats(ProcessMemoryDump* pmd, size_t* total_virtual_size, size_t* resident_size, -@@ -356,6 +358,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump +@@ -357,6 +359,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump &allocated_objects_count); #elif BUILDFLAG(IS_FUCHSIA) // TODO(fuchsia): Port, see https://crbug.com/706592. diff --git a/www/iridium/files/patch-build_config_compiler_BUILD.gn b/www/iridium/files/patch-build_config_compiler_BUILD.gn index 6b6d36614ebe..afaa15c08f14 100644 --- a/www/iridium/files/patch-build_config_compiler_BUILD.gn +++ b/www/iridium/files/patch-build_config_compiler_BUILD.gn @@ -1,4 +1,4 @@ ---- build/config/compiler/BUILD.gn.orig 2022-10-05 07:34:01 UTC +--- build/config/compiler/BUILD.gn.orig 2022-12-01 10:35:46 UTC +++ build/config/compiler/BUILD.gn @@ -222,13 +222,16 @@ config("default_include_dirs") { # Compiler instrumentation can introduce dependencies in DSOs to symbols in @@ -39,7 +39,7 @@ # Linux-specific compiler flags setup. # ------------------------------------ if (use_gold) { -@@ -862,7 +871,7 @@ config("compiler_cpu_abi") { +@@ -879,7 +888,7 @@ config("compiler_cpu_abi") { ] } } else if (current_cpu == "arm") { @@ -48,25 +48,53 @@ !(is_chromeos_lacros && is_chromeos_device)) { cflags += [ "--target=arm-linux-gnueabihf" ] ldflags += [ "--target=arm-linux-gnueabihf" ] -@@ -878,7 +887,7 @@ config("compiler_cpu_abi") { +@@ -894,7 +903,7 @@ config("compiler_cpu_abi") { + cflags += [ "-mtune=$arm_tune" ] } } else if (current_cpu == "arm64") { - if (is_clang && !is_android && !is_nacl && !is_fuchsia && -- !(is_chromeos_lacros && is_chromeos_device)) { -+ !(is_chromeos_lacros && is_chromeos_device) && !is_bsd) { +- if (is_clang && !is_android && !is_nacl && !is_fuchsia && ++ if (is_clang && !is_android && !is_nacl && !is_fuchsia && !is_bsd && + !(is_chromeos_lacros && is_chromeos_device)) { cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] - } -@@ -1464,7 +1473,7 @@ config("default_warnings") { - ] - } +@@ -1233,6 +1242,27 @@ config("compiler_deterministic") { + } + } + ++config("clang_revision") { ++ if (is_clang && !is_bsd && clang_base_path == default_clang_base_path) { ++ update_args = [ ++ "--print-revision", ++ "--verify-version=$clang_version", ++ ] ++ if (llvm_force_head_revision) { ++ update_args += [ "--llvm-force-head-revision" ] ++ } ++ clang_revision = exec_script("//tools/clang/scripts/update.py", ++ update_args, ++ "trim string") ++ ++ # This is here so that all files get recompiled after a clang roll and ++ # when turning clang on or off. (defines are passed via the command line, ++ # and build system rebuild things when their commandline changes). Nothing ++ # should ever read this define. ++ defines = [ "CR_CLANG_REVISION=\"$clang_revision\"" ] ++ } ++} ++ + config("rustc_revision") { + if (enable_rust && defined(rustc_version)) { + # Similar to the above config, this is here so that all files get +@@ -1450,7 +1480,7 @@ config("default_warnings") { + "-Wno-ignored-pragma-optimize", + ] - if (!is_nacl) { + if (!is_nacl && !is_bsd) { cflags += [ # TODO(crbug.com/1343975) Evaluate and possibly enable. "-Wno-deprecated-builtins", -@@ -1623,7 +1632,7 @@ config("no_chromium_code") { +@@ -1619,7 +1649,7 @@ config("no_chromium_code") { # third-party libraries. "-Wno-c++11-narrowing", ] @@ -75,7 +103,7 @@ cflags += [ # Disabled for similar reasons as -Wunused-variable. "-Wno-unused-but-set-variable", -@@ -1935,8 +1944,7 @@ config("default_stack_frames") { +@@ -1931,8 +1961,7 @@ config("default_stack_frames") { } # Default "optimization on" config. @@ -85,7 +113,7 @@ if (is_win) { if (chrome_pgo_phase != 2) { # Favor size over speed, /O1 must be before the common flags. -@@ -1974,8 +1982,7 @@ config("xoptimize") { +@@ -1977,8 +2006,7 @@ config("xoptimize") { } # Turn off optimizations. @@ -95,7 +123,7 @@ if (is_win) { cflags = [ "/Od", # Disable optimization. -@@ -2015,8 +2022,7 @@ config("xno_optimize") { +@@ -2018,8 +2046,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. @@ -105,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: -@@ -2049,8 +2055,7 @@ config("xoptimize_max") { +@@ -2052,8 +2079,7 @@ config("xoptimize_max") { # # TODO(crbug.com/621335) - rework how all of these configs are related # so that we don't need this disclaimer. @@ -115,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: -@@ -2076,8 +2081,7 @@ config("xoptimize_speed") { +@@ -2079,8 +2105,7 @@ config("xoptimize_speed") { } } @@ -125,7 +153,7 @@ cflags = [ "-O1" ] + common_optimize_on_cflags rustflags = [ "-Copt-level=1" ] ldflags = common_optimize_on_ldflags -@@ -2142,7 +2146,7 @@ config("afdo_optimize_size") { +@@ -2146,7 +2171,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") { @@ -134,7 +162,7 @@ cflags = [] if (clang_emit_debug_info_for_profiling) { # Add the following flags to generate debug info for profiling. -@@ -2158,7 +2162,7 @@ config("afdo") { +@@ -2162,7 +2187,7 @@ config("afdo") { cflags += [ "-fprofile-sample-use=${rebased_clang_sample_profile}" ] inputs = [ _clang_sample_profile ] } @@ -143,7 +171,7 @@ cflags = [ "-fauto-profile=${auto_profile_path}" ] inputs = [ auto_profile_path ] } -@@ -2196,8 +2200,7 @@ config("win_pdbaltpath") { +@@ -2200,8 +2225,7 @@ config("win_pdbaltpath") { } # Full symbols. @@ -153,8 +181,8 @@ if (is_win) { if (is_clang) { cflags = [ "/Z7" ] # Debug information in the .obj files. -@@ -2299,7 +2302,8 @@ config("xsymbols") { - } +@@ -2311,7 +2335,8 @@ config("xsymbols") { + configs += [ "//build/config:compress_debug_sections" ] } - if (is_clang && (!is_nacl || is_nacl_saigo) && current_os != "zos") { @@ -163,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. -@@ -2322,8 +2326,7 @@ config("xsymbols") { +@@ -2334,8 +2359,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. @@ -173,7 +201,7 @@ if (is_win) { # Functions, files, and line tables only. cflags = [] -@@ -2395,8 +2398,7 @@ config("xminimal_symbols") { +@@ -2407,8 +2431,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-cc_BUILD.gn b/www/iridium/files/patch-cc_BUILD.gn index 777f4d138909..95d8ceed4fda 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-04-01 07:48:30 UTC +--- cc/BUILD.gn.orig 2022-12-01 10:35:46 UTC +++ cc/BUILD.gn @@ -664,7 +664,7 @@ cc_test_static_library("test_support") { if (enable_vulkan) { @@ -9,7 +9,7 @@ data_deps = [ "//third_party/mesa_headers" ] } } -@@ -891,7 +891,6 @@ cc_test("cc_unittests") { +@@ -892,7 +892,6 @@ cc_test("cc_unittests") { data = [ "//components/viz/test/data/" ] data_deps = [ "//testing/buildbot/filters:cc_unittests_filters", diff --git a/www/iridium/files/patch-chrome_app_chrome__main__delegate.cc b/www/iridium/files/patch-chrome_app_chrome__main__delegate.cc index 57b083bc2b25..28d27f0ac8dc 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-10-05 07:34:01 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/app/chrome_main_delegate.cc -@@ -126,7 +126,7 @@ +@@ -128,7 +128,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 -@@ -169,16 +169,16 @@ +@@ -171,16 +171,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 -@@ -329,7 +329,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty +@@ -336,7 +336,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 -@@ -415,7 +415,7 @@ bool HandleVersionSwitches(const base::CommandLine& co +@@ -422,7 +422,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) || -@@ -506,7 +506,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -513,7 +513,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. -@@ -589,7 +589,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat +@@ -596,7 +596,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( -@@ -767,6 +767,8 @@ void ChromeMainDelegate::CommonEarlyInitialization() { +@@ -832,6 +832,8 @@ void ChromeMainDelegate::CommonEarlyInitialization() { // not always enabled on Linux/ChromeOS. #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) bool enable_gwp_asan = crash_reporter::IsCrashpadEnabled(); @@ -74,7 +74,7 @@ #else bool enable_gwp_asan = true; #endif -@@ -826,7 +828,7 @@ void ChromeMainDelegate::CommonEarlyInitialization() { +@@ -892,7 +894,7 @@ void ChromeMainDelegate::CommonEarlyInitialization() { base::internal::TimerBase::InitializeFeatures(); base::InitializeCpuReductionExperiment(); base::sequence_manager::internal::SequenceManagerImpl::InitializeFeatures(); @@ -83,7 +83,7 @@ base::MessagePumpLibevent::InitializeFeatures(); #elif BUILDFLAG(IS_MAC) base::PlatformThread::InitializeOptimizedRealtimeThreadingFeature(); -@@ -916,7 +918,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo +@@ -982,7 +984,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo // TODO(crbug.com/1052397): Revisit the macro expression once build flag // switch of lacros-chrome is complete. @@ -92,7 +92,7 @@ // This will directly exit if the user asked for help. HandleHelpSwitches(command_line); #endif -@@ -946,7 +948,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo +@@ -1012,7 +1014,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo #if BUILDFLAG(IS_CHROMEOS) chromeos::dbus_paths::RegisterPathProvider(); #endif @@ -101,7 +101,7 @@ nacl::RegisterPathProvider(); #endif -@@ -1336,7 +1338,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1402,7 +1404,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)) { -@@ -1412,7 +1414,7 @@ absl::variant<int, content::MainFunctionParams> Chrome +@@ -1478,7 +1480,7 @@ absl::variant<int, content::MainFunctionParams> Chrome // This entry is not needed on Linux, where the NaCl loader // process is launched via nacl_helper instead. diff --git a/www/iridium/files/patch-chrome_app_generated__resources.grd b/www/iridium/files/patch-chrome_app_generated__resources.grd index 413eb5ad5528..59967b08e089 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-10-05 07:34:01 UTC +--- chrome/app/generated_resources.grd.orig 2022-12-01 10:35:46 UTC +++ chrome/app/generated_resources.grd @@ -2,7 +2,7 @@ @@ -9,7 +9,7 @@ for making strings OS specific. Other platform defines such as use_titlecase are declared in tools/grit/grit_rule.gni. --> -@@ -3069,7 +3069,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -3081,7 +3081,7 @@ are declared in tools/grit/grit_rule.gni. </if> <!-- Bluetooth Device Credentials (i.e. PIN/Passkey) dialog --> @@ -18,7 +18,7 @@ <message name="IDS_BLUETOOTH_DEVICE_CREDENTIALS_TITLE" desc="Title of the Bluetooth device credentials prompt dialog."> Device Credentials </message> -@@ -4802,7 +4802,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -4811,7 +4811,7 @@ are declared in tools/grit/grit_rule.gni. Read information about your browser, OS, device, installed software, registry values and files </message> </if> @@ -27,7 +27,7 @@ <message name="IDS_EXTENSION_PROMPT_WARNING_ENTERPRISE_REPORTING_PRIVATE_ENABLED_LINUX_AND_MACOS" desc="Permission string for enterprise private reporting permission on Linux and MacOS."> Read information about your browser, OS, device, installed software and files </message> -@@ -5439,7 +5439,7 @@ Keep your key file in a safe place. You will need it t +@@ -5469,7 +5469,7 @@ Keep your key file in a safe place. You will need it t Old versions of Chrome Apps won't open on Windows devices after December 2022. Contact your administrator to update to a new version or remove this app. </message> </if> @@ -36,7 +36,7 @@ <message name="IDS_FORCE_INSTALLED_DEPRECATED_APPS_CONTENT" desc="Content of the force installed deprecated app dialog"> Old versions of Chrome Apps won't open on Linux devices after December 2022. Contact your administrator to update to a new version or remove this app. </message> -@@ -5467,7 +5467,7 @@ Keep your key file in a safe place. You will need it t +@@ -5497,7 +5497,7 @@ Keep your key file in a safe place. You will need it t Old versions of Chrome apps won't open on Windows devices after December 2022. You can check if there's a new version available. </message> </if> @@ -45,7 +45,7 @@ <message name="IDS_DEPRECATED_APPS_MONITOR_RENDERER" desc="Dialog content that educates users that Chrome Apps will soon no longer launch."> Old versions of Chrome apps won't open on Linux devices after December 2022. You can check if there's a new version available. </message> -@@ -8964,7 +8964,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW +@@ -8984,7 +8984,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW Google Pay </message> @@ -54,7 +54,7 @@ <message name="IDS_SHOW_WINDOW_DECORATIONS" desc="The label of a radio button in the options dialog for using the system title bar and borders."> Use system title bar and borders </message> -@@ -10148,7 +10148,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -10195,7 +10195,7 @@ Please help our engineers fix this problem. Tell us wh Set as default </message> @@ -63,7 +63,7 @@ <message name="IDS_MINIMIZE_WINDOW_MENU" desc="The Linux browser window menu item text for minimizing the window."> Minimize </message> -@@ -12211,7 +12211,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -12285,7 +12285,7 @@ Please help our engineers fix this problem. Tell us wh Open Anyway </message> diff --git a/www/iridium/files/patch-chrome_app_settings__strings.grdp b/www/iridium/files/patch-chrome_app_settings__strings.grdp index a956f79d3910..f8ba3c909ba7 100644 --- a/www/iridium/files/patch-chrome_app_settings__strings.grdp +++ b/www/iridium/files/patch-chrome_app_settings__strings.grdp @@ -1,15 +1,15 @@ ---- chrome/app/settings_strings.grdp.orig 2022-10-05 07:34:01 UTC +--- chrome/app/settings_strings.grdp.orig 2022-12-01 10:35:46 UTC +++ chrome/app/settings_strings.grdp -@@ -134,7 +134,7 @@ +@@ -137,7 +137,7 @@ Theme </message> </if> - <if expr="is_linux"> + <if expr="is_posix"> - <message name="IDS_SETTINGS_SYSTEM_THEME" desc="Text of the label describing the system (GTK+) browser theme on Linux"> - GTK+ + <message name="IDS_SETTINGS_GTK_THEME" desc="Text of the label describing the system (GTK) browser theme on Linux"> + GTK </message> -@@ -148,7 +148,7 @@ +@@ -157,7 +157,7 @@ Use Classic </message> </if> diff --git a/www/iridium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd b/www/iridium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd index ab7eb9bd7ba3..d3eedd7e5eba 100644 --- a/www/iridium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd +++ b/www/iridium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd @@ -1,32 +1,29 @@ ---- chrome/app/theme/chrome_unscaled_resources.grd.orig 2022-10-05 07:34:01 UTC +--- chrome/app/theme/chrome_unscaled_resources.grd.orig 2022-12-01 10:35:46 UTC +++ chrome/app/theme/chrome_unscaled_resources.grd -@@ -15,12 +15,12 @@ - <release seq="1"> - <includes> - <if expr="_google_chrome"> -- <if expr="not is_linux"> -+ <if expr="not is_posix"> - <include name="IDR_PRODUCT_LOGO_64" file="google_chrome/product_logo_64.png" type="BINDATA" /> - <include name="IDR_PRODUCT_LOGO_128" file="google_chrome/product_logo_128.png" type="BINDATA" /> - <include name="IDR_PRODUCT_LOGO_256" file="google_chrome/product_logo_256.png" type="BINDATA" /> - </if> -- <if expr="is_linux"> -+ <if expr="is_posix"> - <include name="IDR_PRODUCT_LOGO_64" file="google_chrome/linux/product_logo_64.png" type="BINDATA" /> - <include name="IDR_PRODUCT_LOGO_128" file="google_chrome/linux/product_logo_128.png" type="BINDATA" /> - <include name="IDR_PRODUCT_LOGO_128_BETA" file="google_chrome/linux/product_logo_128_beta.png" type="BINDATA" /> -@@ -53,12 +53,12 @@ - </if> - </if> - <if expr="not _google_chrome"> -- <if expr="not is_linux"> -+ <if expr="not is_posix"> - <include name="IDR_PRODUCT_LOGO_64" file="chromium/product_logo_64.png" type="BINDATA" /> - <include name="IDR_PRODUCT_LOGO_128" file="chromium/product_logo_128.png" type="BINDATA" /> - <include name="IDR_PRODUCT_LOGO_256" file="chromium/product_logo_256.png" type="BINDATA" /> - </if> -- <if expr="is_linux"> -+ <if expr="is_posix"> - <include name="IDR_PRODUCT_LOGO_64" file="chromium/linux/product_logo_64.png" type="BINDATA" /> - <include name="IDR_PRODUCT_LOGO_128" file="chromium/linux/product_logo_128.png" type="BINDATA" /> - <include name="IDR_PRODUCT_LOGO_256" file="chromium/linux/product_logo_256.png" type="BINDATA" /> +@@ -19,7 +19,7 @@ + <include name="IDR_ASSISTANT_LOGO_MONOCHROME" file="google_chrome/google_assistant.svg" type="BINDATA" /> + <if expr="_google_chrome_for_testing"> + <then> +- <if expr="is_linux"> ++ <if expr="is_posix"> + <then> + <include name="IDR_PRODUCT_LOGO_64" file="google_chrome/google_chrome_for_testing/linux/product_logo_64.png" type="BINDATA" /> + <include name="IDR_PRODUCT_LOGO_128" file="google_chrome/google_chrome_for_testing/linux/product_logo_128.png" type="BINDATA" /> +@@ -36,7 +36,7 @@ + </if> + </then> + <else> <!-- not _google_chrome_for_testing --> +- <if expr="is_linux"> ++ <if expr="is_posix"> + <then> + <include name="IDR_PRODUCT_LOGO_64" file="google_chrome/linux/product_logo_64.png" type="BINDATA" /> + <include name="IDR_PRODUCT_LOGO_128" file="google_chrome/linux/product_logo_128.png" type="BINDATA" /> +@@ -78,7 +78,7 @@ + </if> + </then> + <else> <!-- not _google_chrome --> +- <if expr="is_linux"> ++ <if expr="is_posix"> + <then> + <include name="IDR_PRODUCT_LOGO_64" file="chromium/linux/product_logo_64.png" type="BINDATA" /> + <include name="IDR_PRODUCT_LOGO_128" file="chromium/linux/product_logo_128.png" type="BINDATA" /> diff --git a/www/iridium/files/patch-chrome_app_theme_theme__resources.grd b/www/iridium/files/patch-chrome_app_theme_theme__resources.grd index d19441f84c1b..6b17ac5d3d4a 100644 --- a/www/iridium/files/patch-chrome_app_theme_theme__resources.grd +++ b/www/iridium/files/patch-chrome_app_theme_theme__resources.grd @@ -1,34 +1,47 @@ ---- chrome/app/theme/theme_resources.grd.orig 2022-10-05 07:34:01 UTC +--- chrome/app/theme/theme_resources.grd.orig 2022-12-01 10:35:46 UTC +++ chrome/app/theme/theme_resources.grd -@@ -130,11 +130,11 @@ - <structure type="chrome_scaled_image" name="IDR_PRERENDER" file="common/prerender_succeed_icon.png" /> - </if> - <if expr="not _google_chrome"> -- <if expr="not is_linux"> -+ <if expr="not is_posix"> - <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="chromium/product_logo_16.png" /> - <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="chromium/product_logo_32.png" /> - </if> -- <if expr="is_linux"> -+ <if expr="is_posix"> - <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="chromium/linux/product_logo_16.png" /> - <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="chromium/linux/product_logo_32.png" /> - </if> -@@ -142,7 +142,7 @@ - <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_NAME_22_WHITE" file="chromium/product_logo_name_22_white.png" /> +@@ -131,7 +131,7 @@ </if> <if expr="_google_chrome"> -- <if expr="not is_linux"> -+ <if expr="not is_posix"> + <then> +- <if expr="is_linux"> ++ <if expr="is_posix"> + <then> + <if expr="_google_chrome_for_testing"> + <then> +@@ -148,7 +148,7 @@ + </else> + </if> <!-- _google_chrome_for_testing --> + </then> +- <else> <!-- not is_linux --> ++ <else> <!-- not is_posix --> + <if expr="not is_android"> + <if expr="_google_chrome_for_testing"> + <then> +@@ -172,7 +172,7 @@ + </else> + </if> <!-- _google_chrome_for_testing --> + </else> +- </if> <!-- is_linux --> ++ </if> <!-- is_posix --> + <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_CANARY" file="google_chrome/product_logo_32_canary.png" /> <if expr="not is_android"> - <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="google_chrome/product_logo_16.png" /> - <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="google_chrome/product_logo_32.png" /> -@@ -150,7 +150,7 @@ - <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_BETA" file="google_chrome/product_logo_32_beta.png" /> - <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_DEV" file="google_chrome/product_logo_32_dev.png" /> - </if> -- <if expr="is_linux"> -+ <if expr="is_posix"> - <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="google_chrome/linux/product_logo_16.png" /> - <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="google_chrome/linux/product_logo_32.png" /> - <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_BETA" file="google_chrome/linux/product_logo_32_beta.png" /> + <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_NAME_22" file="google_chrome/product_logo_name_22.png" /> +@@ -182,7 +182,7 @@ + <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_ENTERPRISE_WHITE" file="google_chrome/product_logo_enterprise_white.png" /> + </then> + <else> <!-- not _google_chrome --> +- <if expr="is_linux"> ++ <if expr="is_posix"> + <then> + <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="chromium/linux/product_logo_16.png" /> + <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="chromium/linux/product_logo_32.png" /> +@@ -191,7 +191,7 @@ + <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="chromium/product_logo_16.png" /> + <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="chromium/product_logo_32.png" /> + </else> +- </if> <!-- is_linux --> ++ </if> <!-- is_posix --> + <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_NAME_22" file="chromium/product_logo_name_22.png" /> + <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_NAME_22_WHITE" file="chromium/product_logo_name_22_white.png" /> + </else> diff --git a/www/iridium/files/patch-chrome_browser_about__flags.cc b/www/iridium/files/patch-chrome_browser_about__flags.cc index fdf0ba9fcb20..8cd6a3c3438e 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-10-05 07:34:01 UTC +--- chrome/browser/about_flags.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/about_flags.cc -@@ -212,7 +212,7 @@ +@@ -214,7 +214,7 @@ #include "ui/native_theme/native_theme_features.h" #include "ui/ui_features.h" @@ -9,7 +9,7 @@ #include "base/allocator/buildflags.h" #endif -@@ -287,7 +287,7 @@ +@@ -289,7 +289,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) -@@ -392,7 +392,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap +@@ -394,7 +394,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, -@@ -1262,7 +1262,7 @@ const FeatureEntry::FeatureVariation +@@ -1254,7 +1254,7 @@ const FeatureEntry::FeatureVariation }; #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -36,7 +36,7 @@ const FeatureEntry::FeatureParam kOmniboxDocumentProviderServerScoring[] = { {"DocumentUseServerScore", "true"}, {"DocumentUseClientScore", "false"}, -@@ -3923,7 +3923,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4072,7 +4072,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(base::kOneGroupPerRenderer)}, #endif // BUILDFLAG(IS_CHROMEOS) @@ -45,7 +45,7 @@ { "enable-accelerated-video-decode", flag_descriptions::kAcceleratedVideoDecodeName, -@@ -4549,7 +4549,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4660,7 +4660,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kWebShare)}, #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -54,7 +54,7 @@ {"ozone-platform-hint", flag_descriptions::kOzonePlatformHintName, flag_descriptions::kOzonePlatformHintDescription, kOsLinux, MULTI_VALUE_TYPE(kOzonePlatformHintRuntimeChoices)}, -@@ -4568,7 +4568,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4679,7 +4679,7 @@ const FeatureEntry kFeatureEntries[] = { password_manager::features::kForceInitialSyncWhenDecryptionFails)}, #endif // BUILDFLAG(IS_LINUX) @@ -63,8 +63,8 @@ {"skip-undecryptable-passwords", flag_descriptions::kSkipUndecryptablePasswordsName, flag_descriptions::kSkipUndecryptablePasswordsDescription, -@@ -4822,7 +4822,7 @@ const FeatureEntry kFeatureEntries[] = { - "FeedCloseRefresh")}, +@@ -4939,7 +4939,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(feed::kDiscoFeedEndpoint)}, #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) @@ -72,8 +72,8 @@ {"following-feed-sidepanel", flag_descriptions::kFollowingFeedSidepanelName, flag_descriptions::kFollowingFeedSidepanelDescription, kOsDesktop, FEATURE_VALUE_TYPE(feed::kWebUiFeed)}, -@@ -5336,7 +5336,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(omnibox::kZeroSuggestPrefetchingOnWeb)}, +@@ -5480,7 +5480,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(omnibox::kZeroSuggestInMemoryCaching)}, #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) @@ -81,7 +81,7 @@ {"omnibox-experimental-keyword-mode", flag_descriptions::kOmniboxExperimentalKeywordModeName, flag_descriptions::kOmniboxExperimentalKeywordModeDescription, kOsDesktop, -@@ -5873,7 +5873,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6018,7 +6018,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kPointerLockOptionsDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kPointerLockOptions)}, @@ -90,7 +90,7 @@ {"enable-async-dns", flag_descriptions::kAsyncDnsName, flag_descriptions::kAsyncDnsDescription, kOsWin | kOsLinux, FEATURE_VALUE_TYPE(features::kAsyncDns)}, -@@ -6791,7 +6791,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6962,7 +6962,7 @@ const FeatureEntry kFeatureEntries[] = { #endif // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -99,7 +99,7 @@ {"global-media-controls-modern-ui", flag_descriptions::kGlobalMediaControlsModernUIName, flag_descriptions::kGlobalMediaControlsModernUIDescription, -@@ -7651,7 +7651,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7832,7 +7832,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -108,7 +108,7 @@ {"quick-commands", flag_descriptions::kQuickCommandsName, flag_descriptions::kQuickCommandsDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kQuickCommands)}, -@@ -7950,7 +7950,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8147,7 +8147,7 @@ const FeatureEntry kFeatureEntries[] = { #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -117,7 +117,7 @@ { "ui-debug-tools", flag_descriptions::kUIDebugToolsName, -@@ -8530,7 +8530,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -8756,7 +8756,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ diff --git a/www/iridium/files/patch-chrome_browser_browser__process__impl.cc b/www/iridium/files/patch-chrome_browser_browser__process__impl.cc index 95cee6f52e68..928df95d45c0 100644 --- a/www/iridium/files/patch-chrome_browser_browser__process__impl.cc +++ b/www/iridium/files/patch-chrome_browser_browser__process__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/browser_process_impl.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/browser_process_impl.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/browser_process_impl.cc -@@ -211,7 +211,7 @@ +@@ -210,7 +210,7 @@ #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/error_reporting/chrome_js_error_report_processor.h" // nogncheck #endif -@@ -1167,7 +1167,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { +@@ -1160,7 +1160,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { ApplyMetricsReportingPolicy(); @@ -18,7 +18,7 @@ ChromeJsErrorReportProcessor::Create(); #endif -@@ -1426,7 +1426,7 @@ void BrowserProcessImpl::Unpin() { +@@ -1416,7 +1416,7 @@ void BrowserProcessImpl::Unpin() { // Mac is currently not supported. // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/iridium/files/patch-chrome_browser_browser__resources.grd b/www/iridium/files/patch-chrome_browser_browser__resources.grd deleted file mode 100644 index d8bff188f734..000000000000 --- a/www/iridium/files/patch-chrome_browser_browser__resources.grd +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/browser_resources.grd.orig 2022-10-05 07:34:01 UTC -+++ chrome/browser/browser_resources.grd -@@ -120,7 +120,7 @@ - <if expr="chromeos_ash"> - <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugins_chromeos.json" type="BINDATA" /> - </if> -- <if expr="is_linux or chromeos_lacros"> -+ <if expr="is_posix or chromeos_lacros"> - <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugins_linux.json" type="BINDATA" /> - </if> - <if expr="chromeos_ash"> 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 494c4e4dca4f..637a9db95101 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-10-05 07:34:01 UTC +--- chrome/browser/chrome_browser_interface_binders.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/chrome_browser_interface_binders.cc -@@ -113,13 +113,13 @@ +@@ -112,13 +112,13 @@ #endif // BUILDFLAG(FULL_SAFE_BROWSING) #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" -@@ -780,7 +780,7 @@ void PopulateChromeFrameBinders( +@@ -799,7 +799,7 @@ void PopulateChromeFrameBinders( #endif // BUILDFLAG(ENABLE_SPEECH_SERVICE) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -34,16 +34,16 @@ if (!render_frame_host->GetParent()) { map->Add<chrome::mojom::DraggableRegions>( base::BindRepeating(&DraggableRegionsHostImpl::CreateIfAllowed)); -@@ -788,7 +788,7 @@ void PopulateChromeFrameBinders( +@@ -807,7 +807,7 @@ void PopulateChromeFrameBinders( #endif #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) if (base::FeatureList::IsEnabled(blink::features::kDesktopPWAsSubApps) && - render_frame_host->IsInPrimaryMainFrame()) { - map->Add<blink::mojom::SubAppsService>( -@@ -843,14 +843,14 @@ void PopulateChromeWebUIFrameBinders( + !render_frame_host->GetParentOrOuterDocument()) { + // The service binder will reject non-primary main frames, but we still need +@@ -872,14 +872,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 -@@ -1235,7 +1235,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -1270,7 +1270,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 c08f0e351738..a8bc3de82574 100644 --- a/www/iridium/files/patch-chrome_browser_chrome__browser__main.cc +++ b/www/iridium/files/patch-chrome_browser_chrome__browser__main.cc @@ -1,4 +1,4 @@ ---- chrome/browser/chrome_browser_main.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/chrome_browser_main.cc @@ -239,11 +239,11 @@ @@ -23,7 +23,7 @@ #include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h" #include "chrome/browser/metrics/desktop_session_duration/touch_mode_stats_tracker.h" #include "chrome/browser/profiles/profile_activity_metrics_recorder.h" -@@ -1025,7 +1025,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1030,7 +1030,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 . -@@ -1038,7 +1038,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1043,7 +1043,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { } #endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH) @@ -41,7 +41,7 @@ // Set the product channel for crash reports. if (!crash_reporter::IsCrashpadEnabled()) { breakpad::SetChannelCrashKey( -@@ -1060,7 +1060,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1079,7 +1079,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 efd7b9f3a342..f652a58cbefd 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-10-05 07:34:01 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -386,7 +386,7 @@ +@@ -388,7 +388,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" -@@ -467,17 +467,17 @@ +@@ -472,17 +472,17 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -30,12 +30,13 @@ #if !BUILDFLAG(IS_ANDROID) #include "base/debug/leak_annotations.h" #include "components/crash/core/app/breakpad_linux.h" -@@ -485,12 +485,12 @@ +@@ -490,13 +490,13 @@ #include "components/crash/content/browser/crash_handler_host_linux.h" #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + #include "chrome/browser/enterprise/chrome_browser_main_extra_parts_enterprise.h" #include "chrome/browser/ui/webui/app_settings/web_app_settings_navigation_throttle.h" #endif @@ -45,7 +46,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) -@@ -514,11 +514,11 @@ +@@ -525,11 +525,11 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -59,7 +60,7 @@ #include "chrome/browser/chrome_browser_main_extra_parts_linux.h" #elif defined(USE_OZONE) #include "chrome/browser/chrome_browser_main_extra_parts_ozone.h" -@@ -927,7 +927,7 @@ blink::mojom::AutoplayPolicy GetAutoplayPolicyForWebCo +@@ -938,7 +938,7 @@ blink::mojom::AutoplayPolicy GetAutoplayPolicyForWebCo int GetCrashSignalFD(const base::CommandLine& command_line) { return crashpad::CrashHandlerHost::Get()->GetDeathSignalSocket(); } @@ -68,7 +69,7 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost( const std::string& process_type) { base::FilePath dumps_path; -@@ -1475,7 +1475,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1529,7 +1529,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo #elif BUILDFLAG(IS_CHROMEOS_LACROS) main_parts = std::make_unique<ChromeBrowserMainPartsLacros>( is_integration_test, &startup_data_); @@ -77,7 +78,7 @@ main_parts = std::make_unique<ChromeBrowserMainPartsLinux>( is_integration_test, &startup_data_); #elif BUILDFLAG(IS_ANDROID) -@@ -1514,7 +1514,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1568,7 +1568,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo std::make_unique<ChromeBrowserMainExtraPartsViewsLacros>()); // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -86,7 +87,7 @@ main_parts->AddParts( std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>()); #else -@@ -1535,7 +1535,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo +@@ -1589,7 +1589,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLacros>()); #endif @@ -95,7 +96,16 @@ main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>()); #elif defined(USE_OZONE) main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>()); -@@ -2304,6 +2304,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -1608,7 +1608,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo + + chrome::AddMetricsExtraParts(main_parts.get()); + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + main_parts->AddParts( + std::make_unique< + chrome::enterprise_util::ChromeBrowserMainExtraPartsEnterprise>()); +@@ -2377,6 +2377,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin #elif BUILDFLAG(IS_POSIX) #if BUILDFLAG(IS_ANDROID) bool enable_crash_reporter = true; @@ -104,7 +114,7 @@ #else bool enable_crash_reporter = false; if (crash_reporter::IsCrashpadEnabled()) { -@@ -2653,7 +2655,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2730,7 +2732,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin ThreadProfilerConfiguration::Get()->AppendCommandLineSwitchForChildProcess( command_line); @@ -113,7 +123,7 @@ // Opt into a hardened stack canary mitigation if it hasn't already been // force-disabled. if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) { -@@ -4096,7 +4098,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst +@@ -4180,7 +4182,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst } } @@ -122,7 +132,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -4540,14 +4542,14 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -4625,14 +4627,14 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati &throttles); } @@ -139,7 +149,7 @@ MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle:: MaybeCreateThrottleFor(handle), &throttles); -@@ -4580,7 +4582,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -4669,7 +4671,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati // 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_chrome__content__browser__client.h b/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.h index 645762e24515..78351f057d5c 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-10-05 07:34:01 UTC +--- chrome/browser/chrome_content_browser_client.h.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/chrome_content_browser_client.h -@@ -436,7 +436,7 @@ class ChromeContentBrowserClient : public content::Con +@@ -439,7 +439,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 0c9cd7e4aac7..8423840d4d18 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-10-05 07:34:01 UTC +--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/download/chrome_download_manager_delegate.cc -@@ -1552,7 +1552,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1551,7 +1551,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(); } -@@ -1668,7 +1668,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow +@@ -1667,7 +1667,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,16 +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()) { -@@ -1710,7 +1710,7 @@ std::unique_ptr<download::DownloadItemRenameHandler> - ChromeDownloadManagerDelegate::GetRenameHandlerForDownload( - download::DownloadItem* download_item) { - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ -- BUILDFLAG(IS_MAC) -+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - return enterprise_connectors::FileSystemRenameHandler::CreateIfNeeded( - download_item); - #else -@@ -1726,7 +1726,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl +@@ -1713,7 +1713,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 9b9a3e9b3e0d..28f01c6016aa 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,4 +1,4 @@ ---- chrome/browser/download/download_file_picker.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/download/download_file_picker.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/download/download_file_picker.cc @@ -16,7 +16,7 @@ #include "content/public/browser/download_manager.h" @@ -9,7 +9,7 @@ #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_window.h" #include "ui/aura/window.h" -@@ -84,7 +84,7 @@ DownloadFilePicker::DownloadFilePicker(download::Downl +@@ -87,7 +87,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 8d188458ea48..5e1049a4854d 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-10-05 07:34:01 UTC +--- chrome/browser/download/download_item_model.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/download/download_item_model.cc -@@ -731,7 +731,7 @@ bool DownloadItemModel::IsCommandChecked( +@@ -738,7 +738,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(); -@@ -773,7 +773,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand +@@ -780,7 +780,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand DownloadCommands::ALWAYS_OPEN_TYPE); DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile()); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -18,7 +18,7 @@ if (download_commands->CanOpenPdfInSystemViewer()) { prefs->SetShouldOpenPdfInSystemReader(!is_checked); SetShouldPreferOpeningInBrowser(is_checked); -@@ -1087,7 +1087,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe +@@ -1156,7 +1156,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe return; } diff --git a/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc b/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc index f5bb819f9561..87b2783351f6 100644 --- a/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc +++ b/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc @@ -1,4 +1,4 @@ ---- chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc @@ -11,11 +11,11 @@ #include "chrome/browser/profiles/profile.h" @@ -14,7 +14,7 @@ #include "chrome/browser/enterprise/connectors/device_trust/browser/browser_device_trust_connector_service.h" #endif // BUILDFLAG(IS_MAC) #include "chrome/browser/policy/chrome_browser_policy_connector.h" -@@ -40,7 +40,7 @@ DeviceTrustConnectorService* DeviceTrustConnectorServi +@@ -44,7 +44,7 @@ DeviceTrustConnectorService* DeviceTrustConnectorServi bool DeviceTrustConnectorServiceFactory::ServiceIsCreatedWithBrowserContext() const { @@ -23,7 +23,7 @@ return IsDeviceTrustConnectorFeatureEnabled(); #else return false; -@@ -59,7 +59,7 @@ KeyedService* DeviceTrustConnectorServiceFactory::Buil +@@ -75,7 +75,7 @@ KeyedService* DeviceTrustConnectorServiceFactory::Buil DeviceTrustConnectorService* service = nullptr; @@ -32,7 +32,7 @@ if (IsDeviceTrustConnectorFeatureEnabled()) { auto* key_manager = g_browser_process->browser_policy_connector() ->chrome_browser_cloud_management_controller() -@@ -67,7 +67,7 @@ KeyedService* DeviceTrustConnectorServiceFactory::Buil +@@ -83,7 +83,7 @@ KeyedService* DeviceTrustConnectorServiceFactory::Buil #if BUILDFLAG(IS_MAC) service = new MacDeviceTrustConnectorService( key_manager, profile->GetPrefs(), g_browser_process->local_state()); diff --git a/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_browser_commands_key__rotation__command__factory.cc b/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_browser_commands_key__rotation__command__factory.cc index f1f86114fc4d..77951dbd1832 100644 --- a/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_browser_commands_key__rotation__command__factory.cc +++ b/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_browser_commands_key__rotation__command__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/key_rotation_command_factory.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/key_rotation_command_factory.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/key_rotation_command_factory.cc -@@ -13,7 +13,7 @@ +@@ -14,7 +14,7 @@ #if BUILDFLAG(IS_WIN) #include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/win_key_rotation_command.h" @@ -9,12 +9,12 @@ #include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/linux_key_rotation_command.h" #elif BUILDFLAG(IS_MAC) #include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/mac_key_rotation_command.h" -@@ -45,7 +45,7 @@ std::unique_ptr<KeyRotationCommand> KeyRotationCommand - scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory) { +@@ -47,7 +47,7 @@ std::unique_ptr<KeyRotationCommand> KeyRotationCommand + PrefService* local_prefs) { #if BUILDFLAG(IS_WIN) return std::make_unique<WinKeyRotationCommand>(); -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return std::make_unique<LinuxKeyRotationCommand>(url_loader_factory); #elif BUILDFLAG(IS_MAC) - return std::make_unique<MacKeyRotationCommand>(url_loader_factory); + return std::make_unique<MacKeyRotationCommand>(url_loader_factory, diff --git a/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc b/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc index aca8bb196f9c..9f365c1668dc 100644 --- a/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc +++ b/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc @@ -1,6 +1,6 @@ ---- chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.cc -@@ -18,14 +18,14 @@ +@@ -19,14 +19,14 @@ #include "chrome/common/chrome_paths.h" #include "components/version_info/version_info.h" 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 8b0d93510578..04f8c0f2b350 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,6 +1,15 @@ ---- chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.h.orig 2022-10-05 07:34:01 UTC +--- 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 -@@ -22,7 +22,7 @@ class BrowserCrashEventRouter +@@ -9,7 +9,7 @@ + #include "chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.h" + #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h" + +-#if !BUILDFLAG(IS_FUCHSIA) ++#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_BSD) + #include "third_party/crashpad/crashpad/client/crash_report_database.h" + #endif // !BUILDFLAG(IS_FUCHSIA) + namespace enterprise_connectors { +@@ -27,7 +27,7 @@ class BrowserCrashEventRouter BrowserCrashEventRouter& operator=(const BrowserCrashEventRouter&) = delete; ~BrowserCrashEventRouter() override; @@ -8,8 +17,8 @@ +#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_BSD) void OnCloudReportingLaunched( enterprise_reporting::ReportScheduler* report_scheduler) override; - #endif // !BUILDFLAG(IS_FUCHSIA) -@@ -32,7 +32,7 @@ class BrowserCrashEventRouter + void UploadToReportingServer( +@@ -41,7 +41,7 @@ class BrowserCrashEventRouter nullptr; raw_ptr<policy::ChromeBrowserCloudManagementController> controller_ = nullptr; diff --git a/www/iridium/files/patch-chrome_browser_extensions_BUILD.gn b/www/iridium/files/patch-chrome_browser_extensions_BUILD.gn index d390d215f8bd..3dfff81cf14e 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-10-05 07:34:01 UTC +--- chrome/browser/extensions/BUILD.gn.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/extensions/BUILD.gn -@@ -1332,6 +1332,10 @@ static_library("extensions") { +@@ -1331,6 +1331,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 519a666554c7..b292df7ca83a 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-10-05 07:34:01 UTC +--- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc -@@ -31,7 +31,7 @@ +@@ -32,7 +32,7 @@ #include "components/reporting/util/statusor.h" #endif @@ -9,7 +9,7 @@ #include "base/strings/string_util.h" #include "chrome/browser/enterprise/signals/signals_aggregator_factory.h" #include "chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.h" -@@ -155,7 +155,7 @@ api::enterprise_reporting_private::ContextInfo ToConte +@@ -151,7 +151,7 @@ api::enterprise_reporting_private::ContextInfo ToConte return info; } @@ -18,7 +18,7 @@ device_signals::SignalsAggregationRequest CreateAggregationRequest( const std::string& user_id, -@@ -215,7 +215,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction:: +@@ -211,7 +211,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction:: // getPersistentSecret @@ -27,7 +27,7 @@ EnterpriseReportingPrivateGetPersistentSecretFunction:: EnterpriseReportingPrivateGetPersistentSecretFunction() = default; -@@ -655,7 +655,7 @@ void EnterpriseReportingPrivateEnqueueRecordFunction:: +@@ -636,7 +636,7 @@ void EnterpriseReportingPrivateEnqueueRecordFunction:: } #endif diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc b/www/iridium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc index 5a02959f36c8..25eae117cc36 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc +++ b/www/iridium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc -@@ -21,6 +21,7 @@ static base::LazyInstance<scoped_refptr<StorageDeviceL +@@ -20,6 +20,7 @@ static base::LazyInstance<scoped_refptr<StorageDeviceL void RemovableStorageProvider::GetAllDevices(DeviceListReadyCallback callback) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); @@ -8,7 +8,7 @@ if (g_test_device_list.Get().get() != nullptr) { base::ThreadTaskRunnerHandle::Get()->PostTask( FROM_HERE, -@@ -34,6 +35,9 @@ void RemovableStorageProvider::GetAllDevices(DeviceLis +@@ -33,6 +34,9 @@ void RemovableStorageProvider::GetAllDevices(DeviceLis base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN}, base::BindOnce(&RemovableStorageProvider::PopulateDeviceList), std::move(callback)); 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 new file mode 100644 index 000000000000..252e80f03c67 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc @@ -0,0 +1,11 @@ +--- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2022-12-01 10:35:46 UTC ++++ chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc +@@ -494,7 +494,7 @@ void PasswordsPrivateDelegateImpl::OsReauthCall( + } + + void PasswordsPrivateDelegateImpl::OsReauthTimeoutCall() { +-#if !BUILDFLAG(IS_LINUX) ++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) + PasswordsPrivateEventRouter* router = + PasswordsPrivateEventRouterFactory::GetForProfile(profile_); + if (router) diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc b/www/iridium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc index 1875d794c31a..d2bde42afb98 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc +++ b/www/iridium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -187,7 +187,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -191,7 +191,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,12 +9,12 @@ (*s_allowlist)[::prefs::kUseCustomChromeFrame] = settings_api::PrefType::PREF_TYPE_BOOLEAN; #endif -@@ -201,7 +201,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -203,7 +203,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist + settings_api::PrefType::PREF_TYPE_STRING; + (*s_allowlist)[::prefs::kPolicyThemeColor] = settings_api::PrefType::PREF_TYPE_NUMBER; - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - (*s_allowlist)[::prefs::kUsesSystemTheme] = +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + (*s_allowlist)[::prefs::kUsesSystemThemeDeprecated] = settings_api::PrefType::PREF_TYPE_BOOLEAN; - #endif + (*s_allowlist)[::prefs::kSystemTheme] = 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 6b9b9043fe8a..f34367be8b16 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-04-01 07:48:30 UTC +--- chrome/browser/extensions/external_provider_impl.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/extensions/external_provider_impl.cc -@@ -818,7 +818,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -828,7 +828,7 @@ void ExternalProviderImpl::CreateExternalProviders( if (!profile->GetPrefs()->GetBoolean(pref_names::kBlockExternalExtensions)) { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ provider_list->push_back(std::make_unique<ExternalProviderImpl>( service, base::MakeRefCounted<ExternalPrefLoader>( -@@ -846,7 +846,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -856,7 +856,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 1e2ff2cddb93..1357d4947b84 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-10-05 07:34:01 UTC +--- 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 -@@ -254,7 +254,7 @@ const struct { +@@ -256,7 +256,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 974da531f97a..860c3f64fcbe 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-10-05 07:34:01 UTC +--- chrome/browser/flag_descriptions.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/flag_descriptions.cc -@@ -6226,7 +6226,7 @@ const char kSideSearchDSESupportDescription[] = +@@ -6383,7 +6383,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."; -@@ -6235,7 +6235,7 @@ const char kQuickCommandsDescription[] = +@@ -6392,7 +6392,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."; -@@ -6249,7 +6249,7 @@ const char kWebShareDescription[] = +@@ -6406,7 +6406,7 @@ const char kWebShareDescription[] = "platforms."; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) @@ -27,7 +27,7 @@ const char kOzonePlatformHintChoiceDefault[] = "Default"; const char kOzonePlatformHintChoiceAuto[] = "Auto"; const char kOzonePlatformHintChoiceX11[] = "X11"; -@@ -6269,7 +6269,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti +@@ -6426,7 +6426,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti "Bluetooth"; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) @@ -36,7 +36,7 @@ const char kCleanUndecryptablePasswordsLinuxName[] = "Cleanup local undecryptable passwords during initial sync flow"; const char kCleanUndecryptablePasswordsLinuxDescription[] = -@@ -6282,7 +6282,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail +@@ -6439,7 +6439,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."; -@@ -6291,7 +6291,7 @@ const char kSkipUndecryptablePasswordsDescription[] = +@@ -6448,7 +6448,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) -@@ -6396,7 +6396,7 @@ const char kElasticOverscrollDescription[] = +@@ -6553,7 +6553,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 66ef087962bd..f6f0f70da1cd 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-10-05 07:34:01 UTC +--- chrome/browser/flag_descriptions.h.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/flag_descriptions.h -@@ -3574,7 +3574,7 @@ extern const char kSideSearchDSESupportDescription[]; +@@ -3661,7 +3661,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[]; -@@ -3591,7 +3591,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa +@@ -3678,7 +3678,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[]; -@@ -3607,18 +3607,18 @@ extern const char kForcePasswordInitialSyncWhenDecrypt +@@ -3694,18 +3694,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) || -@@ -3695,7 +3695,7 @@ extern const char kElasticOverscrollDescription[]; +@@ -3782,7 +3782,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_media__galleries_media__file__system__registry.cc b/www/iridium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc index 5f7b86fc368a..57f6d387d23e 100644 --- a/www/iridium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc +++ b/www/iridium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc @@ -1,6 +1,6 @@ ---- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/media_galleries/media_file_system_registry.cc -@@ -744,7 +744,12 @@ class MediaFileSystemRegistry::MediaFileSystemContextI +@@ -585,7 +585,12 @@ class MediaFileSystemRegistry::MediaFileSystemContextI // Constructor in 'private' section because depends on private class definition. MediaFileSystemRegistry::MediaFileSystemRegistry() : file_system_context_(new MediaFileSystemContextImpl) { diff --git a/www/iridium/files/patch-chrome_browser_media_router_discovery_BUILD.gn b/www/iridium/files/patch-chrome_browser_media_router_discovery_BUILD.gn index 6413e1c86e81..488744c31ace 100644 --- a/www/iridium/files/patch-chrome_browser_media_router_discovery_BUILD.gn +++ b/www/iridium/files/patch-chrome_browser_media_router_discovery_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/browser/media/router/discovery/BUILD.gn.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/media/router/discovery/BUILD.gn.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/media/router/discovery/BUILD.gn -@@ -79,7 +79,7 @@ static_library("discovery") { +@@ -80,7 +80,7 @@ static_library("discovery") { "media_sink_discovery_metrics.h", ] diff --git a/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.h b/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.h index d0f349689694..70285dc5e31f 100644 --- a/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.h +++ b/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.h @@ -1,6 +1,6 @@ ---- chrome/browser/media/webrtc/webrtc_logging_controller.h.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/media/webrtc/webrtc_logging_controller.h.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/media/webrtc/webrtc_logging_controller.h -@@ -132,7 +132,7 @@ class WebRtcLoggingController +@@ -133,7 +133,7 @@ class WebRtcLoggingController size_t web_app_id, const StartEventLoggingCallback& callback); @@ -9,7 +9,7 @@ // Ensures that the WebRTC Logs directory exists and then grants render // process access to the 'WebRTC Logs' directory, and invokes |callback| with // the ids necessary to create a DirectoryEntry object. -@@ -191,7 +191,7 @@ class WebRtcLoggingController +@@ -192,7 +192,7 @@ class WebRtcLoggingController bool success, const std::string& error_message); diff --git a/www/iridium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc b/www/iridium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc index dd9c42c7d272..4ceeeab27b12 100644 --- a/www/iridium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc +++ b/www/iridium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc @@ -1,4 +1,4 @@ ---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc @@ -58,8 +58,10 @@ @@ -12,7 +12,7 @@ #include "base/linux_util.h" #include "base/strings/string_split.h" -@@ -516,7 +518,7 @@ void RecordStartupMetrics() { +@@ -491,7 +493,7 @@ void RecordStartupMetrics() { // Record whether Chrome is the default browser or not. // Disabled on Linux due to hanging browser tests, see crbug.com/1216328. diff --git a/www/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 86455309a176..e40dc692e189 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,6 +1,6 @@ ---- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/metrics/chrome_metrics_service_client.cc -@@ -174,7 +174,7 @@ +@@ -175,7 +175,7 @@ #include "chrome/notification_helper/notification_helper_constants.h" #endif @@ -9,7 +9,7 @@ #include "components/metrics/motherboard_metrics_provider.h" #endif -@@ -721,7 +721,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -722,7 +722,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic metrics_service_->RegisterMetricsProvider( std::make_unique<metrics::CPUMetricsProvider>()); @@ -18,7 +18,7 @@ metrics_service_->RegisterMetricsProvider( std::make_unique<metrics::MotherboardMetricsProvider>()); #endif -@@ -798,7 +798,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -799,7 +799,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -27,7 +27,7 @@ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) metrics_service_->RegisterMetricsProvider( std::make_unique<DesktopPlatformFeaturesMetricsProvider>()); -@@ -890,7 +890,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -894,7 +894,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic std::make_unique<PowerMetricsProvider>()); #endif @@ -36,7 +36,7 @@ metrics_service_->RegisterMetricsProvider( metrics::CreateDesktopSessionMetricsProvider()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) -@@ -1073,7 +1073,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve +@@ -1077,7 +1077,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_metrics_power_process__monitor.cc b/www/iridium/files/patch-chrome_browser_metrics_power_process__monitor.cc index ed6557e14480..05d2de1f79f1 100644 --- a/www/iridium/files/patch-chrome_browser_metrics_power_process__monitor.cc +++ b/www/iridium/files/patch-chrome_browser_metrics_power_process__monitor.cc @@ -1,4 +1,4 @@ ---- chrome/browser/metrics/power/process_monitor.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/metrics/power/process_monitor.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/metrics/power/process_monitor.cc @@ -64,7 +64,7 @@ ProcessMonitor::Metrics SampleMetrics(base::ProcessMet #endif @@ -18,7 +18,7 @@ metrics->idle_wakeups *= factor; #endif -@@ -130,7 +130,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me +@@ -147,7 +147,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me lhs.cpu_usage += rhs.cpu_usage; #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/iridium/files/patch-chrome_browser_metrics_power_process__monitor.h b/www/iridium/files/patch-chrome_browser_metrics_power_process__monitor.h index fef39301f47c..2dcd6d5adfc2 100644 --- a/www/iridium/files/patch-chrome_browser_metrics_power_process__monitor.h +++ b/www/iridium/files/patch-chrome_browser_metrics_power_process__monitor.h @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/power/process_monitor.h.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/metrics/power/process_monitor.h.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/metrics/power/process_monitor.h -@@ -70,7 +70,7 @@ class ProcessMonitor : public content::BrowserChildPro +@@ -71,7 +71,7 @@ class ProcessMonitor : public content::BrowserChildPro double cpu_usage = 0.0; #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/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 0d99aec179ed..9419554229b5 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,4 +1,4 @@ ---- chrome/browser/net/system_network_context_manager.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/net/system_network_context_manager.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/net/system_network_context_manager.cc @@ -91,7 +91,7 @@ @@ -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) -@@ -484,7 +484,7 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -451,7 +451,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) -@@ -556,7 +556,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -523,7 +523,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe registry->RegisterBooleanPref(prefs::kKerberosEnabled, false); #endif // BUILDFLAG(IS_CHROMEOS_LACROS) diff --git a/www/iridium/files/patch-chrome_browser_new__tab__page_new__tab__page__util.cc b/www/iridium/files/patch-chrome_browser_new__tab__page_new__tab__page__util.cc index a89356fbdc99..2ba9f63bdfb3 100644 --- a/www/iridium/files/patch-chrome_browser_new__tab__page_new__tab__page__util.cc +++ b/www/iridium/files/patch-chrome_browser_new__tab__page_new__tab__page__util.cc @@ -1,4 +1,4 @@ ---- chrome/browser/new_tab_page/new_tab_page_util.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/new_tab_page/new_tab_page_util.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/new_tab_page/new_tab_page_util.cc @@ -11,7 +11,7 @@ @@ -9,3 +9,12 @@ return true; #else return false; +@@ -27,7 +27,7 @@ bool IsOsSupportedForCart() { + } + + bool IsOsSupportedForDrive() { +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return true; + #else + return false; diff --git a/www/iridium/files/patch-chrome_browser_policy_browser__signin__policy__handler.cc b/www/iridium/files/patch-chrome_browser_policy_browser__signin__policy__handler.cc index 4548084bdef9..c18a4b5f00f2 100644 --- a/www/iridium/files/patch-chrome_browser_policy_browser__signin__policy__handler.cc +++ b/www/iridium/files/patch-chrome_browser_policy_browser__signin__policy__handler.cc @@ -1,6 +1,6 @@ ---- chrome/browser/policy/browser_signin_policy_handler.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/policy/browser_signin_policy_handler.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/policy/browser_signin_policy_handler.cc -@@ -44,7 +44,7 @@ void BrowserSigninPolicyHandler::ApplyPolicySettings(c +@@ -45,7 +45,7 @@ void BrowserSigninPolicyHandler::ApplyPolicySettings(c policies.GetValue(policy_name(), base::Value::Type::INTEGER); switch (static_cast<BrowserSigninMode>(value->GetInt())) { case BrowserSigninMode::kForced: 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 00174075da4d..6eaae53b7d68 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,6 @@ ---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -189,12 +189,12 @@ +@@ -192,12 +192,12 @@ #include "components/spellcheck/browser/pref_names.h" #endif // BUILDFLAG(ENABLE_SPELLCHECK) @@ -15,7 +15,7 @@ #include "chrome/browser/web_applications/policy/web_app_settings_policy_handler.h" #endif -@@ -725,7 +725,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -731,7 +731,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kManagedDefaultGeolocationSetting, base::Value::Type::INTEGER }, #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \ @@ -24,8 +24,8 @@ { key::kRequireOnlineRevocationChecksForLocalAnchors, prefs::kCertRevocationCheckingRequiredLocalAnchors, base::Value::Type::BOOLEAN }, -@@ -1330,7 +1330,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = - base::Value::Type::BOOLEAN }, +@@ -1339,7 +1339,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + base::Value::Type::STRING }, #endif // BUILDFLAG(IS_CHROMEOS_ASH) -#if BUILDFLAG(IS_LINUX) @@ -33,7 +33,7 @@ { key::kGSSAPILibraryName, prefs::kGSSAPILibraryName, base::Value::Type::STRING }, -@@ -1400,18 +1400,18 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1409,18 +1409,18 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kTotalMemoryLimitMb, base::Value::Type::INTEGER }, #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -55,7 +55,7 @@ { key::kDefaultBrowserSettingEnabled, prefs::kDefaultBrowserSettingEnabled, base::Value::Type::BOOLEAN }, -@@ -1424,7 +1424,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1433,7 +1433,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) \ @@ -64,7 +64,7 @@ { key::kAutoplayAllowed, prefs::kAutoplayAllowed, base::Value::Type::BOOLEAN }, -@@ -1609,7 +1609,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1621,7 +1621,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_CHROMEOS) @@ -73,7 +73,7 @@ { key::kAuthNegotiateDelegateByKdcPolicy, prefs::kAuthNegotiateDelegateByKdcPolicy, base::Value::Type::BOOLEAN }, -@@ -1668,7 +1668,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1674,7 +1674,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = #endif // BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(ENABLE_EXTENSIONS) && (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) \ @@ -82,7 +82,16 @@ { key::kChromeAppsEnabled, extensions::pref_names::kChromeAppsEnabled, base::Value::Type::BOOLEAN }, -@@ -2007,7 +2007,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -1731,7 +1731,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + { key::kPrefixedStorageInfoEnabled, + storage::kPrefixedStorageInfoEnabled, + base::Value::Type::BOOLEAN }, +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + { key::kHighEfficiencyModeEnabled, + performance_manager::user_tuning::prefs::kHighEfficiencyModeEnabled, + base::Value::Type::BOOLEAN }, +@@ -2032,7 +2032,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime, chrome_schema)); @@ -91,7 +100,7 @@ handlers->AddHandler(std::make_unique<LocalSyncPolicyHandler>()); handlers->AddHandler(std::make_unique<ThemeColorPolicyHandler>()); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -@@ -2036,7 +2036,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2061,7 +2061,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH std::vector<std::unique_ptr<ConfigurationPolicyHandler>> signin_legacy_policies; #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ @@ -100,7 +109,7 @@ signin_legacy_policies.push_back(std::make_unique<SimplePolicyHandler>( key::kForceBrowserSignin, prefs::kForceBrowserSignin, base::Value::Type::BOOLEAN)); -@@ -2369,7 +2369,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2394,7 +2394,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH chrome_schema)); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -109,7 +118,7 @@ handlers->AddHandler( std::make_unique<web_app::WebAppSettingsPolicyHandler>(chrome_schema)); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || -@@ -2382,7 +2382,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2407,7 +2407,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif #if BUILDFLAG(ENABLE_SPELLCHECK) @@ -118,7 +127,7 @@ handlers->AddHandler(std::make_unique<SpellcheckLanguagePolicyHandler>()); handlers->AddHandler( std::make_unique<SpellcheckLanguageBlocklistPolicyHandler>( -@@ -2390,7 +2390,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2415,7 +2415,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) #endif // BUILDFLAG(ENABLE_SPELLCHECK) 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 1d9062af2193..088513ca5c81 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-10-05 07:34:01 UTC +--- chrome/browser/prefs/browser_prefs.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/prefs/browser_prefs.cc -@@ -439,14 +439,14 @@ +@@ -441,14 +441,14 @@ #include "components/os_crypt/os_crypt.h" #endif @@ -17,7 +17,25 @@ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" #endif -@@ -1214,7 +1214,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) +@@ -476,7 +476,7 @@ + #include "chrome/browser/sessions/session_service_log.h" + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "ui/color/system_theme.h" + #endif + +@@ -1010,7 +1010,7 @@ void RegisterProfilePrefsForMigration( + registry->RegisterIntegerPref(kProfileAvatarTutorialShown, 0); + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Deprecated 08/2022. + registry->RegisterBooleanPref(prefs::kUsesSystemThemeDeprecated, false); + #endif +@@ -1241,7 +1241,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) #endif // BUILDFLAG(IS_WIN) @@ -26,7 +44,7 @@ web_app::url_handler_prefs::RegisterLocalStatePrefs(registry); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -@@ -1531,13 +1531,13 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync +@@ -1561,13 +1561,13 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync safe_browsing::PostCleanupSettingsResetter::RegisterProfilePrefs(registry); #endif @@ -42,3 +60,12 @@ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) browser_switcher::BrowserSwitcherPrefs::RegisterProfilePrefs(registry); #endif +@@ -1981,7 +1981,7 @@ void MigrateObsoleteProfilePrefs(Profile* profile) { + profile_prefs->ClearPref(kProfileAvatarTutorialShown); + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Added 08/2022. + if (profile_prefs->HasPrefPath(prefs::kUsesSystemThemeDeprecated)) { + auto migrated_theme = 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 b2fb081d187e..3e429227ccaf 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-10-05 07:34:01 UTC +--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -255,7 +255,7 @@ +@@ -257,7 +257,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 -@@ -435,11 +435,11 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -438,11 +438,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 d9914b5b7e9b..e0e7fd0a47c3 100644 --- a/www/iridium/files/patch-chrome_browser_profiles_profile__impl.cc +++ b/www/iridium/files/patch-chrome_browser_profiles_profile__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/profiles/profile_impl.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/profiles/profile_impl.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/profiles/profile_impl.cc -@@ -261,6 +261,10 @@ +@@ -266,6 +266,10 @@ #include "chrome/browser/spellchecker/spellcheck_service.h" #endif @@ -11,7 +11,7 @@ using bookmarks::BookmarkModel; using content::BrowserThread; using content::DownloadManagerDelegate; -@@ -851,7 +855,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) +@@ -864,7 +868,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) } base::FilePath ProfileImpl::last_selected_directory() { diff --git a/www/iridium/files/patch-chrome_browser_renderer__preferences__util.cc b/www/iridium/files/patch-chrome_browser_renderer__preferences__util.cc index e7fa42eb5039..034ec5e932de 100644 --- a/www/iridium/files/patch-chrome_browser_renderer__preferences__util.cc +++ b/www/iridium/files/patch-chrome_browser_renderer__preferences__util.cc @@ -1,4 +1,4 @@ ---- chrome/browser/renderer_preferences_util.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/renderer_preferences_util.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/renderer_preferences_util.cc @@ -37,7 +37,7 @@ #include "ui/views/controls/textfield/textfield.h" @@ -9,14 +9,14 @@ #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" #include "ui/linux/linux_ui.h" -@@ -159,7 +159,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc +@@ -156,7 +156,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc prefs->caret_blink_interval = views::Textfield::GetCaretBlinkInterval(); #endif -#if defined(USE_AURA) && BUILDFLAG(IS_LINUX) +#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) - ui::LinuxUi* linux_ui = ui::LinuxUi::instance(); - if (linux_ui) { + auto* linux_ui_theme = ui::LinuxUiTheme::GetForProfile(profile); + if (linux_ui_theme) { if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) { @@ -179,7 +179,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc #endif diff --git a/www/iridium/files/patch-chrome_browser_resources_plugin__metadata_plugins__linux.json b/www/iridium/files/patch-chrome_browser_resources_plugin__metadata_plugins__linux.json deleted file mode 100644 index 82d341ff4140..000000000000 --- a/www/iridium/files/patch-chrome_browser_resources_plugin__metadata_plugins__linux.json +++ /dev/null @@ -1,31 +0,0 @@ ---- chrome/browser/resources/plugin_metadata/plugins_linux.json.orig 2022-03-28 18:11:04 UTC -+++ chrome/browser/resources/plugin_metadata/plugins_linux.json -@@ -1,28 +1,5 @@ - { - "x-version": 46, -- "adobe-flash-player": { -- "mime_types": [ -- "application/futuresplash", -- "application/x-shockwave-flash" -- ], -- "matching_mime_types": [ -- "application/futuresplash" -- ], -- "versions": [ -- { -- "version": "32.0.0.445", -- "status": "up_to_date", -- "reference": "https://helpx.adobe.com/security/products/flash-player/apsb20-58.html" -- } -- ], -- "lang": "en-US", -- "name": "Adobe Flash Player", -- "help_url": "https://support.google.com/chrome/?p=plugin_flash", -- "url": "https://support.google.com/chrome/answer/6258784", -- "displayurl": true, -- "group_name_matcher": "*Shockwave Flash*", -- "plugin_is_deprecated": true -- }, - "google-chrome-pdf": { - "mime_types": [ - ], 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 606bb92511a8..10f7fdc7604b 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,20 +1,20 @@ ---- chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.ts.orig 2022-10-05 07:34:01 UTC +--- 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 @@ -16,7 +16,7 @@ export interface AppearanceBrowserProxy { useDefaultTheme(): void; - // <if expr="is_linux"> -+ // <if expr="is_bsd"> - useSystemTheme(): void; ++ // <if expr="is_posix"> + useGtkTheme(): void; + useQtTheme(): void; // </if> - -@@ -44,7 +44,7 @@ export class AppearanceBrowserProxyImpl implements App +@@ -45,7 +45,7 @@ export class AppearanceBrowserProxyImpl implements App chrome.send('useDefaultTheme'); } - // <if expr="is_linux"> -+ // <if expr="is_bsd"> - useSystemTheme() { - chrome.send('useSystemTheme'); ++ // <if expr="is_posix"> + useGtkTheme() { + chrome.send('useGtkTheme'); } diff --git a/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html b/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html index c1e1690188b5..3bd5d7afe61e 100644 --- a/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html +++ b/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html @@ -1,4 +1,4 @@ ---- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/resources/settings/appearance_page/appearance_page.html @@ -27,7 +27,7 @@ <cr-link-row class="first" hidden="[[!pageVisibility.setTheme]]" @@ -8,7 +8,7 @@ +<if expr="not is_posix"> <template is="dom-if" if="[[prefs.extensions.theme.id.value]]"> <div class="separator"></div> - <cr-button id="useDefault" on-click="onUseDefaultTap_"> + <cr-button id="useDefault" on-click="onUseDefaultClick_"> @@ -35,7 +35,7 @@ </cr-button> </template> @@ -17,8 +17,8 @@ +<if expr="is_posix"> <div class="settings-row continuation" hidden="[[!showThemesSecondary_( - prefs.extensions.theme.id.value, useSystemTheme_)]]" -@@ -135,7 +135,7 @@ + prefs.extensions.theme.id.value, systemTheme_)]]" +@@ -142,7 +142,7 @@ </div> </template> diff --git a/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.ts b/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.ts index 96805b25753f..fdefe62cc821 100644 --- a/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.ts +++ b/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.ts @@ -1,6 +1,15 @@ ---- chrome/browser/resources/settings/appearance_page/appearance_page.ts.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/resources/settings/appearance_page/appearance_page.ts.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/resources/settings/appearance_page/appearance_page.ts -@@ -145,7 +145,7 @@ export class SettingsAppearancePageElement extends +@@ -63,7 +63,7 @@ export interface SettingsAppearancePageElement { + export enum SystemTheme { + // Either classic or web theme. + DEFAULT = 0, +- // <if expr="is_linux"> ++ // <if expr="is_posix"> + GTK = 1, + QT = 2, + // </if> +@@ -155,7 +155,7 @@ export class SettingsAppearancePageElement extends 'prefs.autogenerated.theme.policy.color.controlledBy)', }, @@ -9,16 +18,16 @@ /** * Whether to show the "Custom Chrome Frame" setting. */ -@@ -174,7 +174,7 @@ export class SettingsAppearancePageElement extends +@@ -184,7 +184,7 @@ export class SettingsAppearancePageElement extends 'themeChanged_(' + - 'prefs.extensions.theme.id.value, useSystemTheme_, isForcedTheme_)', + 'prefs.extensions.theme.id.value, systemTheme_, isForcedTheme_)', - // <if expr="is_linux"> + // <if expr="is_posix"> - // NOTE: this pref only exists on Linux. - 'useSystemThemePrefChanged_(prefs.extensions.theme.use_system.value)', + 'systemThemePrefChanged_(prefs.extensions.theme.system_theme.value)', // </if> -@@ -194,7 +194,7 @@ export class SettingsAppearancePageElement extends + ]; +@@ -203,7 +203,7 @@ export class SettingsAppearancePageElement extends private showReaderModeOption_: boolean; private isForcedTheme_: boolean; @@ -27,22 +36,27 @@ private showCustomChromeFrame_: boolean; // </if> -@@ -272,7 +272,7 @@ export class SettingsAppearancePageElement extends +@@ -281,7 +281,7 @@ export class SettingsAppearancePageElement extends this.appearanceBrowserProxy_.useDefaultTheme(); } - // <if expr="is_linux"> + // <if expr="is_posix"> - private useSystemThemePrefChanged_(useSystemTheme: boolean) { - this.useSystemTheme_ = useSystemTheme; + private systemThemePrefChanged_(systemTheme: SystemTheme) { + this.systemTheme_ = systemTheme; } -@@ -333,10 +333,10 @@ export class SettingsAppearancePageElement extends +@@ -354,7 +354,7 @@ export class SettingsAppearancePageElement extends } let i18nId; - // <if expr="is_linux"> + // <if expr="is_posix"> - i18nId = useSystemTheme ? 'systemTheme' : 'classicTheme'; + switch (this.systemTheme_) { + case SystemTheme.GTK: + i18nId = 'gtkTheme'; +@@ -367,7 +367,7 @@ export class SettingsAppearancePageElement extends + break; + } // </if> - // <if expr="not is_linux"> + // <if expr="not is_posix"> diff --git a/www/iridium/files/patch-chrome_browser_resources_settings_autofill__page_passwords__shared.css b/www/iridium/files/patch-chrome_browser_resources_settings_autofill__page_passwords__shared.css index 36661037a2b8..7048d1618b0f 100644 --- a/www/iridium/files/patch-chrome_browser_resources_settings_autofill__page_passwords__shared.css +++ b/www/iridium/files/patch-chrome_browser_resources_settings_autofill__page_passwords__shared.css @@ -1,6 +1,6 @@ ---- chrome/browser/resources/settings/autofill_page/passwords_shared.css.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/resources/settings/autofill_page/passwords_shared.css.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/resources/settings/autofill_page/passwords_shared.css -@@ -90,7 +90,7 @@ cr-input.password-input::part(input), +@@ -100,7 +100,7 @@ cr-input.password-input::part(input), * necessary to prevent Chrome from using the operating system's font * instead of the Material Design font. * TODO(dbeam): why not font: inherit? */ diff --git a/www/iridium/files/patch-chrome_browser_resources_signin_signin__shared.css b/www/iridium/files/patch-chrome_browser_resources_signin_signin__shared.css index e9e089b0b49b..0f1cd32be241 100644 --- a/www/iridium/files/patch-chrome_browser_resources_signin_signin__shared.css +++ b/www/iridium/files/patch-chrome_browser_resources_signin_signin__shared.css @@ -1,7 +1,7 @@ ---- chrome/browser/resources/signin/signin_shared.css.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/resources/signin/signin_shared.css.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/resources/signin/signin_shared.css -@@ -37,7 +37,7 @@ cr-button + cr-button { - margin-inline-start: 8px; +@@ -34,7 +34,7 @@ a { + padding: var(--action-container-padding); } -<if expr="is_macosx or is_linux or is_chromeos"> 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 a0c32f211c42..3c8ba869126e 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-10-05 07:34:01 UTC +--- chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.html.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.html -@@ -326,7 +326,7 @@ +@@ -334,7 +334,7 @@ consent-confirmation autofocus> $i18n{syncConfirmationConfirmLabel} </cr-button> @@ -9,7 +9,7 @@ <cr-button id="settingsButton" on-click="onGoToSettings_" disabled="[[anyButtonClicked_]]" consent-confirmation> $i18n{syncConfirmationSettingsLabel} -@@ -336,7 +336,7 @@ +@@ -344,7 +344,7 @@ disabled="[[anyButtonClicked_]]"> $i18n{syncConfirmationUndoLabel} </cr-button> @@ -18,7 +18,7 @@ <cr-button id="settingsButton" on-click="onGoToSettings_" disabled="[[anyButtonClicked_]]" consent-confirmation> $i18n{syncConfirmationSettingsLabel} -@@ -379,7 +379,7 @@ +@@ -387,7 +387,7 @@ consent-confirmation> $i18n{syncConfirmationConfirmLabel} </cr-button> @@ -27,7 +27,7 @@ <cr-button id="settingsButton" on-click="onGoToSettings_" disabled="[[anyButtonClicked_]]" consent-confirmation> $i18n{syncConfirmationSettingsLabel} -@@ -389,7 +389,7 @@ +@@ -397,7 +397,7 @@ disabled="[[anyButtonClicked_]]"> $i18n{syncConfirmationUndoLabel} </cr-button> 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 fb7bddf20fd2..840ec99b5865 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-10-05 07:34:01 UTC +--- chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc @@ -17,7 +17,7 @@ #include "net/base/url_util.h" @@ -9,7 +9,7 @@ #include "chrome/browser/enterprise/connectors/analysis/local_binary_upload_service_factory.h" #endif -@@ -287,7 +287,7 @@ BinaryUploadService* BinaryUploadService::GetForProfil +@@ -297,7 +297,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_sharing_sharing__handler__registry__impl.cc b/www/iridium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc index 7e50967d1e62..02af82a89e52 100644 --- a/www/iridium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc +++ b/www/iridium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/sharing/sharing_handler_registry_impl.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/sharing/sharing_handler_registry_impl.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/sharing/sharing_handler_registry_impl.cc -@@ -24,7 +24,7 @@ +@@ -23,7 +23,7 @@ #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ #include "chrome/browser/sharing/shared_clipboard/remote_copy_message_handler.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS_LACROS)) BUILDFLAG(IS_CHROMEOS) -@@ -78,7 +78,7 @@ SharingHandlerRegistryImpl::SharingHandlerRegistryImpl +@@ -77,7 +77,7 @@ SharingHandlerRegistryImpl::SharingHandlerRegistryImpl } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-chrome_browser_sync_chrome__sync__client.cc b/www/iridium/files/patch-chrome_browser_sync_chrome__sync__client.cc index 1f9df1b810a2..078312b32dbd 100644 --- a/www/iridium/files/patch-chrome_browser_sync_chrome__sync__client.cc +++ b/www/iridium/files/patch-chrome_browser_sync_chrome__sync__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/sync/chrome_sync_client.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/sync/chrome_sync_client.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/sync/chrome_sync_client.cc -@@ -437,7 +437,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy +@@ -440,7 +440,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy // Chrome prefers OS provided spell checkers where they exist. So only sync the // custom dictionary on platforms that typically don't provide one. diff --git a/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc b/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc index e973d0d8e602..2e937dc7d5f0 100644 --- a/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc +++ b/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc @@ -1,6 +1,6 @@ ---- chrome/browser/task_manager/sampling/task_group_sampler.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/task_manager/sampling/task_group_sampler.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/task_manager/sampling/task_group_sampler.cc -@@ -44,7 +44,7 @@ TaskGroupSampler::TaskGroupSampler( +@@ -45,7 +45,7 @@ TaskGroupSampler::TaskGroupSampler( const OnCpuRefreshCallback& on_cpu_refresh, const OnSwappedMemRefreshCallback& on_swapped_mem_refresh, const OnIdleWakeupsCallback& on_idle_wakeups, @@ -9,7 +9,7 @@ const OnOpenFdCountCallback& on_open_fd_count, #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) const OnProcessPriorityCallback& on_process_priority) -@@ -54,7 +54,7 @@ TaskGroupSampler::TaskGroupSampler( +@@ -55,7 +55,7 @@ TaskGroupSampler::TaskGroupSampler( on_cpu_refresh_callback_(on_cpu_refresh), on_swapped_mem_refresh_callback_(on_swapped_mem_refresh), on_idle_wakeups_callback_(on_idle_wakeups), @@ -18,7 +18,7 @@ on_open_fd_count_callback_(on_open_fd_count), #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) on_process_priority_callback_(on_process_priority) { -@@ -86,7 +86,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) +@@ -87,7 +87,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) base::BindOnce(on_swapped_mem_refresh_callback_)); } @@ -27,7 +27,7 @@ if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_IDLE_WAKEUPS, refresh_flags)) { base::PostTaskAndReplyWithResult( -@@ -96,7 +96,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) +@@ -97,7 +97,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) } #endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -36,12 +36,12 @@ if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_FD_COUNT, refresh_flags)) { base::PostTaskAndReplyWithResult( -@@ -146,7 +146,7 @@ int TaskGroupSampler::RefreshIdleWakeupsPerSecond() { +@@ -147,7 +147,7 @@ int TaskGroupSampler::RefreshIdleWakeupsPerSecond() { return process_metrics_->GetIdleWakeupsPerSecond(); } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) int TaskGroupSampler::RefreshOpenFdCount() { - DCHECK(worker_pool_sequenced_checker_.CalledOnValidSequence()); + DCHECK_CALLED_ON_VALID_SEQUENCE(worker_pool_sequenced_checker_); diff --git a/www/iridium/files/patch-chrome_browser_themes_theme__helper.cc b/www/iridium/files/patch-chrome_browser_themes_theme__helper.cc index 290276423f6f..b8a9e998100f 100644 --- a/www/iridium/files/patch-chrome_browser_themes_theme__helper.cc +++ b/www/iridium/files/patch-chrome_browser_themes_theme__helper.cc @@ -1,4 +1,4 @@ ---- chrome/browser/themes/theme_helper.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/themes/theme_helper.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/themes/theme_helper.cc @@ -18,7 +18,7 @@ #include "ui/gfx/image/image.h" @@ -9,12 +9,3 @@ #include "ui/linux/linux_ui.h" #endif -@@ -172,7 +172,7 @@ bool ThemeHelper::UseDarkModeColors(const CustomThemeS - - ui::NativeTheme const* native_theme = - ui::NativeTheme::GetInstanceForNativeUi(); --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (const auto* linux_ui = ui::LinuxUi::instance()) { - // We rely on the fact that the system theme is in use iff `theme_supplier` - // is non-null, but this is cheating. In the future this might not hold diff --git a/www/iridium/files/patch-chrome_browser_themes_theme__service.cc b/www/iridium/files/patch-chrome_browser_themes_theme__service.cc index caf205212c29..1f45728b3628 100644 --- a/www/iridium/files/patch-chrome_browser_themes_theme__service.cc +++ b/www/iridium/files/patch-chrome_browser_themes_theme__service.cc @@ -1,4 +1,4 @@ ---- chrome/browser/themes/theme_service.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/themes/theme_service.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/themes/theme_service.cc @@ -72,7 +72,7 @@ #include "extensions/browser/extension_registry_observer.h" @@ -12,15 +12,6 @@ @@ -314,7 +314,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier() } - bool ThemeService::ShouldUseSystemTheme() const { --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - return profile_->GetPrefs()->GetBoolean(prefs::kUsesSystemTheme); - #else - return false; -@@ -322,7 +322,7 @@ bool ThemeService::ShouldUseSystemTheme() const { - } - bool ThemeService::ShouldUseCustomFrame() const { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/iridium/files/patch-chrome_browser_themes_theme__service__aura__linux.cc b/www/iridium/files/patch-chrome_browser_themes_theme__service__aura__linux.cc index 5c098eda2482..6c964a02b34c 100644 --- a/www/iridium/files/patch-chrome_browser_themes_theme__service__aura__linux.cc +++ b/www/iridium/files/patch-chrome_browser_themes_theme__service__aura__linux.cc @@ -1,37 +1,11 @@ ---- chrome/browser/themes/theme_service_aura_linux.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/themes/theme_service_aura_linux.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/themes/theme_service_aura_linux.cc -@@ -13,7 +13,7 @@ - #include "ui/gfx/image/image.h" - #include "ui/native_theme/native_theme_aura.h" - +@@ -22,7 +22,7 @@ namespace { + ui::SystemTheme ValidateSystemTheme(ui::SystemTheme system_theme) { + switch (system_theme) { + case ui::SystemTheme::kDefault: -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "ui/linux/linux_ui.h" - #endif - -@@ -53,14 +53,14 @@ void SystemThemeLinux::StartUsingTheme() { - void SystemThemeLinux::StopUsingTheme() { - pref_service_->SetBoolean(prefs::kUsesSystemTheme, false); - // Have the former theme notify its observers of change. --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (auto* linux_ui = ui::LinuxUi::instance()) - linux_ui->GetNativeTheme(nullptr)->NotifyOnNativeThemeUpdated(); - #endif - } - - bool SystemThemeLinux::GetColor(int id, SkColor* color) const { --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (auto* linux_ui = ui::LinuxUi::instance()) { - return linux_ui->GetColor( - id, color, pref_service_->GetBoolean(prefs::kUseCustomChromeFrame)); -@@ -70,7 +70,7 @@ bool SystemThemeLinux::GetColor(int id, SkColor* color - } - - bool SystemThemeLinux::GetDisplayProperty(int id, int* result) const { --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (auto* linux_ui = ui::LinuxUi::instance()) - return linux_ui->GetDisplayProperty(id, result); + case ui::SystemTheme::kGtk: + case ui::SystemTheme::kQt: #endif diff --git a/www/iridium/files/patch-chrome_browser_themes_theme__service__factory.cc b/www/iridium/files/patch-chrome_browser_themes_theme__service__factory.cc index fe5729c29ed7..2a0a19ba9773 100644 --- a/www/iridium/files/patch-chrome_browser_themes_theme__service__factory.cc +++ b/www/iridium/files/patch-chrome_browser_themes_theme__service__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/themes/theme_service_factory.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/themes/theme_service_factory.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/themes/theme_service_factory.cc -@@ -25,11 +25,11 @@ +@@ -23,11 +23,11 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -11,27 +11,27 @@ -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "ui/linux/linux_ui.h" + #include "ui/linux/linux_ui_factory.h" #endif -@@ -85,7 +85,7 @@ KeyedService* ThemeServiceFactory::BuildServiceInstanc +@@ -81,7 +81,7 @@ ThemeServiceFactory::~ThemeServiceFactory() = default; + + KeyedService* ThemeServiceFactory::BuildServiceInstanceFor( content::BrowserContext* profile) const { - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) using ThemeService = ThemeServiceAuraLinux; #endif -@@ -99,9 +99,9 @@ void ThemeServiceFactory::RegisterProfilePrefs( +@@ -95,9 +95,9 @@ void ThemeServiceFactory::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - bool default_uses_system_theme = false; + ui::SystemTheme default_system_theme = ui::SystemTheme::kDefault; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - const ui::LinuxUi* linux_ui = ui::LinuxUi::instance(); - if (linux_ui) - default_uses_system_theme = linux_ui->GetDefaultUsesSystemTheme(); + default_system_theme = ui::GetDefaultSystemTheme(); + #endif + registry->RegisterIntegerPref(prefs::kSystemTheme, diff --git a/www/iridium/files/patch-chrome_browser_ui_browser.h b/www/iridium/files/patch-chrome_browser_ui_browser.h index 8479ed6930c5..a57d2b658ff3 100644 --- a/www/iridium/files/patch-chrome_browser_ui_browser.h +++ b/www/iridium/files/patch-chrome_browser_ui_browser.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/browser.h.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/ui/browser.h.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/ui/browser.h -@@ -282,7 +282,7 @@ class Browser : public TabStripModelObserver, +@@ -276,7 +276,7 @@ class Browser : public TabStripModelObserver, int32_t restore_id = kDefaultRestoreId; #endif diff --git a/www/iridium/files/patch-chrome_browser_ui_browser__command__controller.cc b/www/iridium/files/patch-chrome_browser_ui_browser__command__controller.cc index d65c1eabfae9..140b86557cd8 100644 --- a/www/iridium/files/patch-chrome_browser_ui_browser__command__controller.cc +++ b/www/iridium/files/patch-chrome_browser_ui_browser__command__controller.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/browser_command_controller.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/ui/browser_command_controller.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/ui/browser_command_controller.cc -@@ -96,7 +96,7 @@ +@@ -98,7 +98,7 @@ #include "components/user_manager/user_manager.h" #endif @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -285,7 +285,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( +@@ -287,7 +287,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( #endif } @@ -18,7 +18,7 @@ // If this key was registered by the user as a content editing hotkey, then // it is not reserved. auto* linux_ui = ui::LinuxUi::instance(); -@@ -530,7 +530,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -532,7 +532,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -27,7 +27,7 @@ case IDC_MINIMIZE_WINDOW: browser_->window()->Minimize(); break; -@@ -1093,7 +1093,7 @@ void BrowserCommandController::InitCommandState() { +@@ -1098,7 +1098,7 @@ void BrowserCommandController::InitCommandState() { #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-chrome_browser_ui_browser__dialogs.h b/www/iridium/files/patch-chrome_browser_ui_browser__dialogs.h deleted file mode 100644 index 34283cd459cd..000000000000 --- a/www/iridium/files/patch-chrome_browser_ui_browser__dialogs.h +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/ui/browser_dialogs.h.orig 2022-10-05 07:34:01 UTC -+++ chrome/browser/ui/browser_dialogs.h -@@ -25,7 +25,7 @@ - #include "ui/base/models/dialog_model.h" - #include "ui/gfx/native_widget_types.h" - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ - (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) - #include "chrome/browser/web_applications/web_app_id.h" - #endif diff --git a/www/iridium/files/patch-chrome_browser_ui_chrome__pages.cc b/www/iridium/files/patch-chrome_browser_ui_chrome__pages.cc index 596812459b36..ea3be2b3c9eb 100644 --- a/www/iridium/files/patch-chrome_browser_ui_chrome__pages.cc +++ b/www/iridium/files/patch-chrome_browser_ui_chrome__pages.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/chrome_pages.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/ui/chrome_pages.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/ui/chrome_pages.cc @@ -69,7 +69,7 @@ #endif @@ -9,7 +9,7 @@ #include "chrome/browser/web_applications/web_app_utils.h" #endif -@@ -613,7 +613,7 @@ void ShowBrowserSigninOrSettings(Browser* browser, +@@ -630,7 +630,7 @@ void ShowBrowserSigninOrSettings(Browser* browser, #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-chrome_browser_ui_chrome__pages.h b/www/iridium/files/patch-chrome_browser_ui_chrome__pages.h index 21d06651815a..7b0dc9c16933 100644 --- a/www/iridium/files/patch-chrome_browser_ui_chrome__pages.h +++ b/www/iridium/files/patch-chrome_browser_ui_chrome__pages.h @@ -1,4 +1,4 @@ ---- chrome/browser/ui/chrome_pages.h.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/ui/chrome_pages.h.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/ui/chrome_pages.h @@ -30,7 +30,7 @@ enum class ConsentLevel; } // namespace signin @@ -9,7 +9,7 @@ namespace web_app { enum class AppSettingsPageEntryPoint; } // namespace web_app -@@ -213,7 +213,7 @@ void ShowBrowserSigninOrSettings(Browser* browser, +@@ -218,7 +218,7 @@ void ShowBrowserSigninOrSettings(Browser* browser, #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-chrome_browser_ui_signin__view__controller.cc b/www/iridium/files/patch-chrome_browser_ui_signin__view__controller.cc index ff8645dd5c5f..613522b2c373 100644 --- a/www/iridium/files/patch-chrome_browser_ui_signin__view__controller.cc +++ b/www/iridium/files/patch-chrome_browser_ui_signin__view__controller.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/signin_view_controller.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/ui/signin_view_controller.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/ui/signin_view_controller.cc -@@ -271,7 +271,7 @@ void SigninViewController::ShowModalEnterpriseConfirma +@@ -273,7 +273,7 @@ void SigninViewController::ShowModalEnterpriseConfirma SkColor profile_color, signin::SigninChoiceCallback callback) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-chrome_browser_ui_signin__view__controller__delegate.h b/www/iridium/files/patch-chrome_browser_ui_signin__view__controller__delegate.h index 1a22fd408429..9f7c12ab1800 100644 --- a/www/iridium/files/patch-chrome_browser_ui_signin__view__controller__delegate.h +++ b/www/iridium/files/patch-chrome_browser_ui_signin__view__controller__delegate.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/signin_view_controller_delegate.h.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/ui/signin_view_controller_delegate.h.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/ui/signin_view_controller_delegate.h -@@ -81,7 +81,7 @@ class SigninViewControllerDelegate { +@@ -84,7 +84,7 @@ class SigninViewControllerDelegate { #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/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 5fd0717d36ba..d1d1aeca7b73 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,4 +1,4 @@ ---- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/ui/startup/startup_browser_creator.cc @@ -128,7 +128,7 @@ #include "chrome/credential_provider/common/gcp_strings.h" @@ -9,7 +9,7 @@ #include "chrome/browser/ui/startup/web_app_info_recorder_utils.h" #endif -@@ -1017,7 +1017,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -1006,7 +1006,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( silent_launch = true; } @@ -18,7 +18,7 @@ // Writes open and installed web apps to the specified file without // launching a new browser window or tab. if (base::FeatureList::IsEnabled(features::kListWebAppsSwitch) && -@@ -1207,7 +1207,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -1196,7 +1196,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 6cba314d60e7..b816e9138ee1 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,6 +1,6 @@ ---- chrome/browser/ui/startup/startup_browser_creator_impl.cc.orig 2022-10-05 07:34:01 UTC +--- 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 -@@ -241,7 +241,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser( +@@ -257,7 +257,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser( // at the state of the MessageLoop. Browser::CreateParams params = Browser::CreateParams(profile_, false); params.creation_source = Browser::CreationSource::kStartupCreator; diff --git a/www/iridium/files/patch-chrome_browser_ui_tab__helpers.cc b/www/iridium/files/patch-chrome_browser_ui_tab__helpers.cc index 8969d605baac..8d92b56469b7 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-10-05 07:34:01 UTC +--- chrome/browser/ui/tab_helpers.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/ui/tab_helpers.cc -@@ -200,7 +200,7 @@ +@@ -211,7 +211,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" -@@ -532,13 +532,13 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con +@@ -561,13 +561,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) || -@@ -553,7 +553,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con +@@ -590,7 +590,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_first__run__dialog.cc b/www/iridium/files/patch-chrome_browser_ui_views_first__run__dialog.cc index 9979b28b8b50..cd7cd56ee47d 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_first__run__dialog.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_first__run__dialog.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/first_run_dialog.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/ui/views/first_run_dialog.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/ui/views/first_run_dialog.cc -@@ -34,7 +34,7 @@ +@@ -35,7 +35,7 @@ namespace { @@ -9,7 +9,7 @@ void InitCrashReporterIfEnabled(bool enabled) { if (!crash_reporter::IsCrashpadEnabled() && enabled) breakpad::InitCrashReporter(std::string()); -@@ -122,7 +122,7 @@ bool FirstRunDialog::Accept() { +@@ -129,7 +129,7 @@ bool FirstRunDialog::Accept() { #if BUILDFLAG(IS_MAC) ChangeMetricsReportingState(report_crashes_->GetChecked()); 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 25049f1c9aeb..55b7c63e1116 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,52 +1,47 @@ ---- chrome/browser/ui/views/frame/browser_frame.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/ui/views/frame/browser_frame.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/ui/views/frame/browser_frame.cc -@@ -49,11 +49,11 @@ - - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - #include "ui/display/screen.h" +@@ -46,7 +46,7 @@ + #include "components/user_manager/user_manager.h" #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "ui/display/screen.h" #include "ui/linux/linux_ui.h" #endif +@@ -54,7 +54,7 @@ + namespace { -@@ -62,7 +62,7 @@ namespace { - bool IsUsingGtkTheme(Profile* profile) { - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + bool IsUsingLinuxSystemTheme(Profile* profile) { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme(); #else return false; -@@ -279,7 +279,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() { +@@ -269,7 +269,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() { + chrome::SaveWindowWorkspace(browser_view_->browser(), GetWorkspace()); + chrome::SaveWindowVisibleOnAllWorkspaces(browser_view_->browser(), IsVisibleOnAllWorkspaces()); - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // 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() -@@ -402,7 +402,7 @@ void BrowserFrame::SelectNativeTheme() { +@@ -392,7 +392,7 @@ void BrowserFrame::SelectNativeTheme() { return; } -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - const ui::LinuxUi* linux_ui = ui::LinuxUi::instance(); - // Ignore GTK+ for web apps with window-controls-overlay as the - // display_override so the web contents can blend with the overlay by using -@@ -421,7 +421,7 @@ bool BrowserFrame::RegenerateFrameOnThemeChange( + 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() { + bool BrowserFrame::RegenerateFrameOnThemeChange( + BrowserThemeChangeType theme_change_type) { bool need_regenerate = false; - // TODO(crbug.com/1052397): Revisit the macro expression once build flag - // switch of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - // GTK and user theme changes can both change frame buttons, so the frame +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // System and user theme changes can both change frame buttons, so the frame // always needs to be regenerated on Linux. need_regenerate = true; 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 new file mode 100644 index 000000000000..3637038abd33 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame.h @@ -0,0 +1,29 @@ +--- chrome/browser/ui/views/frame/browser_frame.h.orig 2022-12-01 10:35:46 UTC ++++ chrome/browser/ui/views/frame/browser_frame.h +@@ -12,7 +12,7 @@ + #include "ui/views/context_menu_controller.h" + #include "ui/views/widget/widget.h" + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + #include "ui/base/ui_base_types.h" + #endif + +@@ -63,7 +63,7 @@ class BrowserFrame : public views::Widget, public view + + ~BrowserFrame() override; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + // 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 + // contents for smoother dragging. + TabDragKind tab_drag_kind_ = TabDragKind::kNone; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + ui::WindowTiledEdges tiled_edges_; + #endif + 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 1be2e9136b95..9eff14034086 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-10-05 07:34:01 UTC +--- 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 @@ -16,7 +16,7 @@ #include "chrome/browser/ui/views/frame/glass_browser_frame_view.h" @@ -8,17 +8,17 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/browser/ui/views/frame/browser_frame_view_layout_linux.h" #include "chrome/browser/ui/views/frame/browser_frame_view_layout_linux_native.h" - #include "chrome/browser/ui/views/frame/browser_frame_view_linux.h" -@@ -34,7 +34,7 @@ namespace { + #include "chrome/browser/ui/views/frame/browser_frame_view_linux_native.h" +@@ -33,7 +33,7 @@ namespace { std::unique_ptr<OpaqueBrowserFrameView> CreateOpaqueBrowserFrameView( BrowserFrame* frame, BrowserView* browser_view) { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - auto* linux_ui = ui::LinuxUi::instance(); auto* profile = browser_view->browser()->profile(); + auto* linux_ui_theme = ui::LinuxUiTheme::GetForProfile(profile); auto* theme_service_factory = ThemeServiceFactory::GetForProfile(profile); -@@ -74,7 +74,7 @@ std::unique_ptr<BrowserNonClientFrameView> CreateBrows +@@ -73,7 +73,7 @@ std::unique_ptr<BrowserNonClientFrameView> CreateBrows BrowserFrame* frame, BrowserView* browser_view) { // TODO(https://crbug.com/1346734): Enable it on all platforms. 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 b93235be1fd7..ee1b60fa0d71 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-10-05 07:34:01 UTC +--- chrome/browser/ui/views/frame/browser_view.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/ui/views/frame/browser_view.cc -@@ -2012,7 +2012,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra +@@ -2037,7 +2037,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.cc b/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc index 010cd249bb55..ef54e5ed5a56 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc @@ -55,7 +55,7 @@ #include "ui/views/window/vector_icons/vector_icons.h" @@ -18,7 +18,16 @@ return FrameButtonStyle::kMdButton; #else return FrameButtonStyle::kImageButton; -@@ -767,7 +767,7 @@ gfx::Rect OpaqueBrowserFrameView::GetIconBounds() cons +@@ -580,7 +580,7 @@ bool OpaqueBrowserFrameView::ShouldDrawRestoredFrameSh + return false; + } + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + ui::WindowTiledEdges OpaqueBrowserFrameView::GetTiledEdges() const { + return frame()->tiled_edges(); + } +@@ -776,7 +776,7 @@ gfx::Rect OpaqueBrowserFrameView::GetIconBounds() cons } void OpaqueBrowserFrameView::WindowIconPressed() { 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 1056d7e50edd..38005251967a 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,15 @@ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view.h.orig 2022-10-05 07:34:01 UTC +--- 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 -@@ -226,7 +226,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient +@@ -114,7 +114,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient + const gfx::Rect& bounding_rect) const override; + bool IsTranslucentWindowOpacitySupported() const override; + bool ShouldDrawRestoredFrameShadow() const override; +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + ui::WindowTiledEdges GetTiledEdges() const override; + #endif + +@@ -230,7 +230,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient // Background painter for the window frame. std::unique_ptr<views::FrameBackground> frame_background_; diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout__delegate.h b/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout__delegate.h new file mode 100644 index 000000000000..9bb6781b59aa --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout__delegate.h @@ -0,0 +1,20 @@ +--- chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_delegate.h.orig 2022-12-01 10:35:46 UTC ++++ chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_delegate.h +@@ -10,7 +10,7 @@ + #include "build/build_config.h" + #include "build/chromeos_buildflags.h" + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + #include "ui/base/ui_base_types.h" + #endif + +@@ -96,7 +96,7 @@ class OpaqueBrowserFrameViewLayoutDelegate { + // Returns true if a client-side shadow should be drawn for restored windows. + virtual bool ShouldDrawRestoredFrameShadow() const = 0; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + // Returns which edges of the window are snapped to the edges of the desktop + // (or "tiled"). + virtual ui::WindowTiledEdges GetTiledEdges() const = 0; diff --git a/www/iridium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc b/www/iridium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc index eb6d99a9ca5f..30b28d707066 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc @@ -1,6 +1,15 @@ ---- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc -@@ -160,7 +160,7 @@ SigninViewControllerDelegateViews::CreateProfileCustom +@@ -50,7 +50,7 @@ namespace { + + const int kModalDialogWidth = 448; + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS_LACROS) ++ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + const int kEnterpriseConfirmationDialogWidth = 512; + const int kEnterpriseConfirmationDialogHeight = 576; + #endif +@@ -170,7 +170,7 @@ SigninViewControllerDelegateViews::CreateProfileCustom #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +18,7 @@ // static std::unique_ptr<views::WebView> SigninViewControllerDelegateViews::CreateEnterpriseConfirmationWebView( -@@ -445,7 +445,7 @@ SigninViewControllerDelegate::CreateProfileCustomizati +@@ -456,7 +456,7 @@ SigninViewControllerDelegate::CreateProfileCustomizati #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h b/www/iridium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h index 6d0df3d5a9af..3fb97fbc7290 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h +++ b/www/iridium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h -@@ -76,7 +76,7 @@ class SigninViewControllerDelegateViews +@@ -77,7 +77,7 @@ class SigninViewControllerDelegateViews #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/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 3a64e2405882..d3e7a307352e 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,6 @@ ---- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/ui/views/tabs/tab_drag_controller.cc -@@ -476,7 +476,7 @@ void TabDragController::Init(TabDragContext* source_co +@@ -481,7 +481,7 @@ void TabDragController::Init(TabDragContext* source_co // synchronous on desktop Linux, so use that. // - Chrome OS // Releasing capture on Ash cancels gestures so avoid it. @@ -9,7 +9,7 @@ can_release_capture_ = false; #endif start_point_in_screen_ = gfx::Point(source_view_offset, mouse_offset.y()); -@@ -1029,7 +1029,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon +@@ -1034,7 +1034,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -18,7 +18,7 @@ // EndMoveLoop is going to snap the window back to its original location. // Hide it so users don't see this. Hiding a window in Linux aura causes // it to lose capture so skip it. -@@ -1944,7 +1944,7 @@ void TabDragController::CompleteDrag() { +@@ -1972,7 +1972,7 @@ void TabDragController::CompleteDrag() { } // If source window was maximized - maximize the new window as well. @@ -27,7 +27,7 @@ // Keeping maximized state breaks snap to Grid on Windows when dragging // tabs from maximized windows. TODO:(crbug.com/727051) Explore doing this // for other desktop OS's. kMaximizedStateRetainedOnTabDrag in -@@ -2334,7 +2334,7 @@ TabDragController::Liveness TabDragController::GetLoca +@@ -2362,7 +2362,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_views_tabs_tab__hover__card__controller.cc b/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__controller.cc index fc790eeedd1a..ef2a28745664 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__controller.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__controller.cc @@ -1,9 +1,9 @@ ---- chrome/browser/ui/views/tabs/tab_hover_card_controller.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/ui/views/tabs/tab_hover_card_controller.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/ui/views/tabs/tab_hover_card_controller.cc -@@ -72,7 +72,7 @@ GetMemoryPressureOverride() { - // Fetches the Omnibox drop-down widget, or returns null if the drop-down is - // not visible. - void FixWidgetStackOrder(views::Widget* widget, const Browser* browser) { +@@ -79,7 +79,7 @@ void FixWidgetStackOrder(views::Widget* widget, const + return; + } + -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Ensure the hover card Widget assumes the highest z-order to avoid occlusion diff --git a/www/iridium/files/patch-chrome_browser_ui_web__applications_app__browser__controller.cc b/www/iridium/files/patch-chrome_browser_ui_web__applications_app__browser__controller.cc deleted file mode 100644 index 64a885446c02..000000000000 --- a/www/iridium/files/patch-chrome_browser_ui_web__applications_app__browser__controller.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/ui/web_applications/app_browser_controller.cc.orig 2022-10-05 07:34:01 UTC -+++ chrome/browser/ui/web_applications/app_browser_controller.cc -@@ -428,7 +428,7 @@ CustomThemeSupplier* AppBrowserController::GetThemeSup - } - - bool AppBrowserController::ShouldUseSystemTheme() const { --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - return browser_->profile()->GetPrefs()->GetBoolean(prefs::kUsesSystemTheme); - #else - return false; 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 1eb62ca33e54..72a566dc9ef7 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-10-05 07:34:01 UTC +--- chrome/browser/ui/webui/about_ui.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/ui/webui/about_ui.cc -@@ -622,7 +622,7 @@ std::string ChromeURLs() { +@@ -621,7 +621,7 @@ std::string ChromeURLs() { return html; } @@ -9,7 +9,7 @@ std::string AboutLinuxProxyConfig() { std::string data; AppendHeader(&data, -@@ -680,7 +680,7 @@ void AboutUIHTMLSource::StartDataRequest( +@@ -679,7 +679,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 2e3ee87615b0..947cb6431be0 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-10-05 07:34:01 UTC +--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -309,7 +309,7 @@ +@@ -313,7 +313,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 -@@ -335,17 +335,17 @@ +@@ -339,17 +339,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 -@@ -698,7 +698,7 @@ bool IsAboutUI(const GURL& url) { +@@ -699,7 +699,7 @@ bool IsAboutUI(const GURL& url) { #if !BUILDFLAG(IS_ANDROID) || url.host_piece() == chrome::kChromeUITermsHost #endif @@ -39,7 +39,7 @@ || url.host_piece() == chrome::kChromeUILinuxProxyConfigHost #endif #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -1132,7 +1132,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -1131,7 +1131,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we #endif // !defined(USE_REAL_DBUS_CLIENTS) #endif // !defined(OFFICIAL_BUILD) #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -48,7 +48,7 @@ if (url.host_piece() == chrome::kChromeUIWebUIJsErrorHost) return &NewWebUI<WebUIJsErrorUI>; #endif -@@ -1193,7 +1193,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -1192,7 +1192,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we if (url.host_piece() == chrome::kChromeUINaClHost) return &NewWebUI<NaClUI>; #endif @@ -57,7 +57,7 @@ defined(TOOLKIT_VIEWS)) || \ defined(USE_AURA) if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost) -@@ -1253,27 +1253,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -1252,27 +1252,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_settings_appearance__handler.cc b/www/iridium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc index 410729c961c8..e2a8998c13a6 100644 --- a/www/iridium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc +++ b/www/iridium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc @@ -1,20 +1,11 @@ ---- chrome/browser/ui/webui/settings/appearance_handler.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/ui/webui/settings/appearance_handler.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/ui/webui/settings/appearance_handler.cc -@@ -29,7 +29,7 @@ void AppearanceHandler::RegisterMessages() { +@@ -28,7 +28,7 @@ void AppearanceHandler::RegisterMessages() { "useDefaultTheme", - base::BindRepeating(&AppearanceHandler::HandleUseDefaultTheme, - base::Unretained(this))); + base::BindRepeating(&AppearanceHandler::HandleUseTheme, + base::Unretained(this), ui::SystemTheme::kDefault)); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) web_ui()->RegisterMessageCallback( - "useSystemTheme", - base::BindRepeating(&AppearanceHandler::HandleUseSystemTheme, -@@ -43,7 +43,7 @@ void AppearanceHandler::HandleUseDefaultTheme(const ba - - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS) -+#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD) - void AppearanceHandler::HandleUseSystemTheme(const base::Value::List& args) { - if (profile_->IsChild()) - NOTREACHED(); + "useGtkTheme", + base::BindRepeating(&AppearanceHandler::HandleUseTheme, diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.h b/www/iridium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.h deleted file mode 100644 index 17762fb9dd83..000000000000 --- a/www/iridium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.h +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/ui/webui/settings/appearance_handler.h.orig 2022-10-05 07:34:01 UTC -+++ chrome/browser/ui/webui/settings/appearance_handler.h -@@ -40,7 +40,7 @@ class AppearanceHandler : public SettingsPageUIHandler - - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - // Changes the UI theme of the browser to the system (GTK+) theme. - void HandleUseSystemTheme(const base::Value::List& args); - #endif 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 afb901713611..64594f59ccf8 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-10-05 07:34:01 UTC +--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -116,7 +116,7 @@ +@@ -117,7 +117,7 @@ #include "chrome/browser/ui/webui/settings/chromeos/constants/routes.mojom.h" #endif @@ -9,25 +9,34 @@ #include "ui/display/screen.h" #endif -@@ -137,7 +137,7 @@ +@@ -138,7 +138,7 @@ #include "chrome/browser/ui/webui/certificate_manager_localized_strings_provider.h" #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "ui/linux/linux_ui_factory.h" #include "ui/ozone/public/ozone_platform.h" #endif +@@ -224,7 +224,7 @@ void AddCommonStrings(content::WebUIDataSource* html_s + #endif -@@ -360,7 +360,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht + html_source->AddBoolean("isChildAccount", profile->IsChild()); +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + bool allow_qt_theme = base::FeatureList::IsEnabled(ui::kAllowQt); + #else + bool allow_qt_theme = false; +@@ -370,7 +370,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}, - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_LACROS) - {"systemTheme", IDS_SETTINGS_SYSTEM_THEME}, - {"useSystemTheme", IDS_SETTINGS_USE_SYSTEM_THEME}, - {"classicTheme", IDS_SETTINGS_CLASSIC_THEME}, -@@ -368,7 +368,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + {"gtkTheme", IDS_SETTINGS_GTK_THEME}, + {"useGtkTheme", IDS_SETTINGS_USE_GTK_THEME}, + {"qtTheme", IDS_SETTINGS_QT_THEME}, +@@ -380,7 +380,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht #else {"resetToDefaultTheme", IDS_SETTINGS_RESET_TO_DEFAULT_THEME}, #endif @@ -36,7 +45,7 @@ {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS}, #endif #if BUILDFLAG(IS_MAC) -@@ -392,7 +392,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -404,7 +404,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_web__applications_os__integration_web__app__shortcut.cc b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc index 67e93b304adc..bb4100b8743c 100644 --- a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc +++ b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/os_integration/web_app_shortcut.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/web_applications/os_integration/web_app_shortcut.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/web_applications/os_integration/web_app_shortcut.cc -@@ -45,7 +45,7 @@ namespace { +@@ -54,7 +54,7 @@ namespace { #if BUILDFLAG(IS_MAC) const int kDesiredIconSizesForShortcut[] = {16, 32, 128, 256, 512}; @@ -9,16 +9,34 @@ // Linux supports icons of any size. FreeDesktop Icon Theme Specification states // that "Minimally you should install a 48x48 icon in the hicolor theme." const int kDesiredIconSizesForShortcut[] = {16, 32, 48, 128, 256, 512}; -@@ -130,7 +130,7 @@ std::string GetAllFilesInDir(const base::FilePath& fil - } // namespace +@@ -207,7 +207,7 @@ ShortcutOverrideForTesting::ShortcutOverrideForTesting + #elif BUILDFLAG(IS_MAC) + bool success = chrome_apps_folder.CreateUniqueTempDirUnderPath(base_path); + DCHECK(success); +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + bool success = desktop.CreateUniqueTempDirUnderPath(base_path); + DCHECK(success); + success = startup.CreateUniqueTempDirUnderPath(base_path); +@@ -226,7 +226,7 @@ ShortcutOverrideForTesting::ShortcutOverrideForTesting + #elif BUILDFLAG(IS_MAC) + bool success = chrome_apps_folder.CreateUniqueTempDir(); + DCHECK(success); +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + bool success = desktop.CreateUniqueTempDir(); + DCHECK(success); + success = startup.CreateUniqueTempDir(); +@@ -234,7 +234,7 @@ ShortcutOverrideForTesting::ShortcutOverrideForTesting + #endif + } - ScopedShortcutOverrideForTesting::ScopedShortcutOverrideForTesting() { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - auto callback = base::BindRepeating( - [](ScopedShortcutOverrideForTesting* scoped_override, - base::FilePath filename, std::string xdg_command, -@@ -163,7 +163,7 @@ ScopedShortcutOverrideForTesting::~ScopedShortcutOverr + auto callback = + base::BindRepeating([](base::FilePath filename, std::string xdg_command, + std::string file_contents) { +@@ -267,7 +267,7 @@ ShortcutOverrideForTesting::~ShortcutOverrideForTestin } } } @@ -27,21 +45,3 @@ // Reset the file handling callback. SetUpdateMimeInfoDatabaseOnLinuxCallbackForTesting( UpdateMimeInfoDatabaseOnLinuxCallback()); -@@ -210,7 +210,7 @@ std::unique_ptr<ScopedShortcutOverrideForTesting> Over - scoped_override->chrome_apps_folder.CreateUniqueTempDirUnderPath( - base_path); - DCHECK(success); --#elif BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - bool success = - scoped_override->desktop.CreateUniqueTempDirUnderPath(base_path); - DCHECK(success); -@@ -230,7 +230,7 @@ std::unique_ptr<ScopedShortcutOverrideForTesting> Over - #elif BUILDFLAG(IS_MAC) - bool success = scoped_override->chrome_apps_folder.CreateUniqueTempDir(); - DCHECK(success); --#elif BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - bool success = scoped_override->desktop.CreateUniqueTempDir(); - DCHECK(success); - success = scoped_override->startup.CreateUniqueTempDir(); 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 de98371470dd..3e3941c8e3ea 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,6 +1,6 @@ ---- chrome/browser/web_applications/os_integration/web_app_shortcut.h.orig 2022-10-05 07:34:01 UTC +--- 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 -@@ -19,7 +19,7 @@ +@@ -21,7 +21,7 @@ #include "ui/gfx/image/image_family.h" #include "url/gurl.h" @@ -9,7 +9,7 @@ #include "chrome/browser/web_applications/os_integration/web_app_shortcut_linux.h" #endif // BUILDFLAG(IS_LINUX) -@@ -33,7 +33,7 @@ class ImageSkia; +@@ -35,7 +35,7 @@ class ImageSkia; namespace web_app { @@ -18,7 +18,7 @@ struct LinuxFileRegistration { std::string xdg_command; std::string file_contents; -@@ -61,7 +61,7 @@ struct ScopedShortcutOverrideForTesting { +@@ -85,7 +85,7 @@ struct ShortcutOverrideForTesting #elif BUILDFLAG(IS_MAC) base::ScopedTempDir chrome_apps_folder; std::map<base::FilePath, bool> startup_enabled; @@ -27,7 +27,7 @@ base::ScopedTempDir desktop; base::ScopedTempDir startup; std::vector<LinuxFileRegistration> linux_file_registration; -@@ -107,7 +107,7 @@ struct ShortcutInfo { +@@ -132,7 +132,7 @@ struct ShortcutInfo { std::set<std::string> file_handler_extensions; std::set<std::string> file_handler_mime_types; std::set<std::string> protocol_handlers; diff --git a/www/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 7b1ffe8f408e..58662228ac94 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-10-05 07:34:01 UTC +--- 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 -@@ -379,7 +379,7 @@ std::unique_ptr<ShortcutInfo> WebAppShortcutManager::B +@@ -391,7 +391,7 @@ std::unique_ptr<ShortcutInfo> WebAppShortcutManager::B } } 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 7c5b8880e09a..ac9cde88294e 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,11 +1,11 @@ ---- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/browser/webauthn/chrome_authenticator_request_delegate.cc -@@ -668,7 +668,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureCabl - } +@@ -667,7 +667,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureCabl + g_observer->ConfiguringCable(request_type); } -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // No caBLEv1 on Linux. It tends to crash bluez. - if (std::any_of(pairings_from_extension.begin(), - pairings_from_extension.end(), + if (base::Contains(pairings_from_extension, + device::CableDiscoveryData::Version::V1, diff --git a/www/iridium/files/patch-chrome_common_chrome__features.cc b/www/iridium/files/patch-chrome_common_chrome__features.cc index eee498d6a39f..58be5022d0df 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-10-05 07:34:01 UTC +--- chrome/common/chrome_features.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/common/chrome_features.cc -@@ -90,7 +90,7 @@ const base::Feature kAsyncDns { +@@ -95,7 +95,7 @@ const 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. const base::Feature kAutofillAddressSurvey{"AutofillAddressSurvey", -@@ -105,7 +105,7 @@ const base::Feature kAutofillPasswordSurvey{"AutofillP +@@ -110,7 +110,7 @@ const base::Feature kAutofillPasswordSurvey{"AutofillP base::FEATURE_DISABLED_BY_DEFAULT}; #endif @@ -27,7 +27,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -284,7 +284,7 @@ const base::Feature kDesktopPWAsWebBundles{"DesktopPWA +@@ -289,7 +289,7 @@ const base::Feature kDesktopPWAsWebBundles{"DesktopPWA base::FEATURE_DISABLED_BY_DEFAULT}; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -36,7 +36,7 @@ // Controls whether Chrome Apps are supported. See https://crbug.com/1221251. // If the feature is disabled, Chrome Apps continue to work. If enabled, Chrome // Apps will not launch and will be marked in the UI as deprecated. -@@ -306,7 +306,7 @@ const base::Feature kDisruptiveNotificationPermissionR +@@ -311,7 +311,7 @@ const base::Feature kDisruptiveNotificationPermissionR const base::Feature kDnsOverHttps { "DnsOverHttps", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -45,7 +45,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -322,7 +322,7 @@ const base::FeatureParam<bool> kDnsOverHttpsFallbackPa +@@ -327,7 +327,7 @@ const base::FeatureParam<bool> kDnsOverHttpsFallbackPa const base::FeatureParam<bool> kDnsOverHttpsShowUiParam { &kDnsOverHttps, "ShowUi", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -54,7 +54,7 @@ true #else false -@@ -608,7 +608,7 @@ const base::Feature kKioskEnableAppService("KioskEnabl +@@ -627,7 +627,7 @@ const base::Feature kKAnonymityServiceOHTTPRequests{ const base::Feature kUpdateHistoryEntryPointsInIncognito{ "UpdateHistoryEntryPointsInIncognito", base::FEATURE_ENABLED_BY_DEFAULT}; @@ -63,7 +63,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) const base::Feature kLinuxLowMemoryMonitor{"LinuxLowMemoryMonitor", base::FEATURE_DISABLED_BY_DEFAULT}; -@@ -621,7 +621,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit +@@ -640,7 +640,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit &kLinuxLowMemoryMonitor, "critical_level", 255}; #endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) diff --git a/www/iridium/files/patch-chrome_common_chrome__features.h b/www/iridium/files/patch-chrome_common_chrome__features.h index 3f2e395e082a..1278124414b5 100644 --- a/www/iridium/files/patch-chrome_common_chrome__features.h +++ b/www/iridium/files/patch-chrome_common_chrome__features.h @@ -1,6 +1,6 @@ ---- chrome/common/chrome_features.h.orig 2022-10-05 07:34:01 UTC +--- chrome/common/chrome_features.h.orig 2022-12-01 10:35:46 UTC +++ chrome/common/chrome_features.h -@@ -81,7 +81,7 @@ extern const base::Feature kAppShimNewCloseBehavior; +@@ -86,7 +86,7 @@ extern const base::Feature kAppShimNewCloseBehavior; COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kAsyncDns; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kAutofillAddressSurvey; COMPONENT_EXPORT(CHROME_FEATURES) -@@ -90,7 +90,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) +@@ -95,7 +95,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kAutofillPasswordSurvey; #endif @@ -18,7 +18,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kBackgroundModeAllowRestart; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -204,7 +204,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) +@@ -207,7 +207,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kDesktopPWAsWebBundles; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -27,7 +27,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kChromeAppsDeprecation; COMPONENT_EXPORT(CHROME_FEATURES) -@@ -429,7 +429,7 @@ extern const base::Feature kKioskEnableAppService; +@@ -440,7 +440,7 @@ extern const base::Feature kKAnonymityServiceOHTTPRequ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kUpdateHistoryEntryPointsInIncognito; @@ -36,7 +36,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kLinuxLowMemoryMonitor; COMPONENT_EXPORT(CHROME_FEATURES) -@@ -438,7 +438,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) +@@ -449,7 +449,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::FeatureParam<int> kLinuxLowMemoryMonitorCriticalLevel; #endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) diff --git a/www/iridium/files/patch-chrome_common_media_cdm__host__file__path.cc b/www/iridium/files/patch-chrome_common_media_cdm__host__file__path.cc index 9fceab96b5e1..ad32c0c1b2ee 100644 --- a/www/iridium/files/patch-chrome_common_media_cdm__host__file__path.cc +++ b/www/iridium/files/patch-chrome_common_media_cdm__host__file__path.cc @@ -1,6 +1,6 @@ ---- chrome/common/media/cdm_host_file_path.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/common/media/cdm_host_file_path.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/common/media/cdm_host_file_path.cc -@@ -94,7 +94,7 @@ void AddCdmHostFilePaths( +@@ -91,7 +91,7 @@ void AddCdmHostFilePaths( cdm_host_file_paths->emplace_back(chrome_framework_path, chrome_framework_sig_path); diff --git a/www/iridium/files/patch-chrome_common_pref__names.cc b/www/iridium/files/patch-chrome_common_pref__names.cc index 81b03381cb41..df20b3b69b0b 100644 --- a/www/iridium/files/patch-chrome_common_pref__names.cc +++ b/www/iridium/files/patch-chrome_common_pref__names.cc @@ -1,4 +1,4 @@ ---- chrome/common/pref_names.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/common/pref_names.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/common/pref_names.cc @@ -1249,7 +1249,7 @@ const char kUseAshProxy[] = "lacros.proxy.use_ash_prox @@ -7,9 +7,9 @@ -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) // Linux specific preference on whether we should match the system theme. - const char kUsesSystemTheme[] = "extensions.theme.use_system"; - #endif -@@ -1348,7 +1348,7 @@ const char kShowUpdatePromotionInfoBar[] = + const char kUsesSystemThemeDeprecated[] = "extensions.theme.use_system"; + const char kSystemTheme[] = "extensions.theme.system_theme"; +@@ -1363,7 +1363,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"; -@@ -1854,7 +1854,7 @@ const char kDownloadDirUpgraded[] = "download.director +@@ -1866,7 +1866,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 -@@ -2151,7 +2151,7 @@ const char kWebAppsPreferences[] = "web_apps.web_app_i +@@ -2163,7 +2163,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"; -@@ -2251,7 +2251,7 @@ const char kAmbientAuthenticationInPrivateModesEnabled +@@ -2263,7 +2263,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[] = -@@ -3275,7 +3275,7 @@ const char kBlockAutoplayEnabled[] = "media.block_auto +@@ -3286,7 +3286,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 c75508191962..6814a248c144 100644 --- a/www/iridium/files/patch-chrome_common_pref__names.h +++ b/www/iridium/files/patch-chrome_common_pref__names.h @@ -1,15 +1,15 @@ ---- chrome/common/pref_names.h.orig 2022-10-05 07:34:01 UTC +--- chrome/common/pref_names.h.orig 2022-12-01 10:35:46 UTC +++ chrome/common/pref_names.h -@@ -389,7 +389,7 @@ extern const char kUseAshProxy[]; +@@ -393,7 +393,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. -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - extern const char kUsesSystemTheme[]; - #endif - extern const char kCurrentThemePackFilename[]; -@@ -414,7 +414,7 @@ extern const char kShowUpdatePromotionInfoBar[]; + // TODO(https://crbug.com/1317782): Remove in M110. + extern const char kUsesSystemThemeDeprecated[]; + extern const char kSystemTheme[]; +@@ -420,7 +420,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) -@@ -604,7 +604,7 @@ extern const char kDownloadAllowedURLsForOpenByPolicy[ +@@ -607,7 +607,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) -@@ -714,7 +714,7 @@ extern const char kWebAppsUninstalledDefaultChromeApps +@@ -717,7 +717,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 -@@ -846,7 +846,7 @@ extern const char kGloballyScopeHTTPAuthCacheEnabled[] +@@ -848,7 +848,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) -@@ -1115,7 +1115,7 @@ extern const char kBlockAutoplayEnabled[]; +@@ -1118,7 +1118,7 @@ extern const char kBlockAutoplayEnabled[]; #endif extern const char kSandboxExternalProtocolBlocked[]; diff --git a/www/iridium/files/patch-chrome_common_url__constants.cc b/www/iridium/files/patch-chrome_common_url__constants.cc index 9be415891553..bddc66fb75d7 100644 --- a/www/iridium/files/patch-chrome_common_url__constants.cc +++ b/www/iridium/files/patch-chrome_common_url__constants.cc @@ -1,6 +1,6 @@ ---- chrome/common/url_constants.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/common/url_constants.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/common/url_constants.cc -@@ -489,7 +489,7 @@ const char kPhoneHubPermissionLearnMoreURL[] = +@@ -492,7 +492,7 @@ const char kPhoneHubPermissionLearnMoreURL[] = "https://support.google.com/chromebook/?p=multidevice"; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-chrome_common_url__constants.h b/www/iridium/files/patch-chrome_common_url__constants.h index a92741c15ada..bf3dc04803bf 100644 --- a/www/iridium/files/patch-chrome_common_url__constants.h +++ b/www/iridium/files/patch-chrome_common_url__constants.h @@ -1,6 +1,6 @@ ---- chrome/common/url_constants.h.orig 2022-10-05 07:34:01 UTC +--- chrome/common/url_constants.h.orig 2022-12-01 10:35:46 UTC +++ chrome/common/url_constants.h -@@ -462,7 +462,7 @@ extern const char kOutdatedPluginLearnMoreURL[]; +@@ -465,7 +465,7 @@ extern const char kOutdatedPluginLearnMoreURL[]; extern const char kPhoneHubPermissionLearnMoreURL[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ 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 926ee0bd9699..9bc6c8eda04c 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-10-05 07:34:01 UTC +--- chrome/common/webui_url_constants.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/common/webui_url_constants.cc -@@ -478,18 +478,18 @@ const char kOsUIScanningAppURL[] = "os://scanning"; +@@ -480,18 +480,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 -@@ -504,14 +504,14 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-pr +@@ -506,14 +506,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[] = -@@ -527,7 +527,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro +@@ -529,7 +529,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"; -@@ -602,7 +602,7 @@ const char kPrivacySandboxSubPagePath[] = "/privacySan +@@ -605,7 +605,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 -@@ -810,7 +810,7 @@ const char* const kChromeDebugURLs[] = { +@@ -813,7 +813,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 cdb6418f2a75..10a5cc0dea19 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-10-05 07:34:01 UTC +--- chrome/common/webui_url_constants.h.orig 2022-12-01 10:35:46 UTC +++ chrome/common/webui_url_constants.h -@@ -407,24 +407,24 @@ extern const char kOsUIScanningAppURL[]; +@@ -409,24 +409,24 @@ extern const char kOsUIScanningAppURL[]; extern const char kOsUIVersionURL[]; #endif @@ -29,7 +29,7 @@ extern const char kChromeUIWebAppSettingsURL[]; extern const char kChromeUIWebAppSettingsHost[]; #endif -@@ -439,14 +439,14 @@ extern const char kChromeUILinuxProxyConfigHost[]; +@@ -441,14 +441,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[]; -@@ -459,7 +459,7 @@ extern const char kChromeUIProfilePickerUrl[]; +@@ -461,7 +461,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 7dbc3f1b095a..d7cac2dce482 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-10-05 07:34:01 UTC +--- chrome/renderer/chrome_render_frame_observer.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/renderer/chrome_render_frame_observer.cc -@@ -340,7 +340,7 @@ void ChromeRenderFrameObserver::OnDestruct() { +@@ -342,7 +342,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 de027118f1f5..800575c55c20 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,6 +1,6 @@ ---- chrome/services/printing/print_backend_service_impl.cc.orig 2022-10-05 07:34:01 UTC +--- chrome/services/printing/print_backend_service_impl.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/services/printing/print_backend_service_impl.cc -@@ -604,7 +604,7 @@ void PrintBackendServiceImpl::UpdatePrintSettings( +@@ -606,7 +606,7 @@ void PrintBackendServiceImpl::UpdatePrintSettings( crash_keys_ = std::make_unique<crash_keys::ScopedPrinterInfo>( print_backend_->GetPrinterDriverInfo(*printer_name)); diff --git a/www/iridium/files/patch-chrome_test_BUILD.gn b/www/iridium/files/patch-chrome_test_BUILD.gn index 4af67e7d6edb..9dba379eb3bc 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-10-05 07:34:01 UTC +--- chrome/test/BUILD.gn.orig 2022-12-01 10:35:46 UTC +++ chrome/test/BUILD.gn -@@ -9861,7 +9861,7 @@ test("chrome_app_unittests") { +@@ -9994,7 +9994,7 @@ test("chrome_app_unittests") { "//components/heap_profiling/in_process", "//components/safe_browsing:buildflags", ] 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 index 4d1c1adf03f0..87cbc152de55 100644 --- a/www/iridium/files/patch-chrome_updater_device__management_dm__client.cc +++ b/www/iridium/files/patch-chrome_updater_device__management_dm__client.cc @@ -1,6 +1,6 @@ ---- chrome/updater/device_management/dm_client.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/updater/device_management/dm_client.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/updater/device_management/dm_client.cc -@@ -36,7 +36,7 @@ +@@ -37,7 +37,7 @@ #include "chrome/updater/win/net/network.h" #elif BUILDFLAG(IS_MAC) #include "chrome/updater/mac/net/network.h" diff --git a/www/iridium/files/patch-chrome_updater_installer.cc b/www/iridium/files/patch-chrome_updater_installer.cc index 734a14bba90f..34be41eebb6f 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-10-05 07:34:01 UTC +--- chrome/updater/installer.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/updater/installer.cc -@@ -243,7 +243,7 @@ absl::optional<base::FilePath> Installer::GetCurrentIn +@@ -242,7 +242,7 @@ absl::optional<base::FilePath> Installer::GetCurrentIn return path->AppendASCII(pv_.GetString()); } diff --git a/www/iridium/files/patch-chrome_updater_util.cc b/www/iridium/files/patch-chrome_updater_util.cc index ebb1c69040b5..77343a0d88d7 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-10-05 07:34:01 UTC +--- chrome/updater/util.cc.orig 2022-12-01 10:35:46 UTC +++ chrome/updater/util.cc -@@ -263,7 +263,7 @@ GURL AppendQueryParameter(const GURL& url, +@@ -264,7 +264,7 @@ GURL AppendQueryParameter(const GURL& url, return url.ReplaceComponents(replacements); } 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 8f9c1f73c05c..692a0409c9bf 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-10-05 07:34:01 UTC +--- components/autofill/core/browser/personal_data_manager.cc.orig 2022-12-01 10:35:46 UTC +++ components/autofill/core/browser/personal_data_manager.cc -@@ -2057,7 +2057,8 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp +@@ -2056,7 +2056,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_autofill_core_common_autofill__payments__features.cc b/www/iridium/files/patch-components_autofill_core_common_autofill__payments__features.cc index 8dba799b902d..ac01b304581b 100644 --- a/www/iridium/files/patch-components_autofill_core_common_autofill__payments__features.cc +++ b/www/iridium/files/patch-components_autofill_core_common_autofill__payments__features.cc @@ -1,6 +1,6 @@ ---- components/autofill/core/common/autofill_payments_features.cc.orig 2022-10-05 07:34:01 UTC +--- components/autofill/core/common/autofill_payments_features.cc.orig 2022-12-01 10:35:46 UTC +++ components/autofill/core/common/autofill_payments_features.cc -@@ -237,7 +237,7 @@ const base::FeatureParam<int> +@@ -239,7 +239,7 @@ const base::FeatureParam<int> bool ShouldShowImprovedUserConsentForCreditCardSave() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-components_cast__channel_cast__message__util.cc b/www/iridium/files/patch-components_cast__channel_cast__message__util.cc index 4eb194626c45..fdfdea8dfc0f 100644 --- a/www/iridium/files/patch-components_cast__channel_cast__message__util.cc +++ b/www/iridium/files/patch-components_cast__channel_cast__message__util.cc @@ -1,6 +1,6 @@ ---- components/cast_channel/cast_message_util.cc.orig 2022-10-05 07:34:01 UTC +--- components/cast_channel/cast_message_util.cc.orig 2022-12-01 10:35:46 UTC +++ components/cast_channel/cast_message_util.cc -@@ -169,7 +169,7 @@ int GetVirtualConnectPlatformValue() { +@@ -170,7 +170,7 @@ int GetVirtualConnectPlatformValue() { return 4; #elif BUILDFLAG(IS_CHROMEOS_ASH) return 5; 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 c256a8ebdc6c..173ad3f587db 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-10-05 07:34:01 UTC +--- components/feature_engagement/public/feature_configurations.cc.orig 2022-12-01 10:35:46 UTC +++ components/feature_engagement/public/feature_configurations.cc @@ -35,7 +35,7 @@ FeatureConfig CreateAlwaysTriggerConfig(const base::Fe absl::optional<FeatureConfig> GetClientSideFeatureConfig( @@ -9,7 +9,7 @@ if (kIPHPasswordsAccountStorageFeature.name == feature->name) { absl::optional<FeatureConfig> config = FeatureConfig(); config->valid = true; -@@ -904,7 +904,8 @@ absl::optional<FeatureConfig> GetClientSideFeatureConf +@@ -917,7 +917,8 @@ absl::optional<FeatureConfig> 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 29c1f43637c0..b509d47f59ef 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-10-05 07:34:01 UTC +--- components/feature_engagement/public/feature_constants.cc.orig 2022-12-01 10:35:46 UTC +++ components/feature_engagement/public/feature_constants.cc @@ -24,7 +24,7 @@ const base::Feature kIPHDummyFeature{"IPH_Dummy", base::FEATURE_DISABLED_BY_DEFAULT}; @@ -6,15 +6,16 @@ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + const base::Feature kIPHBatterySaverModeFeature{ + "IPH_BatterySaverMode", base::FEATURE_DISABLED_BY_DEFAULT}; const base::Feature kIPHDesktopSharedHighlightingFeature{ - "IPH_DesktopSharedHighlighting", base::FEATURE_DISABLED_BY_DEFAULT}; - const base::Feature kIPHDesktopTabGroupsNewGroupFeature{ -@@ -294,7 +294,7 @@ const base::Feature kIPHOverflowMenuTipFeature{ - "IPH_OverflowMenuTip", base::FEATURE_DISABLED_BY_DEFAULT}; +@@ -301,7 +301,8 @@ const base::Feature kIPHOverflowMenuTipFeature{ #endif // BUILDFLAG(IS_IOS) --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ ++ BUILDFLAG(IS_BSD) const base::Feature kIPHAutofillVirtualCardSuggestionFeature{ "IPH_AutofillVirtualCardSuggestion", base::FEATURE_ENABLED_BY_DEFAULT}; + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || 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 1928d3de7f8c..4c55054377ae 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-10-05 07:34:01 UTC +--- components/feature_engagement/public/feature_constants.h.orig 2022-12-01 10:35:46 UTC +++ components/feature_engagement/public/feature_constants.h @@ -32,7 +32,7 @@ extern const base::Feature kIPHDummyFeature; extern const base::Feature kEnableIPH; @@ -6,15 +6,16 @@ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + extern const base::Feature kIPHBatterySaverModeFeature; extern const base::Feature kIPHDesktopSharedHighlightingFeature; extern const base::Feature kIPHDesktopTabGroupsNewGroupFeature; - extern const base::Feature kIPHFocusHelpBubbleScreenReaderPromoFeature; -@@ -178,7 +178,7 @@ extern const base::Feature kIPHFollowWhileBrowsingFeat - extern const base::Feature kIPHOverflowMenuTipFeature; +@@ -182,7 +182,8 @@ extern const base::Feature kIPHOverflowMenuTipFeature; #endif // BUILDFLAG(IS_IOS) --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ ++ BUILDFLAG(IS_BSD) extern const base::Feature kIPHAutofillVirtualCardSuggestionFeature; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || + // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || 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 34cabc1f410e..1ce40eef0a39 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,4 +1,4 @@ ---- components/feature_engagement/public/feature_list.cc.orig 2022-10-05 07:34:01 UTC +--- components/feature_engagement/public/feature_list.cc.orig 2022-12-01 10:35:46 UTC +++ components/feature_engagement/public/feature_list.cc @@ -118,7 +118,7 @@ const base::Feature* const kAllFeatures[] = { &kIPHOverflowMenuTipFeature, @@ -6,10 +6,10 @@ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + &kIPHBatterySaverModeFeature, &kIPHDesktopTabGroupsNewGroupFeature, - &kIPHFocusHelpBubbleScreenReaderPromoFeature, - &kIPHGMCCastStartStopFeature, -@@ -142,7 +142,8 @@ const base::Feature* const kAllFeatures[] = { + &kIPHExtensionsMenuFeature, +@@ -145,7 +145,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 bd4f89fbf3bb..244b2fff7992 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,4 +1,4 @@ ---- components/feature_engagement/public/feature_list.h.orig 2022-10-05 07:34:01 UTC +--- components/feature_engagement/public/feature_list.h.orig 2022-12-01 10:35:46 UTC +++ components/feature_engagement/public/feature_list.h @@ -216,7 +216,7 @@ DEFINE_VARIATION_PARAM(kIPHOverflowMenuTipFeature, "IP #endif // BUILDFLAG(IS_IOS) @@ -6,10 +6,10 @@ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + DEFINE_VARIATION_PARAM(kIPHBatterySaverModeFeature, "IPH_BatterySaverMode"); DEFINE_VARIATION_PARAM(kIPHDesktopTabGroupsNewGroupFeature, "IPH_DesktopTabGroupsNewGroup"); - DEFINE_VARIATION_PARAM(kIPHFocusModeFeature, "IPH_FocusMode"); -@@ -249,7 +249,8 @@ DEFINE_VARIATION_PARAM(kIPHWebUiHelpBubbleTestFeature, +@@ -253,7 +253,8 @@ DEFINE_VARIATION_PARAM(kIPHWebUiHelpBubbleTestFeature, // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -19,16 +19,16 @@ DEFINE_VARIATION_PARAM(kIPHAutofillVirtualCardSuggestionFeature, "IPH_AutofillVirtualCardSuggestion"); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || -@@ -351,7 +352,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation +@@ -355,7 +356,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation VARIATION_ENTRY(kIPHFollowWhileBrowsingFeature), VARIATION_ENTRY(kIPHOverflowMenuTipFeature), #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + VARIATION_ENTRY(kIPHBatterySaverModeFeature), VARIATION_ENTRY(kIPHDesktopTabGroupsNewGroupFeature), - VARIATION_ENTRY(kIPHFocusModeFeature), - VARIATION_ENTRY(kIPHGlobalMediaControls), -@@ -376,7 +377,8 @@ constexpr flags_ui::FeatureEntry::FeatureVariation + VARIATION_ENTRY(kIPHExtensionsMenuFeature), +@@ -383,7 +384,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_motherboard.cc b/www/iridium/files/patch-components_metrics_motherboard.cc index 313abeb56a83..d555a1c25a68 100644 --- a/www/iridium/files/patch-components_metrics_motherboard.cc +++ b/www/iridium/files/patch-components_metrics_motherboard.cc @@ -1,7 +1,7 @@ ---- components/metrics/motherboard.cc.orig 2022-10-05 07:34:01 UTC +--- components/metrics/motherboard.cc.orig 2022-12-01 10:35:46 UTC +++ components/metrics/motherboard.cc @@ -1,6 +1,7 @@ - // Copyright 2022 The Chromium Authors. All rights reserved. + // Copyright 2022 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +// CHECK diff --git a/www/iridium/files/patch-components_optimization__guide_core_optimization__guide__util.cc b/www/iridium/files/patch-components_optimization__guide_core_optimization__guide__util.cc index 2a679efdfbb4..cbe1419b6301 100644 --- a/www/iridium/files/patch-components_optimization__guide_core_optimization__guide__util.cc +++ b/www/iridium/files/patch-components_optimization__guide_core_optimization__guide__util.cc @@ -1,6 +1,6 @@ ---- components/optimization_guide/core/optimization_guide_util.cc.orig 2022-10-05 07:34:01 UTC +--- components/optimization_guide/core/optimization_guide_util.cc.orig 2022-12-01 10:35:46 UTC +++ components/optimization_guide/core/optimization_guide_util.cc -@@ -25,7 +25,7 @@ optimization_guide::proto::Platform GetPlatform() { +@@ -27,7 +27,7 @@ optimization_guide::proto::Platform GetPlatform() { return optimization_guide::proto::PLATFORM_CHROMEOS; #elif BUILDFLAG(IS_ANDROID) return optimization_guide::proto::PLATFORM_ANDROID; diff --git a/www/iridium/files/patch-components_paint__preview_browser_paint__preview__client.cc b/www/iridium/files/patch-components_paint__preview_browser_paint__preview__client.cc index 266ac9af3829..b986a7db1455 100644 --- a/www/iridium/files/patch-components_paint__preview_browser_paint__preview__client.cc +++ b/www/iridium/files/patch-components_paint__preview_browser_paint__preview__client.cc @@ -1,6 +1,6 @@ ---- components/paint_preview/browser/paint_preview_client.cc.orig 2022-10-05 07:34:01 UTC +--- components/paint_preview/browser/paint_preview_client.cc.orig 2022-12-01 10:35:46 UTC +++ components/paint_preview/browser/paint_preview_client.cc -@@ -309,8 +309,8 @@ void PaintPreviewClient::CapturePaintPreview( +@@ -307,8 +307,8 @@ void PaintPreviewClient::CapturePaintPreview( metadata->set_url(url.spec()); metadata->set_version(kPaintPreviewVersion); auto* chromeVersion = metadata->mutable_chrome_version(); 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 28de5d623df7..b3ce77b43180 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,6 +1,6 @@ ---- components/password_manager/core/browser/sync/password_sync_bridge.cc.orig 2022-10-05 07:34:01 UTC +--- components/password_manager/core/browser/sync/password_sync_bridge.cc.orig 2022-12-01 10:35:46 UTC +++ components/password_manager/core/browser/sync/password_sync_bridge.cc -@@ -177,7 +177,7 @@ bool ShouldRecoverPasswordsDuringMerge() { +@@ -178,7 +178,7 @@ bool ShouldRecoverPasswordsDuringMerge() { // Delete the local undecryptable copy when this is MacOS only. #if BUILDFLAG(IS_MAC) return true; @@ -9,7 +9,7 @@ return base::FeatureList::IsEnabled( features::kSyncUndecryptablePasswordsLinux); #else -@@ -186,7 +186,7 @@ bool ShouldRecoverPasswordsDuringMerge() { +@@ -187,7 +187,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 e9f775b82b25..54c986450433 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,4 +1,4 @@ ---- components/password_manager/core/common/password_manager_features.cc.orig 2022-10-05 07:34:01 UTC +--- components/password_manager/core/common/password_manager_features.cc.orig 2022-12-01 10:35:46 UTC +++ components/password_manager/core/common/password_manager_features.cc @@ -83,7 +83,7 @@ const base::Feature kFillingAcrossAffiliatedWebsites{ const base::Feature kFillOnAccountSelect = {"fill-on-account-select", @@ -9,7 +9,7 @@ // When enabled, initial sync will be forced during startup if the password // store has encryption service failures. const base::Feature kForceInitialSyncWhenDecryptionFails = { -@@ -189,14 +189,14 @@ const base::Feature kRecoverFromNeverSaveAndroid = { +@@ -200,14 +200,14 @@ const base::Feature kRecoverFromNeverSaveAndroid = { const base::Feature kPasswordStrengthIndicator = { "PasswordStrengthIndicator", base::FEATURE_DISABLED_BY_DEFAULT}; 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 81565414fc7a..8495c10313f8 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-10-05 07:34:01 UTC +--- components/password_manager/core/common/password_manager_features.h.orig 2022-12-01 10:35:46 UTC +++ components/password_manager/core/common/password_manager_features.h -@@ -37,7 +37,7 @@ extern const base::Feature KEnablePasswordGenerationFo +@@ -38,7 +38,7 @@ extern const base::Feature KEnablePasswordGenerationFo extern const base::Feature kEnablePasswordManagerWithinFencedFrame; extern const base::Feature kFillingAcrossAffiliatedWebsites; extern const base::Feature kFillOnAccountSelect; @@ -9,8 +9,8 @@ extern const base::Feature kForceInitialSyncWhenDecryptionFails; #endif extern const base::Feature kInferConfirmationPasswordField; -@@ -63,10 +63,10 @@ extern const base::Feature kPasswordReuseDetectionEnab - extern const base::Feature kPasswordScriptsFetching; +@@ -68,10 +68,10 @@ extern const base::Feature kPasswordScriptsFetching; + extern const base::Feature kPasswordsGrouping; extern const base::Feature kPasswordStrengthIndicator; extern const base::Feature kRecoverFromNeverSaveAndroid; -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) diff --git a/www/iridium/files/patch-components_policy_resources_policy__templates.json b/www/iridium/files/patch-components_policy_resources_policy__templates.json index 36d0e182e432..dbae79da800e 100644 --- a/www/iridium/files/patch-components_policy_resources_policy__templates.json +++ b/www/iridium/files/patch-components_policy_resources_policy__templates.json @@ -1,6 +1,6 @@ ---- components/policy/resources/policy_templates.json.orig 2022-10-05 07:34:01 UTC +--- components/policy/resources/policy_templates.json.orig 2022-12-01 10:35:46 UTC +++ components/policy/resources/policy_templates.json -@@ -1446,7 +1446,7 @@ +@@ -1450,7 +1450,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -9,7 +9,7 @@ 'future_on': ['fuchsia'], 'features': { 'dynamic_refresh': True, -@@ -2596,7 +2596,7 @@ +@@ -2600,7 +2600,7 @@ 'owners': ['file://remoting/OWNERS', 'jamiewalch@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -18,7 +18,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -4386,7 +4386,7 @@ +@@ -4420,7 +4420,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -27,7 +27,7 @@ 'future_on': ['fuchsia'], 'features': { 'dynamic_refresh': False, -@@ -4416,7 +4416,7 @@ +@@ -4450,7 +4450,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], 'type': 'string', 'schema': { 'type': 'string' }, @@ -36,7 +36,7 @@ 'features': { 'dynamic_refresh': False, 'per_profile': False, -@@ -5400,7 +5400,7 @@ +@@ -5434,7 +5434,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -45,7 +45,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -5462,7 +5462,7 @@ +@@ -5496,7 +5496,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], 'type': 'string', 'schema': { 'type': 'string' }, @@ -54,7 +54,7 @@ 'features': { 'dynamic_refresh': False, 'per_profile': False, -@@ -5529,7 +5529,7 @@ +@@ -5563,7 +5563,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -63,7 +63,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -11143,7 +11143,7 @@ +@@ -11183,7 +11183,7 @@ 'owners': ['file://net/cert/OWNERS', 'rsleevi@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -72,16 +72,16 @@ 'future_on': ['fuchsia'], 'features': { 'dynamic_refresh': True, -@@ -11268,7 +11268,7 @@ +@@ -11308,7 +11308,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-'], -+ 'supported_on': ['chrome_os:77-83', 'chrome.linux:79-83', 'chrome.mac:83-', 'chrome.openbsd:79-83', 'chrome.freebsd:79-83'], +- '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, - 'per_profile': False, -@@ -13532,7 +13532,7 @@ +@@ -13738,7 +13738,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -90,7 +90,7 @@ 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -14402,7 +14402,7 @@ +@@ -14608,7 +14608,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -99,7 +99,7 @@ 'future_on': ['fuchsia'], 'features': { 'dynamic_refresh': True, -@@ -17239,7 +17239,7 @@ +@@ -17483,7 +17483,7 @@ 'deprecated': True, 'schema': { 'type': 'boolean' }, 'supported_on': ['chrome.win:64-', 'chrome.mac:66-', 'android:65-'], @@ -108,7 +108,7 @@ 'features': { 'dynamic_refresh': False, 'per_profile': False, -@@ -21470,7 +21470,7 @@ +@@ -21716,7 +21716,7 @@ 'items': { 'type': 'string' } }, # Spell checking is provided by macOS, so can't be controlled on Mac. @@ -117,7 +117,7 @@ 'features': { 'can_be_recommended': False, 'dynamic_refresh': True, -@@ -21501,7 +21501,7 @@ +@@ -21747,7 +21747,7 @@ 'items': { 'type': 'string' } }, # Spell checking is provided by macOS, so can't be controlled on Mac. @@ -126,7 +126,7 @@ 'deprecated': True, 'features': { 'can_be_recommended': False, -@@ -21535,7 +21535,7 @@ +@@ -21781,7 +21781,7 @@ 'items': { 'type': 'string' } }, # Spell checking is provided by macOS, so can't be controlled on Mac. @@ -135,7 +135,7 @@ 'features': { 'can_be_recommended': False, 'dynamic_refresh': True, -@@ -22319,7 +22319,7 @@ +@@ -22565,7 +22565,7 @@ 'owners': ['fbeaufort@chromium.org', 'beccahughes@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -144,7 +144,7 @@ 'future_on': ['fuchsia'], 'features': { 'dynamic_refresh': True, -@@ -27015,7 +27015,7 @@ +@@ -27314,7 +27314,7 @@ 'owners': ['file://services/audio/OWNERS', 'dalecurtis@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -153,7 +153,7 @@ 'features': { 'dynamic_refresh': False, 'per_profile': False, -@@ -28415,7 +28415,7 @@ If this policy is left unset, privacy screen is disabl +@@ -28714,7 +28714,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' }, @@ -162,7 +162,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': True, -@@ -28439,7 +28439,7 @@ If set to False, <ph name="PRODUCT_NAME">$1<ex>Google +@@ -28738,7 +28738,7 @@ If set to False, <ph name="PRODUCT_NAME">$1<ex>Google 'owners': ['file://chrome/browser/notifications/OWNERS'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -171,7 +171,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': True, -@@ -29549,7 +29549,7 @@ If you disable this policy, web page scrolling to spec +@@ -29848,7 +29848,7 @@ If you disable this policy, web page scrolling to spec 'owners': ['asumaneev@google.com'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -180,7 +180,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -30851,7 +30851,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PR +@@ -31206,7 +31206,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PR }, ], 'default': True, @@ -189,7 +189,7 @@ 'future_on': ['fuchsia'], 'features': { 'dynamic_refresh': True, -@@ -30985,7 +30985,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PR +@@ -31340,7 +31340,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PR 'owners': ['mattm@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, diff --git a/www/iridium/files/patch-components_segmentation__platform_embedder_default__model_cross__device__user__segment.cc b/www/iridium/files/patch-components_segmentation__platform_embedder_default__model_cross__device__user__segment.cc new file mode 100644 index 000000000000..b8fe37a3802d --- /dev/null +++ b/www/iridium/files/patch-components_segmentation__platform_embedder_default__model_cross__device__user__segment.cc @@ -0,0 +1,11 @@ +--- components/segmentation_platform/embedder/default_model/cross_device_user_segment.cc.orig 2022-12-01 10:35:46 UTC ++++ components/segmentation_platform/embedder/default_model/cross_device_user_segment.cc +@@ -184,7 +184,7 @@ void CrossDeviceUserSegment::ExecuteModelWithInput( + // Check for current device type and subtract it from the device count + // calculation. + #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + desktop_count -= 1; + #elif BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) + if (ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_TABLET) { diff --git a/www/iridium/files/patch-components_storage__monitor_BUILD.gn b/www/iridium/files/patch-components_storage__monitor_BUILD.gn index bc6c6e788017..44fff649d61d 100644 --- a/www/iridium/files/patch-components_storage__monitor_BUILD.gn +++ b/www/iridium/files/patch-components_storage__monitor_BUILD.gn @@ -1,5 +1,14 @@ ---- components/storage_monitor/BUILD.gn.orig 2022-10-05 07:34:01 UTC +--- components/storage_monitor/BUILD.gn.orig 2022-12-01 10:35:46 UTC +++ components/storage_monitor/BUILD.gn +@@ -71,7 +71,7 @@ static_library("storage_monitor") { + deps += [ "//services/device/public/mojom" ] + } + } else if (is_linux || is_chromeos_lacros) { +- if (use_udev) { ++ if (use_udev && !is_bsd) { + sources += [ + "mtab_watcher_linux.cc", + "mtab_watcher_linux.h", @@ -175,7 +175,7 @@ source_set("unit_tests") { "storage_monitor_chromeos_unittest.cc", ] diff --git a/www/iridium/files/patch-components_translate_core_common_translate__util.cc b/www/iridium/files/patch-components_translate_core_common_translate__util.cc index 69214ce8db6a..b4577dd2fe6b 100644 --- a/www/iridium/files/patch-components_translate_core_common_translate__util.cc +++ b/www/iridium/files/patch-components_translate_core_common_translate__util.cc @@ -1,7 +1,7 @@ ---- components/translate/core/common/translate_util.cc.orig 2022-04-01 07:48:30 UTC +--- components/translate/core/common/translate_util.cc.orig 2022-12-01 10:35:46 UTC +++ components/translate/core/common/translate_util.cc @@ -34,7 +34,7 @@ const base::Feature kTranslateSubFrames{"TranslateSubF - const base::Feature kTFLiteLanguageDetectionEnabled{ + const base::Feature kTFLiteLanguageDetectionEnabled { "TFLiteLanguageDetectionEnabled", #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ - BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID) 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 6b27c230ee84..547b6553e717 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-10-05 07:34:01 UTC +--- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2022-12-01 10:35:46 UTC +++ components/viz/service/display_embedder/skia_output_surface_impl.cc -@@ -1156,7 +1156,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor +@@ -1161,7 +1161,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor ->GetDeviceQueue() ->GetVulkanPhysicalDevice(), VK_IMAGE_TILING_OPTIMAL, ycbcr_info); diff --git a/www/iridium/files/patch-components_viz_service_display_skia__renderer.cc b/www/iridium/files/patch-components_viz_service_display_skia__renderer.cc index 0c8744c6f836..7aac703770e0 100644 --- a/www/iridium/files/patch-components_viz_service_display_skia__renderer.cc +++ b/www/iridium/files/patch-components_viz_service_display_skia__renderer.cc @@ -1,6 +1,6 @@ ---- components/viz/service/display/skia_renderer.cc.orig 2022-10-05 07:34:01 UTC +--- components/viz/service/display/skia_renderer.cc.orig 2022-12-01 10:35:46 UTC +++ components/viz/service/display/skia_renderer.cc -@@ -1026,7 +1026,7 @@ void SkiaRenderer::ClearFramebuffer() { +@@ -1135,7 +1135,7 @@ void SkiaRenderer::ClearFramebuffer() { if (current_frame()->current_render_pass->has_transparent_background) { ClearCanvas(SkColors::kTransparent); } else { diff --git a/www/iridium/files/patch-content_app_content__main.cc b/www/iridium/files/patch-content_app_content__main.cc index 6c881b1a4e13..e5d736a2e181 100644 --- a/www/iridium/files/patch-content_app_content__main.cc +++ b/www/iridium/files/patch-content_app_content__main.cc @@ -1,6 +1,6 @@ ---- content/app/content_main.cc.orig 2022-10-05 07:34:01 UTC +--- content/app/content_main.cc.orig 2022-12-01 10:35:46 UTC +++ content/app/content_main.cc -@@ -284,7 +284,7 @@ RunContentProcess(ContentMainParams params, +@@ -226,7 +226,7 @@ RunContentProcess(ContentMainParams params, #endif base::EnableTerminationOnOutOfMemory(); 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 a29ea2a5625f..73db1536fbb1 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,6 +1,6 @@ ---- content/app/content_main_runner_impl.cc.orig 2022-10-05 07:34:01 UTC +--- content/app/content_main_runner_impl.cc.orig 2022-12-01 10:35:46 UTC +++ content/app/content_main_runner_impl.cc -@@ -130,13 +130,13 @@ +@@ -133,13 +133,13 @@ #include "base/posix/global_descriptors.h" #include "content/public/common/content_descriptors.h" @@ -16,7 +16,7 @@ #include "base/native_library.h" #include "base/rand_util.h" #include "content/public/common/zygote/sandbox_support_linux.h" -@@ -175,6 +175,10 @@ +@@ -178,6 +178,10 @@ #include "media/base/media_switches.h" #endif @@ -27,7 +27,7 @@ #if BUILDFLAG(IS_ANDROID) #include "base/system/sys_info.h" #include "content/browser/android/battery_metrics.h" -@@ -360,7 +364,7 @@ void InitializeZygoteSandboxForBrowserProcess( +@@ -375,7 +379,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 -@@ -396,7 +400,7 @@ void PreloadLibraryCdms() { +@@ -411,7 +415,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 -@@ -412,6 +416,11 @@ void PreSandboxInit() { +@@ -427,6 +431,11 @@ void PreSandboxInit() { #endif InitializeWebRtcModule(); @@ -57,7 +57,7 @@ // Set the android SkFontMgr for blink. We need to ensure this is done // before the sandbox is initialized to allow the font manager to access // font configuration files on disk. -@@ -594,7 +603,7 @@ int NO_STACK_PROTECTOR RunZygote(ContentMainDelegate* +@@ -609,7 +618,7 @@ int NO_STACK_PROTECTOR RunZygote(ContentMainDelegate* delegate->ZygoteStarting(&zygote_fork_delegates); media::InitializeMediaLibrary(); @@ -66,7 +66,7 @@ PreSandboxInit(); #endif -@@ -785,11 +794,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -803,11 +812,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam kFieldTrialDescriptor + base::GlobalDescriptors::kBaseDescriptor); #endif // !BUILDFLAG(IS_ANDROID) @@ -80,7 +80,7 @@ #endif // !BUILDFLAG(IS_WIN) -@@ -972,6 +980,16 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -990,6 +998,16 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam } #endif @@ -97,8 +97,8 @@ delegate_->SandboxInitialized(process_type); #if BUILDFLAG(USE_ZYGOTE_HANDLE) -@@ -1031,7 +1049,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { - mojo::core::InitFeatures(); +@@ -1053,7 +1071,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { + process_type); } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -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 -@@ -1064,6 +1082,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { +@@ -1086,6 +1104,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 00b53c4c0339..b1fca970b069 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-10-05 07:34:01 UTC +--- content/browser/BUILD.gn.orig 2022-12-01 10:35:46 UTC +++ content/browser/BUILD.gn -@@ -2471,6 +2471,13 @@ source_set("browser") { +@@ -2484,6 +2484,13 @@ source_set("browser") { ] } diff --git a/www/iridium/files/patch-content_browser_browser__main__loop.cc b/www/iridium/files/patch-content_browser_browser__main__loop.cc index 52ba8af73eab..b638886bcb20 100644 --- a/www/iridium/files/patch-content_browser_browser__main__loop.cc +++ b/www/iridium/files/patch-content_browser_browser__main__loop.cc @@ -1,6 +1,6 @@ ---- content/browser/browser_main_loop.cc.orig 2022-10-05 07:34:01 UTC +--- content/browser/browser_main_loop.cc.orig 2022-12-01 10:35:46 UTC +++ content/browser/browser_main_loop.cc -@@ -240,6 +240,12 @@ +@@ -241,6 +241,12 @@ #include "mojo/public/cpp/bindings/lib/test_random_mojo_delays.h" #endif @@ -13,7 +13,7 @@ // One of the linux specific headers defines this as a macro. #ifdef DestroyAll #undef DestroyAll -@@ -523,6 +529,12 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -524,6 +530,12 @@ int BrowserMainLoop::EarlyInitialization() { // by now since a thread to start the ServiceManager has been created // before the browser main loop starts. DCHECK(SandboxHostLinux::GetInstance()->IsInitialized()); @@ -26,7 +26,7 @@ #endif // GLib's spawning of new processes is buggy, so it's important that at this -@@ -554,7 +566,7 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -555,7 +567,7 @@ int BrowserMainLoop::EarlyInitialization() { base::PlatformThread::SetCurrentThreadType(base::ThreadType::kCompositing); #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/iridium/files/patch-content_browser_compositor_viz__process__transport__factory.cc b/www/iridium/files/patch-content_browser_compositor_viz__process__transport__factory.cc index 8f7957d541c2..0789cc6a1dd4 100644 --- a/www/iridium/files/patch-content_browser_compositor_viz__process__transport__factory.cc +++ b/www/iridium/files/patch-content_browser_compositor_viz__process__transport__factory.cc @@ -1,6 +1,6 @@ ---- content/browser/compositor/viz_process_transport_factory.cc.orig 2022-03-28 18:11:04 UTC +--- content/browser/compositor/viz_process_transport_factory.cc.orig 2022-12-01 10:35:46 UTC +++ content/browser/compositor/viz_process_transport_factory.cc -@@ -112,7 +112,7 @@ class HostDisplayClient : public viz::HostDisplayClien +@@ -115,7 +115,7 @@ class HostDisplayClient : public viz::HostDisplayClien // viz::HostDisplayClient: // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-content_browser_download_download__manager__impl.cc b/www/iridium/files/patch-content_browser_download_download__manager__impl.cc index 9456018380f7..b175e161aca9 100644 --- a/www/iridium/files/patch-content_browser_download_download__manager__impl.cc +++ b/www/iridium/files/patch-content_browser_download_download__manager__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/download/download_manager_impl.cc.orig 2022-10-05 07:34:01 UTC +--- content/browser/download/download_manager_impl.cc.orig 2022-12-01 10:35:46 UTC +++ content/browser/download/download_manager_impl.cc -@@ -91,7 +91,7 @@ +@@ -92,7 +92,7 @@ #include "third_party/blink/public/common/storage_key/storage_key.h" #include "url/origin.h" @@ -9,7 +9,7 @@ #include "base/nix/xdg_util.h" #endif -@@ -218,7 +218,7 @@ class DownloadItemFactoryImpl : public download::Downl +@@ -219,7 +219,7 @@ class DownloadItemFactoryImpl : public download::Downl } }; @@ -18,7 +18,7 @@ base::FilePath GetTemporaryDownloadDirectory() { std::unique_ptr<base::Environment> env(base::Environment::Create()); return base::nix::GetXDGDirectory(env.get(), "XDG_DATA_HOME", ".local/share"); -@@ -654,7 +654,7 @@ bool DownloadManagerImpl::InterceptDownload( +@@ -655,7 +655,7 @@ bool DownloadManagerImpl::InterceptDownload( base::FilePath DownloadManagerImpl::GetDefaultDownloadDirectory() { base::FilePath default_download_directory; diff --git a/www/iridium/files/patch-content_browser_gpu_gpu__process__host.cc b/www/iridium/files/patch-content_browser_gpu_gpu__process__host.cc index 6dcc9aa1e9e3..f5a380d70d65 100644 --- a/www/iridium/files/patch-content_browser_gpu_gpu__process__host.cc +++ b/www/iridium/files/patch-content_browser_gpu_gpu__process__host.cc @@ -1,15 +1,6 @@ ---- content/browser/gpu/gpu_process_host.cc.orig 2022-10-05 07:34:01 UTC +--- content/browser/gpu/gpu_process_host.cc.orig 2022-12-01 10:35:46 UTC +++ content/browser/gpu/gpu_process_host.cc -@@ -101,7 +101,7 @@ - #include "ui/ozone/public/ozone_switches.h" - #endif - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "ui/gfx/switches.h" - #endif - -@@ -253,6 +253,7 @@ static const char* const kSwitchNames[] = { +@@ -249,6 +249,7 @@ static const char* const kSwitchNames[] = { switches::kEnableBackgroundThreadPool, switches::kEnableGpuRasterization, switches::kEnableLogging, @@ -17,7 +8,7 @@ switches::kEnableDeJelly, switches::kDeJellyScreenWidth, switches::kDoubleBufferCompositing, -@@ -286,7 +287,7 @@ static const char* const kSwitchNames[] = { +@@ -282,7 +283,7 @@ static const char* const kSwitchNames[] = { switches::kOzoneDumpFile, switches::kDisableBufferBWCompression, #endif diff --git a/www/iridium/files/patch-content_browser_media_frameless__media__interface__proxy.h b/www/iridium/files/patch-content_browser_media_frameless__media__interface__proxy.h index 24c7c1b73499..dec41f556f78 100644 --- a/www/iridium/files/patch-content_browser_media_frameless__media__interface__proxy.h +++ b/www/iridium/files/patch-content_browser_media_frameless__media__interface__proxy.h @@ -1,4 +1,4 @@ ---- content/browser/media/frameless_media_interface_proxy.h.orig 2022-10-05 07:34:01 UTC +--- content/browser/media/frameless_media_interface_proxy.h.orig 2022-12-01 10:35:46 UTC +++ content/browser/media/frameless_media_interface_proxy.h @@ -19,7 +19,7 @@ #include "mojo/public/cpp/bindings/receiver_set.h" @@ -9,7 +9,7 @@ #include "media/mojo/mojom/stable/stable_video_decoder.mojom.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -99,7 +99,7 @@ class FramelessMediaInterfaceProxy final +@@ -100,7 +100,7 @@ class FramelessMediaInterfaceProxy final // Connections to the renderer. mojo::ReceiverSet<media::mojom::InterfaceFactory> receivers_; diff --git a/www/iridium/files/patch-content_browser_media_media__interface__proxy.cc b/www/iridium/files/patch-content_browser_media_media__interface__proxy.cc index f985454c8f20..44c212b2a058 100644 --- a/www/iridium/files/patch-content_browser_media_media__interface__proxy.cc +++ b/www/iridium/files/patch-content_browser_media_media__interface__proxy.cc @@ -1,6 +1,6 @@ ---- content/browser/media/media_interface_proxy.cc.orig 2022-10-05 07:34:01 UTC +--- content/browser/media/media_interface_proxy.cc.orig 2022-12-01 10:35:46 UTC +++ content/browser/media/media_interface_proxy.cc -@@ -76,7 +76,7 @@ +@@ -73,7 +73,7 @@ #include "media/mojo/services/mojo_renderer_service.h" // nogncheck #endif @@ -9,7 +9,7 @@ #include "content/public/browser/stable_video_decoder_factory.h" #include "media/base/media_switches.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -327,7 +327,7 @@ void MediaInterfaceProxy::CreateVideoDecoder( +@@ -286,7 +286,7 @@ void MediaInterfaceProxy::CreateVideoDecoder( mojo::PendingRemote<media::stable::mojom::StableVideoDecoder> oop_video_decoder; 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 af21858c6ada..1848006a9a0f 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-10-05 07:34:01 UTC +--- content/browser/renderer_host/render_process_host_impl.cc.orig 2022-12-01 10:35:46 UTC +++ content/browser/renderer_host/render_process_host_impl.cc -@@ -211,7 +211,7 @@ +@@ -212,7 +212,7 @@ #include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h" #endif @@ -9,7 +9,7 @@ #include <sys/resource.h> #include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck -@@ -1135,7 +1135,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = +@@ -1136,7 +1136,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = // to indicate failure and std::numeric_limits<size_t>::max() to indicate // unlimited. size_t GetPlatformProcessLimit() { @@ -18,7 +18,7 @@ struct rlimit limit; if (getrlimit(RLIMIT_NPROC, &limit) != 0) return kUnknownPlatformProcessLimit; -@@ -1222,7 +1222,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public +@@ -1223,7 +1223,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public return; } @@ -27,16 +27,16 @@ if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) { ConnectToFontService(std::move(font_receiver)); return; -@@ -2114,7 +2114,7 @@ void RenderProcessHostImpl::CreateWebSocketConnector( - std::move(receiver)); +@@ -2118,7 +2118,7 @@ void RenderProcessHostImpl::ReinitializeLogging( } + #endif // BUILDFLAG(IS_CHROMEOS_ASH) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) void RenderProcessHostImpl::CreateStableVideoDecoder( mojo::PendingReceiver<media::stable::mojom::StableVideoDecoder> receiver) { if (!stable_video_decoder_factory_remote_.is_bound()) { -@@ -3243,6 +3243,8 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin +@@ -3258,6 +3258,8 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin switches::kDisableSpeechAPI, switches::kDisableThreadedCompositing, switches::kDisableTouchDragDrop, @@ -45,7 +45,7 @@ switches::kDisableV8IdleTasks, switches::kDisableVideoCaptureUseGpuMemoryBuffer, switches::kDisableWebGLImageChromium, -@@ -4716,7 +4718,7 @@ void RenderProcessHostImpl::ResetIPC() { +@@ -4732,7 +4734,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 2eb3f22cc08a..da37a7d7fb1c 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,4 +1,4 @@ ---- content/browser/renderer_host/render_process_host_impl.h.orig 2022-10-05 07:34:01 UTC +--- content/browser/renderer_host/render_process_host_impl.h.orig 2022-12-01 10:35:46 UTC +++ content/browser/renderer_host/render_process_host_impl.h @@ -83,7 +83,7 @@ #include "content/public/browser/android/child_process_importance.h" @@ -9,7 +9,7 @@ #include "media/mojo/mojom/stable/stable_video_decoder.mojom.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -472,7 +472,7 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -479,7 +479,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) -@@ -671,7 +671,7 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -678,7 +678,7 @@ class CONTENT_EXPORT RenderProcessHostImpl mojo::PendingReceiver<blink::mojom::WebSocketConnector> receiver) override; @@ -27,7 +27,7 @@ void CreateStableVideoDecoder( mojo::PendingReceiver<media::stable::mojom::StableVideoDecoder> receiver) override; -@@ -1121,7 +1121,7 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -1133,7 +1133,7 @@ class CONTENT_EXPORT RenderProcessHostImpl // RenderProcessHost. This is destroyed early in ResetIPC() method. std::unique_ptr<PermissionServiceContext> permission_service_context_; diff --git a/www/iridium/files/patch-content_browser_renderer__host_render__view__host__impl.cc b/www/iridium/files/patch-content_browser_renderer__host_render__view__host__impl.cc index 4b509ff23e12..ab8a119c9d45 100644 --- a/www/iridium/files/patch-content_browser_renderer__host_render__view__host__impl.cc +++ b/www/iridium/files/patch-content_browser_renderer__host_render__view__host__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_view_host_impl.cc.orig 2022-03-28 18:11:04 UTC +--- content/browser/renderer_host/render_view_host_impl.cc.orig 2022-12-01 10:35:46 UTC +++ content/browser/renderer_host/render_view_host_impl.cc -@@ -259,7 +259,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs( +@@ -254,7 +254,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs( display::win::ScreenWin::GetSystemMetricsInDIP(SM_CYVSCROLL); prefs->arrow_bitmap_width_horizontal_scroll_bar_in_dips = display::win::ScreenWin::GetSystemMetricsInDIP(SM_CXHSCROLL); diff --git a/www/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 4f404eb29cff..0979fafa0a3a 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-10-05 07:34:01 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2022-12-01 10:35:46 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.cc @@ -116,7 +116,7 @@ #include "ui/gfx/gdi_util.h" @@ -9,16 +9,16 @@ #include "content/browser/accessibility/browser_accessibility_auralinux.h" #include "ui/base/ime/linux/text_edit_command_auralinux.h" #include "ui/linux/linux_ui.h" -@@ -441,7 +441,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge - if (manager) - return ToBrowserAccessibilityWin(manager->GetRoot())->GetCOM(); +@@ -449,7 +449,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge + return ToBrowserAccessibilityWin(manager->GetBrowserAccessibilityRoot()) + ->GetCOM(); -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) BrowserAccessibilityManager* manager = host()->GetOrCreateRootBrowserAccessibilityManager(); - if (manager && manager->GetRoot()) -@@ -1579,7 +1579,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { + if (manager && manager->GetBrowserAccessibilityRoot()) +@@ -1587,7 +1587,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { return GetTextInputManager() && GetTextInputManager()->should_do_learning(); } @@ -27,7 +27,7 @@ bool RenderWidgetHostViewAura::SetCompositionFromExistingText( const gfx::Range& range, const std::vector<ui::ImeTextSpan>& ui_ime_text_spans) { -@@ -2400,7 +2400,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { +@@ -2407,7 +2407,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { } bool RenderWidgetHostViewAura::NeedsMouseCapture() { @@ -36,7 +36,7 @@ return NeedsInputGrab(); #else return false; -@@ -2577,7 +2577,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit +@@ -2584,7 +2584,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit if (!target_host) 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 e143251c7269..d6acfe6350cb 100644 --- a/www/iridium/files/patch-content_browser_utility__sandbox__delegate.cc +++ b/www/iridium/files/patch-content_browser_utility__sandbox__delegate.cc @@ -1,7 +1,7 @@ ---- content/browser/utility_sandbox_delegate.cc.orig 2022-10-05 07:34:01 UTC +--- content/browser/utility_sandbox_delegate.cc.orig 2022-12-01 10:35:46 UTC +++ content/browser/utility_sandbox_delegate.cc @@ -63,10 +63,10 @@ UtilitySandboxedProcessLauncherDelegate:: - #if BUILDFLAG(ENABLE_PLUGINS) + #if BUILDFLAG(ENABLE_PPAPI) sandbox_type_ == sandbox::mojom::Sandbox::kPpapi || #endif -#if BUILDFLAG(IS_FUCHSIA) 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 d45e445a570e..66b1f0d65f3b 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,4 +1,4 @@ ---- content/browser/web_contents/web_contents_view_aura.cc.orig 2022-10-05 07:34:01 UTC +--- 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 @@ -176,7 +176,7 @@ class WebDragSourceAura : public content::WebContentsO raw_ptr<aura::Window> window_; @@ -18,7 +18,7 @@ // We set the file contents before the URL because the URL also sets file // contents (to a .URL shortcut). We want to prefer file content data over // a shortcut so we add it first. -@@ -1360,7 +1360,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent* +@@ -1365,7 +1365,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 48d5b35b558b..56d272ae488e 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-10-05 07:34:01 UTC +--- content/common/BUILD.gn.orig 2022-12-01 10:35:46 UTC +++ content/common/BUILD.gn -@@ -428,6 +428,9 @@ if (is_linux || is_chromeos) { +@@ -430,6 +430,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__sandbox__hook__linux.cc b/www/iridium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc index 6aac6f475933..204b36e6b6cc 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,6 +1,6 @@ ---- content/gpu/gpu_sandbox_hook_linux.cc.orig 2022-10-05 07:34:01 UTC +--- content/gpu/gpu_sandbox_hook_linux.cc.orig 2022-12-01 10:35:46 UTC +++ content/gpu/gpu_sandbox_hook_linux.cc -@@ -118,6 +118,7 @@ void AddStandardChromeOsPermissions( +@@ -121,6 +121,7 @@ void AddStandardChromeOsPermissions( permissions->push_back(BrokerFilePermission::ReadOnly(kAngleGlesPath)); } @@ -8,7 +8,7 @@ void AddV4L2GpuPermissions( std::vector<BrokerFilePermission>* permissions, const sandbox::policy::SandboxSeccompBPF::Options& options) { -@@ -434,8 +435,10 @@ std::vector<BrokerFilePermission> FilePermissionsForGp +@@ -440,8 +441,10 @@ std::vector<BrokerFilePermission> FilePermissionsForGp AddStandardGpuPermissions(&permissions); return permissions; } @@ -19,7 +19,7 @@ // Preload the Mali library. if (UseChromecastSandboxAllowlist()) { for (const char* path : kAllowedChromecastPaths) { -@@ -477,6 +480,7 @@ void LoadArmGpuLibraries() { +@@ -483,6 +486,7 @@ void LoadArmGpuLibraries() { dlopen(driver_paths[i], dlopen_flag); } } @@ -27,7 +27,7 @@ } bool LoadAmdGpuLibraries() { -@@ -542,12 +546,14 @@ void LoadV4L2Libraries( +@@ -550,12 +554,14 @@ void LoadV4L2Libraries( } void LoadChromecastV4L2Libraries() { @@ -42,7 +42,7 @@ } bool LoadLibrariesForGpu( -@@ -575,6 +581,7 @@ bool LoadLibrariesForGpu( +@@ -583,6 +589,7 @@ bool LoadLibrariesForGpu( return true; } @@ -50,7 +50,7 @@ sandbox::syscall_broker::BrokerCommandSet CommandSetForGPU( const sandbox::policy::SandboxLinux::Options& options) { sandbox::syscall_broker::BrokerCommandSet command_set; -@@ -597,13 +604,17 @@ bool BrokerProcessPreSandboxHook( +@@ -605,13 +612,17 @@ bool BrokerProcessPreSandboxHook( SetProcessTitleFromCommandLine(nullptr); return true; } 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 2729b8bf362f..20ff7fbb12ce 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,4 +1,4 @@ ---- content/public/browser/render_process_host.h.orig 2022-10-05 07:34:01 UTC +--- content/public/browser/render_process_host.h.orig 2022-12-01 10:35:46 UTC +++ content/public/browser/render_process_host.h @@ -53,7 +53,7 @@ #include "content/public/browser/android/child_process_importance.h" @@ -9,7 +9,7 @@ #include "media/mojo/mojom/stable/stable_video_decoder.mojom-forward.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -626,7 +626,7 @@ class CONTENT_EXPORT RenderProcessHost : public IPC::S +@@ -614,7 +614,7 @@ class CONTENT_EXPORT RenderProcessHost : public IPC::S const blink::StorageKey& storage_key, mojo::PendingReceiver<blink::mojom::WebSocketConnector> receiver) = 0; diff --git a/www/iridium/files/patch-content_public_common_common__param__traits__macros.h b/www/iridium/files/patch-content_public_common_common__param__traits__macros.h index 474b5484157f..c202945d55c5 100644 --- a/www/iridium/files/patch-content_public_common_common__param__traits__macros.h +++ b/www/iridium/files/patch-content_public_common_common__param__traits__macros.h @@ -1,6 +1,6 @@ ---- content/public/common/common_param_traits_macros.h.orig 2022-04-01 07:48:30 UTC +--- content/public/common/common_param_traits_macros.h.orig 2022-12-01 10:35:46 UTC +++ content/public/common/common_param_traits_macros.h -@@ -128,7 +128,7 @@ IPC_STRUCT_TRAITS_BEGIN(blink::RendererPreferences) +@@ -125,7 +125,7 @@ IPC_STRUCT_TRAITS_BEGIN(blink::RendererPreferences) IPC_STRUCT_TRAITS_MEMBER(accept_languages) IPC_STRUCT_TRAITS_MEMBER(plugin_fullscreen_allowed) IPC_STRUCT_TRAITS_MEMBER(caret_browsing_enabled) diff --git a/www/iridium/files/patch-content_public_common_content__features.cc b/www/iridium/files/patch-content_public_common_content__features.cc index f9a34454add2..dd7d0ef61178 100644 --- a/www/iridium/files/patch-content_public_common_content__features.cc +++ b/www/iridium/files/patch-content_public_common_content__features.cc @@ -1,4 +1,4 @@ ---- content/public/common/content_features.cc.orig 2022-10-05 07:34:01 UTC +--- content/public/common/content_features.cc.orig 2022-12-01 10:35:46 UTC +++ content/public/common/content_features.cc @@ -43,7 +43,7 @@ const base::Feature kAudioServiceOutOfProcess { "AudioServiceOutOfProcess", @@ -18,7 +18,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -1086,7 +1086,7 @@ const base::Feature kWebAssemblyBaseline{"WebAssemblyB +@@ -1102,7 +1102,7 @@ const base::Feature kWebAssemblyBaseline{"WebAssemblyB const base::Feature kWebAssemblyCodeProtection{ "WebAssemblyCodeProtection", base::FEATURE_ENABLED_BY_DEFAULT}; @@ -27,7 +27,7 @@ // Use memory protection keys in userspace (PKU) (if available) to protect code // JITed for WebAssembly. Fall back to traditional memory protection if // WebAssemblyCodeProtection is also enabled. -@@ -1122,7 +1122,7 @@ const base::Feature kWebAssemblyTiering{"WebAssemblyTi +@@ -1138,7 +1138,7 @@ const base::Feature kWebAssemblyTiering{"WebAssemblyTi const base::Feature kWebAssemblyTrapHandler { "WebAssemblyTrapHandler", #if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ @@ -36,7 +36,7 @@ defined(ARCH_CPU_X86_64)) || \ (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) base::FEATURE_ENABLED_BY_DEFAULT -@@ -1192,7 +1192,11 @@ const base::Feature kWebUIReportOnlyTrustedTypes{ +@@ -1208,7 +1208,11 @@ const 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 c10663a8f4b5..79a68eddbf36 100644 --- a/www/iridium/files/patch-content_public_common_content__features.h +++ b/www/iridium/files/patch-content_public_common_content__features.h @@ -1,6 +1,6 @@ ---- content/public/common/content_features.h.orig 2022-10-05 07:34:01 UTC +--- content/public/common/content_features.h.orig 2022-12-01 10:35:46 UTC +++ content/public/common/content_features.h -@@ -282,7 +282,7 @@ CONTENT_EXPORT extern const base::Feature kV8VmFuture; +@@ -284,7 +284,7 @@ CONTENT_EXPORT extern const base::Feature kJavaScriptE CONTENT_EXPORT extern const base::Feature kWebAppWindowControlsOverlay; CONTENT_EXPORT extern const base::Feature kWebAssemblyBaseline; CONTENT_EXPORT extern const base::Feature kWebAssemblyCodeProtection; diff --git a/www/iridium/files/patch-content_public_common_content__switches.cc b/www/iridium/files/patch-content_public_common_content__switches.cc index d821874b32c7..307fe7afd820 100644 --- a/www/iridium/files/patch-content_public_common_content__switches.cc +++ b/www/iridium/files/patch-content_public_common_content__switches.cc @@ -1,6 +1,6 @@ ---- content/public/common/content_switches.cc.orig 2022-10-05 07:34:01 UTC +--- content/public/common/content_switches.cc.orig 2022-12-01 10:35:46 UTC +++ content/public/common/content_switches.cc -@@ -370,6 +370,10 @@ const char kEnableGpuMemoryBufferVideoFrames[] = +@@ -374,6 +374,10 @@ const char kEnableGpuMemoryBufferVideoFrames[] = // builds. const char kEnableLogging[] = "enable-logging"; @@ -11,7 +11,7 @@ // Enables the type, downlinkMax attributes of the NetInfo API. Also, enables // triggering of change attribute of the NetInfo API when there is a change in // the connection type. -@@ -984,7 +988,7 @@ const char kEnableAutomation[] = "enable-automation"; +@@ -988,7 +992,7 @@ const char kEnableAutomation[] = "enable-automation"; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-content_public_common_content__switches.h b/www/iridium/files/patch-content_public_common_content__switches.h index 9c7a2f6b4571..a9b2317d0b9e 100644 --- a/www/iridium/files/patch-content_public_common_content__switches.h +++ b/www/iridium/files/patch-content_public_common_content__switches.h @@ -1,6 +1,6 @@ ---- content/public/common/content_switches.h.orig 2022-10-05 07:34:01 UTC +--- content/public/common/content_switches.h.orig 2022-12-01 10:35:46 UTC +++ content/public/common/content_switches.h -@@ -118,6 +118,8 @@ CONTENT_EXPORT extern const char kEnableBlinkTestFeatu +@@ -119,6 +119,8 @@ CONTENT_EXPORT extern const char kEnableBlinkTestFeatu CONTENT_EXPORT extern const char kEnableGpuMemoryBufferVideoFrames[]; CONTENT_EXPORT extern const char kEnableLCDText[]; CONTENT_EXPORT extern const char kEnableLogging[]; @@ -9,7 +9,7 @@ CONTENT_EXPORT extern const char kEnableNetworkInformationDownlinkMax[]; CONTENT_EXPORT extern const char kEnableCanvas2DLayers[]; CONTENT_EXPORT extern const char kEnablePluginPlaceholderTesting[]; -@@ -265,7 +267,7 @@ CONTENT_EXPORT extern const char kRendererWaitForJavaD +@@ -266,7 +268,7 @@ CONTENT_EXPORT extern const char kRendererWaitForJavaD // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/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 582f200c8e76..17d7691e1358 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-10-05 07:34:01 UTC +--- content/public/test/mock_render_process_host.h.orig 2022-12-01 10:35:46 UTC +++ content/public/test/mock_render_process_host.h -@@ -261,7 +261,7 @@ class MockRenderProcessHost : public RenderProcessHost +@@ -263,7 +263,7 @@ class MockRenderProcessHost : public RenderProcessHost const blink::StorageKey& storage_key, mojo::PendingReceiver<blink::mojom::WebSocketConnector> receiver) override {} diff --git a/www/iridium/files/patch-content_renderer_media_render__media__client.cc b/www/iridium/files/patch-content_renderer_media_render__media__client.cc index b83b3fedb3d8..ce4d575b149b 100644 --- a/www/iridium/files/patch-content_renderer_media_render__media__client.cc +++ b/www/iridium/files/patch-content_renderer_media_render__media__client.cc @@ -1,11 +1,11 @@ ---- content/renderer/media/render_media_client.cc.orig 2022-10-05 07:34:01 UTC +--- content/renderer/media/render_media_client.cc.orig 2022-12-01 10:35:46 UTC +++ content/renderer/media/render_media_client.cc -@@ -21,7 +21,7 @@ namespace { - // it asynchronously ahead of time, but can fallback to a blocking call +@@ -22,7 +22,7 @@ namespace { // when it's needed synchronously. - #if BUILDFLAG(ENABLE_PLATFORM_HEVC) && \ -- (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)) -+ (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) + #if BUILDFLAG(ENABLE_PLATFORM_HEVC) && \ + (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_MAC)) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)) #define NEEDS_PROFILE_UPDATER 1 #else #define NEEDS_PROFILE_UPDATER 0 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 08b44699a1d6..9744cc38d4f7 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-10-05 07:34:01 UTC +--- content/renderer/render_process_impl.cc.orig 2022-12-01 10:35:46 UTC +++ content/renderer/render_process_impl.cc @@ -46,7 +46,7 @@ #if BUILDFLAG(IS_WIN) @@ -9,7 +9,7 @@ #include "v8/include/v8-wasm-trap-handler-posix.h" #endif -@@ -138,7 +138,7 @@ RenderProcessImpl::RenderProcessImpl() +@@ -141,7 +141,7 @@ RenderProcessImpl::RenderProcessImpl() SetV8FlagIfNotFeature(features::kWebAssemblyCodeProtection, "--no-wasm-write-protect-code-memory"); @@ -18,9 +18,9 @@ SetV8FlagIfFeature(features::kWebAssemblyCodeProtectionPku, "--wasm-memory-protection-keys"); SetV8FlagIfNotFeature(features::kWebAssemblyCodeProtectionPku, -@@ -224,7 +224,7 @@ RenderProcessImpl::RenderProcessImpl() - - v8::V8::SetFlagsFromString("--freeze-flags-after-init"); +@@ -226,7 +226,7 @@ RenderProcessImpl::RenderProcessImpl() + SetV8FlagIfNotFeature(features::kWebAssemblyDynamicTiering, + "--no-wasm-dynamic-tiering"); -#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(ARCH_CPU_X86_64) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_X86_64) 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 34292a718826..34ba0c47e285 100644 --- a/www/iridium/files/patch-content_renderer_render__thread__impl.cc +++ b/www/iridium/files/patch-content_renderer_render__thread__impl.cc @@ -1,4 +1,4 @@ ---- content/renderer/render_thread_impl.cc.orig 2022-10-05 07:34:01 UTC +--- content/renderer/render_thread_impl.cc.orig 2022-12-01 10:35:46 UTC +++ content/renderer/render_thread_impl.cc @@ -190,7 +190,7 @@ @@ -9,7 +9,7 @@ #include <malloc.h> #endif -@@ -671,7 +671,7 @@ void RenderThreadImpl::Init() { +@@ -655,7 +655,7 @@ void RenderThreadImpl::Init() { base::DiscardableMemoryAllocator::SetInstance( discardable_memory_allocator_.get()); @@ -18,7 +18,7 @@ render_message_filter()->SetThreadType( ChildProcess::current()->io_thread_id(), base::ThreadType::kCompositing); #endif -@@ -1041,7 +1041,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1025,7 +1025,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: const bool enable_video_decode_accelerator = @@ -27,7 +27,7 @@ base::FeatureList::IsEnabled(media::kVaapiVideoDecodeLinux) && #else !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode) && -@@ -1052,7 +1052,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1036,7 +1036,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 01b2b4d8a80f..14c0f154c13a 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,4 +1,4 @@ ---- content/renderer/renderer_blink_platform_impl.cc.orig 2022-10-05 07:34:01 UTC +--- content/renderer/renderer_blink_platform_impl.cc.orig 2022-12-01 10:35:46 UTC +++ content/renderer/renderer_blink_platform_impl.cc @@ -108,7 +108,7 @@ @@ -27,7 +27,7 @@ if (sandboxEnabled()) { #if BUILDFLAG(IS_MAC) sandbox_support_ = std::make_unique<WebSandboxSupportMac>(); -@@ -254,7 +254,7 @@ RendererBlinkPlatformImpl::WrapURLLoaderFactory( +@@ -258,7 +258,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()) { -@@ -265,7 +265,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl +@@ -269,7 +269,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl #endif blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() { diff --git a/www/iridium/files/patch-content_shell_BUILD.gn b/www/iridium/files/patch-content_shell_BUILD.gn index 6a82bb1be27e..3eb7aa26a376 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-10-05 07:34:01 UTC +--- content/shell/BUILD.gn.orig 2022-12-01 10:35:46 UTC +++ content/shell/BUILD.gn -@@ -893,7 +893,7 @@ group("content_shell_crash_test") { +@@ -897,7 +897,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_app_shell__main__delegate.cc b/www/iridium/files/patch-content_shell_app_shell__main__delegate.cc index f875b92e2d0e..3d303d29a725 100644 --- a/www/iridium/files/patch-content_shell_app_shell__main__delegate.cc +++ b/www/iridium/files/patch-content_shell_app_shell__main__delegate.cc @@ -1,6 +1,6 @@ ---- content/shell/app/shell_main_delegate.cc.orig 2022-10-05 07:34:01 UTC +--- content/shell/app/shell_main_delegate.cc.orig 2022-12-01 10:35:46 UTC +++ content/shell/app/shell_main_delegate.cc -@@ -208,7 +208,7 @@ void ShellMainDelegate::PreSandboxStartup() { +@@ -213,7 +213,7 @@ void ShellMainDelegate::PreSandboxStartup() { // Reporting for sub-processes will be initialized in ZygoteForked. if (process_type != switches::kZygoteProcess) { crash_reporter::InitializeCrashpad(process_type.empty(), process_type); diff --git a/www/iridium/files/patch-content_shell_browser_shell__browser__main__parts.cc b/www/iridium/files/patch-content_shell_browser_shell__browser__main__parts.cc index 37446ba5882f..3b5f453b280b 100644 --- a/www/iridium/files/patch-content_shell_browser_shell__browser__main__parts.cc +++ b/www/iridium/files/patch-content_shell_browser_shell__browser__main__parts.cc @@ -1,4 +1,4 @@ ---- content/shell/browser/shell_browser_main_parts.cc.orig 2022-10-05 07:34:01 UTC +--- content/shell/browser/shell_browser_main_parts.cc.orig 2022-12-01 10:35:46 UTC +++ content/shell/browser/shell_browser_main_parts.cc @@ -50,7 +50,7 @@ #include "net/base/network_change_notifier.h" @@ -33,7 +33,7 @@ -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - ui::LinuxUi::SetInstance(ui::CreateLinuxUi()); + ui::LinuxUi::SetInstance(ui::GetDefaultLinuxUi()); #endif } @@ -196,7 +196,7 @@ void ShellBrowserMainParts::PostMainMessageLoopRun() { 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 9eeff1afd57d..5e4b7b70f9bb 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-10-05 07:34:01 UTC +--- content/shell/utility/shell_content_utility_client.cc.orig 2022-12-01 10:35:46 UTC +++ content/shell/utility/shell_content_utility_client.cc -@@ -32,7 +32,7 @@ +@@ -33,7 +33,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 -@@ -143,7 +143,7 @@ void ShellContentUtilityClient::ExposeInterfacesToBrow +@@ -146,7 +146,7 @@ void ShellContentUtilityClient::ExposeInterfacesToBrow binders->Add<mojom::PowerMonitorTest>( 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 5639435a3e28..f5d514b9d2d0 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-10-05 07:34:01 UTC +--- content/test/BUILD.gn.orig 2022-12-01 10:35:46 UTC +++ content/test/BUILD.gn -@@ -2055,7 +2055,7 @@ static_library("run_all_unittests") { +@@ -2076,7 +2076,7 @@ static_library("run_all_unittests") { ":test_support", "//base/test:test_support", ] @@ -9,7 +9,7 @@ deps += [ "//content/common:set_process_title_linux" ] } } -@@ -3025,7 +3025,7 @@ test("content_unittests") { +@@ -3053,7 +3053,7 @@ test("content_unittests") { deps += [ "//third_party/boringssl" ] } diff --git a/www/iridium/files/patch-content_zygote_zygote__linux.cc b/www/iridium/files/patch-content_zygote_zygote__linux.cc index 93d9347c0fbb..cdb64a0ae036 100644 --- a/www/iridium/files/patch-content_zygote_zygote__linux.cc +++ b/www/iridium/files/patch-content_zygote_zygote__linux.cc @@ -1,7 +1,7 @@ ---- content/zygote/zygote_linux.cc.orig 2022-10-05 07:34:01 UTC +--- content/zygote/zygote_linux.cc.orig 2022-12-01 10:35:46 UTC +++ content/zygote/zygote_linux.cc @@ -1,6 +1,7 @@ - // Copyright (c) 2012 The Chromium Authors. All rights reserved. + // Copyright 2012 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#if 0 diff --git a/www/iridium/files/patch-device_gamepad_BUILD.gn b/www/iridium/files/patch-device_gamepad_BUILD.gn new file mode 100644 index 000000000000..00d237052fe9 --- /dev/null +++ b/www/iridium/files/patch-device_gamepad_BUILD.gn @@ -0,0 +1,11 @@ +--- device/gamepad/BUILD.gn.orig 2022-12-01 10:35:46 UTC ++++ device/gamepad/BUILD.gn +@@ -98,7 +98,7 @@ component("gamepad") { + "hid_writer_linux.cc", + "hid_writer_linux.h", + ] +- if (use_udev) { ++ if (use_udev && !is_bsd) { + sources += [ + "gamepad_device_linux.cc", + "gamepad_device_linux.h", diff --git a/www/iridium/files/patch-extensions_browser_extension__prefs.cc b/www/iridium/files/patch-extensions_browser_extension__prefs.cc index 172200e7c3e0..4bf2a96c134a 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-10-05 07:34:01 UTC +--- extensions/browser/extension_prefs.cc.orig 2022-12-01 10:35:46 UTC +++ extensions/browser/extension_prefs.cc -@@ -2274,7 +2274,7 @@ void ExtensionPrefs::RegisterProfilePrefs( +@@ -2286,7 +2286,7 @@ void ExtensionPrefs::RegisterProfilePrefs( registry->RegisterDictionaryPref(kInstallSignature); registry->RegisterListPref(kExternalUninstalls); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc index b94484657fad..00331064fd9e 100644 --- a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc +++ b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc.orig 2022-10-05 07:34:01 UTC +--- gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc.orig 2022-12-01 10:35:46 UTC +++ gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc -@@ -640,7 +640,7 @@ bool AngleVulkanImageBackingFactory::CanUseAngleVulkan +@@ -600,7 +600,7 @@ bool AngleVulkanImageBackingFactory::CanUseAngleVulkan // TODO(penghuang): verify the scanout is the right usage for video playback. // crbug.com/1280798 constexpr auto kSupportedUsages = diff --git a/www/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 23b34c5e2a27..13be4f44d0e0 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-10-05 07:34:01 UTC +--- gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig 2022-12-01 10:35:46 UTC +++ gpu/command_buffer/service/shared_image/external_vk_image_backing.cc @@ -31,7 +31,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 -@@ -576,7 +576,7 @@ std::unique_ptr<DawnImageRepresentation> ExternalVkIma +@@ -568,7 +568,7 @@ std::unique_ptr<DawnImageRepresentation> 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 e0b83540b5cc..554adcc648c9 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,6 +1,6 @@ ---- gpu/command_buffer/service/shared_image/gl_texture_image_backing.cc.orig 2022-10-05 07:34:01 UTC +--- gpu/command_buffer/service/shared_image/gl_texture_image_backing.cc.orig 2022-12-01 10:35:46 UTC +++ gpu/command_buffer/service/shared_image/gl_texture_image_backing.cc -@@ -254,7 +254,7 @@ void GLTextureImageBacking::InitializeGLTexture( +@@ -246,7 +246,7 @@ void GLTextureImageBacking::InitializeGLTexture( } void GLTextureImageBacking::CreateEGLImage() { diff --git a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc index cacec8b0c5c4..f5b1494e48a1 100644 --- a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc +++ b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/shared_image/shared_image_factory.cc.orig 2022-10-05 07:34:01 UTC +--- gpu/command_buffer/service/shared_image/shared_image_factory.cc.orig 2022-12-01 10:35:46 UTC +++ gpu/command_buffer/service/shared_image/shared_image_factory.cc -@@ -52,7 +52,7 @@ +@@ -51,7 +51,7 @@ #include "ui/ozone/public/surface_factory_ozone.h" #endif @@ -9,7 +9,7 @@ BUILDFLAG(ENABLE_VULKAN) #include "gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.h" #include "gpu/command_buffer/service/shared_image/ozone_image_backing_factory.h" -@@ -88,7 +88,7 @@ namespace gpu { +@@ -86,7 +86,7 @@ namespace gpu { namespace { @@ -18,7 +18,7 @@ bool ShouldUseExternalVulkanImageFactory() { #if BUILDFLAG(ENABLE_VULKAN) -@@ -398,7 +398,7 @@ SharedImageFactory::SharedImageFactory( +@@ -394,7 +394,7 @@ SharedImageFactory::SharedImageFactory( factories_.push_back(std::move(external_vk_image_factory)); } #elif defined(USE_OZONE) @@ -26,4 +26,4 @@ +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CASTOS) // Desktop Linux, not ChromeOS. if (ShouldUseOzoneImageBackingFactory()) { - auto ozone_factory = + auto ozone_factory = std::make_unique<OzoneImageBackingFactory>( 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 12af80d5eccd..24907bf6568a 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,9 +1,9 @@ ---- gpu/command_buffer/service/shared_image/wrapped_sk_image_backing_factory.cc.orig 2022-10-05 07:34:01 UTC +--- gpu/command_buffer/service/shared_image/wrapped_sk_image_backing_factory.cc.orig 2022-12-01 10:35:46 UTC +++ gpu/command_buffer/service/shared_image/wrapped_sk_image_backing_factory.cc -@@ -257,7 +257,7 @@ class WrappedSkImage : public ClearTrackingSharedImage - DCHECK_NE(format(), viz::ResourceFormat::ETC1); - auto mipmap = usage() & SHARED_IMAGE_USAGE_MIPMAP ? GrMipMapped::kYes +@@ -244,7 +244,7 @@ class WrappedSkImage : public ClearTrackingSharedImage : GrMipMapped::kNo; + const std::string label = "WrappedSkImageBackingFactory_Initialize" + + CreateLabelForSharedImageUsage(usage()); -#if DCHECK_IS_ON() && !BUILDFLAG(IS_LINUX) +#if DCHECK_IS_ON() && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) // Initializing to bright green makes it obvious if the pixels are not 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 68ec9a88fb7d..089a5e470628 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-10-05 07:34:01 UTC +--- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2022-12-01 10:35:46 UTC +++ gpu/command_buffer/service/webgpu_decoder_impl.cc -@@ -1071,7 +1071,7 @@ void WebGPUDecoderImpl::RequestAdapterImpl( +@@ -1099,7 +1099,7 @@ void WebGPUDecoderImpl::RequestAdapterImpl( if (gr_context_type_ != GrContextType::kVulkan && use_webgpu_adapter_ != WebGPUAdapterName::kCompat) { diff --git a/www/iridium/files/patch-gpu_ipc_service_gpu__init.cc b/www/iridium/files/patch-gpu_ipc_service_gpu__init.cc index eb05a01c12c3..6544025545a2 100644 --- a/www/iridium/files/patch-gpu_ipc_service_gpu__init.cc +++ b/www/iridium/files/patch-gpu_ipc_service_gpu__init.cc @@ -1,6 +1,6 @@ ---- gpu/ipc/service/gpu_init.cc.orig 2022-10-05 07:34:01 UTC +--- gpu/ipc/service/gpu_init.cc.orig 2022-12-01 10:35:46 UTC +++ gpu/ipc/service/gpu_init.cc -@@ -350,7 +350,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -351,7 +351,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL enable_watchdog = false; #endif @@ -9,7 +9,7 @@ bool gpu_sandbox_start_early = gpu_preferences_.gpu_sandbox_start_early; #else // !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) // For some reasons MacOSX's VideoToolbox might crash when called after -@@ -400,7 +400,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -401,7 +401,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } bool attempted_startsandbox = false; @@ -18,7 +18,7 @@ // On Chrome OS ARM Mali, GPU driver userspace creates threads when // initializing a GL context, so start the sandbox early. // TODO(zmo): Need to collect OS version before this. -@@ -449,7 +449,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -450,7 +450,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL if (gl_initialized && gl_use_swiftshader_ && !gl::IsSoftwareGLImplementation(gl::GetGLImplementationParts())) { @@ -27,7 +27,7 @@ VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " << "on Linux"; return false; -@@ -485,7 +485,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -501,7 +501,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } } @@ -36,7 +36,7 @@ // The ContentSandboxHelper is currently the only one implementation of // GpuSandboxHelper and it has no dependency. Except on Linux where // VaapiWrapper checks the GL implementation to determine which display -@@ -545,7 +545,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -561,7 +561,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL command_line, gpu_feature_info_, gpu_preferences_.disable_software_rasterizer, false); if (gl_use_swiftshader_) { @@ -45,7 +45,7 @@ VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " << "on Linux"; return false; -@@ -673,7 +673,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -689,7 +689,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_); @@ -54,7 +54,25 @@ // Driver may create a compatibility profile context when collect graphics // information on Linux platform. Try to collect graphics information // based on core profile context after disabling platform extensions. -@@ -909,7 +909,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -741,7 +741,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL + gl_use_swiftshader_ = true; + } + } +-#if BUILDFLAG(IS_LINUX) || \ ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \ + (BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_CHROMEOS_DEVICE)) + if (!gl_disabled && !gl_use_swiftshader_ && std::getenv("RUNNING_UNDER_RR")) { + // https://rr-project.org/ is a Linux-only record-and-replay debugger that +@@ -883,7 +883,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c + } + bool gl_disabled = gl::GetGLImplementation() == gl::kGLImplementationDisabled; + +-#if BUILDFLAG(IS_LINUX) || \ ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \ + (BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_CHROMEOS_DEVICE)) + if (!gl_disabled && !gl_use_swiftshader_ && std::getenv("RUNNING_UNDER_RR")) { + // https://rr-project.org/ is a Linux-only record-and-replay debugger that +@@ -946,7 +946,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_); diff --git a/www/iridium/files/patch-headless_lib_browser_headless__web__contents__impl.cc b/www/iridium/files/patch-headless_lib_browser_headless__web__contents__impl.cc index 634b75c25cb3..2fba1c59e5b0 100644 --- a/www/iridium/files/patch-headless_lib_browser_headless__web__contents__impl.cc +++ b/www/iridium/files/patch-headless_lib_browser_headless__web__contents__impl.cc @@ -1,6 +1,6 @@ ---- headless/lib/browser/headless_web_contents_impl.cc.orig 2022-10-05 07:34:01 UTC +--- headless/lib/browser/headless_web_contents_impl.cc.orig 2022-12-01 10:35:46 UTC +++ headless/lib/browser/headless_web_contents_impl.cc -@@ -59,7 +59,7 @@ namespace headless { +@@ -60,7 +60,7 @@ namespace headless { namespace { void UpdatePrefsFromSystemSettings(blink::RendererPreferences* prefs) { diff --git a/www/iridium/files/patch-media_BUILD.gn b/www/iridium/files/patch-media_BUILD.gn index f6b7d8f5686e..ab6a31fd6875 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-10-05 07:34:01 UTC +--- media/BUILD.gn.orig 2022-12-01 10:35:46 UTC +++ media/BUILD.gn -@@ -84,6 +84,9 @@ config("media_config") { +@@ -78,6 +78,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 3aa4bb813f4c..40909bc7c973 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-10-05 07:34:01 UTC +--- media/audio/BUILD.gn.orig 2022-12-01 10:35:46 UTC +++ media/audio/BUILD.gn -@@ -248,9 +248,20 @@ source_set("audio") { +@@ -250,9 +250,20 @@ source_set("audio") { ] } diff --git a/www/iridium/files/patch-media_audio_audio__features.cc b/www/iridium/files/patch-media_audio_audio__features.cc deleted file mode 100644 index 2e39352ed327..000000000000 --- a/www/iridium/files/patch-media_audio_audio__features.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- media/audio/audio_features.cc.orig 2022-10-05 07:34:01 UTC -+++ media/audio/audio_features.cc -@@ -14,7 +14,7 @@ namespace features { - const base::Feature kAudioServiceOutOfProcessKillAtHang{ - "AudioServiceOutOfProcessKillAtHang", - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - base::FEATURE_ENABLED_BY_DEFAULT - #else - base::FEATURE_DISABLED_BY_DEFAULT diff --git a/www/iridium/files/patch-media_audio_sndio_audio__manager__sndio.cc b/www/iridium/files/patch-media_audio_sndio_audio__manager__sndio.cc index ee833c86c6ac..a8897c485059 100644 --- a/www/iridium/files/patch-media_audio_sndio_audio__manager__sndio.cc +++ b/www/iridium/files/patch-media_audio_sndio_audio__manager__sndio.cc @@ -1,4 +1,4 @@ ---- media/audio/sndio/audio_manager_sndio.cc.orig 2022-03-28 18:11:04 UTC +--- media/audio/sndio/audio_manager_sndio.cc.orig 2022-12-01 10:35:46 UTC +++ media/audio/sndio/audio_manager_sndio.cc @@ -0,0 +1,181 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. @@ -75,7 +75,7 @@ + user_buffer_size : kDefaultInputBufferSize; + + return AudioParameters( -+ AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO, ++ AudioParameters::AUDIO_PCM_LOW_LATENCY, ChannelLayoutConfig::Stereo(), + kDefaultSampleRate, buffer_size); +} + @@ -128,12 +128,12 @@ + DLOG_IF(ERROR, !output_device_id.empty()) << "Not implemented!"; + static const int kDefaultOutputBufferSize = 2048; + -+ ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO; ++ ChannelLayoutConfig channel_layout_config = ChannelLayoutConfig::Stereo(); + int sample_rate = kDefaultSampleRate; + int buffer_size = kDefaultOutputBufferSize; + if (input_params.IsValid()) { + sample_rate = input_params.sample_rate(); -+ channel_layout = input_params.channel_layout(); ++ channel_layout_config = input_params.channel_layout_config(); + buffer_size = std::min(buffer_size, input_params.frames_per_buffer()); + } + @@ -142,8 +142,8 @@ + buffer_size = user_buffer_size; + + return AudioParameters( -+ AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout, -+ sample_rate, buffer_size); ++ AudioParameters::AUDIO_PCM_LOW_LATENCY, ++ channel_layout_config, sample_rate, buffer_size); +} + +AudioInputStream* AudioManagerSndio::MakeInputStream( diff --git a/www/iridium/files/patch-media_base_media__switches.cc b/www/iridium/files/patch-media_base_media__switches.cc index 47d457e6874f..0e062b25c411 100644 --- a/www/iridium/files/patch-media_base_media__switches.cc +++ b/www/iridium/files/patch-media_base_media__switches.cc @@ -1,4 +1,4 @@ ---- media/base/media_switches.cc.orig 2022-10-05 07:34:01 UTC +--- media/base/media_switches.cc.orig 2022-12-01 10:35:46 UTC +++ media/base/media_switches.cc @@ -10,7 +10,7 @@ #include "components/system_media_controls/linux/buildflags/buildflags.h" @@ -9,7 +9,7 @@ #include "base/cpu.h" #endif -@@ -452,7 +452,7 @@ const base::Feature kGav1VideoDecoder{"Gav1VideoDecode +@@ -448,7 +448,7 @@ const base::Feature kGav1VideoDecoder{"Gav1VideoDecode // Show toolbar button that opens dialog for controlling media sessions. const base::Feature kGlobalMediaControls { "GlobalMediaControls", @@ -18,7 +18,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -490,7 +490,7 @@ constexpr base::FeatureParam<kCrosGlobalMediaControlsP +@@ -486,7 +486,7 @@ constexpr base::FeatureParam<kCrosGlobalMediaControlsP const base::Feature kGlobalMediaControlsPictureInPicture { "GlobalMediaControlsPictureInPicture", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -27,7 +27,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -527,7 +527,7 @@ const base::Feature kUseR16Texture{"use-r16-texture", +@@ -523,7 +523,7 @@ const base::Feature kUseR16Texture{"use-r16-texture", const base::Feature kUnifiedAutoplay{"UnifiedAutoplay", base::FEATURE_ENABLED_BY_DEFAULT}; @@ -36,7 +36,7 @@ // Enable vaapi video decoding on linux. This is already enabled by default on // chromeos, but needs an experiment on linux. const base::Feature kVaapiVideoDecodeLinux{"VaapiVideoDecoder", -@@ -942,7 +942,7 @@ const base::Feature MEDIA_EXPORT kDeprecateLowUsageCod +@@ -944,7 +944,7 @@ const base::Feature MEDIA_EXPORT kDeprecateLowUsageCod "DeprecateLowUsageCodecs", base::FEATURE_ENABLED_BY_DEFAULT}; #endif // BUILDFLAG(IS_CHROMEOS) diff --git a/www/iridium/files/patch-media_base_media__switches.h b/www/iridium/files/patch-media_base_media__switches.h index cb3a9acdb8eb..90725de8b3e3 100644 --- a/www/iridium/files/patch-media_base_media__switches.h +++ b/www/iridium/files/patch-media_base_media__switches.h @@ -1,6 +1,6 @@ ---- media/base/media_switches.h.orig 2022-10-05 07:34:01 UTC +--- media/base/media_switches.h.orig 2022-12-01 10:35:46 UTC +++ media/base/media_switches.h -@@ -203,7 +203,7 @@ MEDIA_EXPORT extern const base::Feature kUseDecoderStr +@@ -202,7 +202,7 @@ MEDIA_EXPORT extern const base::Feature kUseDecoderStr MEDIA_EXPORT extern const base::Feature kUseFakeDeviceForMediaStream; MEDIA_EXPORT extern const base::Feature kUseMediaHistoryStore; MEDIA_EXPORT extern const base::Feature kUseR16Texture; diff --git a/www/iridium/files/patch-media_base_supported__types.cc b/www/iridium/files/patch-media_base_supported__types.cc index 15d38598a127..1135811b4e3a 100644 --- a/www/iridium/files/patch-media_base_supported__types.cc +++ b/www/iridium/files/patch-media_base_supported__types.cc @@ -1,11 +1,11 @@ ---- media/base/supported_types.cc.orig 2022-10-05 07:34:01 UTC +--- media/base/supported_types.cc.orig 2022-12-01 10:35:46 UTC +++ media/base/supported_types.cc -@@ -205,7 +205,7 @@ bool IsHevcProfileSupported(const VideoType& type) { - return false; +@@ -206,7 +206,7 @@ bool IsHevcProfileSupported(const VideoType& type) { #if BUILDFLAG(ENABLE_PLATFORM_HEVC) --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) #if BUILDFLAG(IS_CHROMEOS_LACROS) // TODO(b/171813538): For Lacros, the supplemental profile cache will be // asking lacros-gpu, but we will be doing decoding in ash-gpu. Until the diff --git a/www/iridium/files/patch-media_base_video__frame.cc b/www/iridium/files/patch-media_base_video__frame.cc index bb5b7988765e..bbb2ae61cc1e 100644 --- a/www/iridium/files/patch-media_base_video__frame.cc +++ b/www/iridium/files/patch-media_base_video__frame.cc @@ -1,4 +1,4 @@ ---- media/base/video_frame.cc.orig 2022-10-05 07:34:01 UTC +--- media/base/video_frame.cc.orig 2022-12-01 10:35:46 UTC +++ media/base/video_frame.cc @@ -72,7 +72,7 @@ std::string VideoFrame::StorageTypeToString( return "OWNED_MEMORY"; @@ -9,7 +9,7 @@ case VideoFrame::STORAGE_DMABUFS: return "DMABUFS"; #endif -@@ -89,7 +89,7 @@ std::string VideoFrame::StorageTypeToString( +@@ -87,7 +87,7 @@ std::string VideoFrame::StorageTypeToString( // static bool VideoFrame::IsStorageTypeMappable(VideoFrame::StorageType storage_type) { return @@ -18,7 +18,7 @@ // This is not strictly needed but makes explicit that, at VideoFrame // level, DmaBufs are not mappable from userspace. storage_type != VideoFrame::STORAGE_DMABUFS && -@@ -285,7 +285,7 @@ static absl::optional<VideoFrameLayout> GetDefaultLayo +@@ -282,7 +282,7 @@ static absl::optional<VideoFrameLayout> GetDefaultLayo return VideoFrameLayout::CreateWithPlanes(format, coded_size, planes); } @@ -27,7 +27,7 @@ // This class allows us to embed a vector<ScopedFD> into a scoped_refptr, and // thus to have several VideoFrames share the same set of DMABUF FDs. class VideoFrame::DmabufHolder -@@ -624,7 +624,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM +@@ -621,7 +621,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM for (size_t i = 0; i < num_planes; ++i) planes[i].stride = gpu_memory_buffer->stride(i); uint64_t modifier = gfx::NativePixmapHandle::kNoModifier; @@ -36,7 +36,7 @@ if (gpu_memory_buffer->GetType() == gfx::NATIVE_PIXMAP) { const auto gmb_handle = gpu_memory_buffer->CloneHandle(); if (gmb_handle.is_null() || -@@ -670,7 +670,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM +@@ -667,7 +667,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM return frame; } @@ -45,7 +45,7 @@ // static scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs( const VideoFrameLayout& layout, -@@ -894,7 +894,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame( +@@ -884,7 +884,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame( } } @@ -54,7 +54,7 @@ DCHECK(frame->dmabuf_fds_); // If there are any |dmabuf_fds_| plugged in, we should refer them too. wrapping_frame->dmabuf_fds_ = frame->dmabuf_fds_; -@@ -1265,7 +1265,7 @@ const gpu::MailboxHolder& VideoFrame::mailbox_holder( +@@ -1259,7 +1259,7 @@ const gpu::MailboxHolder& VideoFrame::mailbox_holder( : mailbox_holders_[texture_index]; } @@ -63,7 +63,7 @@ const std::vector<base::ScopedFD>& VideoFrame::DmabufFds() const { DCHECK_EQ(storage_type_, STORAGE_DMABUFS); -@@ -1377,7 +1377,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout, +@@ -1371,7 +1371,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 859afac63ea3..5d91caf3bfb6 100644 --- a/www/iridium/files/patch-media_base_video__frame.h +++ b/www/iridium/files/patch-media_base_video__frame.h @@ -1,4 +1,4 @@ ---- media/base/video_frame.h.orig 2022-10-05 07:34:01 UTC +--- media/base/video_frame.h.orig 2022-12-01 10:35:46 UTC +++ media/base/video_frame.h @@ -41,7 +41,7 @@ #include "base/mac/scoped_cftyperef.h" @@ -9,16 +9,16 @@ #include "base/files/scoped_file.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -82,7 +82,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -84,7 +84,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 unsafe (writable) shared memory. + STORAGE_SHMEM = 4, // Backed by read-only shared memory. -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // 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 -@@ -280,7 +280,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -279,7 +279,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 -@@ -539,7 +539,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -538,7 +538,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 -@@ -743,7 +743,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -745,7 +745,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte // GPU memory buffer, if this frame is STORAGE_GPU_MEMORY_BUFFER. std::unique_ptr<gfx::GpuMemoryBuffer> gpu_memory_buffer_; diff --git a/www/iridium/files/patch-media_cdm_cdm__paths__unittest.cc b/www/iridium/files/patch-media_cdm_cdm__paths__unittest.cc index fd05db23b70b..cbb34ef82506 100644 --- a/www/iridium/files/patch-media_cdm_cdm__paths__unittest.cc +++ b/www/iridium/files/patch-media_cdm_cdm__paths__unittest.cc @@ -1,4 +1,4 @@ ---- media/cdm/cdm_paths_unittest.cc.orig 2022-10-05 07:34:01 UTC +--- media/cdm/cdm_paths_unittest.cc.orig 2022-12-01 10:35:46 UTC +++ media/cdm/cdm_paths_unittest.cc @@ -27,7 +27,7 @@ const char kComponentPlatform[] = "win"; @@ -7,5 +7,5 @@ -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) "linux"; - #else - #error unsupported platform + #elif BUILDFLAG(IS_FUCHSIA) + "fuchsia"; 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 367a875c17af..6e84fcc8239d 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-10-05 07:34:01 UTC +--- media/gpu/chromeos/video_decoder_pipeline.cc.orig 2022-12-01 10:35:46 UTC +++ media/gpu/chromeos/video_decoder_pipeline.cc -@@ -747,7 +747,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -748,7 +748,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()); -@@ -769,7 +769,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -770,7 +770,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( #error "Unsupported platform" #endif diff --git a/www/iridium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc b/www/iridium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc index 3cd29d56773d..5047a171b03f 100644 --- a/www/iridium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc +++ b/www/iridium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc @@ -1,4 +1,4 @@ ---- media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc.orig 2022-10-05 07:34:01 UTC +--- media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc.orig 2022-12-01 10:35:46 UTC +++ media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc @@ -14,12 +14,15 @@ #include "media/gpu/vaapi/vaapi_wrapper.h" @@ -16,7 +16,7 @@ sandbox::syscall_broker::BrokerCommandSet command_set; std::vector<BrokerFilePermission> permissions; -@@ -121,6 +124,7 @@ bool HardwareVideoDecodingPreSandboxHook( +@@ -126,6 +129,7 @@ bool HardwareVideoDecodingPreSandboxHook( dlopen("/usr/lib/libv4l2.so", RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE); #endif // defined(__aarch64__) #endif // BUILDFLAG(USE_VAAPI) diff --git a/www/iridium/files/patch-media_media__options.gni b/www/iridium/files/patch-media_media__options.gni index e58e626e6841..410a6a987393 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-10-05 07:34:01 UTC +--- media/media_options.gni.orig 2022-12-01 10:35:46 UTC +++ media/media_options.gni -@@ -165,12 +165,15 @@ declare_args() { +@@ -167,12 +167,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 -@@ -186,6 +189,10 @@ declare_args() { +@@ -188,6 +191,10 @@ declare_args() { if (!use_cras && !is_castos && !is_asan && !is_tsan) { use_pulseaudio = true } diff --git a/www/iridium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc b/www/iridium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc index 18b0d0a60f42..11cd14501883 100644 --- a/www/iridium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc +++ b/www/iridium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc @@ -1,6 +1,6 @@ ---- media/mojo/mojom/video_frame_mojom_traits.cc.orig 2022-10-05 07:34:01 UTC +--- media/mojo/mojom/video_frame_mojom_traits.cc.orig 2022-12-01 10:35:46 UTC +++ media/mojo/mojom/video_frame_mojom_traits.cc -@@ -23,7 +23,7 @@ +@@ -22,7 +22,7 @@ #include "ui/gfx/mojom/color_space_mojom_traits.h" #include "ui/gfx/mojom/hdr_metadata_mojom_traits.h" 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 960da767169d..6043b8697710 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-10-05 07:34:01 UTC +--- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2022-12-01 10:35:46 UTC +++ media/video/gpu_memory_buffer_video_frame_pool.cc -@@ -797,7 +797,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa +@@ -729,7 +729,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa } bool is_software_backed_video_frame = !video_frame->HasTextures(); @@ -9,21 +9,21 @@ is_software_backed_video_frame &= !video_frame->HasDmaBufs(); #endif -@@ -1223,7 +1223,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo - frame_resources->plane_resources[gpu_memory_buffer_plane] - .gpu_memory_buffer.get(); +@@ -1158,7 +1158,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo + is_webgpu_compatible = (gpu_memory_buffer != nullptr); + #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - is_webgpu_compatible &= (gpu_memory_buffer != nullptr); + is_webgpu_compatible = (gpu_memory_buffer != nullptr); if (is_webgpu_compatible) { is_webgpu_compatible &= -@@ -1243,7 +1243,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo +@@ -1176,7 +1176,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo gpu::SHARED_IMAGE_USAGE_GLES2 | gpu::SHARED_IMAGE_USAGE_RASTER | gpu::SHARED_IMAGE_USAGE_DISPLAY | gpu::SHARED_IMAGE_USAGE_SCANOUT; --#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_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) // TODO(crbug.com/1241537): Always add the flag once the // OzoneImageBacking is by default turned on. if (base::CommandLine::ForCurrentProcess()->HasSwitch( 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 7af616e37fcc..c2a780f453dc 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,15 +1,15 @@ ---- media/video/video_encode_accelerator_adapter.cc.orig 2022-10-05 07:34:01 UTC +--- media/video/video_encode_accelerator_adapter.cc.orig 2022-12-01 10:35:46 UTC +++ media/video/video_encode_accelerator_adapter.cc -@@ -129,7 +129,7 @@ VideoEncodeAccelerator::Config SetUpVeaConfig( +@@ -130,7 +130,7 @@ VideoEncodeAccelerator::Config SetUpVeaConfig( if (is_rgb) config.input_format = PIXEL_FORMAT_I420; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - if (storage_type == VideoFrame::STORAGE_DMABUFS || - storage_type == VideoFrame::STORAGE_GPU_MEMORY_BUFFER) { - if (is_rgb) -@@ -298,7 +298,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal + 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 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 c521f984f5a3..085f1cc91c31 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,11 +1,11 @@ ---- media/video/video_encode_accelerator_adapter_test.cc.orig 2022-10-05 07:34:01 UTC +--- media/video/video_encode_accelerator_adapter_test.cc.orig 2022-12-01 10:35:46 UTC +++ media/video/video_encode_accelerator_adapter_test.cc -@@ -395,7 +395,7 @@ TEST_P(VideoEncodeAcceleratorAdapterTest, TwoFramesRes +@@ -435,7 +435,7 @@ TEST_P(VideoEncodeAcceleratorAdapterTest, TwoFramesRes + CreateGreenFrame(large_size, pixel_format, base::Milliseconds(2)); - vea()->SetEncodingCallback(base::BindLambdaForTesting( - [&](BitstreamBuffer&, bool keyframe, scoped_refptr<VideoFrame> frame) { + VideoPixelFormat expected_input_format = PIXEL_FORMAT_I420; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - EXPECT_EQ(frame->format(), - IsYuvPlanar(pixel_format) ? pixel_format : PIXEL_FORMAT_I420); - #else + if (pixel_format != PIXEL_FORMAT_I420 || !small_frame->IsMappable()) + expected_input_format = PIXEL_FORMAT_NV12; + #endif diff --git a/www/iridium/files/patch-mojo_core_BUILD.gn b/www/iridium/files/patch-mojo_core_BUILD.gn index 8a54c5732c81..35479a212d11 100644 --- a/www/iridium/files/patch-mojo_core_BUILD.gn +++ b/www/iridium/files/patch-mojo_core_BUILD.gn @@ -1,6 +1,6 @@ ---- mojo/core/BUILD.gn.orig 2022-10-05 07:34:01 UTC +--- mojo/core/BUILD.gn.orig 2022-12-01 10:35:46 UTC +++ mojo/core/BUILD.gn -@@ -146,7 +146,7 @@ template("core_impl_source_set") { +@@ -159,7 +159,7 @@ template("core_impl_source_set") { ] } diff --git a/www/iridium/files/patch-mojo_core_channel.cc b/www/iridium/files/patch-mojo_core_channel.cc index 634c29a70a74..bbd634e34580 100644 --- a/www/iridium/files/patch-mojo_core_channel.cc +++ b/www/iridium/files/patch-mojo_core_channel.cc @@ -1,6 +1,6 @@ ---- mojo/core/channel.cc.orig 2022-10-05 07:34:01 UTC +--- mojo/core/channel.cc.orig 2022-12-01 10:35:46 UTC +++ mojo/core/channel.cc -@@ -71,7 +71,11 @@ const size_t kMaxUnusedReadBufferCapacity = 4096; +@@ -72,7 +72,11 @@ const size_t kMaxUnusedReadBufferCapacity = 4096; // Fuchsia: The zx_channel_write() API supports up to 64 handles. const size_t kMaxAttachedHandles = 64; diff --git a/www/iridium/files/patch-net_BUILD.gn b/www/iridium/files/patch-net_BUILD.gn index 29a3c7f6633d..5448e4b5e610 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-10-05 07:34:01 UTC +--- net/BUILD.gn.orig 2022-12-01 10:35:46 UTC +++ net/BUILD.gn @@ -104,7 +104,7 @@ net_configs = [ "//build/config/compiler:wexit_time_destructors", @@ -9,8 +9,8 @@ net_configs += [ "//build/config/linux:libresolv" ] } -@@ -1198,6 +1198,15 @@ component("net") { - ] +@@ -1202,6 +1202,15 @@ component("net") { + deps += [ "//third_party/xdg_shared_mime_info" ] } + if (is_bsd) { @@ -25,7 +25,7 @@ if (is_mac) { sources += [ "base/network_notification_thread_mac.cc", -@@ -1330,7 +1339,7 @@ component("net") { +@@ -1334,7 +1343,7 @@ component("net") { } } @@ -34,7 +34,7 @@ sources += [ "base/network_change_notifier_posix.cc", "base/network_change_notifier_posix.h", -@@ -1363,7 +1372,7 @@ component("net") { +@@ -1367,7 +1376,7 @@ component("net") { } # Use getifaddrs() on POSIX platforms, except Linux. @@ -43,7 +43,7 @@ sources += [ "base/network_interfaces_getifaddrs.cc", "base/network_interfaces_getifaddrs.h", -@@ -4368,7 +4377,7 @@ test("net_unittests") { +@@ -4374,7 +4383,7 @@ test("net_unittests") { ] } @@ -52,7 +52,7 @@ sources += [ "base/address_tracker_linux_unittest.cc", "base/network_interfaces_linux_unittest.cc", -@@ -4443,6 +4452,10 @@ test("net_unittests") { +@@ -4449,6 +4458,10 @@ test("net_unittests") { "//url:buildflags", ] @@ -63,7 +63,7 @@ if (enable_websockets) { deps += [ "//net/server:tests" ] } -@@ -4510,7 +4523,7 @@ test("net_unittests") { +@@ -4516,7 +4529,7 @@ test("net_unittests") { ] } @@ -72,7 +72,7 @@ sources += [ "tools/quic/quic_simple_server_test.cc" ] } -@@ -4651,7 +4664,7 @@ test("net_unittests") { +@@ -4657,7 +4670,7 @@ test("net_unittests") { } # Use getifaddrs() on POSIX platforms, except Linux. diff --git a/www/iridium/files/patch-net_dns_BUILD.gn b/www/iridium/files/patch-net_dns_BUILD.gn index 1936485b29e2..31e31a8cb87e 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-10-05 07:34:01 UTC +--- net/dns/BUILD.gn.orig 2022-12-01 10:35:46 UTC +++ net/dns/BUILD.gn -@@ -113,7 +113,7 @@ source_set("dns") { +@@ -112,7 +112,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", -@@ -154,6 +154,7 @@ source_set("dns") { +@@ -153,6 +153,7 @@ source_set("dns") { ":host_resolver_manager", ":mdns_client", "//net:net_public_deps", @@ -17,7 +17,7 @@ ] allow_circular_includes_from = [ -@@ -416,9 +417,9 @@ source_set("tests") { +@@ -414,9 +415,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__manager.cc b/www/iridium/files/patch-net_dns_host__resolver__manager.cc index 8af897fd99b9..6bace3b1aed0 100644 --- a/www/iridium/files/patch-net_dns_host__resolver__manager.cc +++ b/www/iridium/files/patch-net_dns_host__resolver__manager.cc @@ -1,6 +1,6 @@ ---- net/dns/host_resolver_manager.cc.orig 2022-10-05 07:34:01 UTC +--- net/dns/host_resolver_manager.cc.orig 2022-12-01 10:35:46 UTC +++ net/dns/host_resolver_manager.cc -@@ -3126,7 +3126,7 @@ HostResolverManager::HostResolverManager( +@@ -3132,7 +3132,7 @@ HostResolverManager::HostResolverManager( } if (system_dns_config_notifier_) system_dns_config_notifier_->AddObserver(this); diff --git a/www/iridium/files/patch-net_dns_public_BUILD.gn b/www/iridium/files/patch-net_dns_public_BUILD.gn index be529589f3c2..c324ebebcf56 100644 --- a/www/iridium/files/patch-net_dns_public_BUILD.gn +++ b/www/iridium/files/patch-net_dns_public_BUILD.gn @@ -1,6 +1,6 @@ ---- net/dns/public/BUILD.gn.orig 2022-04-01 07:48:30 UTC +--- net/dns/public/BUILD.gn.orig 2022-12-01 10:35:46 UTC +++ net/dns/public/BUILD.gn -@@ -74,7 +74,7 @@ source_set("tests") { +@@ -76,7 +76,7 @@ source_set("tests") { "doh_provider_entry_unittest.cc", ] 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 b5737b89e637..4e79210c2b16 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-10-05 07:34:01 UTC +--- net/proxy_resolution/proxy_config_service_linux.cc.orig 2022-12-01 10:35:46 UTC +++ net/proxy_resolution/proxy_config_service_linux.cc @@ -6,7 +6,9 @@ @@ -36,5 +36,5 @@ break; +#endif case base::nix::DESKTOP_ENVIRONMENT_XFCE: + case base::nix::DESKTOP_ENVIRONMENT_LXQT: case base::nix::DESKTOP_ENVIRONMENT_OTHER: - break; diff --git a/www/iridium/files/patch-net_socket_udp__socket__posix.cc b/www/iridium/files/patch-net_socket_udp__socket__posix.cc index 37570a469d3d..bb68f0435cb0 100644 --- a/www/iridium/files/patch-net_socket_udp__socket__posix.cc +++ b/www/iridium/files/patch-net_socket_udp__socket__posix.cc @@ -1,6 +1,6 @@ ---- net/socket/udp_socket_posix.cc.orig 2022-10-05 07:34:01 UTC +--- net/socket/udp_socket_posix.cc.orig 2022-12-01 10:35:46 UTC +++ net/socket/udp_socket_posix.cc -@@ -559,7 +559,7 @@ int UDPSocketPosix::SetDoNotFragment() { +@@ -558,7 +558,7 @@ int UDPSocketPosix::SetDoNotFragment() { } void UDPSocketPosix::SetMsgConfirm(bool confirm) { @@ -9,7 +9,7 @@ if (confirm) { sendto_flags_ |= MSG_CONFIRM; } else { -@@ -580,7 +580,7 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) { +@@ -579,7 +579,7 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) { DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); int value = broadcast ? 1 : 0; int rv; @@ -18,7 +18,7 @@ // SO_REUSEPORT on OSX permits multiple processes to each receive // UDP multicast or broadcast datagrams destined for the bound // port. -@@ -893,7 +893,7 @@ int UDPSocketPosix::DoBind(const IPEndPoint& address) +@@ -892,7 +892,7 @@ int UDPSocketPosix::DoBind(const IPEndPoint& address) #if BUILDFLAG(IS_CHROMEOS_ASH) if (last_error == EINVAL) return ERR_ADDRESS_IN_USE; diff --git a/www/iridium/files/patch-net_third__party_quiche_BUILD.gn b/www/iridium/files/patch-net_third__party_quiche_BUILD.gn index c910ff0df3fb..679d6b967435 100644 --- a/www/iridium/files/patch-net_third__party_quiche_BUILD.gn +++ b/www/iridium/files/patch-net_third__party_quiche_BUILD.gn @@ -1,4 +1,4 @@ ---- net/third_party/quiche/BUILD.gn.orig 2022-10-05 07:34:01 UTC +--- net/third_party/quiche/BUILD.gn.orig 2022-12-01 10:35:46 UTC +++ net/third_party/quiche/BUILD.gn @@ -28,7 +28,7 @@ import("//build/config/chromeos/ui_mode.gni") import("//testing/libfuzzer/fuzzer_test.gni") @@ -7,5 +7,5 @@ -build_epoll_based_tools = is_linux || is_chromeos +build_epoll_based_tools = (is_linux && !is_bsd) || is_chromeos - config("quiche_internal_config") { - cflags = [] + # TODO(crbug.com/1344231): Set this to always true. At which point, this + # variable can go away and the conditionals below that depends on it can be 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 5b53ded07314..44692d94c95a 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-10-05 07:34:01 UTC +--- net/url_request/url_request_context.cc.orig 2022-12-01 10:35:46 UTC +++ net/url_request/url_request_context.cc -@@ -64,7 +64,7 @@ const HttpNetworkSessionContext* URLRequestContext::Ge +@@ -110,7 +110,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 d89c0e68dfc1..196096385397 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-10-05 07:34:01 UTC +--- net/url_request/url_request_context.h.orig 2022-12-01 10:35:46 UTC +++ net/url_request/url_request_context.h -@@ -89,7 +89,7 @@ class NET_EXPORT URLRequestContext { +@@ -87,7 +87,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-net_url__request_url__request__context__builder.cc b/www/iridium/files/patch-net_url__request_url__request__context__builder.cc index bc1103ff0db5..6d337fe241f8 100644 --- a/www/iridium/files/patch-net_url__request_url__request__context__builder.cc +++ b/www/iridium/files/patch-net_url__request_url__request__context__builder.cc @@ -1,6 +1,6 @@ ---- net/url_request/url_request_context_builder.cc.orig 2022-10-05 07:34:01 UTC +--- net/url_request/url_request_context_builder.cc.orig 2022-12-01 10:35:46 UTC +++ net/url_request/url_request_context_builder.cc -@@ -503,7 +503,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu +@@ -443,7 +443,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu } if (!proxy_resolution_service_) { diff --git a/www/iridium/files/patch-pdf_pdfium_pdfium__engine.cc b/www/iridium/files/patch-pdf_pdfium_pdfium__engine.cc index 2c531f0291fc..03779d760003 100644 --- a/www/iridium/files/patch-pdf_pdfium_pdfium__engine.cc +++ b/www/iridium/files/patch-pdf_pdfium_pdfium__engine.cc @@ -1,4 +1,4 @@ ---- pdf/pdfium/pdfium_engine.cc.orig 2022-10-05 07:34:01 UTC +--- pdf/pdfium/pdfium_engine.cc.orig 2022-12-01 10:35:46 UTC +++ pdf/pdfium/pdfium_engine.cc @@ -81,7 +81,7 @@ #include "gin/public/cppgc.h" @@ -9,7 +9,7 @@ #include "pdf/pdfium/pdfium_font_linux.h" #endif -@@ -516,7 +516,7 @@ void InitializeSDK(bool enable_v8, FontMappingMode fon +@@ -520,7 +520,7 @@ void InitializeSDK(bool enable_v8, FontMappingMode fon FPDF_InitLibraryWithConfig(&config); diff --git a/www/iridium/files/patch-remoting_host_basic__desktop__environment.cc b/www/iridium/files/patch-remoting_host_basic__desktop__environment.cc new file mode 100644 index 000000000000..7ad8adb1275a --- /dev/null +++ b/www/iridium/files/patch-remoting_host_basic__desktop__environment.cc @@ -0,0 +1,11 @@ +--- remoting/host/basic_desktop_environment.cc.orig 2022-12-01 10:35:46 UTC ++++ remoting/host/basic_desktop_environment.cc +@@ -190,7 +190,7 @@ BasicDesktopEnvironment::CreateVideoCapturer() { + scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner; + #if BUILDFLAG(IS_CHROMEOS_ASH) + capture_task_runner = ui_task_runner_; +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Each capturer instance should get its own thread so the capturers don't + // compete with each other in multistream mode. + capture_task_runner = base::ThreadPool::CreateSingleThreadTaskRunner( diff --git a/www/iridium/files/patch-remoting_host_ipc__constants.cc b/www/iridium/files/patch-remoting_host_ipc__constants.cc index eab294bedded..d8b000221c96 100644 --- a/www/iridium/files/patch-remoting_host_ipc__constants.cc +++ b/www/iridium/files/patch-remoting_host_ipc__constants.cc @@ -1,11 +1,20 @@ ---- remoting/host/ipc_constants.cc.orig 2022-03-28 18:11:04 UTC +--- remoting/host/ipc_constants.cc.orig 2022-12-01 10:35:46 UTC +++ remoting/host/ipc_constants.cc -@@ -16,7 +16,7 @@ namespace remoting { +@@ -17,7 +17,7 @@ namespace remoting { namespace { --#if !defined(NDEBUG) && BUILDFLAG(IS_LINUX) -+#if !defined(NDEBUG) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) - // Use a different IPC name for Linux debug builds so that we can run the host - // directly from out/Debug without interfering with the production host that - // might also be running. +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + + #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() { + static const base::NoDestructor<mojo::NamedPlatformChannel::ServerName> + server_name(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. 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 d35504d6da6d..3635b0152b03 100644 --- a/www/iridium/files/patch-remoting_host_me2me__desktop__environment.cc +++ b/www/iridium/files/patch-remoting_host_me2me__desktop__environment.cc @@ -1,6 +1,24 @@ ---- remoting/host/me2me_desktop_environment.cc.orig 2022-10-05 07:34:01 UTC +--- remoting/host/me2me_desktop_environment.cc.orig 2022-12-01 10:35:46 UTC +++ remoting/host/me2me_desktop_environment.cc -@@ -148,7 +148,7 @@ bool Me2MeDesktopEnvironment::InitializeSecurity( +@@ -41,7 +41,7 @@ namespace remoting { + + namespace { + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + + constexpr char kUseXvfbEnvVar[] = "CHROME_REMOTE_DESKTOP_USE_XVFB"; + +@@ -114,7 +114,7 @@ std::string Me2MeDesktopEnvironment::GetCapabilities() + capabilities += protocol::kRemoteWebAuthnCapability; + } + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Multi-stream and client-controlled layout are only supported with + // Xorg+Dummy. + // TODO(crbug.com/1366595): Either just remove this check if the dependency +@@ -175,7 +175,7 @@ bool Me2MeDesktopEnvironment::InitializeSecurity( // 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-remoting_host_policy__watcher.cc b/www/iridium/files/patch-remoting_host_policy__watcher.cc index 2455dbfc76ea..02f9e7521d49 100644 --- a/www/iridium/files/patch-remoting_host_policy__watcher.cc +++ b/www/iridium/files/patch-remoting_host_policy__watcher.cc @@ -1,11 +1,11 @@ ---- remoting/host/policy_watcher.cc.orig 2022-10-05 07:34:01 UTC +--- remoting/host/policy_watcher.cc.orig 2022-12-01 10:35:46 UTC +++ remoting/host/policy_watcher.cc -@@ -184,7 +184,7 @@ std::unique_ptr<base::DictionaryValue> PolicyWatcher:: - result->SetStringKey(key::kRemoteAccessHostUdpPortRange, ""); - result->SetIntKey(key::kRemoteAccessHostClipboardSizeBytes, -1); - result->SetBoolKey(key::kRemoteAccessHostAllowRemoteSupportConnections, true); +@@ -179,7 +179,7 @@ base::Value::Dict PolicyWatcher::GetDefaultPolicies() + result.Set(key::kRemoteAccessHostUdpPortRange, ""); + result.Set(key::kRemoteAccessHostClipboardSizeBytes, -1); + result.Set(key::kRemoteAccessHostAllowRemoteSupportConnections, true); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - result->SetBoolKey(key::kRemoteAccessHostMatchUsername, false); + result.Set(key::kRemoteAccessHostMatchUsername, false); #endif #if !BUILDFLAG(IS_CHROMEOS) diff --git a/www/iridium/files/patch-remoting_host_remoting__me2me__host.cc b/www/iridium/files/patch-remoting_host_remoting__me2me__host.cc index eb8a4aa6de5c..a671b82e54de 100644 --- a/www/iridium/files/patch-remoting_host_remoting__me2me__host.cc +++ b/www/iridium/files/patch-remoting_host_remoting__me2me__host.cc @@ -1,4 +1,4 @@ ---- remoting/host/remoting_me2me_host.cc.orig 2022-10-05 07:34:01 UTC +--- remoting/host/remoting_me2me_host.cc.orig 2022-12-01 10:35:46 UTC +++ remoting/host/remoting_me2me_host.cc @@ -125,7 +125,7 @@ #include "remoting/host/mac/permission_utils.h" @@ -25,7 +25,7 @@ #include "remoting/host/host_utmp_logger.h" #endif -@@ -177,7 +177,7 @@ const char kApplicationName[] = "chromoting"; +@@ -181,7 +181,7 @@ const char kApplicationName[] = "chromoting"; const char kStdinConfigPath[] = "-"; #endif // !defined(REMOTING_MULTI_PROCESS) @@ -34,7 +34,7 @@ // The command line switch used to pass name of the pipe to capture audio on // linux. const char kAudioPipeSwitchName[] = "audio-pipe-name"; -@@ -385,7 +385,7 @@ class HostProcess : public ConfigWatcher::Delegate, +@@ -389,7 +389,7 @@ class HostProcess : public ConfigWatcher::Delegate, std::unique_ptr<ChromotingHostContext> context_; @@ -43,7 +43,7 @@ // Watch for certificate changes and kill the host when changes occur std::unique_ptr<CertificateWatcher> cert_watcher_; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -451,7 +451,7 @@ class HostProcess : public ConfigWatcher::Delegate, +@@ -455,7 +455,7 @@ class HostProcess : public ConfigWatcher::Delegate, std::unique_ptr<HostStatusLogger> host_status_logger_; std::unique_ptr<HostEventLogger> host_event_logger_; @@ -52,7 +52,7 @@ std::unique_ptr<HostUTMPLogger> host_utmp_logger_; #endif std::unique_ptr<HostPowerSaveBlocker> power_save_blocker_; -@@ -759,7 +759,7 @@ void HostProcess::StartOnNetworkThread() { +@@ -763,7 +763,7 @@ void HostProcess::StartOnNetworkThread() { void HostProcess::ShutdownOnNetworkThread() { DCHECK(context_->network_task_runner()->BelongsToCurrentThread()); config_watcher_.reset(); @@ -61,7 +61,7 @@ cert_watcher_.reset(); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) } -@@ -818,7 +818,7 @@ void HostProcess::CreateAuthenticatorFactory() { +@@ -822,7 +822,7 @@ void HostProcess::CreateAuthenticatorFactory() { DCHECK(third_party_auth_config_.token_url.is_valid()); DCHECK(third_party_auth_config_.token_validation_url.is_valid()); @@ -70,16 +70,16 @@ if (!cert_watcher_) { cert_watcher_ = std::make_unique<CertificateWatcher>( base::BindRepeating(&HostProcess::ShutdownHost, -@@ -937,7 +937,7 @@ void HostProcess::StartOnUiThread() { - base::BindRepeating(&HostProcess::OnPolicyUpdate, base::Unretained(this)), - base::BindRepeating(&HostProcess::OnPolicyError, base::Unretained(this))); +@@ -945,7 +945,7 @@ void HostProcess::StartOnUiThread() { + WaylandManager::Get()->Init(context_->ui_task_runner()); + #endif // defined(REMOTING_USE_WAYLAND -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // If an audio pipe is specific on the command-line then initialize // AudioCapturerLinux to capture from it. base::FilePath audio_pipe_name = base::CommandLine::ForCurrentProcess()-> -@@ -1008,7 +1008,7 @@ void HostProcess::ShutdownOnUiThread() { +@@ -1016,7 +1016,7 @@ void HostProcess::ShutdownOnUiThread() { // It is now safe for the HostProcess to be deleted. self_ = nullptr; @@ -88,7 +88,7 @@ // Cause the global AudioPipeReader to be freed, otherwise the audio // thread will remain in-use and prevent the process from exiting. // TODO(wez): DesktopEnvironmentFactory should own the pipe reader. -@@ -1016,7 +1016,7 @@ void HostProcess::ShutdownOnUiThread() { +@@ -1024,7 +1024,7 @@ void HostProcess::ShutdownOnUiThread() { AudioCapturerLinux::InitializePipeReader(nullptr, base::FilePath()); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -97,16 +97,16 @@ context_->input_task_runner()->PostTask( FROM_HERE, base::BindOnce([]() { delete ui::X11EventSource::GetInstance(); })); -@@ -1343,7 +1343,7 @@ bool HostProcess::OnUsernamePolicyUpdate(base::Diction +@@ -1351,7 +1351,7 @@ bool HostProcess::OnUsernamePolicyUpdate(const base::V // Returns false: never restart the host after this policy update. DCHECK(context_->network_task_runner()->BelongsToCurrentThread()); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) absl::optional<bool> host_username_match_required = - policies->FindBoolKey(policy::key::kRemoteAccessHostMatchUsername); + policies.FindBool(policy::key::kRemoteAccessHostMatchUsername); if (!host_username_match_required.has_value()) -@@ -1727,7 +1727,7 @@ void HostProcess::StartHost() { +@@ -1737,7 +1737,7 @@ void HostProcess::StartHost() { // The feature is enabled for all Googlers using a supported platform. desktop_environment_options_.set_enable_remote_open_url(is_googler_); @@ -115,7 +115,7 @@ desktop_environment_options_.set_enable_remote_webauthn(is_googler_); #endif -@@ -1760,7 +1760,7 @@ void HostProcess::StartHost() { +@@ -1770,7 +1770,7 @@ void HostProcess::StartHost() { host_status_logger_ = std::make_unique<HostStatusLogger>( host_->status_monitor(), log_to_server_.get()); @@ -124,7 +124,7 @@ const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); if (cmd_line->HasSwitch(kEnableUtempter)) host_utmp_logger_ = -@@ -1929,7 +1929,7 @@ int HostProcessMain() { +@@ -1939,7 +1939,7 @@ int HostProcessMain() { HOST_LOG << "Starting host process: version " << STRINGIZE(VERSION); const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); @@ -133,7 +133,7 @@ #if defined(REMOTING_USE_X11) // Initialize Xlib for multi-threaded use, allowing non-Chromium code to // use X11 safely (such as the WebRTC capturer, GTK ...) -@@ -1975,7 +1975,7 @@ int HostProcessMain() { +@@ -1985,7 +1985,7 @@ int HostProcessMain() { std::unique_ptr<net::NetworkChangeNotifier> network_change_notifier( net::NetworkChangeNotifier::CreateIfNeeded()); diff --git a/www/iridium/files/patch-remoting_host_setup_start__host__main.cc b/www/iridium/files/patch-remoting_host_setup_start__host__main.cc index 1141fe6b5b41..bc92848ec4d3 100644 --- a/www/iridium/files/patch-remoting_host_setup_start__host__main.cc +++ b/www/iridium/files/patch-remoting_host_setup_start__host__main.cc @@ -1,6 +1,6 @@ ---- remoting/host/setup/start_host_main.cc.orig 2022-10-05 07:34:01 UTC +--- remoting/host/setup/start_host_main.cc.orig 2022-12-01 10:35:46 UTC +++ remoting/host/setup/start_host_main.cc -@@ -31,7 +31,7 @@ +@@ -33,7 +33,7 @@ #include <unistd.h> #endif // BUILDFLAG(IS_POSIX) @@ -9,7 +9,7 @@ #include "remoting/host/setup/daemon_controller_delegate_linux.h" #include "remoting/host/setup/start_host_as_root.h" #endif // BUILDFLAG(IS_LINUX) -@@ -125,7 +125,7 @@ void OnDone(HostStarter::Result result) { +@@ -127,7 +127,7 @@ void OnDone(HostStarter::Result result) { } // namespace int StartHostMain(int argc, char** argv) { @@ -18,7 +18,7 @@ // Minimize the amount of code that runs as root on Posix systems. if (getuid() == 0) { return remoting::StartHostAsRoot(argc, argv); -@@ -162,7 +162,7 @@ int StartHostMain(int argc, char** argv) { +@@ -170,7 +170,7 @@ int StartHostMain(int argc, char** argv) { // for the account which generated |code|. std::string host_owner = command_line->GetSwitchValueASCII("host-owner"); diff --git a/www/iridium/files/patch-remoting_host_webauthn_remote__webauthn__caller__security__utils.cc b/www/iridium/files/patch-remoting_host_webauthn_remote__webauthn__caller__security__utils.cc index be166a373549..504812a01bd9 100644 --- a/www/iridium/files/patch-remoting_host_webauthn_remote__webauthn__caller__security__utils.cc +++ b/www/iridium/files/patch-remoting_host_webauthn_remote__webauthn__caller__security__utils.cc @@ -1,4 +1,4 @@ ---- remoting/host/webauthn/remote_webauthn_caller_security_utils.cc.orig 2022-10-05 07:34:01 UTC +--- remoting/host/webauthn/remote_webauthn_caller_security_utils.cc.orig 2022-12-01 10:35:46 UTC +++ remoting/host/webauthn/remote_webauthn_caller_security_utils.cc @@ -9,7 +9,7 @@ #include "base/strings/utf_string_conversions.h" @@ -18,7 +18,7 @@ constexpr auto kAllowedCallerPrograms = base::MakeFixedFlatSet<base::FilePath::StringPieceType>({ -@@ -76,7 +76,7 @@ bool IsLaunchedByTrustedProcess() { +@@ -81,7 +81,7 @@ bool IsLaunchedByTrustedProcess() { #if !defined(NDEBUG) // Just return true on debug builds for the convenience of development. return true; diff --git a/www/iridium/files/patch-services_cert__verifier_cert__verifier__creation.cc b/www/iridium/files/patch-services_cert__verifier_cert__verifier__creation.cc index 00242505f4bb..ed18ad6676fc 100644 --- a/www/iridium/files/patch-services_cert__verifier_cert__verifier__creation.cc +++ b/www/iridium/files/patch-services_cert__verifier_cert__verifier__creation.cc @@ -1,4 +1,4 @@ ---- services/cert_verifier/cert_verifier_creation.cc.orig 2022-10-05 07:34:01 UTC +--- services/cert_verifier/cert_verifier_creation.cc.orig 2022-12-01 10:35:46 UTC +++ services/cert_verifier/cert_verifier_creation.cc @@ -12,7 +12,7 @@ #include "net/cert_net/cert_net_fetcher_url_request.h" @@ -9,7 +9,7 @@ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) #include "net/cert/cert_verify_proc_builtin.h" #include "net/cert/internal/system_trust_store.h" -@@ -119,7 +119,7 @@ class OldDefaultCertVerifyProcFactory : public net::Ce +@@ -90,7 +90,7 @@ class OldDefaultCertVerifyProcFactory : public net::Ce user_slot_restriction_ ? crypto::ScopedPK11Slot(PK11_ReferenceSlot( user_slot_restriction_.get())) : nullptr)); @@ -18,7 +18,7 @@ verify_proc = net::CreateCertVerifyProcBuiltin( std::move(cert_net_fetcher), net::CreateSslSystemTrustStore()); #else -@@ -294,6 +294,7 @@ bool IsUsingChromeRootStore( +@@ -242,6 +242,7 @@ std::unique_ptr<net::CertVerifierWithUpdatableProc> Cr bool IsUsingCertNetFetcher() { #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-services_device_BUILD.gn b/www/iridium/files/patch-services_device_BUILD.gn new file mode 100644 index 000000000000..5aa60b31040b --- /dev/null +++ b/www/iridium/files/patch-services_device_BUILD.gn @@ -0,0 +1,11 @@ +--- services/device/BUILD.gn.orig 2022-12-01 10:35:46 UTC ++++ services/device/BUILD.gn +@@ -16,7 +16,7 @@ if (is_android) { + } + + is_serial_enabled_platform = +- is_win || ((is_linux || is_chromeos) && use_udev) || is_mac ++ is_win || ((!is_bsd && is_linux || is_chromeos) && use_udev) || is_mac + + source_set("lib") { + # This should be visible only to embedders of the Device Service, and the diff --git a/www/iridium/files/patch-services_device_hid_BUILD.gn b/www/iridium/files/patch-services_device_hid_BUILD.gn index 3d3a7f0e3119..d145bb408443 100644 --- a/www/iridium/files/patch-services_device_hid_BUILD.gn +++ b/www/iridium/files/patch-services_device_hid_BUILD.gn @@ -1,9 +1,10 @@ ---- services/device/hid/BUILD.gn.orig 2022-03-28 18:11:04 UTC +--- services/device/hid/BUILD.gn.orig 2022-12-01 10:35:46 UTC +++ services/device/hid/BUILD.gn -@@ -35,6 +35,25 @@ source_set("hid") { +@@ -35,7 +35,26 @@ source_set("hid") { "//services/device/public/mojom", ] +- if ((is_linux || is_chromeos) && use_udev) { + if (is_openbsd) { + sources += [ + "hid_connection_fido.cc", @@ -23,6 +24,7 @@ + ] + } + - if ((is_linux || is_chromeos) && use_udev) { ++ if ((is_linux || is_chromeos) && !is_bsd && use_udev) { sources += [ "hid_connection_linux.cc", + "hid_connection_linux.h", diff --git a/www/iridium/files/patch-services_device_hid_hid__connection__fido.cc b/www/iridium/files/patch-services_device_hid_hid__connection__fido.cc index cf540ae9bf1a..84edc22b3cde 100644 --- a/www/iridium/files/patch-services_device_hid_hid__connection__fido.cc +++ b/www/iridium/files/patch-services_device_hid_hid__connection__fido.cc @@ -1,53 +1,60 @@ ---- services/device/hid/hid_connection_fido.cc.orig 2022-10-05 07:34:01 UTC +--- services/device/hid/hid_connection_fido.cc.orig 2022-12-01 10:35:46 UTC +++ services/device/hid/hid_connection_fido.cc -@@ -0,0 +1,197 @@ -+// Copyright (c) 2020 The Chromium Authors. All rights reserved. +@@ -0,0 +1,218 @@ ++// Copyright 2014 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "services/device/hid/hid_connection_fido.h" + ++#include <errno.h> ++#include <sys/ioctl.h> ++ ++#include <memory> ++#include <string> ++#include <utility> ++ +#include "base/bind.h" +#include "base/files/file_descriptor_watcher_posix.h" -+#include "base/location.h" -+#include "base/numerics/safe_math.h" ++#include "base/memory/ref_counted_memory.h" +#include "base/posix/eintr_wrapper.h" -+#include "base/task/single_thread_task_runner.h" +#include "base/threading/scoped_blocking_call.h" -+#include "base/threading/thread_restrictions.h" -+#include "base/threading/thread_task_runner_handle.h" ++#include "base/threading/sequenced_task_runner_handle.h" +#include "components/device_event_log/device_event_log.h" +#include "services/device/hid/hid_service.h" + +namespace device { + -+class HidConnectionFido::BlockingTaskHelper { -+public: -+ BlockingTaskHelper(base::ScopedFD fd, -+ scoped_refptr<HidDeviceInfo> device_info, -+ base::WeakPtr<HidConnectionFido> connection) ++class HidConnectionFido::BlockingTaskRunnerHelper { ++ public: ++ BlockingTaskRunnerHelper(base::ScopedFD fd, ++ scoped_refptr<HidDeviceInfo> device_info, ++ base::WeakPtr<HidConnectionFido> connection) + : fd_(std::move(fd)), -+ // Report buffers must always have room for the report ID. -+ report_buffer_size_(device_info->max_input_report_size() + 1), -+ has_report_id_(device_info->has_report_id()), connection_(connection), -+ origin_task_runner_(base::ThreadTaskRunnerHandle::Get()) { ++ connection_(connection), ++ origin_task_runner_(base::SequencedTaskRunnerHandle::Get()) { + DETACH_FROM_SEQUENCE(sequence_checker_); ++ // Report buffers must always have room for the report ID. ++ report_buffer_size_ = device_info->max_input_report_size() + 1; ++ has_report_id_ = device_info->has_report_id(); + } + -+ BlockingTaskHelper(const BlockingTaskHelper&) = delete; -+ BlockingTaskHelper& operator=(const BlockingTaskHelper&) = delete; ++ BlockingTaskRunnerHelper(const BlockingTaskRunnerHelper&) = delete; ++ BlockingTaskRunnerHelper& operator=(const BlockingTaskRunnerHelper&) = delete; + -+ ~BlockingTaskHelper() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); } ++ ~BlockingTaskRunnerHelper() { ++ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); ++ } + + // Starts the FileDescriptorWatcher that reads input events from the device. + // Must be called on a thread that has a base::MessageLoopForIO. + void Start() { + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); -+ base::internal::AssertBlockingAllowed(); + + file_watcher_ = base::FileDescriptorWatcher::WatchReadable( -+ fd_.get(), base::BindRepeating(&BlockingTaskHelper::OnFileCanReadWithoutBlocking, -+ base::Unretained(this))); ++ fd_.get(), base::BindRepeating( ++ &BlockingTaskRunnerHelper::OnFileCanReadWithoutBlocking, ++ base::Unretained(this))); + } + + void Write(scoped_refptr<base::RefCountedBytes> buffer, @@ -64,13 +71,20 @@ + size--; + } + -+ ssize_t result = HANDLE_EINTR(write(fd_.get(), data, size)); -+ bool success = static_cast<size_t>(result) == size; -+ if (!success) { -+ HID_LOG(EVENT) << "HID write failed: " << result << " != " << size; ++ ssize_t result = ++ HANDLE_EINTR(write(fd_.get(), data, size)); ++ if (result < 0) { ++ HID_PLOG(EVENT) << "Write failed"; ++ origin_task_runner_->PostTask(FROM_HERE, ++ base::BindOnce(std::move(callback), false)); ++ } else { ++ if (static_cast<size_t>(result) != size) { ++ HID_LOG(EVENT) << "Incomplete HID write: " << result ++ << " != " << buffer->size(); ++ } ++ origin_task_runner_->PostTask(FROM_HERE, ++ base::BindOnce(std::move(callback), true)); + } -+ origin_task_runner_->PostTask(FROM_HERE, -+ base::BindOnce(std::move(callback), success)); + } + + void GetFeatureReport(uint8_t report_id, @@ -87,22 +101,24 @@ + void SendFeatureReport(scoped_refptr<base::RefCountedBytes> buffer, + WriteCallback callback) { + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); ++ base::ScopedBlockingCall scoped_blocking_call( ++ FROM_HERE, base::BlockingType::MAY_BLOCK); + HID_PLOG(EVENT) << "SendFeatureReport not implemented on OpenBSD"; + origin_task_runner_->PostTask(FROM_HERE, -+ base::BindOnce(std::move(callback), false)); ++ base::BindOnce(std::move(callback), false)); + } + -+private: ++ private: + void OnFileCanReadWithoutBlocking() { + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); + -+ scoped_refptr<base::RefCountedBytes> buffer( -+ new base::RefCountedBytes(report_buffer_size_)); -+ unsigned char *data = buffer->front(); ++ auto buffer = ++ base::MakeRefCounted<base::RefCountedBytes>(report_buffer_size_); ++ uint8_t* data = buffer->front(); + size_t length = report_buffer_size_; + if (!has_report_id_) { -+ // OpenBSD will not prefix the buffer with a report ID if report IDs are -+ // not used by the device. Prefix the buffer with 0. ++ // Fido will not prefix the buffer with a report ID if report IDs are not ++ // used by the device. Prefix the buffer with 0. + *data++ = 0; + length--; + } @@ -132,69 +148,74 @@ + + SEQUENCE_CHECKER(sequence_checker_); + base::ScopedFD fd_; -+ const size_t report_buffer_size_; -+ const bool has_report_id_; ++ size_t report_buffer_size_; ++ bool has_report_id_; + base::WeakPtr<HidConnectionFido> connection_; + const scoped_refptr<base::SequencedTaskRunner> origin_task_runner_; + std::unique_ptr<base::FileDescriptorWatcher::Controller> file_watcher_; +}; + +HidConnectionFido::HidConnectionFido( -+ scoped_refptr<HidDeviceInfo> device_info, base::ScopedFD fd, ++ scoped_refptr<HidDeviceInfo> device_info, ++ base::ScopedFD fd, + scoped_refptr<base::SequencedTaskRunner> blocking_task_runner, -+ bool allow_protected_reports, bool allow_fido_reports) ++ bool allow_protected_reports, ++ bool allow_fido_reports) + : HidConnection(device_info, allow_protected_reports, allow_fido_reports), -+ blocking_task_runner_(std::move(blocking_task_runner)), -+ weak_factory_(this), -+ helper_(std::make_unique<BlockingTaskHelper>( -+ std::move(fd), device_info, weak_factory_.GetWeakPtr())) { ++ helper_(nullptr, base::OnTaskRunnerDeleter(blocking_task_runner)), ++ blocking_task_runner_(std::move(blocking_task_runner)) { ++ helper_.reset(new BlockingTaskRunnerHelper(std::move(fd), device_info, ++ weak_factory_.GetWeakPtr())); + blocking_task_runner_->PostTask( -+ FROM_HERE, base::BindOnce(&BlockingTaskHelper::Start, ++ FROM_HERE, base::BindOnce(&BlockingTaskRunnerHelper::Start, + base::Unretained(helper_.get()))); +} + -+HidConnectionFido::~HidConnectionFido() = default; ++HidConnectionFido::~HidConnectionFido() {} + +void HidConnectionFido::PlatformClose() { + // By closing the device on the blocking task runner 1) the requirement that + // base::ScopedFD is destroyed on a thread where I/O is allowed is satisfied + // and 2) any tasks posted to this task runner that refer to this file will + // complete before it is closed. -+ blocking_task_runner_->DeleteSoon(FROM_HERE, helper_.release()); ++ helper_.reset(); +} + +void HidConnectionFido::PlatformWrite( -+ scoped_refptr<base::RefCountedBytes> buffer, WriteCallback callback) { ++ scoped_refptr<base::RefCountedBytes> buffer, ++ WriteCallback callback) { ++ // Fido expects the first byte of the buffer to always be a report ID so the ++ // buffer can be used directly. + blocking_task_runner_->PostTask( -+ FROM_HERE, base::BindOnce(&BlockingTaskHelper::Write, ++ FROM_HERE, base::BindOnce(&BlockingTaskRunnerHelper::Write, + base::Unretained(helper_.get()), buffer, + std::move(callback))); +} + +void HidConnectionFido::PlatformGetFeatureReport(uint8_t report_id, -+ ReadCallback callback) { ++ ReadCallback callback) { + // The first byte of the destination buffer is the report ID being requested + // and is overwritten by the feature report. + DCHECK_GT(device_info()->max_feature_report_size(), 0u); -+ scoped_refptr<base::RefCountedBytes> buffer( -+ new base::RefCountedBytes(device_info()->max_feature_report_size() + 1)); -+ if (report_id != 0) -+ buffer->data()[0] = report_id; ++ auto buffer = base::MakeRefCounted<base::RefCountedBytes>( ++ device_info()->max_feature_report_size() + 1); ++ buffer->data()[0] = report_id; + + blocking_task_runner_->PostTask( -+ FROM_HERE, base::BindOnce(&BlockingTaskHelper::GetFeatureReport, ++ FROM_HERE, base::BindOnce(&BlockingTaskRunnerHelper::GetFeatureReport, + base::Unretained(helper_.get()), report_id, + buffer, std::move(callback))); +} + +void HidConnectionFido::PlatformSendFeatureReport( -+ scoped_refptr<base::RefCountedBytes> buffer, WriteCallback callback) { -+ base::ScopedBlockingCall scoped_blocking_call(FROM_HERE, -+ base::BlockingType::MAY_BLOCK); ++ scoped_refptr<base::RefCountedBytes> buffer, ++ WriteCallback callback) { ++ // Fido expects the first byte of the buffer to always be a report ID so the ++ // buffer can be used directly. + blocking_task_runner_->PostTask( -+ FROM_HERE, base::BindOnce(&BlockingTaskHelper::SendFeatureReport, ++ FROM_HERE, base::BindOnce(&BlockingTaskRunnerHelper::SendFeatureReport, + base::Unretained(helper_.get()), buffer, + std::move(callback))); +} + -+} // namespace device ++} // namespace device diff --git a/www/iridium/files/patch-services_device_hid_hid__connection__fido.h b/www/iridium/files/patch-services_device_hid_hid__connection__fido.h index 6e500eedf702..eac5f5d783fc 100644 --- a/www/iridium/files/patch-services_device_hid_hid__connection__fido.h +++ b/www/iridium/files/patch-services_device_hid_hid__connection__fido.h @@ -1,35 +1,41 @@ ---- services/device/hid/hid_connection_fido.h.orig 2022-03-28 18:11:04 UTC +--- services/device/hid/hid_connection_fido.h.orig 2022-12-01 10:35:46 UTC +++ services/device/hid/hid_connection_fido.h -@@ -0,0 +1,57 @@ -+// Copyright (c) 2020 The Chromium Authors. All rights reserved. +@@ -0,0 +1,60 @@ ++// Copyright 2014 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + -+#ifndef SERVICE_DEVICE_HID_HID_CONNECTION_FIDO_H_ -+#define SERVICE_DEVICE_HID_HID_CONNECTION_FIDO_H_ ++#ifndef SERVICES_DEVICE_HID_HID_CONNECTION_LINUX_H_ ++#define SERVICES_DEVICE_HID_HID_CONNECTION_LINUX_H_ ++ ++#include <stddef.h> ++#include <stdint.h> + +#include "base/files/scoped_file.h" -+#include "base/memory/ptr_util.h" -+#include "base/memory/ref_counted_memory.h" +#include "base/memory/weak_ptr.h" -+#include "base/sequence_checker.h" ++#include "base/task/sequenced_task_runner.h" +#include "services/device/hid/hid_connection.h" + ++namespace base { ++class SequencedTaskRunner; ++} ++ +namespace device { + +class HidConnectionFido : public HidConnection { -+public: ++ public: + HidConnectionFido( -+ scoped_refptr<HidDeviceInfo> device_info, base::ScopedFD fd, ++ scoped_refptr<HidDeviceInfo> device_info, ++ base::ScopedFD fd, + scoped_refptr<base::SequencedTaskRunner> blocking_task_runner, -+ bool allow_protected_reports, bool allow_fido_reports); ++ bool allow_protected_reports, ++ bool allow_fido_reports); ++ HidConnectionFido(HidConnectionFido&) = delete; ++ HidConnectionFido& operator=(HidConnectionFido&) = delete; + -+private: ++ private: + friend class base::RefCountedThreadSafe<HidConnectionFido>; -+ class BlockingTaskHelper; -+ -+ HidConnectionFido(const HidConnectionFido&) = delete; -+ HidConnectionFido& operator=(const HidConnectionFido&) = delete; ++ class BlockingTaskRunnerHelper; + + ~HidConnectionFido() override; + @@ -42,19 +48,16 @@ + void PlatformSendFeatureReport(scoped_refptr<base::RefCountedBytes> buffer, + WriteCallback callback) override; + -+ const scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_; -+ const scoped_refptr<base::SequencedTaskRunner> task_runner_; -+ -+ SEQUENCE_CHECKER(sequence_checker_); -+ -+ base::WeakPtrFactory<HidConnectionFido> weak_factory_; -+ + // |helper_| lives on the sequence to which |blocking_task_runner_| posts + // tasks so all calls must be posted there including this object's + // destruction. -+ std::unique_ptr<BlockingTaskHelper> helper_; ++ std::unique_ptr<BlockingTaskRunnerHelper, base::OnTaskRunnerDeleter> helper_; ++ ++ const scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_; ++ ++ base::WeakPtrFactory<HidConnectionFido> weak_factory_{this}; +}; + -+} // namespace device ++} // namespace device + -+#endif // SERVICE_DEVICE_HID_HID_CONNECTION_FIDO_H_ ++#endif // SERVICES_DEVICE_HID_HID_CONNECTION_LINUX_H_ diff --git a/www/iridium/files/patch-services_device_hid_hid__service.cc b/www/iridium/files/patch-services_device_hid_hid__service.cc index 2ebbeeed6fc1..56fb69f66c17 100644 --- a/www/iridium/files/patch-services_device_hid_hid__service.cc +++ b/www/iridium/files/patch-services_device_hid_hid__service.cc @@ -1,4 +1,4 @@ ---- services/device/hid/hid_service.cc.orig 2022-10-05 07:34:01 UTC +--- services/device/hid/hid_service.cc.orig 2022-12-01 10:35:46 UTC +++ services/device/hid/hid_service.cc @@ -19,6 +19,10 @@ @@ -11,14 +11,14 @@ #elif BUILDFLAG(IS_MAC) #include "services/device/hid/hid_service_mac.h" #elif BUILDFLAG(IS_WIN) -@@ -62,6 +66,10 @@ constexpr base::TaskTraits HidService::kBlockingTaskTr +@@ -64,6 +68,10 @@ constexpr base::TaskTraits HidService::kBlockingTaskTr std::unique_ptr<HidService> HidService::Create() { #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(USE_UDEV) - return base::WrapUnique(new HidServiceLinux()); + return std::make_unique<HidServiceLinux>(); +#elif BUILDFLAG(IS_OPENBSD) -+ return base::WrapUnique(new HidServiceFido()); ++ return std::make_unique<HidServiceFido>(); +#elif BUILDFLAG(IS_FREEBSD) -+ return base::WrapUnique(new HidServiceFreeBSD()); ++ return std::make_unique<HidServiceFreeBSD>(); #elif BUILDFLAG(IS_MAC) - return base::WrapUnique(new HidServiceMac()); + return std::make_unique<HidServiceMac>(); #elif BUILDFLAG(IS_WIN) diff --git a/www/iridium/files/patch-services_device_hid_hid__service__fido.cc b/www/iridium/files/patch-services_device_hid_hid__service__fido.cc index b283d736f9f7..75f5f7626dc2 100644 --- a/www/iridium/files/patch-services_device_hid_hid__service__fido.cc +++ b/www/iridium/files/patch-services_device_hid_hid__service__fido.cc @@ -1,7 +1,7 @@ ---- services/device/hid/hid_service_fido.cc.orig 2022-10-05 07:34:01 UTC +--- services/device/hid/hid_service_fido.cc.orig 2022-12-01 10:35:46 UTC +++ services/device/hid/hid_service_fido.cc -@@ -0,0 +1,327 @@ -+// Copyright 2020 The Chromium Authors. All rights reserved. +@@ -0,0 +1,399 @@ ++// Copyright 2014 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + @@ -10,76 +10,41 @@ +#include <fcntl.h> +#include <poll.h> +#include <stdint.h> -+#include <sys/socket.h> -+#include <sys/un.h> -+#include <unistd.h> + -+// TODO: remove once the missing guard in fido.h is fixed upstream. -+extern "C" { ++#include <dlfcn.h> +#include <fido.h> -+} + -+#include <set> ++#include <limits> ++#include <memory> +#include <string> -+#include <vector> ++#include <utility> + +#include "base/bind.h" ++#include "base/callback_helpers.h" +#include "base/files/file.h" -+#include "base/files/file_descriptor_watcher_posix.h" -+#include "base/files/file_enumerator.h" ++#include "base/files/file_path.h" ++#include "base/files/file_util.h" ++#include "base/files/scoped_file.h" +#include "base/location.h" -+#include "base/logging.h" -+#include "base/posix/eintr_wrapper.h" -+#include "base/task/single_thread_task_runner.h" -+#include "base/task/thread_pool.h" -+#include "base/stl_util.h" -+#include "base/strings/pattern.h" ++#include "base/sequence_checker.h" ++#include "base/strings/string_number_conversions.h" +#include "base/strings/string_split.h" +#include "base/strings/string_util.h" -+#include "base/strings/stringprintf.h" -+#include "base/strings/sys_string_conversions.h" ++#include "base/task/sequenced_task_runner.h" ++#include "base/task/thread_pool.h" +#include "base/threading/scoped_blocking_call.h" -+#include "base/threading/thread_task_runner_handle.h" ++#include "base/threading/sequenced_task_runner_handle.h" ++#include "build/build_config.h" ++#include "build/chromeos_buildflags.h" +#include "components/device_event_log/device_event_log.h" ++#include "device/udev_linux/scoped_udev.h" ++#include "device/udev_linux/udev_watcher.h" +#include "services/device/hid/hid_connection_fido.h" + +namespace device { + +namespace { + -+struct ConnectParams { -+ ConnectParams(scoped_refptr<HidDeviceInfo> device_info, -+ HidService::ConnectCallback callback) -+ : device_info(std::move(device_info)), callback(std::move(callback)), -+ task_runner(base::ThreadTaskRunnerHandle::Get()), -+ blocking_task_runner(base::ThreadPool::CreateSequencedTaskRunner( -+ HidService::kBlockingTaskTraits)) {} -+ ~ConnectParams() {} -+ -+ scoped_refptr<HidDeviceInfo> device_info; -+ HidService::ConnectCallback callback; -+ scoped_refptr<base::SequencedTaskRunner> task_runner; -+ scoped_refptr<base::SequencedTaskRunner> blocking_task_runner; -+ base::ScopedFD fd; -+ bool allow_protected_reports; -+ bool allow_fido_reports; -+}; -+ -+void CreateConnection(std::unique_ptr<ConnectParams> params) { -+ DCHECK(params->fd.is_valid()); -+ std::move(params->callback).Run(base::MakeRefCounted<HidConnectionFido>( -+ std::move(params->device_info), std::move(params->fd), -+ std::move(params->blocking_task_runner), params->allow_protected_reports, -+ params->allow_fido_reports)); -+} -+ -+void FinishOpen(std::unique_ptr<ConnectParams> params) { -+ scoped_refptr<base::SequencedTaskRunner> task_runner = params->task_runner; -+ -+ task_runner->PostTask(FROM_HERE, -+ base::BindOnce(&CreateConnection, std::move(params))); -+} -+ +bool terrible_ping_kludge(int fd, const std::string &path) { + u_char data[256]; + int i, n; @@ -95,8 +60,8 @@ + /* Ping command */ + data[5] = 0x81; + /* One byte ping only, Vasili */ -+ data[6] = 0; -+ data[7] = 1; ++ data[6] = 0; ++ data[7] = 1; + HID_LOG(EVENT) << "send ping " << i << " " << path; + if (write(fd, data, 64) == -1) { + HID_PLOG(ERROR) << "write " << path; @@ -104,7 +69,7 @@ + } + HID_LOG(EVENT) << "wait reply " << path; + memset(&pfd, 0, sizeof(pfd)); -+ pfd.fd = fd; ++ pfd.fd = fd; + pfd.events = POLLIN; + if ((n = poll(&pfd, 1, 100)) == -1) { + HID_PLOG(EVENT) << "poll " << path; @@ -113,7 +78,7 @@ + HID_LOG(EVENT) << "timed out " << path; + continue; + } -+ if (read(fd, data, 64) == -1) { ++ if (read(fd, data, 64) == -1) { + HID_PLOG(ERROR) << "read " << path; + return false; + } @@ -129,31 +94,6 @@ + return false; +} + -+void OpenOnBlockingThread(std::unique_ptr<ConnectParams> params) { -+ base::ScopedBlockingCall scoped_blocking_call(FROM_HERE, -+ base::BlockingType::MAY_BLOCK); -+ scoped_refptr<base::SequencedTaskRunner> task_runner = params->task_runner; -+ -+ const auto &device_node = params->device_info->device_node(); -+ base::FilePath device_path(device_node); -+ int flags = -+ base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_WRITE; -+ base::File device_file(device_path, flags); -+ if (!device_file.IsValid()) { -+ HID_LOG(EVENT) << "Failed to open '" << device_node << "': " -+ << base::File::ErrorToString(device_file.error_details()); -+ task_runner->PostTask(FROM_HERE, base::BindOnce(std::move(params->callback), nullptr)); -+ return; -+ } -+ if (!terrible_ping_kludge(device_file.GetPlatformFile(), device_node)) { -+ HID_LOG(EVENT) << "Failed to ping " << device_node; -+ task_runner->PostTask(FROM_HERE, base::BindOnce(std::move(params->callback), nullptr)); -+ return; -+ } -+ params->fd.reset(device_file.TakePlatformFile()); -+ FinishOpen(std::move(params)); -+} -+ +// HID report descriptor for U2F interface. Copied from: +// https://chromium.googlesource.com/chromiumos/platform2/+/c6c7e4e54fce11932fedaa3ea10236bf75d85a2b%5E%21/u2fd/u2fhid.cc +// Apparently Chromium wants to see these bytes, but OpenBSD fido(4) @@ -178,26 +118,66 @@ + 0xC0 /* End Collection */ +}; + -+} // namespace ++} // namespace ++ ++struct HidServiceFido::ConnectParams { ++ ConnectParams(scoped_refptr<HidDeviceInfo> device_info, ++ bool allow_protected_reports, ++ bool allow_fido_reports, ++ ConnectCallback callback) ++ : device_info(std::move(device_info)), ++ allow_protected_reports(allow_protected_reports), ++ allow_fido_reports(allow_fido_reports), ++ callback(std::move(callback)), ++ task_runner(base::SequencedTaskRunnerHandle::Get()), ++ blocking_task_runner( ++ base::ThreadPool::CreateSequencedTaskRunner(kBlockingTaskTraits)) {} ++ ~ConnectParams() {} ++ ++ scoped_refptr<HidDeviceInfo> device_info; ++ bool allow_protected_reports; ++ bool allow_fido_reports; ++ ConnectCallback callback; ++ scoped_refptr<base::SequencedTaskRunner> task_runner; ++ scoped_refptr<base::SequencedTaskRunner> blocking_task_runner; ++ base::ScopedFD fd; ++}; + -+class HidServiceFido::BlockingTaskHelper { -+public: -+ BlockingTaskHelper(base::WeakPtr<HidServiceFido> service) ++class HidServiceFido::BlockingTaskRunnerHelper : public UdevWatcher::Observer { ++ public: ++ BlockingTaskRunnerHelper(base::WeakPtr<HidServiceFido> service) + : service_(std::move(service)), -+ task_runner_(base::ThreadTaskRunnerHandle::Get()) { ++ task_runner_(base::SequencedTaskRunnerHandle::Get()) { + DETACH_FROM_SEQUENCE(sequence_checker_); + } + -+ BlockingTaskHelper(const BlockingTaskHelper&) = delete; -+ BlockingTaskHelper& operator=(const BlockingTaskHelper&) = delete; ++ BlockingTaskRunnerHelper(const BlockingTaskRunnerHelper&) = delete; ++ BlockingTaskRunnerHelper& operator=(const BlockingTaskRunnerHelper&) = delete; + -+ ~BlockingTaskHelper() = default; ++ ~BlockingTaskRunnerHelper() override { ++ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); ++ } + + void Start() { + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); -+ base::ScopedBlockingCall scoped_blocking_call( -+ FROM_HERE, base::BlockingType::MAY_BLOCK); + ++ void *library = dlopen("libudev.so", RTLD_NOW | RTLD_LOCAL); ++ if (library) { ++ dlclose(library); ++ watcher_ = UdevWatcher::StartWatching(this); ++ watcher_->EnumerateExistingDevices(); ++ } else { ++ HID_LOG(ERROR) << "No udev available, failling back to single enumeration"; ++ WalkFidoDevices(nullptr); ++ } ++ ++ task_runner_->PostTask( ++ FROM_HERE, ++ base::BindOnce(&HidServiceFido::FirstEnumerationComplete, service_)); ++ } ++ ++ private: ++ void WalkFidoDevices(const char *name) { + fido_dev_info_t *devlist = NULL; + fido_dev_t *dev = NULL; + size_t devlist_len = 0, i; @@ -220,65 +200,99 @@ + + for (i = 0; i < devlist_len; i++) { + const fido_dev_info_t *di = fido_dev_info_ptr(devlist, i); ++ + if (di == NULL) { + HID_LOG(ERROR) << "fido_dev_info_ptr " << i << " failed"; + continue; + } ++ + if ((path = fido_dev_info_path(di)) == NULL) { + HID_LOG(ERROR) << "fido_dev_info_path " << i << " failed"; + continue; + } ++ ++ if (name != nullptr && !strcmp(path, name)) { ++ HID_LOG(EVENT) << "hotplug device " << i << ": " << path; ++ OnFidoDeviceAdded(di); ++ break; ++ } ++ + HID_LOG(EVENT) << "trying device " << i << ": " << path; + if ((dev = fido_dev_new()) == NULL) { + HID_LOG(ERROR) << "fido_dev_new failed"; + continue; + } ++ + if ((r = fido_dev_open(dev, path)) != FIDO_OK) { + HID_LOG(ERROR) << "fido_dev_open failed " << path; + fido_dev_free(&dev); + continue; + } -+ OnDeviceAdded(di); ++ + fido_dev_close(dev); + fido_dev_free(&dev); -+ } + ++ OnFidoDeviceAdded(di); ++ } + out: + if (devlist != NULL) + fido_dev_info_free(&devlist, MAX_FIDO_DEVICES); -+ -+ task_runner_->PostTask( -+ FROM_HERE, -+ base::BindOnce(&HidServiceFido::FirstEnumerationComplete, service_)); + } + -+ void OnDeviceAdded(const fido_dev_info_t *di) { ++ void OnFidoDeviceAdded(const fido_dev_info_t *di) { + auto null_as_empty = [](const char *r) -> std::string { + return (r != nullptr) ? r : ""; + }; -+ std::string device_node(null_as_empty(fido_dev_info_path(di))); ++ std::string device_node(null_as_empty(fido_dev_info_path(di))); + std::vector<uint8_t> report_descriptor( + kU2fReportDesc, kU2fReportDesc + sizeof(kU2fReportDesc)); -+ scoped_refptr<HidDeviceInfo> device_info(new HidDeviceInfo( -+ device_node, /*physical_device_id=*/"", fido_dev_info_vendor(di), ++ ++ auto device_info = base::MakeRefCounted<HidDeviceInfo>( ++ device_node, /*physical_device_id*/"", fido_dev_info_vendor(di), + fido_dev_info_product(di), null_as_empty(fido_dev_info_product_string(di)), + null_as_empty(fido_dev_info_manufacturer_string(di)), -+ device::mojom::HidBusType::kHIDBusTypeUSB, report_descriptor, -+ device_node)); ++ device::mojom::HidBusType::kHIDBusTypeUSB, report_descriptor, ++ device_node); ++ ++ task_runner_->PostTask( ++ FROM_HERE, ++ base::BindOnce(&HidServiceFido::AddDevice, service_, device_info)); ++ } ++ ++ // UdevWatcher::Observer ++ void OnDeviceAdded(ScopedUdevDevicePtr device) override { ++ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); ++ base::ScopedBlockingCall scoped_blocking_call( ++ FROM_HERE, base::BlockingType::MAY_BLOCK); ++ ++ const char* subsystem = udev_device_get_subsystem(device.get()); ++ if (!subsystem || strcmp(subsystem, "fido") != 0) ++ return; + -+ task_runner_->PostTask(FROM_HERE, base::BindOnce(&HidServiceFido::AddDevice, -+ service_, device_info)); ++ const char* device_path = udev_device_get_syspath(device.get()); ++ if (!device_path) ++ return; ++ ++ WalkFidoDevices(device_path); + } + -+ void OnDeviceRemoved(std::string device_node) { ++ void OnDeviceRemoved(ScopedUdevDevicePtr device) override { ++ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); + base::ScopedBlockingCall scoped_blocking_call( + FROM_HERE, base::BlockingType::MAY_BLOCK); -+ task_runner_->PostTask(FROM_HERE, base::BindOnce(&HidServiceFido::RemoveDevice, -+ service_, device_node)); ++ ++ const char* device_path = udev_device_get_syspath(device.get()); ++ if (device_path) { ++ task_runner_->PostTask( ++ FROM_HERE, base::BindOnce(&HidServiceFido::RemoveDevice, service_, ++ std::string(device_path))); ++ } + } + -+private: ++ void OnDeviceChanged(ScopedUdevDevicePtr) override {} ++ + SEQUENCE_CHECKER(sequence_checker_); ++ std::unique_ptr<UdevWatcher> watcher_; + + // This weak pointer is only valid when checked on this task runner. + base::WeakPtr<HidServiceFido> service_; @@ -286,45 +300,103 @@ +}; + +HidServiceFido::HidServiceFido() -+ : task_runner_(base::ThreadTaskRunnerHandle::Get()), -+ blocking_task_runner_( ++ : blocking_task_runner_( + base::ThreadPool::CreateSequencedTaskRunner(kBlockingTaskTraits)), -+ weak_factory_(this), helper_(std::make_unique<BlockingTaskHelper>( -+ weak_factory_.GetWeakPtr())) { ++ helper_(nullptr, base::OnTaskRunnerDeleter(blocking_task_runner_)) { ++ // We need to properly initialize |blocking_task_helper_| here because we need ++ // |weak_factory_| to be created first. ++ helper_.reset(new BlockingTaskRunnerHelper(weak_factory_.GetWeakPtr())); + blocking_task_runner_->PostTask( -+ FROM_HERE, -+ base::BindOnce(&BlockingTaskHelper::Start, base::Unretained(helper_.get()))); ++ FROM_HERE, base::BindOnce(&BlockingTaskRunnerHelper::Start, ++ base::Unretained(helper_.get()))); +} + -+HidServiceFido::~HidServiceFido() { -+ blocking_task_runner_->DeleteSoon(FROM_HERE, helper_.release()); -+} ++HidServiceFido::~HidServiceFido() = default; + +base::WeakPtr<HidService> HidServiceFido::GetWeakPtr() { + return weak_factory_.GetWeakPtr(); +} + -+void HidServiceFido::Connect(const std::string &device_guid, -+ bool allow_protected_reports, -+ bool allow_fido_reports, -+ ConnectCallback callback) { ++void HidServiceFido::Connect(const std::string& device_guid, ++ bool allow_protected_reports, ++ bool allow_fido_reports, ++ ConnectCallback callback) { + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); + -+ const auto &map_entry = devices().find(device_guid); ++ const auto& map_entry = devices().find(device_guid); + if (map_entry == devices().end()) { -+ base::ThreadTaskRunnerHandle::Get()->PostTask( ++ base::SequencedTaskRunnerHandle::Get()->PostTask( + FROM_HERE, base::BindOnce(std::move(callback), nullptr)); + return; + } -+ + scoped_refptr<HidDeviceInfo> device_info = map_entry->second; + -+ auto params = std::make_unique<ConnectParams>(device_info, std::move(callback)); -+ ++ auto params = ++ std::make_unique<ConnectParams>(device_info, allow_protected_reports, ++ allow_fido_reports, std::move(callback)); + scoped_refptr<base::SequencedTaskRunner> blocking_task_runner = + params->blocking_task_runner; + blocking_task_runner->PostTask( -+ FROM_HERE, base::BindOnce(&OpenOnBlockingThread, std::move(params))); ++ FROM_HERE, base::BindOnce(&HidServiceFido::OpenOnBlockingThread, ++ std::move(params))); ++} ++ ++// static ++void HidServiceFido::OpenOnBlockingThread( ++ std::unique_ptr<ConnectParams> params) { ++ base::ScopedBlockingCall scoped_blocking_call(FROM_HERE, ++ base::BlockingType::MAY_BLOCK); ++ scoped_refptr<base::SequencedTaskRunner> task_runner = params->task_runner; ++ ++ base::FilePath device_path(params->device_info->device_node()); ++ base::File device_file; ++ int flags = ++ base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_WRITE; ++ device_file.Initialize(device_path, flags); ++ if (!device_file.IsValid()) { ++ base::File::Error file_error = device_file.error_details(); ++ ++ if (file_error == base::File::FILE_ERROR_ACCESS_DENIED) { ++ HID_LOG(EVENT) ++ << "Access denied opening device read-write, trying read-only."; ++ flags = base::File::FLAG_OPEN | base::File::FLAG_READ; ++ device_file.Initialize(device_path, flags); ++ } ++ } ++ if (!device_file.IsValid()) { ++ HID_LOG(EVENT) << "Failed to open '" << params->device_info->device_node() ++ << "': " ++ << base::File::ErrorToString(device_file.error_details()); ++ task_runner->PostTask(FROM_HERE, ++ base::BindOnce(std::move(params->callback), nullptr)); ++ return; ++ } ++ if (!terrible_ping_kludge(device_file.GetPlatformFile(), params->device_info->device_node())) { ++ HID_LOG(EVENT) << "Failed to ping " << params->device_info->device_node(); ++ task_runner->PostTask(FROM_HERE, base::BindOnce(std::move(params->callback), nullptr)); ++ return; ++ } ++ params->fd.reset(device_file.TakePlatformFile()); ++ ++ task_runner->PostTask(FROM_HERE, base::BindOnce(&HidServiceFido::FinishOpen, ++ std::move(params))); ++} ++ ++// static ++void HidServiceFido::FinishOpen(std::unique_ptr<ConnectParams> params) { ++ DCHECK(params->fd.is_valid()); ++ ++ if (!base::SetNonBlocking(params->fd.get())) { ++ HID_PLOG(DEBUG) << "Failed to set the non-blocking flag on the device fd"; ++ std::move(params->callback).Run(nullptr); ++ return; ++ } ++ ++ std::move(params->callback) ++ .Run(base::MakeRefCounted<HidConnectionFido>( ++ std::move(params->device_info), std::move(params->fd), ++ std::move(params->blocking_task_runner), ++ params->allow_protected_reports, params->allow_fido_reports)); +} + -+} // namespace device ++} // namespace device diff --git a/www/iridium/files/patch-services_device_hid_hid__service__fido.h b/www/iridium/files/patch-services_device_hid_hid__service__fido.h index 77f89dabf61e..ee68895e6d64 100644 --- a/www/iridium/files/patch-services_device_hid_hid__service__fido.h +++ b/www/iridium/files/patch-services_device_hid_hid__service__fido.h @@ -1,46 +1,68 @@ ---- services/device/hid/hid_service_fido.h.orig 2022-03-28 18:11:04 UTC +--- services/device/hid/hid_service_fido.h.orig 2022-12-01 10:35:46 UTC +++ services/device/hid/hid_service_fido.h -@@ -0,0 +1,43 @@ -+// Copyright 2020 The Chromium Authors. All rights reserved. +@@ -0,0 +1,65 @@ ++// Copyright 2014 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + -+#ifndef SERVICE_DEVICE_HID_HID_SERVICE_FIDO_H_ -+#define SERVICE_DEVICE_HID_HID_SERVICE_FIDO_H_ ++#ifndef SERVICES_DEVICE_HID_HID_SERVICE_LINUX_H_ ++#define SERVICES_DEVICE_HID_HID_SERVICE_LINUX_H_ + -+#include <string> ++#include <memory> + -+#include "base/memory/ref_counted.h" ++#include "base/compiler_specific.h" ++#include "base/files/scoped_file.h" +#include "base/memory/weak_ptr.h" ++#include "base/task/sequenced_task_runner.h" ++#include "build/build_config.h" ++#include "build/chromeos_buildflags.h" ++#include "services/device/hid/hid_device_info.h" +#include "services/device/hid/hid_service.h" + +namespace device { + +class HidServiceFido : public HidService { -+public: ++ public: + HidServiceFido(); -+ -+ HidServiceFido(const HidServiceFido&) = delete; -+ HidServiceFido& operator=(const HidServiceFido&) = delete; -+ ++ HidServiceFido(HidServiceFido&) = delete; ++ HidServiceFido& operator=(HidServiceFido&) = delete; + ~HidServiceFido() override; + -+ void Connect(const std::string &device_guid, ++ // HidService: ++ void Connect(const std::string& device_id, + bool allow_protected_reports, + bool allow_fido_reports, -+ ConnectCallback connect) override; ++ ConnectCallback callback) override; + base::WeakPtr<HidService> GetWeakPtr() override; + -+private: -+ class BlockingTaskHelper; -+ const scoped_refptr<base::SequencedTaskRunner> task_runner_; ++ private: ++ struct ConnectParams; ++ class BlockingTaskRunnerHelper; ++ ++// These functions implement the process of locating, requesting access to and ++// opening a device. Because this operation crosses multiple threads these ++// functions are static and the necessary parameters are passed as a single ++// struct. ++#if BUILDFLAG(IS_CHROMEOS_ASH) ++ static void OnPathOpenComplete(std::unique_ptr<ConnectParams> params, ++ base::ScopedFD fd); ++ static void OnPathOpenError(const std::string& device_path, ++ ConnectCallback callback, ++ const std::string& error_name, ++ const std::string& error_message); ++#else ++ static void OpenOnBlockingThread(std::unique_ptr<ConnectParams> params); ++#endif ++ static void FinishOpen(std::unique_ptr<ConnectParams> params); ++ + const scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_; -+ base::WeakPtrFactory<HidServiceFido> weak_factory_; ++ + // |helper_| lives on the sequence |blocking_task_runner_| posts to and holds + // a weak reference back to the service that owns it. -+ std::unique_ptr<BlockingTaskHelper> helper_; ++ std::unique_ptr<BlockingTaskRunnerHelper, base::OnTaskRunnerDeleter> helper_; ++ base::WeakPtrFactory<HidServiceFido> weak_factory_{this}; +}; + -+} // namespace device ++} // namespace device + -+#endif // SERVICE_DEVICE_HID_HID_SERVICE_FIDO_H_ ++#endif // SERVICES_DEVICE_HID_HID_SERVICE_LINUX_H_ diff --git a/www/iridium/files/patch-services_device_public_mojom_BUILD.gn b/www/iridium/files/patch-services_device_public_mojom_BUILD.gn new file mode 100644 index 000000000000..c2ac73c1d72c --- /dev/null +++ b/www/iridium/files/patch-services_device_public_mojom_BUILD.gn @@ -0,0 +1,11 @@ +--- services/device/public/mojom/BUILD.gn.orig 2022-12-01 10:35:46 UTC ++++ services/device/public/mojom/BUILD.gn +@@ -91,7 +91,7 @@ mojom("device_service") { + disable_variants = true + + enabled_features = [] +- if ((is_linux || is_chromeos) && use_udev) { ++ if ((is_linux || is_chromeos) && !is_bsd && use_udev) { + enabled_features += [ "enable_input_device_manager" ] + } + diff --git a/www/iridium/files/patch-services_device_serial_BUILD.gn b/www/iridium/files/patch-services_device_serial_BUILD.gn index be004b7560cc..6c517a19f594 100644 --- a/www/iridium/files/patch-services_device_serial_BUILD.gn +++ b/www/iridium/files/patch-services_device_serial_BUILD.gn @@ -1,16 +1,11 @@ ---- services/device/serial/BUILD.gn.orig 2022-03-28 18:11:04 UTC +--- services/device/serial/BUILD.gn.orig 2022-12-01 10:35:46 UTC +++ services/device/serial/BUILD.gn -@@ -83,6 +83,13 @@ if (is_win || ((is_linux || is_chromeos) && use_udev) - ] - } +@@ -5,7 +5,7 @@ + import("//build/config/chromeos/ui_mode.gni") + import("//build/config/features.gni") -+ if (is_bsd) { -+ sources -= [ -+ "serial_device_enumerator_linux.cc", -+ "serial_device_enumerator_linux.h" -+ ] -+ } -+ - if (use_udev) { - deps += [ "//device/udev_linux" ] - } +-if (is_win || ((is_linux || is_chromeos) && use_udev) || is_mac) { ++if (is_win || ((!is_bsd && is_linux || is_chromeos) && use_udev) || is_mac) { + config("platform_support") { + visibility = [ ":serial" ] + if (is_win) { diff --git a/www/iridium/files/patch-services_device_usb_BUILD.gn b/www/iridium/files/patch-services_device_usb_BUILD.gn index 1001dc3a74ca..cbeb819960e7 100644 --- a/www/iridium/files/patch-services_device_usb_BUILD.gn +++ b/www/iridium/files/patch-services_device_usb_BUILD.gn @@ -1,4 +1,4 @@ ---- services/device/usb/BUILD.gn.orig 2022-03-28 18:11:04 UTC +--- services/device/usb/BUILD.gn.orig 2022-12-01 10:35:46 UTC +++ services/device/usb/BUILD.gn @@ -103,15 +103,17 @@ static_library("usb") { deps += [ "//third_party/re2" ] @@ -13,7 +13,7 @@ - "usb_service_mac.cc", - "usb_service_mac.h", - ] -+ if (is_mac || is_bsd) { ++ if (is_mac || is_openbsd) { + if (is_mac) { + sources += [ + "usb_device_handle_mac.cc", @@ -27,7 +27,21 @@ # These sources and deps are required for libusb. # TODO(https://crbug.com/1096743) Remove these sources. -@@ -152,7 +154,7 @@ static_library("usb") { +@@ -135,6 +137,13 @@ static_library("usb") { + deps += [ "//third_party/libusb" ] + } + ++ if (is_freebsd) { ++ sources += [ ++ "usb_service_fake.cc", ++ "usb_service_fake.h", ++ ] ++ } ++ + if (is_linux || is_chromeos) { + sources += [ + "usb_device_linux.cc", +@@ -152,7 +161,7 @@ static_library("usb") { deps += [ "//device/udev_linux" ] } diff --git a/www/iridium/files/patch-services_device_usb_usb__service.cc b/www/iridium/files/patch-services_device_usb_usb__service.cc new file mode 100644 index 000000000000..5977ba3681d3 --- /dev/null +++ b/www/iridium/files/patch-services_device_usb_usb__service.cc @@ -0,0 +1,39 @@ +--- services/device/usb/usb_service.cc.orig 2022-12-01 10:35:46 UTC ++++ services/device/usb/usb_service.cc +@@ -22,13 +22,17 @@ + + #if BUILDFLAG(IS_ANDROID) + #include "services/device/usb/usb_service_android.h" +-#elif defined(USE_UDEV) ++#elif defined(USE_UDEV) && !BUILDFLAG(IS_BSD) + #include "services/device/usb/usb_service_linux.h" + #elif BUILDFLAG(IS_MAC) + #include "services/device/usb/usb_service_impl.h" + #include "services/device/usb/usb_service_mac.h" + #elif BUILDFLAG(IS_WIN) + #include "services/device/usb/usb_service_win.h" ++#elif BUILDFLAG(IS_OPENBSD) ++#include "services/device/usb/usb_service_impl.h" ++#elif BUILDFLAG(IS_FREEBSD) ++#include "services/device/usb/usb_service_fake.h" + #endif + + namespace device { +@@ -51,7 +55,7 @@ constexpr base::TaskTraits UsbService::kBlockingTaskTr + std::unique_ptr<UsbService> UsbService::Create() { + #if BUILDFLAG(IS_ANDROID) + return base::WrapUnique(new UsbServiceAndroid()); +-#elif defined(USE_UDEV) ++#elif defined(USE_UDEV) && !BUILDFLAG(IS_BSD) + return base::WrapUnique(new UsbServiceLinux()); + #elif BUILDFLAG(IS_WIN) + return base::WrapUnique(new UsbServiceWin()); +@@ -60,6 +64,8 @@ std::unique_ptr<UsbService> UsbService::Create() { + return base::WrapUnique(new UsbServiceMac()); + else + return base::WrapUnique(new UsbServiceImpl()); ++#elif BUILDFLAG(IS_BSD) ++ return base::WrapUnique(new UsbServiceImpl()); + #else + return nullptr; + #endif diff --git a/www/iridium/files/patch-services_device_usb_usb__service__fake.cc b/www/iridium/files/patch-services_device_usb_usb__service__fake.cc new file mode 100644 index 000000000000..24068af0d6cd --- /dev/null +++ b/www/iridium/files/patch-services_device_usb_usb__service__fake.cc @@ -0,0 +1,54 @@ +--- services/device/usb/usb_service_fake.cc.orig 2022-12-01 10:35:46 UTC ++++ services/device/usb/usb_service_fake.cc +@@ -0,0 +1,51 @@ ++// Copyright 2014 The Chromium Authors ++// Use of this source code is governed by a BSD-style license that can be ++// found in the LICENSE file. ++ ++#include "services/device/usb/usb_service_fake.h" ++ ++#include <stdint.h> ++ ++#include <list> ++#include <memory> ++#include <set> ++#include <utility> ++ ++#include "base/barrier_closure.h" ++#include "base/bind.h" ++#include "base/callback_helpers.h" ++#include "base/containers/contains.h" ++#include "base/location.h" ++#include "base/memory/ref_counted_memory.h" ++#include "base/memory/weak_ptr.h" ++#include "base/strings/string_number_conversions.h" ++#include "base/strings/utf_string_conversions.h" ++#include "base/task/sequenced_task_runner.h" ++#include "base/task/single_thread_task_runner.h" ++#include "base/task/thread_pool.h" ++#include "base/threading/scoped_blocking_call.h" ++#include "build/build_config.h" ++#include "components/device_event_log/device_event_log.h" ++#include "services/device/usb/usb_device_handle.h" ++#include "services/device/usb/usb_error.h" ++#include "services/device/usb/webusb_descriptors.h" ++ ++namespace device { ++ ++UsbServiceImpl::UsbServiceImpl() ++ : task_runner_(base::SequencedTaskRunnerHandle::Get()) { ++ NOTIMPLEMENTED(); ++} ++ ++UsbServiceImpl::~UsbServiceImpl() { ++ NOTIMPLEMENTED(); ++ NotifyWillDestroyUsbService(); ++} ++ ++void UsbServiceImpl::GetDevices(GetDevicesCallback callback) { ++ NOTIMPLEMENTED(); ++ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); ++ UsbService::GetDevices(std::move(callback)); ++} ++ ++} // namespace device diff --git a/www/iridium/files/patch-services_device_usb_usb__service__fake.h b/www/iridium/files/patch-services_device_usb_usb__service__fake.h new file mode 100644 index 000000000000..334342219d97 --- /dev/null +++ b/www/iridium/files/patch-services_device_usb_usb__service__fake.h @@ -0,0 +1,51 @@ +--- services/device/usb/usb_service_fake.h.orig 2022-12-01 10:35:46 UTC ++++ services/device/usb/usb_service_fake.h +@@ -0,0 +1,48 @@ ++// Copyright 2015 The Chromium Authors ++// Use of this source code is governed by a BSD-style license that can be ++// found in the LICENSE file. ++ ++#ifndef SERVICES_DEVICE_USB_USB_SERVICE_IMPL_H_ ++#define SERVICES_DEVICE_USB_USB_SERVICE_IMPL_H_ ++ ++#include "services/device/usb/usb_service.h" ++ ++#include <stddef.h> ++ ++#include <map> ++#include <set> ++#include <string> ++#include <vector> ++ ++#include "base/containers/queue.h" ++#include "base/memory/weak_ptr.h" ++#include "build/build_config.h" ++#include "services/device/usb/usb_context.h" ++#include "services/device/usb/usb_device_impl.h" ++#include "third_party/abseil-cpp/absl/types/optional.h" ++ ++namespace device { ++ ++class UsbDeviceImpl; ++ ++class UsbServiceImpl final : public UsbService { ++ public: ++ UsbServiceImpl(); ++ ++ UsbServiceImpl(const UsbServiceImpl&) = delete; ++ UsbServiceImpl& operator=(const UsbServiceImpl&) = delete; ++ ++ ~UsbServiceImpl() override; ++ ++ private: ++ // device::UsbService implementation ++ void GetDevices(GetDevicesCallback callback) override; ++ ++ void OnUsbContext(scoped_refptr<UsbContext> context); ++ ++ scoped_refptr<base::SequencedTaskRunner> task_runner_; ++}; ++ ++} // namespace device ++ ++#endif // SERVICES_DEVICE_USB_USB_SERVICE_IMPL_H_ diff --git a/www/iridium/files/patch-services_network_BUILD.gn b/www/iridium/files/patch-services_network_BUILD.gn index da51f3b6ce15..3442187e5821 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-10-05 07:34:01 UTC +--- services/network/BUILD.gn.orig 2022-12-01 10:35:46 UTC +++ services/network/BUILD.gn -@@ -322,7 +322,6 @@ if (is_linux || is_chromeos) { +@@ -324,7 +324,6 @@ if (is_linux || is_chromeos) { ] deps = [ "//base:base", diff --git a/www/iridium/files/patch-third__party_angle_BUILD.gn b/www/iridium/files/patch-third__party_angle_BUILD.gn index 24631c03c21a..32a0131c584c 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-10-05 07:34:01 UTC +--- third_party/angle/BUILD.gn.orig 2022-12-01 10:35:46 UTC +++ third_party/angle/BUILD.gn -@@ -261,7 +261,6 @@ config("extra_warnings") { +@@ -265,7 +265,6 @@ config("extra_warnings") { "-Wtautological-type-limit-compare", "-Wundefined-reinterpret-cast", "-Wunneeded-internal-declaration", @@ -8,7 +8,7 @@ "-Wsuggest-destructor-override", "-Wsuggest-override", -@@ -439,7 +438,7 @@ angle_static_library("angle_common") { +@@ -443,7 +442,7 @@ angle_static_library("angle_common") { all_dependent_configs = [ ":angle_disable_pool_alloc" ] } @@ -17,7 +17,7 @@ libs = [ "dl" ] } -@@ -569,6 +568,9 @@ angle_static_library("angle_gpu_info_util") { +@@ -573,6 +572,9 @@ angle_static_library("angle_gpu_info_util") { "Xi", "Xext", ] @@ -27,7 +27,7 @@ } if (angle_use_wayland && angle_has_build) { -@@ -1089,12 +1091,12 @@ if (angle_use_wayland) { +@@ -1093,12 +1095,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 2330f6c2bc8c..ac3f15bce097 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,4 +1,4 @@ ---- third_party/angle/src/libANGLE/Display.cpp.orig 2022-10-05 07:34:01 UTC +--- third_party/angle/src/libANGLE/Display.cpp.orig 2022-12-01 10:35:46 UTC +++ third_party/angle/src/libANGLE/Display.cpp @@ -54,7 +54,7 @@ # include "libANGLE/renderer/gl/wgl/DisplayWGL.h" @@ -36,7 +36,7 @@ # if defined(ANGLE_USE_GBM) if (platformType == EGL_PLATFORM_GBM_KHR && rx::IsVulkanGbmDisplayAvailable()) { -@@ -1986,7 +1986,7 @@ static ClientExtensions GenerateClientExtensions() +@@ -2011,7 +2011,7 @@ static ClientExtensions GenerateClientExtensions() extensions.x11Visual = true; #endif diff --git a/www/iridium/files/patch-third__party_angle_src_libANGLE_formatutils.cpp b/www/iridium/files/patch-third__party_angle_src_libANGLE_formatutils.cpp index eaca9c9d3a9a..14378d214c81 100644 --- a/www/iridium/files/patch-third__party_angle_src_libANGLE_formatutils.cpp +++ b/www/iridium/files/patch-third__party_angle_src_libANGLE_formatutils.cpp @@ -1,6 +1,6 @@ ---- third_party/angle/src/libANGLE/formatutils.cpp.orig 2022-10-05 07:34:01 UTC +--- third_party/angle/src/libANGLE/formatutils.cpp.orig 2022-12-01 10:35:46 UTC +++ third_party/angle/src/libANGLE/formatutils.cpp -@@ -1399,7 +1399,7 @@ static InternalFormatInfoMap BuildInternalFormatInfoMa +@@ -1413,7 +1413,7 @@ static InternalFormatInfoMap BuildInternalFormatInfoMa AddYUVFormat(&map, GL_G8_B8R8_2PLANE_420_UNORM_ANGLE, true, 8, 8, 8, 0, 0, GL_G8_B8R8_2PLANE_420_UNORM_ANGLE, GL_UNSIGNED_BYTE, GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::yuvInternalFormatANGLE>, RequireExt<&Extensions::yuvInternalFormatANGLE>, RequireExt<&Extensions::yuvInternalFormatANGLE>, NeverSupported, NeverSupported); AddYUVFormat(&map, GL_G8_B8_R8_3PLANE_420_UNORM_ANGLE, true, 8, 8, 8, 0, 0, GL_G8_B8_R8_3PLANE_420_UNORM_ANGLE, GL_UNSIGNED_BYTE, GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::yuvInternalFormatANGLE>, RequireExt<&Extensions::yuvInternalFormatANGLE>, RequireExt<&Extensions::yuvInternalFormatANGLE>, NeverSupported, NeverSupported); diff --git a/www/iridium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h b/www/iridium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h index 5d98a0925a53..ad340ae21685 100644 --- a/www/iridium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h +++ b/www/iridium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h @@ -1,6 +1,6 @@ ---- third_party/angle/src/libANGLE/renderer/driver_utils.h.orig 2022-10-05 07:34:01 UTC +--- third_party/angle/src/libANGLE/renderer/driver_utils.h.orig 2022-12-01 10:35:46 UTC +++ third_party/angle/src/libANGLE/renderer/driver_utils.h -@@ -183,7 +183,7 @@ inline bool IsWindows() +@@ -200,7 +200,7 @@ inline bool IsWindows() inline bool IsLinux() { 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 fc34dbc8b039..566f763156d5 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-10-05 07:34:01 UTC +--- third_party/blink/public/platform/platform.h.orig 2022-12-01 10:35:46 UTC +++ third_party/blink/public/platform/platform.h -@@ -340,7 +340,7 @@ class BLINK_PLATFORM_EXPORT Platform { +@@ -341,7 +341,7 @@ class BLINK_PLATFORM_EXPORT Platform { return nullptr; } diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc b/www/iridium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc index 61e1594b109f..0a2bced163f2 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2022-10-05 07:34:01 UTC +--- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2022-12-01 10:35:46 UTC +++ third_party/blink/renderer/core/exported/web_view_impl.cc -@@ -404,7 +404,7 @@ SkFontHinting RendererPreferencesToSkiaHinting( +@@ -406,7 +406,7 @@ SkFontHinting RendererPreferencesToSkiaHinting( const blink::RendererPreferences& prefs) { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. @@ -9,7 +9,7 @@ if (!prefs.should_antialias_text) { // When anti-aliasing is off, GTK maps all non-zero hinting settings to // 'Normal' hinting so we do the same. Otherwise, folks who have 'Slight' -@@ -3254,7 +3254,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs +@@ -3273,7 +3273,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs renderer_preferences_.use_subpixel_positioning); // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/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 80f63a67937d..e49e5c3ac42b 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-10-05 07:34:01 UTC +--- third_party/blink/renderer/core/frame/web_frame_test.cc.orig 2022-12-01 10:35:46 UTC +++ third_party/blink/renderer/core/frame/web_frame_test.cc -@@ -6357,7 +6357,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) { +@@ -6410,7 +6410,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"); -@@ -6753,7 +6753,7 @@ TEST_F(CompositedSelectionBoundsTest, LargeSelectionSc +@@ -6807,7 +6807,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 cb0a28b50b8b..98a6cf3e4eff 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,6 +1,6 @@ ---- third_party/blink/renderer/core/layout/layout_view.cc.orig 2022-10-05 07:34:01 UTC +--- third_party/blink/renderer/core/layout/layout_view.cc.orig 2022-12-01 10:35:46 UTC +++ third_party/blink/renderer/core/layout/layout_view.cc -@@ -65,7 +65,7 @@ +@@ -66,7 +66,7 @@ #include "ui/display/screen_info.h" #include "ui/gfx/geometry/quad_f.h" @@ -9,7 +9,7 @@ #include "third_party/blink/renderer/platform/fonts/font_cache.h" #endif -@@ -359,7 +359,7 @@ void LayoutView::UpdateLayout() { +@@ -365,7 +365,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 405d899a3c4d..baa90cc54bcb 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-10-05 07:34:01 UTC +--- third_party/blink/renderer/core/paint/paint_layer.cc.orig 2022-12-01 10:35:46 UTC +++ third_party/blink/renderer/core/paint/paint_layer.cc -@@ -110,7 +110,7 @@ namespace blink { +@@ -111,7 +111,7 @@ namespace blink { namespace { diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc b/www/iridium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc index 184c89d7013c..7ec3cd35da68 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2022-10-05 07:34:01 UTC +--- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2022-12-01 10:35:46 UTC +++ third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc -@@ -151,7 +151,7 @@ bool ScrollbarThemeAura::SupportsDragSnapBack() const +@@ -155,7 +155,7 @@ bool ScrollbarThemeAura::SupportsDragSnapBack() const // is true for at least GTK and QT apps). // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. @@ -9,7 +9,7 @@ return false; #else return true; -@@ -325,7 +325,7 @@ bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scr +@@ -329,7 +329,7 @@ bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scr const WebMouseEvent& event) { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/iridium/files/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc b/www/iridium/files/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc index 8aabb92ddde4..d78e484b742e 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc.orig 2022-03-28 18:11:04 UTC +--- third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc.orig 2022-12-01 10:35:46 UTC +++ third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc -@@ -678,7 +678,7 @@ TEST_F(AudioRendererMixerManagerTest, MixerParamsLaten +@@ -708,7 +708,7 @@ TEST_F(AudioRendererMixerManagerTest, MixerParamsLaten mixer->get_output_params_for_testing().sample_rate()); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/iridium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc b/www/iridium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc index b75d646ffc34..807b8f060e4d 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig 2022-10-05 07:34:01 UTC +--- third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig 2022-12-01 10:35:46 UTC +++ third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc -@@ -284,7 +284,7 @@ TEST_F(WebRtcAudioRendererTest, DISABLED_VerifySinkPar +@@ -277,7 +277,7 @@ TEST_F(WebRtcAudioRendererTest, DISABLED_VerifySinkPar SetupRenderer(kDefaultOutputDeviceId); renderer_proxy_->Start(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/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 f5a1b1e5f80f..f7ce9d4c6ab2 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-10-05 07:34:01 UTC +--- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2022-12-01 10:35:46 UTC +++ third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -@@ -6152,7 +6152,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid +@@ -6151,7 +6151,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 f5867eb2ba68..dd356d2f2219 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-10-05 07:34:01 UTC +--- third_party/blink/renderer/modules/webgl/webgl_webcodecs_video_frame.cc.orig 2022-12-01 10:35:46 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 0caa81deaa4d..52943949f791 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-10-05 07:34:01 UTC +--- third_party/blink/renderer/platform/BUILD.gn.orig 2022-12-01 10:35:46 UTC +++ third_party/blink/renderer/platform/BUILD.gn -@@ -1895,7 +1895,7 @@ static_library("test_support") { +@@ -1899,7 +1899,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 c2e2e41727c4..260486910e07 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,6 +1,6 @@ ---- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig 2022-10-05 07:34:01 UTC +--- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig 2022-12-01 10:35:46 UTC +++ third_party/blink/renderer/platform/graphics/video_frame_submitter.cc -@@ -332,7 +332,7 @@ void VideoFrameSubmitter::OnBeginFrame( +@@ -346,7 +346,7 @@ void VideoFrameSubmitter::OnBeginFrame( continue; auto& feedback = timing_details.find(frame_token)->value.presentation_feedback; diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc b/www/iridium/files/patch-third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc new file mode 100644 index 000000000000..d4e0f0124c88 --- /dev/null +++ b/www/iridium/files/patch-third__party_blink_renderer_platform_peerconnection_rtc__video__encoder__factory.cc @@ -0,0 +1,17 @@ +--- third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_factory.cc.orig 2022-12-01 10:35:46 UTC ++++ third_party/blink/renderer/platform/peerconnection/rtc_video_encoder_factory.cc +@@ -174,12 +174,12 @@ SupportedFormats GetSupportedFormatsInternal( + supported_formats.scalability_modes.push_back(profile.scalability_modes); + supported_formats.sdp_formats.push_back(std::move(*format)); + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_WIN) + const bool kShouldAddH264Cbp = + media::IsMediaFoundationH264CbpEncodingEnabled() && + profile.profile == media::VideoCodecProfile::H264PROFILE_BASELINE; +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + const bool kShouldAddH264Cbp = + profile.profile == media::VideoCodecProfile::H264PROFILE_BASELINE; + #endif 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 f0f76706d4f9..e2663951b046 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,6 +1,6 @@ ---- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2022-10-05 07:34:01 UTC +--- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2022-12-01 10:35:46 UTC +++ third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -33,7 +33,7 @@ +@@ -36,7 +36,7 @@ // shipped stable can have its runtime flag removed soon after. status: { valid_values: ["stable", "experimental", "test"], @@ -9,16 +9,16 @@ }, // "implied_by" or "depends_on" specifies relationship to other features: -@@ -1014,7 +1014,7 @@ - depends_on: ["FileSystemAccess"], - status: {"Android": "test", "default": "experimental"}, +@@ -1180,7 +1180,7 @@ + depends_on: ["FileSystemAccessLocal"], + status: {"Android": "test", "default": "stable"}, origin_trial_feature_name: "FileHandling", - origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos"], + origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos", "openbsd", "freebsd"], + base_feature: "FileHandlingAPI", }, { - name: "FileHandlingIcons", -@@ -2320,7 +2320,7 @@ +@@ -2633,7 +2633,7 @@ { name: "U2FSecurityKeyAPI", origin_trial_feature_name: "U2FSecurityKeyAPI", @@ -27,7 +27,7 @@ origin_trial_type: "deprecation", }, { -@@ -2335,7 +2335,7 @@ +@@ -2648,7 +2648,7 @@ { name: "UnrestrictedSharedArrayBuffer", origin_trial_feature_name: "UnrestrictedSharedArrayBuffer", @@ -36,16 +36,16 @@ }, { name: "URLPatternCompareComponent", -@@ -2353,7 +2353,7 @@ +@@ -2668,7 +2668,7 @@ origin_trial_feature_name: "UserAgentReduction", origin_trial_allows_third_party: true, // iOS not included as it should not send a reduced User-Agent string. - origin_trial_os: ["android", "chromeos", "fuchsia", "linux", "mac", "win"], + origin_trial_os: ["android", "chromeos", "fuchsia", "linux", "mac", "win", "openbsd", "freebsd"], + base_feature: "ReduceUserAgent", }, { - name: "V8IdleTasks", -@@ -2468,12 +2468,12 @@ +@@ -2793,12 +2793,12 @@ name: "WebAppUrlHandling", status: "experimental", origin_trial_feature_name: "WebAppUrlHandling", diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_scheduler_common_thread.cc b/www/iridium/files/patch-third__party_blink_renderer_platform_scheduler_common_thread.cc index db6710fe9ce0..e76305e30fcf 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_platform_scheduler_common_thread.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_platform_scheduler_common_thread.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/scheduler/common/thread.cc.orig 2022-10-05 07:34:01 UTC +--- third_party/blink/renderer/platform/scheduler/common/thread.cc.orig 2022-12-01 10:35:46 UTC +++ third_party/blink/renderer/platform/scheduler/common/thread.cc -@@ -86,7 +86,7 @@ void Thread::CreateAndSetCompositorThread() { +@@ -87,7 +87,7 @@ void Thread::CreateAndSetCompositorThread() { std::make_unique<scheduler::CompositorThread>(params); compositor_thread->Init(); diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_widget_compositing_categorized__worker__pool.cc b/www/iridium/files/patch-third__party_blink_renderer_platform_widget_compositing_categorized__worker__pool.cc index 94b25038cde3..1569316d820c 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_platform_widget_compositing_categorized__worker__pool.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_platform_widget_compositing_categorized__worker__pool.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/widget/compositing/categorized_worker_pool.cc.orig 2022-10-05 07:34:01 UTC +--- third_party/blink/renderer/platform/widget/compositing/categorized_worker_pool.cc.orig 2022-12-01 10:35:46 UTC +++ third_party/blink/renderer/platform/widget/compositing/categorized_worker_pool.cc -@@ -256,7 +256,7 @@ void CategorizedWorkerPool::Start(int num_normal_threa +@@ -240,7 +240,7 @@ void CategorizedWorkerPoolImpl::Start(int max_concurre "CompositorTileWorkerBackground", thread_options, this, background_thread_prio_categories, &has_task_for_background_priority_thread_cv_); diff --git a/www/iridium/files/patch-third__party_boringssl_src_include_openssl_base.h b/www/iridium/files/patch-third__party_boringssl_src_include_openssl_base.h index 7c234bab3c61..ffec8f29e0b7 100644 --- a/www/iridium/files/patch-third__party_boringssl_src_include_openssl_base.h +++ b/www/iridium/files/patch-third__party_boringssl_src_include_openssl_base.h @@ -1,6 +1,6 @@ ---- third_party/boringssl/src/include/openssl/base.h.orig 2022-10-05 07:34:01 UTC +--- third_party/boringssl/src/include/openssl/base.h.orig 2022-12-01 10:35:46 UTC +++ third_party/boringssl/src/include/openssl/base.h -@@ -156,6 +156,11 @@ extern "C" { +@@ -154,6 +154,11 @@ extern "C" { #define OPENSSL_FUCHSIA #endif diff --git a/www/iridium/files/patch-third__party_libusb_BUILD.gn b/www/iridium/files/patch-third__party_libusb_BUILD.gn index 3a6c588c06e1..128913675a3c 100644 --- a/www/iridium/files/patch-third__party_libusb_BUILD.gn +++ b/www/iridium/files/patch-third__party_libusb_BUILD.gn @@ -1,4 +1,4 @@ ---- third_party/libusb/BUILD.gn.orig 2022-03-28 18:11:04 UTC +--- third_party/libusb/BUILD.gn.orig 2022-12-01 10:35:46 UTC +++ third_party/libusb/BUILD.gn @@ -3,7 +3,7 @@ # found in the LICENSE file. @@ -18,7 +18,7 @@ sources += [ "src/libusb/os/linux_usbfs.c", "src/libusb/os/linux_usbfs.h", -@@ -127,6 +127,16 @@ static_library("libusb") { +@@ -127,11 +127,21 @@ static_library("libusb") { ] } @@ -35,6 +35,12 @@ if (is_chromeos_ash) { defines += [ "USBI_TIMERFD_AVAILABLE" ] } + +- if (use_udev) { ++ if (use_udev && !is_bsd) { + sources += [ "src/libusb/os/linux_udev.cc" ] + defines += [ + "HAVE_LIBUDEV=1", @@ -140,7 +150,7 @@ static_library("libusb") { deps += [ "//build/linux/libudev" ] } diff --git a/www/iridium/files/patch-third__party_libxml_src_dict.c b/www/iridium/files/patch-third__party_libxml_src_dict.c index f0f92b429db4..d58498be06df 100644 --- a/www/iridium/files/patch-third__party_libxml_src_dict.c +++ b/www/iridium/files/patch-third__party_libxml_src_dict.c @@ -1,6 +1,6 @@ ---- third_party/libxml/src/dict.c.orig 2022-10-05 07:34:01 UTC +--- third_party/libxml/src/dict.c.orig 2022-12-01 10:35:46 UTC +++ third_party/libxml/src/dict.c -@@ -135,7 +135,7 @@ static xmlMutexPtr xmlDictMutex = NULL; +@@ -137,7 +137,7 @@ static xmlMutexPtr xmlDictMutex = NULL; static int xmlDictInitialized = 0; #ifdef DICT_RANDOMIZATION @@ -9,7 +9,7 @@ /* * Internal data for random function, protected by xmlDictMutex */ -@@ -178,7 +178,7 @@ int __xmlInitializeDict(void) { +@@ -180,7 +180,7 @@ int __xmlInitializeDict(void) { return(0); xmlMutexLock(xmlDictMutex); @@ -18,7 +18,7 @@ #ifdef HAVE_RAND_R rand_seed = time(NULL); rand_r(& rand_seed); -@@ -198,13 +198,17 @@ int __xmlRandom(void) { +@@ -200,13 +200,17 @@ int __xmlRandom(void) { if (xmlDictInitialized == 0) __xmlInitializeDict(); diff --git a/www/iridium/files/patch-third__party_perfetto_src_base_unix__socket.cc b/www/iridium/files/patch-third__party_perfetto_src_base_unix__socket.cc index 1c45cbf42175..7331ba2d6b48 100644 --- a/www/iridium/files/patch-third__party_perfetto_src_base_unix__socket.cc +++ b/www/iridium/files/patch-third__party_perfetto_src_base_unix__socket.cc @@ -1,4 +1,4 @@ ---- third_party/perfetto/src/base/unix_socket.cc.orig 2022-10-05 07:34:01 UTC +--- third_party/perfetto/src/base/unix_socket.cc.orig 2022-12-01 10:35:46 UTC +++ third_party/perfetto/src/base/unix_socket.cc @@ -42,7 +42,7 @@ #include <unistd.h> @@ -9,7 +9,7 @@ #include <sys/ucred.h> #endif -@@ -801,9 +801,13 @@ void UnixSocket::ReadPeerCredentialsPosix() { +@@ -803,9 +803,13 @@ void UnixSocket::ReadPeerCredentialsPosix() { return; PERFETTO_CHECK(peer_cred_mode_ != SockPeerCredMode::kIgnore); diff --git a/www/iridium/files/patch-third__party_swiftshader_src_WSI_BUILD.gn b/www/iridium/files/patch-third__party_swiftshader_src_WSI_BUILD.gn index 09c910ef971b..e8789648412d 100644 --- a/www/iridium/files/patch-third__party_swiftshader_src_WSI_BUILD.gn +++ b/www/iridium/files/patch-third__party_swiftshader_src_WSI_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/swiftshader/src/WSI/BUILD.gn.orig 2022-10-05 07:34:01 UTC +--- third_party/swiftshader/src/WSI/BUILD.gn.orig 2022-12-01 10:35:46 UTC +++ third_party/swiftshader/src/WSI/BUILD.gn -@@ -84,7 +84,7 @@ swiftshader_source_set("WSI") { +@@ -87,7 +87,7 @@ swiftshader_source_set("WSI") { "../Vulkan:swiftshader_libvulkan_headers", ] diff --git a/www/iridium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_get__environment.c b/www/iridium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_get__environment.c deleted file mode 100644 index 80e0ccbd0a60..000000000000 --- a/www/iridium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_get__environment.c +++ /dev/null @@ -1,20 +0,0 @@ ---- third_party/vulkan-deps/vulkan-loader/src/loader/get_environment.c.orig 2022-10-05 07:34:01 UTC -+++ third_party/vulkan-deps/vulkan-loader/src/loader/get_environment.c -@@ -32,7 +32,7 @@ - #include "log.h" - - // Environment variables --#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__) || defined(__FreeBSD__) -+#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__) || defined(__FreeBSD__) || defined(__OpenBSD__) - - bool is_high_integrity() { return geteuid() != getuid() || getegid() != getgid(); } - -@@ -44,7 +44,7 @@ char *loader_getenv(const char *name, const struct loa - } - - char *loader_secure_getenv(const char *name, const struct loader_instance *inst) { --#if defined(__APPLE__) || defined(__FreeBSD__) -+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) - // Apple does not appear to have a secure getenv implementation. - // The main difference between secure getenv and getenv is that secure getenv - // returns NULL if the process is being run with elevated privileges by a normal user. diff --git a/www/iridium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_get__environment.h b/www/iridium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_get__environment.h deleted file mode 100644 index 8a5898734511..000000000000 --- a/www/iridium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_get__environment.h +++ /dev/null @@ -1,16 +0,0 @@ ---- third_party/vulkan-deps/vulkan-loader/src/loader/get_environment.h.orig 2022-03-28 18:11:04 UTC -+++ third_party/vulkan-deps/vulkan-loader/src/loader/get_environment.h -@@ -35,10 +35,10 @@ - char *loader_getenv(const char *name, const struct loader_instance *inst); - void loader_free_getenv(char *val, const struct loader_instance *inst); - --#if defined(WIN32) || defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__) || defined(__FreeBSD__) -+#if defined(WIN32) || defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__) || defined(__FreeBSD__) || defined(__OpenBSD__) - - bool is_high_integrity(); - - char *loader_secure_getenv(const char *name, const struct loader_instance *inst); - --#endif -\ No newline at end of file -+#endif diff --git a/www/iridium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_stack__allocation.h b/www/iridium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_stack__allocation.h deleted file mode 100644 index 9a1dd2b60d52..000000000000 --- a/www/iridium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_stack__allocation.h +++ /dev/null @@ -1,16 +0,0 @@ ---- third_party/vulkan-deps/vulkan-loader/src/loader/stack_allocation.h.orig 2022-10-05 07:34:01 UTC -+++ third_party/vulkan-deps/vulkan-loader/src/loader/stack_allocation.h -@@ -30,11 +30,11 @@ - - #if defined(_WIN32) - #include <malloc.h> --#else -+#elif !defined(__OpenBSD__) && !defined(__FreeBSD__) - #include <alloca.h> - #endif - --#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__) || defined(__FreeBSD__) -+#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__) || defined(__FreeBSD__) || defined(__OpenBSD__) - #define loader_stack_alloc(size) alloca(size) - #elif defined(_WIN32) - #define loader_stack_alloc(size) _alloca(size) 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 a099f3a28b33..1d8796d14959 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,45 +1,19 @@ ---- third_party/vulkan-deps/vulkan-loader/src/loader/vk_loader_platform.h.orig 2022-10-05 07:34:01 UTC +--- 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 -@@ -43,7 +43,7 @@ - #include "dlopen_fuchsia.h" - #endif // defined(__Fuchsia__) +@@ -280,7 +280,15 @@ static inline char *loader_platform_executable_path(ch --#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__) || defined(__FreeBSD__) -+#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__) || defined(__FreeBSD__) || defined(__OpenBSD__) - #include <unistd.h> - // Note: The following file is for dynamic loading: - #include <dlfcn.h> -@@ -98,7 +98,7 @@ - #define LAYERS_PATH_ENV "VK_LAYER_PATH" - #define ENABLED_LAYERS_ENV "VK_INSTANCE_LAYERS" - --#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__) || defined(__FreeBSD__) -+#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__) || defined(__FreeBSD__) || defined(__OpenBSD__) - /* Linux-specific common code: */ - - // VK Library Filenames, Paths, etc.: -@@ -219,7 +219,7 @@ static inline void loader_platform_thread_once_fn(pthr - - #endif - --#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__) || defined(__FreeBSD__) -+#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__) || defined(__FreeBSD__) || defined(__OpenBSD__) - - // File IO - static inline bool loader_platform_file_exists(const char *path) { -@@ -277,6 +277,15 @@ static inline char *loader_platform_executable_path(ch - if (sysctl(mib, sizeof(mib) / sizeof(mib[0]), buffer, &size, NULL, 0) < 0) { - return NULL; - } -+ -+ return buffer; -+} + return buffer; + } +-#elif defined(__Fuchsia__) || defined(__OpenBSD__) +#elif defined(__OpenBSD__) +static inline char *loader_platform_executable_path(char *buffer, size_t size) { -+ if ((buffer = getenv("CHROME_EXE_PATH")) != NULL) ++ if ((buffer = getenv("IRIDIUM_EXE_PATH")) != NULL) + return buffer; + else -+ buffer = "/usr/local/chrome/chrome"; ++ buffer = "/usr/local/iridium/iridium"; ++ return buffer; ++} ++#elif defined(__Fuchsia__) + static inline char *loader_platform_executable_path(char *buffer, size_t size) { return NULL; } + #elif defined(__QNXNTO__) - return buffer; - } diff --git a/www/iridium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_vk__loader__platform.h b/www/iridium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_vk__loader__platform.h deleted file mode 100644 index 77c65c570bfb..000000000000 --- a/www/iridium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_vk__loader__platform.h +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/vulkan-deps/vulkan-validation-layers/src/layers/vk_loader_platform.h.orig 2022-03-28 18:11:04 UTC -+++ third_party/vulkan-deps/vulkan-validation-layers/src/layers/vk_loader_platform.h -@@ -33,7 +33,7 @@ - #undef NOMINMAX - #include "vulkan/vk_sdk_platform.h" - --#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) -+#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) - /* Linux-specific common code: */ - - // Headers: diff --git a/www/iridium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_vk__mem__alloc.h b/www/iridium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_vk__mem__alloc.h index 22e0dd2e2d83..cf5a0a6d7d99 100644 --- a/www/iridium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_vk__mem__alloc.h +++ b/www/iridium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_vk__mem__alloc.h @@ -1,12 +1,11 @@ ---- third_party/vulkan-deps/vulkan-validation-layers/src/layers/vk_mem_alloc.h.orig 2022-03-28 18:11:04 UTC +--- third_party/vulkan-deps/vulkan-validation-layers/src/layers/vk_mem_alloc.h.orig 2022-12-01 10:35:46 UTC +++ third_party/vulkan-deps/vulkan-validation-layers/src/layers/vk_mem_alloc.h -@@ -3181,7 +3181,8 @@ void *aligned_alloc(size_t alignment, size_t size) +@@ -2700,7 +2700,7 @@ static void* vma_aligned_alloc(size_t alignment, size_ return memalign(alignment, size); } --#elif defined(__APPLE__) || defined(__ANDROID__) -+#elif defined(__APPLE__) || defined(__ANDROID__) || defined(__OpenBSD__) || \ -+ defined(__FreeBSD__) - # define ALIGNED_ALLOC_WITH_POSIX_MEMALIGN +-#elif defined(__APPLE__) || defined(__ANDROID__) || (defined(__linux__) && defined(__GLIBCXX__) && !defined(_GLIBCXX_HAVE_ALIGNED_ALLOC)) ++#elif defined(__APPLE__) || defined(__ANDROID__) || (defined(__linux__) && defined(__GLIBCXX__) && !defined(_GLIBCXX_HAVE_ALIGNED_ALLOC)) || defined(__OpenBSD__) || defined(__FreeBSD__) + #define ALIGNED_ALLOC_WITH_POSIX_MEMALIGN #elif defined(__GNU_LIBRARY__) # if !defined(__GLIBC_PREREQ) || !__GLIBC_PREREQ(2, 16) 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 9faee003ae78..3710b49adfbe 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,11 +1,11 @@ ---- third_party/vulkan_memory_allocator/include/vk_mem_alloc.h.orig 2022-02-28 16:54:41 UTC +--- third_party/vulkan_memory_allocator/include/vk_mem_alloc.h.orig 2022-12-01 10:54:41 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) -
- return memalign(alignment, size);
- }
--#elif defined(__APPLE__) || defined(__ANDROID__) || (defined(__linux__) && defined(__GLIBCXX__) && !defined(_GLIBCXX_HAVE_ALIGNED_ALLOC))
-+#elif defined(__APPLE__) || defined(__ANDROID__) || (defined(__linux__) && defined(__GLIBCXX__) && !defined(_GLIBCXX_HAVE_ALIGNED_ALLOC)) || defined(__OpenBSD__) || defined(__FreeBSD__)
- #include <cstdlib>
-
- #if defined(__APPLE__)
+@@ -2503,7 +2503,7 @@ + + return memalign(alignment, size); + } +-#elif defined(__APPLE__) || defined(__ANDROID__) || (defined(__linux__) && defined(__GLIBCXX__) && !defined(_GLIBCXX_HAVE_ALIGNED_ALLOC)) ++#elif defined(__APPLE__) || defined(__ANDROID__) || (defined(__linux__) && defined(__GLIBCXX__) && !defined(_GLIBCXX_HAVE_ALIGNED_ALLOC)) || defined(__OpenBSD__) || defined(__FreeBSD__) + #include <cstdlib> + + #if defined(__APPLE__) diff --git a/www/iridium/files/patch-third__party_wayland_features.gni b/www/iridium/files/patch-third__party_wayland_features.gni index 654328e54f36..0e1dba0aa1c4 100644 --- a/www/iridium/files/patch-third__party_wayland_features.gni +++ b/www/iridium/files/patch-third__party_wayland_features.gni @@ -1,7 +1,7 @@ ---- third_party/wayland/features.gni.orig 2022-03-31 09:38:28 UTC +--- third_party/wayland/features.gni.orig 2022-12-01 10:35:46 UTC +++ third_party/wayland/features.gni -@@ -13,8 +13,12 @@ declare_args() { - default_toolchain != "//build/toolchain/cros:target" +@@ -17,8 +17,12 @@ declare_args() { + use_system_libwayland_server = false # Path to wayland-scanner. Has effect only when the system libwayland is used. - assert(host_os == "linux") diff --git a/www/iridium/files/patch-third__party_webrtc_BUILD.gn b/www/iridium/files/patch-third__party_webrtc_BUILD.gn index dc574285135e..6ce2c7d746c2 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-10-05 07:34:01 UTC +--- third_party/webrtc/BUILD.gn.orig 2022-12-01 10:35:46 UTC +++ third_party/webrtc/BUILD.gn -@@ -205,6 +205,9 @@ config("common_inherited_config") { +@@ -206,6 +206,9 @@ config("common_inherited_config") { if (is_linux || is_chromeos) { defines += [ "WEBRTC_LINUX" ] } diff --git a/www/iridium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn b/www/iridium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn index 2452ba520ced..5633c9c43854 100644 --- a/www/iridium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn +++ b/www/iridium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/webrtc/modules/audio_device/BUILD.gn.orig 2022-10-05 07:34:01 UTC +--- third_party/webrtc/modules/audio_device/BUILD.gn.orig 2022-12-01 10:35:46 UTC +++ third_party/webrtc/modules/audio_device/BUILD.gn -@@ -299,7 +299,7 @@ rtc_library("audio_device_impl") { +@@ -298,7 +298,7 @@ rtc_library("audio_device_impl") { if (rtc_use_dummy_audio_file_devices) { defines += [ "WEBRTC_DUMMY_FILE_DEVICES" ] } else { 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 03d6aaf0ec8e..78573b3f4ec7 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-10-05 07:34:01 UTC +--- third_party/webrtc/rtc_base/BUILD.gn.orig 2022-12-01 10:35:46 UTC +++ third_party/webrtc/rtc_base/BUILD.gn -@@ -1250,7 +1250,7 @@ rtc_library("rtc_base") { +@@ -1257,7 +1257,7 @@ rtc_library("rtc_base") { sources += [ "mac_ifaddrs_converter.cc" ] } diff --git a/www/iridium/files/patch-third__party_webrtc_rtc__base_network.cc b/www/iridium/files/patch-third__party_webrtc_rtc__base_network.cc index 08d621cd9b29..0bea202ece30 100644 --- a/www/iridium/files/patch-third__party_webrtc_rtc__base_network.cc +++ b/www/iridium/files/patch-third__party_webrtc_rtc__base_network.cc @@ -1,6 +1,6 @@ ---- third_party/webrtc/rtc_base/network.cc.orig 2022-10-05 07:34:01 UTC +--- third_party/webrtc/rtc_base/network.cc.orig 2022-12-01 10:35:46 UTC +++ third_party/webrtc/rtc_base/network.cc -@@ -269,7 +269,12 @@ AdapterType GetAdapterTypeFromName(absl::string_view n +@@ -285,7 +285,12 @@ AdapterType GetAdapterTypeFromName(absl::string_view n } #endif 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 1ff55987d706..953c47a3e061 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,6 +1,6 @@ ---- third_party/webrtc/rtc_base/physical_socket_server.cc.orig 2022-03-28 18:11:04 UTC +--- 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 -@@ -51,7 +51,7 @@ +@@ -53,7 +53,7 @@ #include "rtc_base/synchronization/mutex.h" #include "rtc_base/time_utils.h" @@ -9,7 +9,7 @@ #include <linux/sockios.h> #endif -@@ -70,7 +70,7 @@ typedef void* SockOptArg; +@@ -72,7 +72,7 @@ typedef void* SockOptArg; #endif // WEBRTC_POSIX @@ -18,7 +18,7 @@ int64_t GetSocketRecvTimestamp(int socket) { struct timeval tv_ioctl; -@@ -298,7 +298,7 @@ int PhysicalSocket::GetOption(Option opt, int* value) +@@ -300,7 +300,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) { -@@ -316,7 +316,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { +@@ -318,7 +318,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) { -@@ -344,7 +344,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { +@@ -346,7 +346,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { int PhysicalSocket::Send(const void* pv, size_t cb) { int sent = DoSend( s_, reinterpret_cast<const char*>(pv), static_cast<int>(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 -@@ -373,7 +373,7 @@ int PhysicalSocket::SendTo(const void* buffer, +@@ -375,7 +375,7 @@ int PhysicalSocket::SendTo(const void* buffer, size_t len = addr.ToSockAddrStorage(&saddr); int sent = DoSendTo(s_, static_cast<const char*>(buffer), static_cast<int>(length), @@ -54,7 +54,7 @@ // Suppress SIGPIPE. See above for explanation. MSG_NOSIGNAL, #else -@@ -564,7 +564,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s +@@ -566,7 +566,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s *slevel = IPPROTO_IP; *sopt = IP_DONTFRAGMENT; break; diff --git a/www/iridium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.h b/www/iridium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.h index ce1ada564228..833e5782be9e 100644 --- a/www/iridium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.h +++ b/www/iridium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.h @@ -1,9 +1,9 @@ ---- third_party/webrtc/rtc_base/physical_socket_server.h.orig 2022-03-28 18:11:04 UTC +--- third_party/webrtc/rtc_base/physical_socket_server.h.orig 2022-12-01 10:35:46 UTC +++ third_party/webrtc/rtc_base/physical_socket_server.h -@@ -11,7 +11,7 @@ - #ifndef RTC_BASE_PHYSICAL_SOCKET_SERVER_H_ +@@ -12,7 +12,7 @@ #define RTC_BASE_PHYSICAL_SOCKET_SERVER_H_ + #include "api/units/time_delta.h" -#if defined(WEBRTC_POSIX) && defined(WEBRTC_LINUX) +#if defined(WEBRTC_POSIX) && defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD) #include <sys/epoll.h> diff --git a/www/iridium/files/patch-ui_aura_screen__ozone.h b/www/iridium/files/patch-ui_aura_screen__ozone.h index dc07ca283aec..7f91d49a5563 100644 --- a/www/iridium/files/patch-ui_aura_screen__ozone.h +++ b/www/iridium/files/patch-ui_aura_screen__ozone.h @@ -1,4 +1,4 @@ ---- ui/aura/screen_ozone.h.orig 2022-10-05 07:34:01 UTC +--- ui/aura/screen_ozone.h.orig 2022-12-01 10:35:46 UTC +++ ui/aura/screen_ozone.h @@ -46,7 +46,7 @@ class AURA_EXPORT ScreenOzone : public display::Screen display::Display GetDisplayMatching( @@ -9,7 +9,7 @@ std::unique_ptr<display::Screen::ScreenSaverSuspender> SuspendScreenSaver() override; #endif // BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) -@@ -68,7 +68,7 @@ class AURA_EXPORT ScreenOzone : public display::Screen +@@ -71,7 +71,7 @@ class AURA_EXPORT ScreenOzone : public display::Screen ui::PlatformScreen* platform_screen() { return platform_screen_.get(); } private: diff --git a/www/iridium/files/patch-ui_base_ime_dummy__text__input__client.cc b/www/iridium/files/patch-ui_base_ime_dummy__text__input__client.cc index 5f4473e3b4ef..c11459b54b5f 100644 --- a/www/iridium/files/patch-ui_base_ime_dummy__text__input__client.cc +++ b/www/iridium/files/patch-ui_base_ime_dummy__text__input__client.cc @@ -1,6 +1,6 @@ ---- ui/base/ime/dummy_text_input_client.cc.orig 2022-10-05 07:34:01 UTC +--- ui/base/ime/dummy_text_input_client.cc.orig 2022-12-01 10:35:46 UTC +++ ui/base/ime/dummy_text_input_client.cc -@@ -158,7 +158,7 @@ bool DummyTextInputClient::ShouldDoLearning() { +@@ -159,7 +159,7 @@ bool DummyTextInputClient::ShouldDoLearning() { return false; } 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 100e4fa72c43..fb4e88528852 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-10-05 07:34:01 UTC +--- ui/base/test/skia_gold_pixel_diff.cc.orig 2022-12-01 10:35:46 UTC +++ ui/base/test/skia_gold_pixel_diff.cc -@@ -150,7 +150,7 @@ std::string SkiaGoldPixelDiff::GetPlatform() { +@@ -142,7 +142,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__types.h b/www/iridium/files/patch-ui_base_ui__base__types.h new file mode 100644 index 000000000000..1a629c4ed44e --- /dev/null +++ b/www/iridium/files/patch-ui_base_ui__base__types.h @@ -0,0 +1,11 @@ +--- ui/base/ui_base_types.h.orig 2022-12-01 10:35:46 UTC ++++ ui/base/ui_base_types.h +@@ -37,7 +37,7 @@ enum WindowShowState { + SHOW_STATE_END = 6 // The end of show state enum. + }; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + // Specifies which edges of the window are tiled. + // + // Wayland can notify the application if certain edge of the window is diff --git a/www/iridium/files/patch-ui_base_webui_web__ui__util.cc b/www/iridium/files/patch-ui_base_webui_web__ui__util.cc index 84bdb71bc095..bec8dbfbb465 100644 --- a/www/iridium/files/patch-ui_base_webui_web__ui__util.cc +++ b/www/iridium/files/patch-ui_base_webui_web__ui__util.cc @@ -1,6 +1,6 @@ ---- ui/base/webui/web_ui_util.cc.orig 2022-10-05 07:34:01 UTC +--- ui/base/webui/web_ui_util.cc.orig 2022-12-01 10:35:46 UTC +++ ui/base/webui/web_ui_util.cc -@@ -225,7 +225,7 @@ std::string GetFontFamily() { +@@ -220,7 +220,7 @@ std::string GetFontFamily() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-ui_base_x_x11__cursor__loader.cc b/www/iridium/files/patch-ui_base_x_x11__cursor__loader.cc index d816f9249d33..9ff4ab02556c 100644 --- a/www/iridium/files/patch-ui_base_x_x11__cursor__loader.cc +++ b/www/iridium/files/patch-ui_base_x_x11__cursor__loader.cc @@ -1,6 +1,6 @@ ---- ui/base/x/x11_cursor_loader.cc.orig 2022-10-05 07:34:01 UTC +--- ui/base/x/x11_cursor_loader.cc.orig 2022-12-01 10:35:46 UTC +++ ui/base/x/x11_cursor_loader.cc -@@ -33,7 +33,7 @@ +@@ -32,7 +32,7 @@ #include "ui/gfx/x/xproto.h" #include "ui/gfx/x/xproto_util.h" @@ -9,7 +9,7 @@ #include "ui/linux/linux_ui.h" #endif -@@ -139,7 +139,11 @@ std::string CursorPathFromLibXcursor() { +@@ -138,7 +138,11 @@ std::string CursorPathFromLibXcursor() { void operator()(void* ptr) const { dlclose(ptr); } }; @@ -21,7 +21,7 @@ if (!lib) return ""; -@@ -250,7 +254,7 @@ scoped_refptr<base::RefCountedMemory> ReadCursorFile( +@@ -249,7 +253,7 @@ scoped_refptr<base::RefCountedMemory> ReadCursorFile( const std::string& rm_xcursor_theme) { constexpr const char kDefaultTheme[] = "default"; std::string themes[] = { @@ -30,7 +30,7 @@ // The toolkit theme has the highest priority. LinuxUi::instance() ? LinuxUi::instance()->GetCursorThemeName() : std::string(), -@@ -444,7 +448,7 @@ uint32_t XCursorLoader::GetPreferredCursorSize() const +@@ -443,7 +447,7 @@ uint32_t XCursorLoader::GetPreferredCursorSize() const if (base::StringToInt(GetEnv(kXcursorSizeEnv), &size) && size > 0) return size; diff --git a/www/iridium/files/patch-ui_color_color__id.h b/www/iridium/files/patch-ui_color_color__id.h index bb8e373df5cc..01c6a31531ef 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-10-05 07:34:01 UTC +--- ui/color/color_id.h.orig 2022-12-01 10:35:46 UTC +++ ui/color/color_id.h -@@ -240,7 +240,7 @@ +@@ -320,7 +320,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 new file mode 100644 index 000000000000..42099a1202bd --- /dev/null +++ b/www/iridium/files/patch-ui_color_color__provider__utils.cc @@ -0,0 +1,11 @@ +--- ui/color/color_provider_utils.cc.orig 2022-12-01 10:35:46 UTC ++++ ui/color/color_provider_utils.cc +@@ -88,7 +88,7 @@ base::StringPiece SystemThemeName(ui::SystemTheme syst + switch (system_theme) { + case ui::SystemTheme::kDefault: + return "kDefault"; +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + case ui::SystemTheme::kGtk: + return "kGtk"; + case ui::SystemTheme::kQt: diff --git a/www/iridium/files/patch-ui_color_system__theme.h b/www/iridium/files/patch-ui_color_system__theme.h new file mode 100644 index 000000000000..25275bd382a4 --- /dev/null +++ b/www/iridium/files/patch-ui_color_system__theme.h @@ -0,0 +1,11 @@ +--- ui/color/system_theme.h.orig 2022-12-01 10:35:46 UTC ++++ ui/color/system_theme.h +@@ -15,7 +15,7 @@ namespace ui { + enum class SystemTheme { + // Classic theme, used in the default or users' chosen theme. + kDefault = 0, +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + kGtk = 1, + kQt = 2, + #endif diff --git a/www/iridium/files/patch-ui_compositor_compositor.cc b/www/iridium/files/patch-ui_compositor_compositor.cc index 860488b64eca..24e4efb28fa6 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-10-05 07:34:01 UTC +--- ui/compositor/compositor.cc.orig 2022-12-01 10:35:46 UTC +++ ui/compositor/compositor.cc -@@ -850,7 +850,7 @@ void Compositor::OnResume() { +@@ -854,7 +854,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 5c9bbfe15017..5c238ccb0f9e 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-10-05 07:34:01 UTC +--- ui/compositor/compositor.h.orig 2022-12-01 10:35:46 UTC +++ ui/compositor/compositor.h -@@ -414,7 +414,7 @@ class COMPOSITOR_EXPORT Compositor : public base::Powe +@@ -419,7 +419,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_display_screen.cc b/www/iridium/files/patch-ui_display_screen.cc index 34704c4dbcca..be29ffe776c8 100644 --- a/www/iridium/files/patch-ui_display_screen.cc +++ b/www/iridium/files/patch-ui_display_screen.cc @@ -1,6 +1,6 @@ ---- ui/display/screen.cc.orig 2022-10-05 07:34:01 UTC +--- ui/display/screen.cc.orig 2022-12-01 10:35:46 UTC +++ ui/display/screen.cc -@@ -84,7 +84,7 @@ void Screen::SetDisplayForNewWindows(int64_t display_i +@@ -85,7 +85,7 @@ void Screen::SetDisplayForNewWindows(int64_t display_i display_id_for_new_windows_ = display_id; } diff --git a/www/iridium/files/patch-ui_display_screen.h b/www/iridium/files/patch-ui_display_screen.h index 901fc1e127bf..faf392ff0747 100644 --- a/www/iridium/files/patch-ui_display_screen.h +++ b/www/iridium/files/patch-ui_display_screen.h @@ -1,6 +1,6 @@ ---- ui/display/screen.h.orig 2022-10-05 07:34:01 UTC +--- ui/display/screen.h.orig 2022-12-01 10:35:46 UTC +++ ui/display/screen.h -@@ -129,7 +129,7 @@ class DISPLAY_EXPORT Screen { +@@ -130,7 +130,7 @@ class DISPLAY_EXPORT Screen { // (both of which may or may not be `nearest_id`). display::ScreenInfos GetScreenInfosNearestDisplay(int64_t nearest_id) const; @@ -9,7 +9,7 @@ // Object which suspends the platform-specific screensaver for the duration of // its existence. class ScreenSaverSuspender { -@@ -213,7 +213,7 @@ class DISPLAY_EXPORT Screen { +@@ -220,7 +220,7 @@ class DISPLAY_EXPORT Screen { int64_t display_id_for_new_windows_; int64_t scoped_display_id_for_new_windows_ = display::kInvalidDisplayId; diff --git a/www/iridium/files/patch-ui_events_event.cc b/www/iridium/files/patch-ui_events_event.cc index 4473f2b0291b..1806fffdc7de 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-10-05 07:34:01 UTC +--- ui/events/event.cc.orig 2022-12-01 10:35:46 UTC +++ ui/events/event.cc @@ -425,7 +425,7 @@ std::string LocatedEvent::ToString() const { MouseEvent::MouseEvent(const PlatformEvent& native_event) @@ -9,7 +9,7 @@ movement_(GetMouseMovementFromNative(native_event)), #endif pointer_details_(GetMousePointerDetailsFromNative(native_event)) { -@@ -919,7 +919,7 @@ void KeyEvent::InitializeNative() { +@@ -924,7 +924,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_BUILD.gn b/www/iridium/files/patch-ui_gfx_BUILD.gn index c7919615d215..3d42b43a5d01 100644 --- a/www/iridium/files/patch-ui_gfx_BUILD.gn +++ b/www/iridium/files/patch-ui_gfx_BUILD.gn @@ -1,6 +1,6 @@ ---- ui/gfx/BUILD.gn.orig 2022-10-05 07:34:01 UTC +--- ui/gfx/BUILD.gn.orig 2022-12-01 10:35:46 UTC +++ ui/gfx/BUILD.gn -@@ -588,7 +588,7 @@ source_set("memory_buffer_sources") { +@@ -590,7 +590,7 @@ source_set("memory_buffer_sources") { deps += [ "//build/config/linux/libdrm" ] } diff --git a/www/iridium/files/patch-ui_gl_gl__implementation.cc b/www/iridium/files/patch-ui_gl_gl__implementation.cc new file mode 100644 index 000000000000..b3478dc17fd6 --- /dev/null +++ b/www/iridium/files/patch-ui_gl_gl__implementation.cc @@ -0,0 +1,11 @@ +--- ui/gl/gl_implementation.cc.orig 2022-12-01 10:35:46 UTC ++++ ui/gl/gl_implementation.cc +@@ -287,7 +287,7 @@ GetRequestedGLImplementationFromCommandLine( + *fallback_to_software_gl = false; + bool overrideUseSoftwareGL = + command_line->HasSwitch(switches::kOverrideUseSoftwareGLForTests); +-#if BUILDFLAG(IS_LINUX) || \ ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \ + (BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_CHROMEOS_DEVICE)) + if (std::getenv("RUNNING_UNDER_RR")) { + // https://rr-project.org/ is a Linux-only record-and-replay debugger that diff --git a/www/iridium/files/patch-ui_message__center_views_message__popup__view.cc b/www/iridium/files/patch-ui_message__center_views_message__popup__view.cc index e1d562c984ed..a9e6a6795931 100644 --- a/www/iridium/files/patch-ui_message__center_views_message__popup__view.cc +++ b/www/iridium/files/patch-ui_message__center_views_message__popup__view.cc @@ -1,6 +1,6 @@ ---- ui/message_center/views/message_popup_view.cc.orig 2022-03-28 18:11:04 UTC +--- ui/message_center/views/message_popup_view.cc.orig 2022-12-01 10:35:46 UTC +++ ui/message_center/views/message_popup_view.cc -@@ -123,7 +123,7 @@ void MessagePopupView::Show() { +@@ -118,7 +118,7 @@ void MessagePopupView::Show() { params.z_order = ui::ZOrderLevel::kFloatingWindow; // 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_ozone_test_mock__platform__window__delegate.h b/www/iridium/files/patch-ui_ozone_test_mock__platform__window__delegate.h new file mode 100644 index 000000000000..2f9068dcded0 --- /dev/null +++ b/www/iridium/files/patch-ui_ozone_test_mock__platform__window__delegate.h @@ -0,0 +1,11 @@ +--- ui/ozone/test/mock_platform_window_delegate.h.orig 2022-12-01 10:35:46 UTC ++++ ui/ozone/test/mock_platform_window_delegate.h +@@ -31,7 +31,7 @@ class MockPlatformWindowDelegate : public PlatformWind + MOCK_METHOD2(OnWindowStateChanged, + void(PlatformWindowState old_state, + PlatformWindowState new_state)); +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + MOCK_METHOD1(OnWindowTiledStateChanged, + void(WindowTiledEdges new_tiled_edges)); + #endif diff --git a/www/iridium/files/patch-ui_platform__window_platform__window__delegate.cc b/www/iridium/files/patch-ui_platform__window_platform__window__delegate.cc new file mode 100644 index 000000000000..b0b6d327608b --- /dev/null +++ b/www/iridium/files/patch-ui_platform__window_platform__window__delegate.cc @@ -0,0 +1,11 @@ +--- ui/platform_window/platform_window_delegate.cc.orig 2022-12-01 10:35:46 UTC ++++ ui/platform_window/platform_window_delegate.cc +@@ -15,7 +15,7 @@ PlatformWindowDelegate::PlatformWindowDelegate() = def + + PlatformWindowDelegate::~PlatformWindowDelegate() = default; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + void PlatformWindowDelegate::OnWindowTiledStateChanged( + WindowTiledEdges new_tiled_edges) {} + #endif diff --git a/www/iridium/files/patch-ui_platform__window_platform__window__delegate.h b/www/iridium/files/patch-ui_platform__window_platform__window__delegate.h new file mode 100644 index 000000000000..af1ab3d267c2 --- /dev/null +++ b/www/iridium/files/patch-ui_platform__window_platform__window__delegate.h @@ -0,0 +1,11 @@ +--- ui/platform_window/platform_window_delegate.h.orig 2022-12-01 10:35:46 UTC ++++ ui/platform_window/platform_window_delegate.h +@@ -95,7 +95,7 @@ class COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindow + virtual void OnWindowStateChanged(PlatformWindowState old_state, + PlatformWindowState new_state) = 0; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + // Notifies the delegate that the tiled state of the window edges has changed. + virtual void OnWindowTiledStateChanged(WindowTiledEdges new_tiled_edges); + #endif 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 834f1d0019ed..026d445a7b54 100644 --- a/www/iridium/files/patch-ui_views_controls_textfield_textfield.cc +++ b/www/iridium/files/patch-ui_views_controls_textfield_textfield.cc @@ -1,6 +1,6 @@ ---- ui/views/controls/textfield/textfield.cc.orig 2022-10-05 07:34:01 UTC +--- ui/views/controls/textfield/textfield.cc.orig 2022-12-01 10:35:46 UTC +++ ui/views/controls/textfield/textfield.cc -@@ -70,7 +70,7 @@ +@@ -71,7 +71,7 @@ #include "base/win/win_util.h" #endif @@ -9,7 +9,7 @@ #include "ui/base/ime/linux/text_edit_command_auralinux.h" #include "ui/linux/linux_ui.h" #endif -@@ -163,7 +163,7 @@ bool IsControlKeyModifier(int flags) { +@@ -164,7 +164,7 @@ bool IsControlKeyModifier(int flags) { // Control-modified key combination, but we cannot extend it to other platforms // as Control has different meanings and behaviors. // https://crrev.com/2580483002/#msg46 @@ -18,7 +18,7 @@ return flags & ui::EF_CONTROL_DOWN; #else return false; -@@ -706,7 +706,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event +@@ -707,7 +707,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event if (!textfield) return handled; @@ -27,7 +27,7 @@ auto* linux_ui = ui::LinuxUi::instance(); std::vector<ui::TextEditCommandAuraLinux> commands; if (!handled && linux_ui && -@@ -850,7 +850,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo +@@ -851,7 +851,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo } bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) { @@ -36,7 +36,7 @@ // Skip any accelerator handling that conflicts with custom keybindings. auto* linux_ui = ui::LinuxUi::instance(); std::vector<ui::TextEditCommandAuraLinux> commands; -@@ -1720,7 +1720,7 @@ bool Textfield::ShouldDoLearning() { +@@ -1721,7 +1721,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( -@@ -2219,14 +2219,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( +@@ -2220,14 +2220,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( #endif return ui::TextEditCommand::DELETE_BACKWARD; } 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 ead2da1af1dc..21cfd87285ef 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-10-05 07:34:01 UTC +--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2022-12-01 10:35:46 UTC +++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc @@ -40,7 +40,7 @@ #include "ui/wm/core/window_util.h" @@ -27,7 +27,7 @@ std::make_unique<DesktopDragDropClientOzoneLinux>(window(), drag_handler); #else std::make_unique<DesktopDragDropClientOzone>(window(), drag_handler); -@@ -1006,7 +1006,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 8af04ac9cd92..e2c492e5e4fa 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-10-05 07:34:01 UTC +--- ui/views/widget/widget.cc.orig 2022-12-01 10:35:46 UTC +++ ui/views/widget/widget.cc -@@ -48,7 +48,7 @@ +@@ -50,7 +50,7 @@ #include "ui/views/window/custom_frame_view.h" #include "ui/views/window/dialog_delegate.h" @@ -9,12 +9,12 @@ #include "ui/linux/linux_ui.h" #endif -@@ -1819,7 +1819,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const +@@ -1854,7 +1854,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const if (parent_) return parent_->GetNativeTheme(); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (const ui::LinuxUi* linux_ui = ui::LinuxUi::instance()) { - if (auto* native_theme = linux_ui->GetNativeTheme(GetNativeWindow())) - return native_theme; + if (auto* linux_ui_theme = ui::LinuxUiTheme::GetForWindow(GetNativeWindow())) + return linux_ui_theme->GetNativeTheme(); + #endif diff --git a/www/iridium/files/patch-ui_views_widget_widget.h b/www/iridium/files/patch-ui_views_widget_widget.h index 7b6d14a7419d..9e5095a899d9 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-10-05 07:34:01 UTC +--- ui/views/widget/widget.h.orig 2022-12-01 10:35:46 UTC +++ ui/views/widget/widget.h -@@ -394,7 +394,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWid +@@ -402,7 +402,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-ui_views_window_custom__frame__view.cc b/www/iridium/files/patch-ui_views_window_custom__frame__view.cc index 67fd6cc3d48a..17128385707c 100644 --- a/www/iridium/files/patch-ui_views_window_custom__frame__view.cc +++ b/www/iridium/files/patch-ui_views_window_custom__frame__view.cc @@ -1,6 +1,6 @@ ---- ui/views/window/custom_frame_view.cc.orig 2022-03-28 18:11:04 UTC +--- ui/views/window/custom_frame_view.cc.orig 2022-12-01 10:35:46 UTC +++ ui/views/window/custom_frame_view.cc -@@ -265,7 +265,7 @@ int CustomFrameView::CaptionButtonY() const { +@@ -266,7 +266,7 @@ int CustomFrameView::CaptionButtonY() const { // drawn flush with the screen edge, they still obey Fitts' Law. // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-v8_BUILD.gn b/www/iridium/files/patch-v8_BUILD.gn index 7220f2734ca8..0c9ce932251d 100644 --- a/www/iridium/files/patch-v8_BUILD.gn +++ b/www/iridium/files/patch-v8_BUILD.gn @@ -1,6 +1,6 @@ ---- v8/BUILD.gn.orig 2022-10-05 07:34:01 UTC +--- v8/BUILD.gn.orig 2022-12-01 10:35:46 UTC +++ v8/BUILD.gn -@@ -1327,6 +1327,14 @@ config("toolchain") { +@@ -1255,6 +1255,14 @@ config("toolchain") { } else if (target_os == "win") { defines += [ "V8_HAVE_TARGET_OS" ] defines += [ "V8_TARGET_OS_WIN" ] @@ -15,7 +15,7 @@ } # TODO(infra): Support v8_enable_prof on Windows. -@@ -5571,7 +5579,7 @@ v8_component("v8_libbase") { +@@ -5467,7 +5475,7 @@ v8_component("v8_libbase") { } } @@ -24,7 +24,7 @@ sources += [ "src/base/debug/stack_trace_posix.cc", "src/base/platform/platform-linux.cc", -@@ -5582,6 +5590,18 @@ v8_component("v8_libbase") { +@@ -5478,6 +5486,18 @@ v8_component("v8_libbase") { "dl", "rt", ] diff --git a/www/iridium/files/patch-v8_include_v8-internal.h b/www/iridium/files/patch-v8_include_v8-internal.h index 6e12835e73c4..d077cdd377aa 100644 --- a/www/iridium/files/patch-v8_include_v8-internal.h +++ b/www/iridium/files/patch-v8_include_v8-internal.h @@ -1,6 +1,6 @@ ---- v8/include/v8-internal.h.orig 2022-10-05 07:34:01 UTC +--- v8/include/v8-internal.h.orig 2022-12-01 10:35:46 UTC +++ v8/include/v8-internal.h -@@ -179,7 +179,7 @@ using SandboxedPointer_t = Address; +@@ -174,7 +174,7 @@ using SandboxedPointer_t = Address; #ifdef V8_ENABLE_SANDBOX // Size of the sandbox, excluding the guard regions surrounding it. diff --git a/www/iridium/files/patch-v8_src_api_api.cc b/www/iridium/files/patch-v8_src_api_api.cc index ed6fe2d6d40d..95273653bb61 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-10-05 07:34:01 UTC +--- v8/src/api/api.cc.orig 2022-12-01 10:35:46 UTC +++ v8/src/api/api.cc -@@ -138,7 +138,7 @@ +@@ -140,7 +140,7 @@ #include "src/wasm/wasm-serialization.h" #endif // V8_ENABLE_WEBASSEMBLY @@ -9,7 +9,7 @@ #include <signal.h> #if V8_ENABLE_WEBASSEMBLY -@@ -6113,7 +6113,7 @@ bool v8::V8::Initialize(const int build_config) { +@@ -6175,7 +6175,7 @@ bool v8::V8::Initialize(const int build_config) { return true; } diff --git a/www/iridium/files/patch-v8_src_base_platform_memory.h b/www/iridium/files/patch-v8_src_base_platform_memory.h new file mode 100644 index 000000000000..507555cc1dab --- /dev/null +++ b/www/iridium/files/patch-v8_src_base_platform_memory.h @@ -0,0 +1,16 @@ +--- v8/src/base/platform/memory.h.orig 2022-12-01 10:35:46 UTC ++++ v8/src/base/platform/memory.h +@@ -19,11 +19,11 @@ + + #if V8_OS_DARWIN + #include <malloc/malloc.h> +-#else // !V8_OS_DARWIN ++#elif !V8_OS_BSD // !V8_OS_DARWIN + #include <malloc.h> + #endif // !V8_OS_DARWIN + +-#if (V8_OS_POSIX && !V8_OS_AIX) || V8_OS_WIN ++#if (V8_OS_POSIX && !V8_OS_AIX && !V8_OS_BSD) || V8_OS_WIN + #define V8_HAS_MALLOC_USABLE_SIZE 1 + #endif // (V8_OS_POSIX && !V8_OS_AIX) || V8_OS_WIN + diff --git a/www/iridium/files/patch-v8_src_base_platform_platform-posix.cc b/www/iridium/files/patch-v8_src_base_platform_platform-posix.cc index 266f3ebe8cdb..d6133de5246b 100644 --- a/www/iridium/files/patch-v8_src_base_platform_platform-posix.cc +++ b/www/iridium/files/patch-v8_src_base_platform_platform-posix.cc @@ -1,6 +1,15 @@ ---- v8/src/base/platform/platform-posix.cc.orig 2022-10-05 07:34:01 UTC +--- v8/src/base/platform/platform-posix.cc.orig 2022-12-01 10:35:46 UTC +++ v8/src/base/platform/platform-posix.cc -@@ -68,7 +68,7 @@ +@@ -53,7 +53,7 @@ + #if V8_OS_DARWIN + #include <mach/mach.h> + #include <malloc/malloc.h> +-#else ++#elif !V8_OS_BSD + #include <malloc.h> + #endif + +@@ -71,7 +71,7 @@ #include <sys/syscall.h> #endif @@ -9,7 +18,7 @@ #define MAP_ANONYMOUS MAP_ANON #endif -@@ -294,8 +294,15 @@ void OS::SetRandomMmapSeed(int64_t seed) { +@@ -297,8 +297,15 @@ void OS::SetRandomMmapSeed(int64_t seed) { } } @@ -25,7 +34,7 @@ uintptr_t raw_addr; { MutexGuard guard(rng_mutex.Pointer()); -@@ -390,6 +397,7 @@ void* OS::GetRandomMmapAddr() { +@@ -393,6 +400,7 @@ void* OS::GetRandomMmapAddr() { #endif return reinterpret_cast<void*>(raw_addr); } @@ -33,7 +42,7 @@ // TODO(bbudge) Move Cygwin and Fuchsia stuff into platform-specific files. #if !V8_OS_CYGWIN && !V8_OS_FUCHSIA -@@ -647,7 +655,7 @@ void OS::DestroySharedMemoryHandle(PlatformSharedMemor +@@ -650,7 +658,7 @@ void OS::DestroySharedMemoryHandle(PlatformSharedMemor // static bool OS::HasLazyCommits() { @@ -42,7 +51,7 @@ return true; #else // TODO(bbudge) Return true for all POSIX platforms. -@@ -1224,7 +1232,7 @@ void Thread::SetThreadLocal(LocalStorageKey key, void* +@@ -1227,7 +1235,7 @@ void Thread::SetThreadLocal(LocalStorageKey key, void* // keep this version in POSIX as most Linux-compatible derivatives will // support it. MacOS and FreeBSD are different here. #if !defined(V8_OS_FREEBSD) && !defined(V8_OS_DARWIN) && !defined(_AIX) && \ diff --git a/www/iridium/files/patch-v8_src_base_small-vector.h b/www/iridium/files/patch-v8_src_base_small-vector.h new file mode 100644 index 000000000000..6d9d1e876cf5 --- /dev/null +++ b/www/iridium/files/patch-v8_src_base_small-vector.h @@ -0,0 +1,11 @@ +--- v8/src/base/small-vector.h.orig 2022-12-01 10:35:46 UTC ++++ v8/src/base/small-vector.h +@@ -22,7 +22,7 @@ template <typename T, size_t kSize, typename Allocator + class SmallVector { + // Currently only support trivially copyable and trivially destructible data + // types, as it uses memcpy to copy elements and never calls destructors. +- ASSERT_TRIVIALLY_COPYABLE(T); ++ // XXX FREEBSD ASSERT_TRIVIALLY_COPYABLE(T); + static_assert(std::is_trivially_destructible<T>::value); + + public: diff --git a/www/iridium/files/patch-v8_src_compiler_backend_ia32_instruction-selector-ia32.cc b/www/iridium/files/patch-v8_src_compiler_backend_ia32_instruction-selector-ia32.cc index 3e3e11418827..064d39e9c500 100644 --- a/www/iridium/files/patch-v8_src_compiler_backend_ia32_instruction-selector-ia32.cc +++ b/www/iridium/files/patch-v8_src_compiler_backend_ia32_instruction-selector-ia32.cc @@ -1,6 +1,6 @@ ---- v8/src/compiler/backend/ia32/instruction-selector-ia32.cc.orig 2022-10-05 07:34:01 UTC +--- v8/src/compiler/backend/ia32/instruction-selector-ia32.cc.orig 2022-12-01 10:35:46 UTC +++ v8/src/compiler/backend/ia32/instruction-selector-ia32.cc -@@ -3026,6 +3026,7 @@ void InstructionSelector::VisitI8x16Shuffle(Node* node +@@ -3033,6 +3033,7 @@ void InstructionSelector::VisitI8x16Shuffle(Node* node Emit(opcode, 1, &dst, input_count, inputs, temp_count, temps); } @@ -8,7 +8,7 @@ void InstructionSelector::VisitI8x16Swizzle(Node* node) { InstructionCode op = kIA32I8x16Swizzle; -@@ -3079,6 +3080,9 @@ void VisitMinOrMax(InstructionSelector* selector, Node +@@ -3086,6 +3087,9 @@ void VisitMinOrMax(InstructionSelector* selector, Node void InstructionSelector::VisitF32x4Pmin(Node* node) { VisitMinOrMax(this, node, kIA32Minps, true); } 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 6c868842b1ea..27a58aacf9b6 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,4 +1,4 @@ ---- v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h.orig 2022-10-05 07:34:01 UTC +--- 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 @@ -432,7 +432,7 @@ void LiftoffAssembler::StoreTaggedPointer(Register dst } @@ -7,9 +7,9 @@ - Register offset_reg, uint32_t offset_imm, + Register offset_reg, uintptr_t offset_imm, LoadType type, uint32_t* protected_load_pc, - bool /* is_load_mem */, bool i64_offset) { - // Offsets >=2GB are statically OOB on 32-bit systems. -@@ -508,7 +508,7 @@ void LiftoffAssembler::Load(LiftoffRegister dst, Regis + bool /* is_load_mem */, bool i64_offset, + bool needs_shift) { +@@ -512,7 +512,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 */) { -@@ -577,7 +577,7 @@ void LiftoffAssembler::Store(Register dst_addr, Regist +@@ -581,7 +581,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); -@@ -596,7 +596,7 @@ void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, +@@ -600,7 +600,7 @@ void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, } void LiftoffAssembler::AtomicStore(Register dst_addr, Register offset_reg, @@ -36,7 +36,7 @@ StoreType type, LiftoffRegList pinned) { DCHECK_NE(offset_reg, no_reg); DCHECK_LE(offset_imm, std::numeric_limits<int32_t>::max()); -@@ -936,7 +936,7 @@ inline void AtomicBinop64(LiftoffAssembler* lasm, Bino +@@ -940,7 +940,7 @@ inline void AtomicBinop64(LiftoffAssembler* lasm, Bino } // namespace liftoff void LiftoffAssembler::AtomicAdd(Register dst_addr, Register offset_reg, @@ -45,7 +45,7 @@ LiftoffRegister result, StoreType type) { if (type.value() == StoreType::kI64Store) { liftoff::AtomicBinop64(this, liftoff::kAdd, dst_addr, offset_reg, -@@ -949,7 +949,7 @@ void LiftoffAssembler::AtomicAdd(Register dst_addr, Re +@@ -953,7 +953,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, -@@ -961,7 +961,7 @@ void LiftoffAssembler::AtomicSub(Register dst_addr, Re +@@ -965,7 +965,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, -@@ -974,7 +974,7 @@ void LiftoffAssembler::AtomicAnd(Register dst_addr, Re +@@ -978,7 +978,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, -@@ -987,7 +987,7 @@ void LiftoffAssembler::AtomicOr(Register dst_addr, Reg +@@ -991,7 +991,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, -@@ -1000,7 +1000,7 @@ void LiftoffAssembler::AtomicXor(Register dst_addr, Re +@@ -1004,7 +1004,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) { -@@ -1014,7 +1014,7 @@ void LiftoffAssembler::AtomicExchange(Register dst_add +@@ -1018,7 +1018,7 @@ void LiftoffAssembler::AtomicExchange(Register dst_add } void LiftoffAssembler::AtomicCompareExchange( |