diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2022-03-02 09:32:47 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2022-03-02 09:32:47 +0000 |
| commit | bfedd5f1f016c174f3fe18cd38c8517ece7b1e9b (patch) | |
| tree | 1d6f8dd03169ed2d788d910cce625af1608e74d0 | |
| parent | e18a8c4a1f1a85473f7d25dadf958405f131c81b (diff) | |
| download | ports-bfedd5f1f016c174f3fe18cd38c8517ece7b1e9b.tar.gz ports-bfedd5f1f016c174f3fe18cd38c8517ece7b1e9b.zip | |
www/chromium: update to 99.0.4844.51
On the port side, this update brings:
- libvulkan enabled by default
- more unit tests enabled
- no longer dependent on Python 2.7
Security: https://vuxml.freebsd.org/freebsd/e0914087-9a09-11ec-9e61-3065ec8fd3ec.html
766 files changed, 6057 insertions, 5232 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile index 5a7dd8ae27a7..b7ee68b405cf 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -1,11 +1,10 @@ # Created by: Florent Thoumie <flz@FreeBSD.org> PORTNAME= chromium -PORTVERSION= 98.0.4758.102 -PORTREVISION= 3 +PORTVERSION= 99.0.4844.51 CATEGORIES= www MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ - LOCAL/rene/chromium/:fonts + https://nerd.hu/distfiles/:fonts DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= chromium@FreeBSD.org @@ -28,7 +27,6 @@ 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}/bin/python2.7:lang/python27 \ ${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-dri LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-atk \ @@ -65,12 +63,11 @@ LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-atk \ RUN_DEPENDS= xdg-open:devel/xdg-utils \ noto-basic>0:x11-fonts/noto-basic -USES= bison compiler:c++17-lang cpe desktop-file-utils dos2unix gl gnome jpeg localbase:ldflags \ +USES= bison compiler:c++17-lang cpe desktop-file-utils gl gnome jpeg localbase:ldflags \ ninja perl5 pkgconfig python:3.6-3.9,build shebangfix tar:xz xorg CPE_VENDOR= google CPE_PRODUCT= chrome -DOS2UNIX_FILES= third_party/vulkan_memory_allocator/include/vk_mem_alloc.h USE_GL= gbm gl USE_GNOME= atk dconf gdkpixbuf2 glib20 gtk30 libxml2 libxslt USE_LDCONFIG= ${DATADIR} @@ -82,8 +79,7 @@ SHEBANG_FILES= chrome/tools/build/linux/chrome-wrapper buildtools/linux64/clang- MAKE_ARGS= -C out/${BUILDTYPE} ALL_TARGET= chrome -BINARY_ALIAS= python=${LOCALBASE}/bin/python2.7 \ - python3=${PYTHON_CMD} +BINARY_ALIAS= python3=${PYTHON_CMD} # TODO bz@ : install libwidevinecdm.so (see third_party/widevine/cdm/BUILD.gn) # @@ -198,7 +194,7 @@ SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false .include "Makefile.tests" TEST_DISTFILES= ${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX} \ - test_fonts-85${EXTRACT_SUFX}:fonts + test_fonts-cd96fc55dc243f6c6f4cb63ad117cad6cd48dceb.tar.gz:fonts TEST_ALL_TARGET= ${TEST_TARGETS} .include <bsd.port.options.mk> @@ -306,6 +302,8 @@ do-install: .for f in libEGL.so libGLESv2.so libVkICD_mock_icd.so ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR} .endfor + ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libvulkan.so.1 \ + ${STAGEDIR}${DATADIR}/libvulkan.so .if ${BUILDTYPE} == Debug ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libVkLayer_khronos_validation.so ${STAGEDIR}${DATADIR} .endif @@ -323,8 +321,6 @@ do-install: post-install-DEBUG-on: ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/*.so \ ${STAGEDIR}${DATADIR} - ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libvulkan.so.1 \ - ${STAGEDIR}${DATADIR} ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/character_data_generator \ ${STAGEDIR}${DATADIR} diff --git a/www/chromium/Makefile.tests b/www/chromium/Makefile.tests index d8a1b3138355..aea948673823 100644 --- a/www/chromium/Makefile.tests +++ b/www/chromium/Makefile.tests @@ -1,7 +1,12 @@ TEST_TARGETS= base_unittests \ + blink_unittests \ chromedriver_unittests \ + components_unittests \ + content_unittests \ crypto_unittests \ headless_unittests \ + media_unittests \ + mojo_unittests \ + net_unittests \ printing_unittests \ url_unittests - diff --git a/www/chromium/distinfo b/www/chromium/distinfo index 4f04e0f5b957..7139f2f3df3c 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1645271488 -SHA256 (chromium-98.0.4758.102.tar.xz) = 415b47e912766cd07f9f52e95bc6470b835acf1d6f566ae32e66ba8be608f33e -SIZE (chromium-98.0.4758.102.tar.xz) = 1242565220 -SHA256 (chromium-98.0.4758.102-testdata.tar.xz) = d18ea0af0a9a87d53e75fbdbd886b17f689e00486f819905b38f02a2619504e6 -SIZE (chromium-98.0.4758.102-testdata.tar.xz) = 258963780 -SHA256 (test_fonts-85.tar.xz) = f22b61b3639acb147c98ec2e2305d8b96f0b55c8c74c40e2ea696402fae8cef9 -SIZE (test_fonts-85.tar.xz) = 9511984 +TIMESTAMP = 1646114129 +SHA256 (chromium-99.0.4844.51.tar.xz) = 97c52e57eca0dc8b752d274047f38c88aaa86036c0587b26b056efbd3fb2bae3 +SIZE (chromium-99.0.4844.51.tar.xz) = 1316125164 +SHA256 (chromium-99.0.4844.51-testdata.tar.xz) = 80e07d1684b07d0390fbb53115ba6a48e39781f2f805d4e17dac657a00a4363e +SIZE (chromium-99.0.4844.51-testdata.tar.xz) = 258957904 +SHA256 (test_fonts-cd96fc55dc243f6c6f4cb63ad117cad6cd48dceb.tar.gz) = ec973eccd669d417fbf2d0a4dac730744a3174268ff062db5451b55c82bc3492 +SIZE (test_fonts-cd96fc55dc243f6c6f4cb63ad117cad6cd48dceb.tar.gz) = 26759650 diff --git a/www/chromium/files/patch-BUILD.gn b/www/chromium/files/patch-BUILD.gn index fbf272d4b247..e6324afdb6fc 100644 --- a/www/chromium/files/patch-BUILD.gn +++ b/www/chromium/files/patch-BUILD.gn @@ -1,4 +1,4 @@ ---- BUILD.gn.orig 2022-02-07 13:39:41 UTC +--- BUILD.gn.orig 2022-02-28 16:54:41 UTC +++ BUILD.gn @@ -52,7 +52,7 @@ declare_args() { root_extra_deps = [] @@ -18,7 +18,7 @@ deps += [ "//third_party/breakpad:breakpad_unittests", "//third_party/breakpad:core-2-minidump", -@@ -638,6 +638,15 @@ group("gn_all") { +@@ -636,6 +636,15 @@ group("gn_all") { } } @@ -34,7 +34,7 @@ if (is_mac) { deps += [ "//third_party/breakpad:crash_inspector", -@@ -688,7 +697,7 @@ group("gn_all") { +@@ -686,7 +695,7 @@ group("gn_all") { host_os == "win") { deps += [ "//chrome/test/mini_installer:mini_installer_tests" ] } @@ -43,7 +43,7 @@ deps += [ "//third_party/breakpad:symupload($host_toolchain)" ] } -@@ -1139,7 +1148,7 @@ if (!is_ios) { +@@ -1137,7 +1146,7 @@ if (!is_ios) { data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ] } @@ -52,7 +52,7 @@ data_deps += [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } -@@ -1148,7 +1157,7 @@ if (!is_ios) { +@@ -1146,7 +1155,7 @@ if (!is_ios) { data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } @@ -61,7 +61,7 @@ data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } -@@ -1525,7 +1534,7 @@ group("chromium_builder_perf") { +@@ -1521,7 +1530,7 @@ group("chromium_builder_perf") { if (is_win) { data_deps += [ "//chrome/installer/mini_installer:mini_installer" ] diff --git a/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc b/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc index 4c99002b2147..151948510862 100644 --- a/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc +++ b/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc @@ -1,11 +1,11 @@ ---- apps/ui/views/app_window_frame_view.cc.orig 2022-02-07 13:39:41 UTC +--- apps/ui/views/app_window_frame_view.cc.orig 2022-02-28 16:54:41 UTC +++ apps/ui/views/app_window_frame_view.cc -@@ -137,7 +137,7 @@ gfx::Rect AppWindowFrameView::GetWindowBoundsForClient +@@ -138,7 +138,7 @@ gfx::Rect AppWindowFrameView::GetWindowBoundsForClient gfx::Rect window_bounds = client_bounds; // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) // Get the difference between the widget's client area bounds and window // bounds, and grow |window_bounds| by that amount. gfx::Insets native_frame_insets = diff --git a/www/chromium/files/patch-base_BUILD.gn b/www/chromium/files/patch-base_BUILD.gn index 20b36c33a916..72069cf118ab 100644 --- a/www/chromium/files/patch-base_BUILD.gn +++ b/www/chromium/files/patch-base_BUILD.gn @@ -1,6 +1,6 @@ ---- base/BUILD.gn.orig 2022-02-07 13:39:41 UTC +--- base/BUILD.gn.orig 2022-02-28 16:54:41 UTC +++ base/BUILD.gn -@@ -975,7 +975,7 @@ component("base") { +@@ -993,7 +993,7 @@ mixed_component("base") { "timer/hi_res_timer_manager_posix.cc", ] @@ -9,7 +9,7 @@ sources += [ "cpu_affinity_posix.cc", "cpu_affinity_posix.h", -@@ -986,6 +986,12 @@ component("base") { +@@ -1004,6 +1004,12 @@ mixed_component("base") { "profiler/thread_delegate_posix.h", ] } @@ -22,7 +22,7 @@ } if (is_win) { -@@ -1416,11 +1422,24 @@ component("base") { +@@ -1462,11 +1468,23 @@ mixed_component("base") { # building inside the cros_sdk environment - use host_toolchain as a # more robust check for this. if (!use_sysroot && @@ -39,7 +39,6 @@ + + if (is_freebsd) { + libs += [ -+ "iconv", + "execinfo", + "util", + ] @@ -48,21 +47,28 @@ if (use_allocator_shim) { sources += [ "allocator/allocator_shim.cc", -@@ -1443,7 +1462,7 @@ component("base") { - "allocator/early_zone_registration_mac.h", +@@ -1490,7 +1508,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", -@@ -2176,6 +2195,42 @@ component("base") { - "linux_util.h", - ] +@@ -1550,7 +1568,7 @@ mixed_component("base") { + # Allow more direct string conversions on platforms with native utf8 + # strings + # TODO(crbug/1052397): Consider replacing is_ash with is_chromeos once lacros switches to target_os=chromeos +- if (is_apple || is_chromeos_ash || is_chromecast || is_fuchsia) { ++ if (is_apple || is_chromeos_ash || is_chromecast || is_fuchsia || is_bsd) { + defines += [ "SYSTEM_NATIVE_UTF8" ] + } + +@@ -2222,6 +2240,42 @@ mixed_component("base") { } -+ } -+ + } + + if (is_bsd) { + sources -= [ + "files/file_path_watcher_linux.cc", @@ -97,6 +103,44 @@ + "process/process_metrics_freebsd.cc", + "system/sys_info_freebsd.cc", + ] ++ } ++ + # iOS + if (is_ios) { + sources -= [ +@@ -3465,7 +3519,7 @@ test("base_unittests") { + } } - # iOS +- if (is_linux || is_chromeos) { ++ if ((is_linux || is_chromeos) && !is_bsd) { + sources += [ + "debug/proc_maps_linux_unittest.cc", + "files/scoped_file_linux_unittest.cc", +@@ -3513,7 +3567,7 @@ test("base_unittests") { + "posix/unix_domain_socket_unittest.cc", + "task/thread_pool/task_tracker_posix_unittest.cc", + ] +- if (!is_nacl && !is_apple) { ++ if (!is_nacl && !is_apple && !is_bsd) { + sources += [ + "cpu_affinity_posix_unittest.cc", + "profiler/stack_copier_signal_unittest.cc", +@@ -3525,7 +3579,7 @@ test("base_unittests") { + # Allow more direct string conversions on platforms with native utf8 + # strings + # TODO(crbug/1052397): Consider replacing is_ash with is_chromeos once lacros switches to target_os=chromeos +- if (is_apple || is_chromeos_ash || is_chromecast || is_fuchsia) { ++ if (is_apple || is_chromeos_ash || is_chromecast || is_fuchsia || is_bsd) { + defines += [ "SYSTEM_NATIVE_UTF8" ] + } + +@@ -3689,7 +3743,7 @@ test("base_unittests") { + } + } + +- if (is_fuchsia || is_linux || is_chromeos) { ++ if ((is_fuchsia || is_linux || is_chromeos) && !is_bsd) { + sources += [ + "debug/elf_reader_unittest.cc", + "debug/test_elf_image_builder.cc", diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_address__space__randomization.h b/www/chromium/files/patch-base_allocator_partition__allocator_address__space__randomization.h index c15f7b02a90a..3f03f54ad491 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_address__space__randomization.h +++ b/www/chromium/files/patch-base_allocator_partition__allocator_address__space__randomization.h @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/address_space_randomization.h.orig 2021-10-07 16:50:24 UTC +--- base/allocator/partition_allocator/address_space_randomization.h.orig 2022-02-28 16:54:41 UTC +++ base/allocator/partition_allocator/address_space_randomization.h -@@ -36,7 +36,7 @@ AslrMask(uintptr_t bits) { +@@ -38,7 +38,7 @@ AslrMask(uintptr_t bits) { #if defined(ARCH_CPU_64_BITS) diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator.h b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator.h index 3d932a28ff32..57ceca3efe3a 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator.h +++ b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator.h @@ -1,11 +1,11 @@ ---- base/allocator/partition_allocator/page_allocator.h.orig 2022-02-23 16:08:07 UTC +--- base/allocator/partition_allocator/page_allocator.h.orig 2022-02-28 16:54:41 UTC +++ base/allocator/partition_allocator/page_allocator.h -@@ -170,7 +170,7 @@ BASE_EXPORT void DecommitAndZeroSystemPages(void* addr +@@ -194,7 +194,7 @@ BASE_EXPORT void DecommitAndZeroSystemPages(void* addr // Whether decommitted memory is guaranteed to be zeroed when it is // recommitted. Do not assume that this will not change over time. constexpr BASE_EXPORT bool DecommittedMemoryIsAlwaysZeroed() { --#if defined(OS_APPLE) -+#if defined(OS_APPLE) || defined(OS_BSD) +-#if BUILDFLAG(IS_APPLE) ++#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) return false; #else return true; diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h index c5069330b3dd..700bf383a007 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h +++ b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h @@ -1,16 +1,16 @@ ---- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2022-02-23 16:08:07 UTC +--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2022-02-28 16:54:41 UTC +++ base/allocator/partition_allocator/page_allocator_internals_posix.h -@@ -339,8 +339,12 @@ bool TryRecommitSystemPagesInternal( - } +@@ -346,8 +346,12 @@ bool TryRecommitSystemPagesInternal( - void DiscardSystemPagesInternal(void* address, size_t length) { --#if defined(OS_APPLE) -+#if defined(OS_APPLE) || defined(OS_BSD) -+#if defined(OS_BSD) -+ int ret = madvise(address, length, MADV_FREE); + void DiscardSystemPagesInternal(uintptr_t address, size_t length) { + void* ptr = reinterpret_cast<void*>(address); +-#if BUILDFLAG(IS_APPLE) ++#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) ++#if BUILDFLAG(IS_BSD) ++ int ret = madvise(ptr, length, MADV_FREE); +#else - int ret = madvise(address, length, MADV_FREE_REUSABLE); + int ret = madvise(ptr, length, MADV_FREE_REUSABLE); +#endif if (ret) { // MADV_FREE_REUSABLE sometimes fails, so fall back to MADV_DONTNEED. - ret = madvise(address, length, MADV_DONTNEED); + ret = madvise(ptr, length, MADV_DONTNEED); diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h index b525560e52b0..011bdf1a8e7b 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h +++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h @@ -1,11 +1,11 @@ ---- base/allocator/partition_allocator/partition_alloc_config.h.orig 2022-02-07 13:39:41 UTC +--- base/allocator/partition_allocator/partition_alloc_config.h.orig 2022-02-28 16:54:41 UTC +++ base/allocator/partition_allocator/partition_alloc_config.h @@ -59,7 +59,7 @@ static_assert(sizeof(void*) != 8, ""); // POSIX is not only UNIX, e.g. macOS and other OSes. We do use Linux-specific // features such as futex(2). --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) #define PA_HAS_LINUX_KERNEL #endif diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h deleted file mode 100644 index 3c37a2b8e5a7..000000000000 --- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h +++ /dev/null @@ -1,11 +0,0 @@ ---- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2022-02-07 13:39:41 UTC -+++ base/allocator/partition_allocator/partition_alloc_constants.h -@@ -361,7 +361,7 @@ constexpr size_t kBitsPerSizeT = sizeof(void*) * CHAR_ - // PartitionPurgeDecommitEmptySlotSpans flag will eagerly decommit all entries - // in the ring buffer, so with periodic purge enabled, this typically happens - // every few seconds. --#if defined(OS_LINUX) || defined(OS_APPLE) -+#if defined(OS_LINUX) || defined(OS_APPLE) || defined(OS_BSD) - // Set to a higher value on Linux and macOS, to assess impact on performance - // bots. This roughly halves the number of syscalls done during a speedometer - // 2.0 run on these platforms. diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__page.h b/www/chromium/files/patch-base_allocator_partition__allocator_partition__page.h index 3fd97ed4f2bf..138e9832363f 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__page.h +++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__page.h @@ -1,12 +1,22 @@ ---- base/allocator/partition_allocator/partition_page.h.orig 2022-02-07 13:39:41 UTC +--- base/allocator/partition_allocator/partition_page.h.orig 2022-02-28 16:54:41 UTC +++ base/allocator/partition_allocator/partition_page.h -@@ -141,7 +141,8 @@ struct __attribute__((packed)) SlotSpanMetadata { - // in PartitionPage, which has other fields as well, and must fit in 32 bytes. +@@ -129,7 +129,8 @@ struct __attribute__((packed)) SlotSpanMetadata { + PartitionBucket<thread_safe>* const bucket = nullptr; // CHECK()ed in AllocNewSlotSpan(). --#if defined(PA_HAS_64_BITS_POINTERS) && defined(OS_APPLE) -+#if (defined(PA_HAS_64_BITS_POINTERS) && defined(OS_APPLE)) || \ -+ (defined(OS_FREEBSD) && defined(__i386__)) +-#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 // PartitionPageSize() is 4 times the OS page size. +@@ -143,7 +144,9 @@ struct __attribute__((packed)) 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/chromium/files/patch-base_allocator_partition__allocator_partition__root.h b/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.h index 86e2996e9bc2..a53eb22b38b2 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.h +++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.h @@ -1,11 +1,11 @@ ---- base/allocator/partition_allocator/partition_root.h.orig 2022-02-07 13:39:41 UTC +--- base/allocator/partition_allocator/partition_root.h.orig 2022-02-28 16:54:41 UTC +++ base/allocator/partition_allocator/partition_root.h -@@ -1044,7 +1044,7 @@ ALWAYS_INLINE void PartitionRoot<thread_safe>::FreeNoH +@@ -1019,7 +1019,7 @@ ALWAYS_INLINE void PartitionRoot<thread_safe>::FreeNoH // essentially). - #if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && \ - ((defined(OS_ANDROID) && !BUILDFLAG(IS_CHROMECAST)) || \ -- (defined(OS_LINUX) && defined(ARCH_CPU_64_BITS))) -+ ((defined(OS_LINUX) || defined(OS_BSD)) && defined(ARCH_CPU_64_BITS))) - PA_CHECK(IsManagedByPartitionAlloc(reinterpret_cast<uintptr_t>(ptr))); + #if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && \ + ((BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMECAST)) || \ +- (BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_64_BITS))) ++ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_64_BITS))) + PA_CHECK(IsManagedByPartitionAlloc(address)); #endif diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_spinning__mutex.cc b/www/chromium/files/patch-base_allocator_partition__allocator_spinning__mutex.cc index be1594ebc8d8..2fa346356669 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_spinning__mutex.cc +++ b/www/chromium/files/patch-base_allocator_partition__allocator_spinning__mutex.cc @@ -1,4 +1,4 @@ ---- base/allocator/partition_allocator/spinning_mutex.cc.orig 2022-02-07 13:39:41 UTC +--- base/allocator/partition_allocator/spinning_mutex.cc.orig 2022-02-28 16:54:41 UTC +++ base/allocator/partition_allocator/spinning_mutex.cc @@ -17,7 +17,15 @@ @@ -16,7 +16,7 @@ #include <sys/syscall.h> #include <unistd.h> #endif // defined(PA_HAS_LINUX_KERNEL) -@@ -86,8 +94,13 @@ void SpinningMutex::FutexWait() { +@@ -85,8 +93,13 @@ void SpinningMutex::FutexWait() { // |kLockedContended| anymore. Note that even without spurious wakeups, the // value of |state_| is not guaranteed when this returns, as another thread // may get the lock before we get to run. @@ -30,7 +30,7 @@ if (err) { // These are programming error, check them. -@@ -99,8 +112,14 @@ void SpinningMutex::FutexWait() { +@@ -98,8 +111,14 @@ void SpinningMutex::FutexWait() { void SpinningMutex::FutexWake() { int saved_errno = errno; diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_starscan_stack_stack.cc b/www/chromium/files/patch-base_allocator_partition__allocator_starscan_stack_stack.cc index 09e46dc3b1a8..54cc31592590 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_starscan_stack_stack.cc +++ b/www/chromium/files/patch-base_allocator_partition__allocator_starscan_stack_stack.cc @@ -1,4 +1,4 @@ ---- base/allocator/partition_allocator/starscan/stack/stack.cc.orig 2022-02-07 13:39:41 UTC +--- base/allocator/partition_allocator/starscan/stack/stack.cc.orig 2022-02-28 16:54:41 UTC +++ base/allocator/partition_allocator/starscan/stack/stack.cc @@ -17,6 +17,10 @@ #include <pthread.h> @@ -47,4 +47,4 @@ + return nullptr; } - #elif defined(OS_POSIX) || defined(OS_FUCHSIA) + #elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA) diff --git a/www/chromium/files/patch-base_base__paths__posix.cc b/www/chromium/files/patch-base_base__paths__posix.cc index e4e467db6322..9b6827056e06 100644 --- a/www/chromium/files/patch-base_base__paths__posix.cc +++ b/www/chromium/files/patch-base_base__paths__posix.cc @@ -1,4 +1,4 @@ ---- base/base_paths_posix.cc.orig 2022-02-07 13:39:41 UTC +--- base/base_paths_posix.cc.orig 2022-02-28 16:54:41 UTC +++ base/base_paths_posix.cc @@ -15,6 +15,7 @@ #include <ostream> @@ -12,21 +12,21 @@ #include "base/process/process_metrics.h" #include "build/build_config.h" --#if defined(OS_FREEBSD) -+#if defined(OS_BSD) +-#if BUILDFLAG(IS_FREEBSD) ++#if BUILDFLAG(IS_BSD) #include <sys/param.h> #include <sys/sysctl.h> -+#if defined(OS_OPENBSD) ++#if BUILDFLAG(IS_OPENBSD) +#include <kvm.h> +#define MAXTOKENS 2 +#endif - #elif defined(OS_SOLARIS) || defined(OS_AIX) + #elif BUILDFLAG(IS_SOLARIS) || BUILDFLAG(IS_AIX) #include <stdlib.h> #endif @@ -68,13 +73,65 @@ bool PathProviderPosix(int key, FilePath* result) { *result = FilePath(bin_dir); return true; - #elif defined(OS_OPENBSD) || defined(OS_AIX) + #elif BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_AIX) - // There is currently no way to get the executable path on OpenBSD - char* cpath; - if ((cpath = getenv("CHROME_EXE_PATH")) != NULL) @@ -35,7 +35,7 @@ - *result = FilePath("/usr/local/chrome/chrome"); - return true; + char *cpath; -+#if !defined(OS_AIX) ++#if !BUILDFLAG(IS_AIX) + struct kinfo_file *files; + kvm_t *kd = NULL; + char errbuf[_POSIX2_LINE_MAX]; @@ -89,7 +89,7 @@ + else + *result = FilePath("/usr/local/chrome/chrome"); + return true; -+#if !defined(OS_AIX) ++#if !BUILDFLAG(IS_AIX) + } + return ret; +#endif diff --git a/www/chromium/files/patch-base_base__switches.cc b/www/chromium/files/patch-base_base__switches.cc index be1fb8bcdacd..59678d7551d9 100644 --- a/www/chromium/files/patch-base_base__switches.cc +++ b/www/chromium/files/patch-base_base__switches.cc @@ -1,11 +1,11 @@ ---- base/base_switches.cc.orig 2022-02-07 13:39:41 UTC +--- base/base_switches.cc.orig 2022-02-28 16:54:41 UTC +++ base/base_switches.cc @@ -170,7 +170,7 @@ const char kForceFieldTrialParams[] = "force-fieldtria #endif --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Controls whether or not retired instruction counts are surfaced for threads // in trace events on Linux. // diff --git a/www/chromium/files/patch-base_base__switches.h b/www/chromium/files/patch-base_base__switches.h index 3388972738b8..8b90f08b6a9e 100644 --- a/www/chromium/files/patch-base_base__switches.h +++ b/www/chromium/files/patch-base_base__switches.h @@ -1,11 +1,11 @@ ---- base/base_switches.h.orig 2022-02-07 13:39:41 UTC +--- base/base_switches.h.orig 2022-02-28 16:54:41 UTC +++ base/base_switches.h @@ -60,7 +60,7 @@ extern const char kEnableIdleTracing[]; extern const char kForceFieldTrialParams[]; #endif --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) extern const char kEnableThreadInstructionCount[]; // TODO(crbug.com/1176772): Remove kEnableCrashpad and IsCrashpadEnabled() when diff --git a/www/chromium/files/patch-base_compiler__specific.h b/www/chromium/files/patch-base_compiler__specific.h index d9fcba02e013..5424b9804aa7 100644 --- a/www/chromium/files/patch-base_compiler__specific.h +++ b/www/chromium/files/patch-base_compiler__specific.h @@ -1,6 +1,6 @@ ---- base/compiler_specific.h.orig 2022-02-07 13:39:41 UTC +--- base/compiler_specific.h.orig 2022-02-28 16:54:41 UTC +++ base/compiler_specific.h -@@ -366,7 +366,7 @@ inline constexpr bool AnalyzerAssumeTrue(bool arg) { +@@ -359,7 +359,7 @@ inline constexpr bool AnalyzerAssumeTrue(bool arg) { #endif // defined(__clang_analyzer__) // Use nomerge attribute to disable optimization of merging multiple same calls. diff --git a/www/chromium/files/patch-base_cpu.h b/www/chromium/files/patch-base_cpu.h index 1879d459ce46..68c6722e4905 100644 --- a/www/chromium/files/patch-base_cpu.h +++ b/www/chromium/files/patch-base_cpu.h @@ -1,11 +1,11 @@ ---- base/cpu.h.orig 2022-02-07 13:39:41 UTC +--- base/cpu.h.orig 2022-02-28 16:54:41 UTC +++ base/cpu.h -@@ -104,7 +104,7 @@ class BASE_EXPORT CPU final { +@@ -108,7 +108,7 @@ class BASE_EXPORT CPU final { const std::string& cpu_brand() const { return cpu_brand_; } - #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ -- defined(OS_AIX) -+ defined(OS_AIX) || defined(OS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ +- BUILDFLAG(IS_AIX) ++ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD) enum class CoreType { kUnknown = 0, kOther, diff --git a/www/chromium/files/patch-base_debug_debugger__posix.cc b/www/chromium/files/patch-base_debug_debugger__posix.cc index 63a56d85b575..01e51311eb4a 100644 --- a/www/chromium/files/patch-base_debug_debugger__posix.cc +++ b/www/chromium/files/patch-base_debug_debugger__posix.cc @@ -1,21 +1,21 @@ ---- base/debug/debugger_posix.cc.orig 2022-02-07 13:39:41 UTC +--- base/debug/debugger_posix.cc.orig 2022-02-28 16:54:41 UTC +++ base/debug/debugger_posix.cc @@ -36,6 +36,10 @@ #include <sys/sysctl.h> #endif -+#if defined(OS_OPENBSD) ++#if BUILDFLAG(IS_OPENBSD) +#include <sys/proc.h> +#endif + - #if defined(OS_FREEBSD) + #if BUILDFLAG(IS_FREEBSD) #include <sys/user.h> #endif -@@ -95,32 +99,51 @@ bool BeingDebugged() { +@@ -96,32 +100,51 @@ bool BeingDebugged() { // Caution: struct kinfo_proc is marked __APPLE_API_UNSTABLE. The source and // binary interfaces may change. -+#if defined(OS_OPENBSD) ++#if BUILDFLAG(IS_OPENBSD) + struct kinfo_proc *info; + size_t info_size; +#else @@ -23,7 +23,7 @@ size_t info_size = sizeof(info); +#endif - #if defined(OS_OPENBSD) + #if BUILDFLAG(IS_OPENBSD) if (sysctl(mib, base::size(mib), NULL, &info_size, NULL, 0) < 0) return -1; @@ -37,7 +37,7 @@ + int sysctl_result = sysctl(mib, base::size(mib), info, &info_size, NULL, 0); #endif -+#if !defined(OS_OPENBSD) ++#if !BUILDFLAG(IS_OPENBSD) int sysctl_result = sysctl(mib, base::size(mib), &info, &info_size, NULL, 0); +#endif DCHECK_EQ(sysctl_result, 0); @@ -50,18 +50,18 @@ // This process is being debugged if the P_TRACED flag is set. is_set = true; - #if defined(OS_FREEBSD) + #if BUILDFLAG(IS_FREEBSD) being_debugged = (info.ki_flag & P_TRACED) != 0; --#elif defined(OS_BSD) +-#elif BUILDFLAG(IS_BSD) - being_debugged = (info.p_flag & P_TRACED) != 0; -+#elif defined(OS_OPENBSD) ++#elif BUILDFLAG(IS_OPENBSD) + being_debugged = (info->p_psflags & PS_TRACED) != 0; #else being_debugged = (info.kp_proc.p_flag & P_TRACED) != 0; +#endif + +out: -+#if defined(OS_OPENBSD) ++#if BUILDFLAG(IS_OPENBSD) + free(info); #endif return being_debugged; diff --git a/www/chromium/files/patch-base_debug_proc__maps__linux.cc b/www/chromium/files/patch-base_debug_proc__maps__linux.cc index c728ce89a006..4ed7cb701ed6 100644 --- a/www/chromium/files/patch-base_debug_proc__maps__linux.cc +++ b/www/chromium/files/patch-base_debug_proc__maps__linux.cc @@ -1,11 +1,11 @@ ---- base/debug/proc_maps_linux.cc.orig 2022-02-07 13:39:41 UTC +--- base/debug/proc_maps_linux.cc.orig 2022-02-28 16:54:41 UTC +++ base/debug/proc_maps_linux.cc @@ -13,7 +13,7 @@ #include "base/strings/string_split.h" #include "build/build_config.h" --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) #include <inttypes.h> #endif diff --git a/www/chromium/files/patch-base_debug_stack__trace__posix.cc b/www/chromium/files/patch-base_debug_stack__trace__posix.cc index 1852f89074be..5ddbea4f56ac 100644 --- a/www/chromium/files/patch-base_debug_stack__trace__posix.cc +++ b/www/chromium/files/patch-base_debug_stack__trace__posix.cc @@ -1,25 +1,25 @@ ---- base/debug/stack_trace_posix.cc.orig 2022-02-07 13:39:41 UTC +--- base/debug/stack_trace_posix.cc.orig 2022-02-28 16:54:41 UTC +++ base/debug/stack_trace_posix.cc -@@ -35,7 +35,7 @@ +@@ -37,7 +37,7 @@ #include <AvailabilityMacros.h> #endif --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "base/debug/proc_maps_linux.h" #endif -@@ -693,6 +693,9 @@ class SandboxSymbolizeHelper { +@@ -695,6 +695,9 @@ class SandboxSymbolizeHelper { // for the modules that are loaded in the current process. // Returns true on success. bool CacheMemoryRegions() { -+#if defined(OS_BSD) ++#if BUILDFLAG(IS_BSD) + return false; +#else // Reads /proc/self/maps. std::string contents; if (!ReadProcMaps(&contents)) { -@@ -710,6 +713,7 @@ class SandboxSymbolizeHelper { +@@ -712,6 +715,7 @@ class SandboxSymbolizeHelper { is_initialized_ = true; return true; @@ -27,12 +27,12 @@ } // Opens all object files and caches their file descriptors. -@@ -866,7 +870,7 @@ size_t CollectStackTrace(void** trace, size_t count) { +@@ -868,7 +872,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); -#elif !defined(__UCLIBC__) && !defined(_AIX) -+#elif !defined(__UCLIBC__) && !defined(_AIX) && !defined(OS_BSD) ++#elif !defined(__UCLIBC__) && !defined(_AIX) && !BUILDFLAG(IS_BSD) // Though the backtrace API man page does not list any possible negative // return values, we take no chance. return base::saturated_cast<size_t>(backtrace(trace, count)); diff --git a/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc b/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc new file mode 100644 index 000000000000..e0978f8b9384 --- /dev/null +++ b/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc @@ -0,0 +1,29 @@ +--- base/files/file_path_watcher_unittest.cc.orig 2022-02-28 16:54:41 UTC ++++ base/files/file_path_watcher_unittest.cc +@@ -450,7 +450,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) { + VLOG(1) << "Waiting for file1 creation"; + ASSERT_TRUE(WaitForEvents()); + +-#if !BUILDFLAG(IS_APPLE) ++#if !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD) + // Mac implementation does not detect files modified in a directory. + ASSERT_TRUE(WriteFile(file1, "content v2")); + VLOG(1) << "Waiting for file1 modification"; +@@ -1038,7 +1038,7 @@ enum Permission { + Execute + }; + +-#if BUILDFLAG(IS_APPLE) ++#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) + bool ChangeFilePermissions(const FilePath& path, Permission perm, bool allow) { + struct stat stat_buf; + +@@ -1069,7 +1069,7 @@ bool ChangeFilePermissions(const FilePath& path, Permi + } + #endif // BUILDFLAG(IS_APPLE) + +-#if BUILDFLAG(IS_APPLE) ++#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) + // Linux implementation of FilePathWatcher doesn't catch attribute changes. + // http://crbug.com/78043 + // Windows implementation of FilePathWatcher catches attribute changes that diff --git a/www/chromium/files/patch-base_files_file__util__unittest.cc b/www/chromium/files/patch-base_files_file__util__unittest.cc new file mode 100644 index 000000000000..4ab8b350d668 --- /dev/null +++ b/www/chromium/files/patch-base_files_file__util__unittest.cc @@ -0,0 +1,20 @@ +--- base/files/file_util_unittest.cc.orig 2022-02-28 16:54:41 UTC ++++ base/files/file_util_unittest.cc +@@ -3524,7 +3524,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) { + } + #endif // BUILDFLAG(IS_WIN) + +-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) ++#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD) + TEST_F(FileUtilTest, ReadFileToStringWithProcFileSystem) { + FilePath file_path("/proc/cpuinfo"); + std::string data = "temp"; +@@ -4240,7 +4240,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles + NULL); + #else + size_t bytes_written = +- ::write(::fileno(output_file.get()), content.c_str(), content.length()); ++ ::write(fileno(output_file.get()), content.c_str(), content.length()); + #endif + EXPECT_EQ(content.length(), bytes_written); + ::fflush(output_file.get()); diff --git a/www/chromium/files/patch-base_files_important__file__writer__cleaner.cc b/www/chromium/files/patch-base_files_important__file__writer__cleaner.cc index 63a8f084dee3..80f08d51a819 100644 --- a/www/chromium/files/patch-base_files_important__file__writer__cleaner.cc +++ b/www/chromium/files/patch-base_files_important__file__writer__cleaner.cc @@ -1,12 +1,12 @@ ---- base/files/important_file_writer_cleaner.cc.orig 2022-02-07 13:39:41 UTC +--- base/files/important_file_writer_cleaner.cc.orig 2022-02-28 16:54:41 UTC +++ base/files/important_file_writer_cleaner.cc -@@ -24,7 +24,8 @@ namespace base { +@@ -25,7 +25,8 @@ namespace base { namespace { base::Time GetUpperBoundTime() { --#if defined(OS_ANDROID) || defined(OS_IOS) || defined(OS_FUCHSIA) +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_FUCHSIA) +// needed because of .CreationTime() pledge -+#if defined(OS_ANDROID) || defined(OS_IOS) || defined(OS_FUCHSIA) || defined(OS_BSD) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) // If process creation time is not available then use instance creation // time as the upper-bound for old files. Modification times may be // rounded-down to coarse-grained increments, e.g. FAT has 2s granularity, diff --git a/www/chromium/files/patch-base_files_scoped__file.cc b/www/chromium/files/patch-base_files_scoped__file.cc index 874e2e3d597a..350c73cc76e7 100644 --- a/www/chromium/files/patch-base_files_scoped__file.cc +++ b/www/chromium/files/patch-base_files_scoped__file.cc @@ -1,11 +1,11 @@ ---- base/files/scoped_file.cc.orig 2022-02-07 13:39:41 UTC +--- base/files/scoped_file.cc.orig 2022-02-28 16:54:41 UTC +++ base/files/scoped_file.cc @@ -31,7 +31,7 @@ void ScopedFDCloseTraits::Free(int fd) { int ret = IGNORE_EINTR(close(fd)); - #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_APPLE) || \ -- defined(OS_FUCHSIA) || defined(OS_ANDROID) -+ defined(OS_FUCHSIA) || defined(OS_ANDROID) || defined(OS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \ +- BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) // NB: Some file descriptors can return errors from close() e.g. network // filesystems such as NFS and Linux input devices. On Linux, macOS, and // Fuchsia's POSIX layer, errors from close other than EBADF do not indicate diff --git a/www/chromium/files/patch-base_i18n_icu__util.cc b/www/chromium/files/patch-base_i18n_icu__util.cc index 36122feefefa..f5d9b12738d7 100644 --- a/www/chromium/files/patch-base_i18n_icu__util.cc +++ b/www/chromium/files/patch-base_i18n_icu__util.cc @@ -1,21 +1,20 @@ ---- base/i18n/icu_util.cc.orig 2022-02-07 13:39:41 UTC +--- base/i18n/icu_util.cc.orig 2022-02-28 16:54:41 UTC +++ base/i18n/icu_util.cc -@@ -49,7 +49,7 @@ - #include "third_party/icu/source/common/unicode/unistr.h" +@@ -52,7 +52,7 @@ #endif --#if defined(OS_ANDROID) || defined(OS_FUCHSIA) || \ -+#if defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD) || \ - ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && !BUILDFLAG(IS_CHROMECAST)) + #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ +- ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \ ++ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && \ + !BUILDFLAG(IS_CHROMECAST)) #include "third_party/icu/source/i18n/unicode/timezone.h" #endif -@@ -343,7 +343,8 @@ void InitializeIcuTimeZone() { +@@ -346,7 +346,7 @@ void InitializeIcuTimeZone() { FuchsiaIntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization(); icu::TimeZone::adoptDefault( icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id))); --#elif (defined(OS_LINUX) || defined(OS_CHROMEOS)) && !BUILDFLAG(IS_CHROMECAST) -+#elif (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && \ -+ !BUILDFLAG(IS_CHROMECAST) +-#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \ ++#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && \ + !BUILDFLAG(IS_CHROMECAST) // To respond to the time zone change properly, the default time zone // cache in ICU has to be populated on starting up. - // See TimeZoneMonitorLinux::NotifyClientsFromImpl(). diff --git a/www/chromium/files/patch-base_logging__unittest.cc b/www/chromium/files/patch-base_logging__unittest.cc new file mode 100644 index 000000000000..875546922a1c --- /dev/null +++ b/www/chromium/files/patch-base_logging__unittest.cc @@ -0,0 +1,31 @@ +--- base/logging_unittest.cc.orig 2022-02-28 16:54:41 UTC ++++ base/logging_unittest.cc +@@ -32,7 +32,7 @@ + #include "base/posix/eintr_wrapper.h" + #endif // BUILDFLAG(IS_POSIX) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FREEBSD) + #include <ucontext.h> + #endif + +@@ -552,14 +552,18 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo + // need the arch-specific boilerplate below, which is inspired by breakpad. + // At the same time, on OSX, ucontext.h is deprecated but si_addr works fine. + uintptr_t crash_addr = 0; +-#if BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FREEBSD) + crash_addr = reinterpret_cast<uintptr_t>(info->si_addr); + #else // OS_* + ucontext_t* context = reinterpret_cast<ucontext_t*>(context_ptr); + #if defined(ARCH_CPU_X86) + crash_addr = static_cast<uintptr_t>(context->uc_mcontext.gregs[REG_EIP]); + #elif defined(ARCH_CPU_X86_64) ++#if BUILDFLAG(IS_OPENBSD) ++ crash_addr = static_cast<uintptr_t>(context->sc_rip); ++#else + crash_addr = static_cast<uintptr_t>(context->uc_mcontext.gregs[REG_RIP]); ++#endif + #elif defined(ARCH_CPU_ARMEL) + crash_addr = static_cast<uintptr_t>(context->uc_mcontext.arm_pc); + #elif defined(ARCH_CPU_ARM64) diff --git a/www/chromium/files/patch-base_memory_discardable__memory.cc b/www/chromium/files/patch-base_memory_discardable__memory.cc index 136569ca00cd..350a28608203 100644 --- a/www/chromium/files/patch-base_memory_discardable__memory.cc +++ b/www/chromium/files/patch-base_memory_discardable__memory.cc @@ -1,38 +1,38 @@ ---- base/memory/discardable_memory.cc.orig 2022-02-07 13:39:41 UTC +--- base/memory/discardable_memory.cc.orig 2022-02-28 16:54:41 UTC +++ base/memory/discardable_memory.cc @@ -24,7 +24,7 @@ const base::Feature kMadvFreeDiscardableMemory{ "MadvFreeDiscardableMemory", base::FEATURE_DISABLED_BY_DEFAULT}; - #endif // defined(OS_POSIX) + #endif // BUILDFLAG(IS_POSIX) --#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) const base::Feature kDiscardableMemoryBackingTrial{ "DiscardableMemoryBackingTrial", base::FEATURE_DISABLED_BY_DEFAULT}; -@@ -48,7 +48,7 @@ const base::FeatureParam<DiscardableMemoryTrialGroup> +@@ -49,7 +49,7 @@ const base::FeatureParam<DiscardableMemoryTrialGroup> namespace { --#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) DiscardableMemoryBacking GetBackingForFieldTrial() { DiscardableMemoryTrialGroup trial_group = -@@ -66,7 +66,7 @@ DiscardableMemoryBacking GetBackingForFieldTrial() { +@@ -68,7 +68,7 @@ DiscardableMemoryBacking GetBackingForFieldTrial() { } // namespace --#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Probe capabilities of this device to determine whether we should participate // in the discardable memory backing trial. -@@ -95,7 +95,7 @@ DiscardableMemory::DiscardableMemory() = default; +@@ -98,7 +98,7 @@ DiscardableMemory::DiscardableMemory() = default; DiscardableMemory::~DiscardableMemory() = default; DiscardableMemoryBacking GetDiscardableMemoryBacking() { --#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (DiscardableMemoryBackingFieldTrialIsEnabled()) { return GetBackingForFieldTrial(); } diff --git a/www/chromium/files/patch-base_memory_discardable__memory__internal.h b/www/chromium/files/patch-base_memory_discardable__memory__internal.h index c511cb6b113c..13bef7210432 100644 --- a/www/chromium/files/patch-base_memory_discardable__memory__internal.h +++ b/www/chromium/files/patch-base_memory_discardable__memory__internal.h @@ -1,11 +1,11 @@ ---- base/memory/discardable_memory_internal.h.orig 2022-02-07 13:39:41 UTC +--- base/memory/discardable_memory_internal.h.orig 2022-02-28 16:54:41 UTC +++ base/memory/discardable_memory_internal.h @@ -10,7 +10,7 @@ #include "base/metrics/field_trial_params.h" #include "build/build_config.h" --#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) namespace base { diff --git a/www/chromium/files/patch-base_memory_madv__free__discardable__memory__posix.cc b/www/chromium/files/patch-base_memory_madv__free__discardable__memory__posix.cc index 51230808b76b..1f2283b19981 100644 --- a/www/chromium/files/patch-base_memory_madv__free__discardable__memory__posix.cc +++ b/www/chromium/files/patch-base_memory_madv__free__discardable__memory__posix.cc @@ -1,17 +1,17 @@ ---- base/memory/madv_free_discardable_memory_posix.cc.orig 2022-02-07 13:39:41 UTC +--- base/memory/madv_free_discardable_memory_posix.cc.orig 2022-02-28 16:54:41 UTC +++ base/memory/madv_free_discardable_memory_posix.cc -@@ -292,6 +292,10 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT +@@ -294,6 +294,10 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT bool MadvFreeDiscardableMemoryPosix::IsResident() const { DFAKE_SCOPED_RECURSIVE_LOCK(thread_collision_warner_); +// XXX mincore -+#if defined(OS_BSD) ++#if BUILDFLAG(IS_BSD) + return false; +#else - #if defined(OS_APPLE) + #if BUILDFLAG(IS_APPLE) std::vector<char> vec(allocated_pages_); #else -@@ -307,6 +311,7 @@ bool MadvFreeDiscardableMemoryPosix::IsResident() cons +@@ -309,6 +313,7 @@ bool MadvFreeDiscardableMemoryPosix::IsResident() cons return false; } return true; diff --git a/www/chromium/files/patch-base_memory_platform__shared__memory__region.h b/www/chromium/files/patch-base_memory_platform__shared__memory__region.h index 6057569add0b..002915dba49c 100644 --- a/www/chromium/files/patch-base_memory_platform__shared__memory__region.h +++ b/www/chromium/files/patch-base_memory_platform__shared__memory__region.h @@ -1,29 +1,29 @@ ---- base/memory/platform_shared_memory_region.h.orig 2021-12-14 11:44:55 UTC +--- base/memory/platform_shared_memory_region.h.orig 2022-02-28 16:54:41 UTC +++ base/memory/platform_shared_memory_region.h -@@ -24,7 +24,7 @@ +@@ -23,7 +23,7 @@ #include "base/files/scoped_file.h" #endif --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) namespace content { class SandboxIPCHandler; } -@@ -117,7 +117,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { +@@ -116,7 +116,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { kMaxValue = GET_SHMEM_TEMP_DIR_FAILURE }; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Structure to limit access to executable region creation. struct ExecutableRegion { private: -@@ -264,7 +264,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { +@@ -263,7 +263,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { CheckPlatformHandlePermissionsCorrespondToMode); static PlatformSharedMemoryRegion Create(Mode mode, size_t size --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) , bool executable = false #endif diff --git a/www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc b/www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc index a35c8d880061..dc7c81b3ea39 100644 --- a/www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc +++ b/www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc @@ -1,11 +1,11 @@ ---- base/memory/platform_shared_memory_region_posix.cc.orig 2022-02-07 13:39:41 UTC +--- base/memory/platform_shared_memory_region_posix.cc.orig 2022-02-28 16:54:41 UTC +++ base/memory/platform_shared_memory_region_posix.cc @@ -70,7 +70,7 @@ FDPair ScopedFDPair::get() const { return {fd.get(), readonly_fd.get()}; } --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // static ScopedFD PlatformSharedMemoryRegion::ExecutableRegion::CreateFD(size_t size) { PlatformSharedMemoryRegion region = @@ -13,8 +13,8 @@ // static PlatformSharedMemoryRegion PlatformSharedMemoryRegion::Create(Mode mode, size_t size --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) , bool executable #endif @@ -22,8 +22,8 @@ // flag. FilePath directory; if (!GetShmemTempDir( --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) executable, #else false /* executable */, diff --git a/www/chromium/files/patch-base_message__loop_message__pump__glib.cc b/www/chromium/files/patch-base_message__loop_message__pump__glib.cc index 5cf21bba2dbd..047712904c6f 100644 --- a/www/chromium/files/patch-base_message__loop_message__pump__glib.cc +++ b/www/chromium/files/patch-base_message__loop_message__pump__glib.cc @@ -1,10 +1,10 @@ ---- base/message_loop/message_pump_glib.cc.orig 2021-09-14 01:51:47 UTC +--- base/message_loop/message_pump_glib.cc.orig 2022-02-28 16:54:41 UTC +++ base/message_loop/message_pump_glib.cc @@ -8,6 +8,11 @@ #include <glib.h> #include <math.h> -+#if defined(OS_BSD) ++#if BUILDFLAG(IS_BSD) +#include <pthread.h> +#include <pthread_np.h> +#endif @@ -12,11 +12,11 @@ #include "base/logging.h" #include "base/notreached.h" #include "base/numerics/safe_conversions.h" -@@ -49,9 +54,13 @@ int GetTimeIntervalMilliseconds(TimeTicks next_task_ti +@@ -50,9 +55,13 @@ int GetTimeIntervalMilliseconds(TimeTicks next_task_ti } bool RunningOnMainThread() { -+#if defined(OS_BSD) ++#if BUILDFLAG(IS_BSD) + return pthread_main_np(); +#else auto pid = getpid(); diff --git a/www/chromium/files/patch-base_native__library__posix.cc b/www/chromium/files/patch-base_native__library__posix.cc index a7ea746723c5..1aca9e8e282e 100644 --- a/www/chromium/files/patch-base_native__library__posix.cc +++ b/www/chromium/files/patch-base_native__library__posix.cc @@ -1,11 +1,11 @@ ---- base/native_library_posix.cc.orig 2021-04-14 18:40:48 UTC +--- base/native_library_posix.cc.orig 2022-02-28 16:54:41 UTC +++ base/native_library_posix.cc -@@ -31,7 +31,7 @@ NativeLibrary LoadNativeLibraryWithOptions(const FileP +@@ -32,7 +32,7 @@ NativeLibrary LoadNativeLibraryWithOptions(const FileP // http://crbug.com/17943, http://crbug.com/17557, http://crbug.com/36892, // and http://crbug.com/40794. int flags = RTLD_LAZY; --#if defined(OS_ANDROID) || !defined(RTLD_DEEPBIND) -+#if defined(OS_ANDROID) || !defined(RTLD_DEEPBIND) || defined(OS_BSD) +-#if BUILDFLAG(IS_ANDROID) || !defined(RTLD_DEEPBIND) ++#if BUILDFLAG(IS_ANDROID) || !defined(RTLD_DEEPBIND) || BUILDFLAG(IS_BSD) // Certain platforms don't define RTLD_DEEPBIND. Android dlopen() requires // further investigation, as it might vary across versions. Crash here to // warn developers that they're trying to rely on uncertain behavior. diff --git a/www/chromium/files/patch-base_native__library__unittest.cc b/www/chromium/files/patch-base_native__library__unittest.cc new file mode 100644 index 000000000000..4729ea97fb39 --- /dev/null +++ b/www/chromium/files/patch-base_native__library__unittest.cc @@ -0,0 +1,11 @@ +--- base/native_library_unittest.cc.orig 2022-02-28 16:54:41 UTC ++++ base/native_library_unittest.cc +@@ -119,7 +119,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) && \ +- !defined(MEMORY_SANITIZER) ++ !defined(MEMORY_SANITIZER) && !BUILDFLAG(IS_BSD) + + // Verifies that the |prefer_own_symbols| option satisfies its guarantee that + // a loaded library will always prefer local symbol resolution before diff --git a/www/chromium/files/patch-base_posix_can__lower__nice__to.cc b/www/chromium/files/patch-base_posix_can__lower__nice__to.cc index 43b20c5e8988..67a5d35808ae 100644 --- a/www/chromium/files/patch-base_posix_can__lower__nice__to.cc +++ b/www/chromium/files/patch-base_posix_can__lower__nice__to.cc @@ -1,16 +1,16 @@ ---- base/posix/can_lower_nice_to.cc.orig 2022-02-07 13:39:41 UTC +--- base/posix/can_lower_nice_to.cc.orig 2022-02-28 16:54:41 UTC +++ base/posix/can_lower_nice_to.cc @@ -11,8 +11,12 @@ #include "build/build_config.h" -+#if defined(OS_FREEBSD) ++#if BUILDFLAG(IS_FREEBSD) +#include <sys/param.h> +#endif + // Not defined on AIX by default. --#if defined(OS_AIX) -+#if defined(OS_AIX) || defined(OS_BSD) +-#if BUILDFLAG(IS_AIX) ++#if BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD) #if defined(RLIMIT_NICE) #error Assumption about OS_AIX is incorrect #endif diff --git a/www/chromium/files/patch-base_posix_unix__domain__socket.cc b/www/chromium/files/patch-base_posix_unix__domain__socket.cc index db441a342cef..9fac90a4accf 100644 --- a/www/chromium/files/patch-base_posix_unix__domain__socket.cc +++ b/www/chromium/files/patch-base_posix_unix__domain__socket.cc @@ -1,11 +1,11 @@ ---- base/posix/unix_domain_socket.cc.orig 2022-02-07 13:39:41 UTC +--- base/posix/unix_domain_socket.cc.orig 2022-02-28 16:54:41 UTC +++ base/posix/unix_domain_socket.cc @@ -50,7 +50,7 @@ bool CreateSocketPair(ScopedFD* one, ScopedFD* two) { // static bool UnixDomainSocket::EnableReceiveProcessId(int fd) { --#if !defined(OS_APPLE) -+#if !defined(OS_APPLE) && !defined(OS_BSD) +-#if !BUILDFLAG(IS_APPLE) ++#if !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD) const int enable = 1; return setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &enable, sizeof(enable)) == 0; #else @@ -13,8 +13,8 @@ const size_t kControlBufferSize = CMSG_SPACE(sizeof(int) * kMaxFileDescriptors) --#if !defined(OS_APPLE) -+#if !defined(OS_APPLE) && !defined(OS_BSD) +-#if !BUILDFLAG(IS_APPLE) ++#if !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD) // macOS does not support ucred. // macOS supports xucred, but this structure is insufficient. + CMSG_SPACE(sizeof(struct ucred)) @@ -22,8 +22,8 @@ wire_fds = reinterpret_cast<int*>(CMSG_DATA(cmsg)); wire_fds_len = payload_len / sizeof(int); } --#if !defined(OS_APPLE) -+#if !defined(OS_APPLE) && !defined(OS_BSD) +-#if !BUILDFLAG(IS_APPLE) ++#if !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD) // macOS does not support SCM_CREDENTIALS. if (cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_type == SCM_CREDENTIALS) { @@ -31,7 +31,7 @@ socklen_t pid_size = sizeof(pid); if (getsockopt(fd, SOL_LOCAL, LOCAL_PEERPID, &pid, &pid_size) != 0) pid = -1; -+#elif defined(OS_BSD) ++#elif BUILDFLAG(IS_BSD) + NOTIMPLEMENTED(); + pid = -1; #else diff --git a/www/chromium/files/patch-base_posix_unix__domain__socket__unittest.cc b/www/chromium/files/patch-base_posix_unix__domain__socket__unittest.cc new file mode 100644 index 000000000000..b2744d4abb50 --- /dev/null +++ b/www/chromium/files/patch-base_posix_unix__domain__socket__unittest.cc @@ -0,0 +1,11 @@ +--- base/posix/unix_domain_socket_unittest.cc.orig 2022-02-28 16:54:41 UTC ++++ base/posix/unix_domain_socket_unittest.cc +@@ -10,6 +10,8 @@ + #include <sys/types.h> + #include <unistd.h> + ++#include <signal.h> ++ + #include "base/bind.h" + #include "base/callback_helpers.h" + #include "base/files/file_util.h" diff --git a/www/chromium/files/patch-base_process_kill.h b/www/chromium/files/patch-base_process_kill.h index d74a364d078e..df8eb9fb5f9c 100644 --- a/www/chromium/files/patch-base_process_kill.h +++ b/www/chromium/files/patch-base_process_kill.h @@ -1,11 +1,11 @@ ---- base/process/kill.h.orig 2022-02-07 13:39:41 UTC +--- base/process/kill.h.orig 2022-02-28 16:54:41 UTC +++ base/process/kill.h @@ -112,7 +112,7 @@ BASE_EXPORT TerminationStatus GetTerminationStatus(Pro BASE_EXPORT TerminationStatus GetKnownDeadTerminationStatus( ProcessHandle handle, int* exit_code); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Spawns a thread to wait asynchronously for the child |process| to exit // and then reaps it. BASE_EXPORT void EnsureProcessGetsReaped(Process process); diff --git a/www/chromium/files/patch-base_process_kill__posix.cc b/www/chromium/files/patch-base_process_kill__posix.cc index 1fc27331b044..f2229616fa15 100644 --- a/www/chromium/files/patch-base_process_kill__posix.cc +++ b/www/chromium/files/patch-base_process_kill__posix.cc @@ -1,11 +1,11 @@ ---- base/process/kill_posix.cc.orig 2022-02-07 13:39:41 UTC +--- base/process/kill_posix.cc.orig 2022-02-28 16:54:41 UTC +++ base/process/kill_posix.cc @@ -159,7 +159,7 @@ void EnsureProcessTerminated(Process process) { 0, new BackgroundReaper(std::move(process), Seconds(2))); } --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) void EnsureProcessGetsReaped(Process process) { DCHECK(!process.is_current()); diff --git a/www/chromium/files/patch-base_process_launch.h b/www/chromium/files/patch-base_process_launch.h index 0fe8b6553511..61716eeeb3f4 100644 --- a/www/chromium/files/patch-base_process_launch.h +++ b/www/chromium/files/patch-base_process_launch.h @@ -1,11 +1,11 @@ ---- base/process/launch.h.orig 2022-02-07 13:39:41 UTC +--- base/process/launch.h.orig 2022-02-28 16:54:41 UTC +++ base/process/launch.h -@@ -192,7 +192,7 @@ struct BASE_EXPORT LaunchOptions { +@@ -195,7 +195,7 @@ struct BASE_EXPORT LaunchOptions { bool clear_environment = false; - #endif // OS_WIN || OS_POSIX || OS_FUCHSIA + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA) --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // If non-zero, start the process using clone(), using flags as provided. // Unlike in clone, clone_flags may not contain a custom termination signal // that is sent to the parent when the child dies. The termination signal will diff --git a/www/chromium/files/patch-base_process_memory.cc b/www/chromium/files/patch-base_process_memory.cc index 67b524cc8e85..13cd43d79b6c 100644 --- a/www/chromium/files/patch-base_process_memory.cc +++ b/www/chromium/files/patch-base_process_memory.cc @@ -1,10 +1,10 @@ ---- base/process/memory.cc.orig 2022-02-07 13:39:41 UTC +--- base/process/memory.cc.orig 2022-02-28 16:54:41 UTC +++ base/process/memory.cc -@@ -63,14 +63,16 @@ NOINLINE void OnNoMemoryInternal(size_t size) { +@@ -65,14 +65,16 @@ NOINLINE void OnNoMemoryInternal(size_t size) { } // namespace internal -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) void TerminateBecauseOutOfMemory(size_t size) { internal::OnNoMemoryInternal(size); } @@ -13,8 +13,8 @@ // 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. --#if !defined(OS_APPLE) || BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) -+#if (!defined(OS_APPLE) && !defined(OS_BSD)) || BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) +-#if !BUILDFLAG(IS_APPLE) || BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) ++#if (!BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD)) || BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) bool UncheckedCalloc(size_t num_items, size_t size, void** result) { const size_t alloc_size = num_items * size; diff --git a/www/chromium/files/patch-base_process_process__handle.cc b/www/chromium/files/patch-base_process_process__handle.cc index 781e7bafa948..efb95e7c3b54 100644 --- a/www/chromium/files/patch-base_process_process__handle.cc +++ b/www/chromium/files/patch-base_process_process__handle.cc @@ -1,11 +1,11 @@ ---- base/process/process_handle.cc.orig 2021-04-14 18:40:48 UTC +--- base/process/process_handle.cc.orig 2022-02-28 16:54:41 UTC +++ base/process/process_handle.cc @@ -30,7 +30,7 @@ UniqueProcId GetUniqueIdForProcess() { : UniqueProcId(GetCurrentProcId()); } --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_AIX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD) void InitUniqueIdForProcessInPidNamespace(ProcessId pid_outside_of_namespace) { DCHECK(pid_outside_of_namespace != kNullProcessId); diff --git a/www/chromium/files/patch-base_process_process__handle.h b/www/chromium/files/patch-base_process_process__handle.h index 1708776734a2..5e25e86d099c 100644 --- a/www/chromium/files/patch-base_process_process__handle.h +++ b/www/chromium/files/patch-base_process_process__handle.h @@ -1,11 +1,11 @@ ---- base/process/process_handle.h.orig 2021-07-19 18:45:05 UTC +--- base/process/process_handle.h.orig 2022-02-28 16:54:41 UTC +++ base/process/process_handle.h @@ -106,7 +106,7 @@ BASE_EXPORT ProcessId GetCurrentProcId(); // processes may be reused. BASE_EXPORT UniqueProcId GetUniqueIdForProcess(); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // When a process is started in a different PID namespace from the browser // process, this function must be called with the process's PID in the browser's // PID namespace in order to initialize its unique ID. Not thread safe. diff --git a/www/chromium/files/patch-base_process_process__metrics.cc b/www/chromium/files/patch-base_process_process__metrics.cc index aff587d7cf98..a20644fcc0a1 100644 --- a/www/chromium/files/patch-base_process_process__metrics.cc +++ b/www/chromium/files/patch-base_process_process__metrics.cc @@ -1,11 +1,11 @@ ---- base/process/process_metrics.cc.orig 2022-02-07 13:39:41 UTC +--- base/process/process_metrics.cc.orig 2022-02-28 16:54:41 UTC +++ base/process/process_metrics.cc @@ -18,7 +18,7 @@ namespace base { namespace { - #if defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -- defined(OS_AIX) -+ defined(OS_AIX) || defined(OS_BSD) + #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_AIX) ++ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD) int CalculateEventsPerSecond(uint64_t event_count, uint64_t* last_event_count, base::TimeTicks* last_calculated) { @@ -13,8 +13,8 @@ SystemMetrics system_metrics; system_metrics.committed_memory_ = GetSystemCommitCharge(); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) GetSystemMemoryInfo(&system_metrics.memory_info_); GetVmStatInfo(&system_metrics.vmstat_info_); GetSystemDiskInfo(&system_metrics.disk_info_); @@ -22,17 +22,17 @@ Value res(Value::Type::DICTIONARY); res.SetIntKey("committed_memory", static_cast<int>(committed_memory_)); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) Value meminfo = memory_info_.ToValue(); Value vmstat = vmstat_info_.ToValue(); meminfo.MergeDictionary(&vmstat); @@ -126,7 +126,7 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage( #endif - #if defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -- defined(OS_AIX) -+ defined(OS_AIX) || defined(OS_BSD) + #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_AIX) ++ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD) int ProcessMetrics::CalculateIdleWakeupsPerSecond( uint64_t absolute_idle_wakeups) { return CalculateEventsPerSecond(absolute_idle_wakeups, diff --git a/www/chromium/files/patch-base_process_process__metrics.h b/www/chromium/files/patch-base_process_process__metrics.h index d56de6d74153..940559196a29 100644 --- a/www/chromium/files/patch-base_process_process__metrics.h +++ b/www/chromium/files/patch-base_process_process__metrics.h @@ -1,20 +1,20 @@ ---- base/process/process_metrics.h.orig 2022-02-07 13:39:41 UTC +--- base/process/process_metrics.h.orig 2022-02-28 16:54:41 UTC +++ base/process/process_metrics.h -@@ -37,7 +37,7 @@ +@@ -36,7 +36,7 @@ #endif - #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ -- defined(OS_AIX) -+ defined(OS_AIX) || defined(OS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ +- BUILDFLAG(IS_AIX) ++ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD) #include <string> #include <utility> #include <vector> -@@ -53,7 +53,7 @@ class Value; +@@ -52,7 +52,7 @@ class Value; // Full declaration is in process_metrics_iocounters.h. struct IoCounters; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) // Minor and major page fault counts since the process creation. // Both counts are process-wide, and exclude child processes. // @@ -22,98 +22,98 @@ // convenience wrapper for CreateProcessMetrics(). static std::unique_ptr<ProcessMetrics> CreateCurrentProcessMetrics(); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) // 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; @@ -134,7 +134,7 @@ class BASE_EXPORT ProcessMetrics { - TimeDelta GetCumulativeCPUUsage() WARN_UNUSED_RESULT; + [[nodiscard]] TimeDelta GetCumulativeCPUUsage(); - #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ -- defined(OS_AIX) -+ defined(OS_AIX) || defined(OS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ +- BUILDFLAG(IS_AIX) ++ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD) // 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 @@ -217,7 +217,7 @@ class BASE_EXPORT ProcessMetrics { int GetOpenFdSoftLimit() const; - #endif // defined(OS_POSIX) + #endif // BUILDFLAG(IS_POSIX) --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) // Bytes of swap as reported by /proc/[pid]/status. uint64_t GetVmSwapBytes() const; -@@ -237,7 +237,7 @@ class BASE_EXPORT ProcessMetrics { - #endif // !defined(OS_MAC) +@@ -238,7 +238,7 @@ class BASE_EXPORT ProcessMetrics { + #endif // !BUILDFLAG(IS_MAC) - #if defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -- defined(OS_AIX) -+ defined(OS_AIX) || defined(OS_BSD) + #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_AIX) ++ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD) int CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups); #endif - #if defined(OS_APPLE) -@@ -248,7 +248,7 @@ class BASE_EXPORT ProcessMetrics { + #if BUILDFLAG(IS_APPLE) +@@ -249,7 +249,7 @@ class BASE_EXPORT ProcessMetrics { #endif - #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ -- defined(OS_AIX) -+ defined(OS_AIX) || defined(OS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ +- BUILDFLAG(IS_AIX) ++ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD) CPU::CoreType GetCoreType(int core_index); - #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || - // defined(OS_AIX) -@@ -273,7 +273,7 @@ class BASE_EXPORT ProcessMetrics { + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || + // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_AIX) +@@ -274,7 +274,7 @@ class BASE_EXPORT ProcessMetrics { uint64_t last_cumulative_disk_usage_ = 0; - #if defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -- defined(OS_AIX) -+ defined(OS_AIX) || defined(OS_BSD) + #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_AIX) ++ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD) // Same thing for idle wakeups. TimeTicks last_idle_wakeups_time_; uint64_t last_absolute_idle_wakeups_; -@@ -316,7 +316,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de +@@ -317,7 +317,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de - #if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || \ - defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_AIX) || \ -- defined(OS_FUCHSIA) -+ defined(OS_FUCHSIA) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_AIX) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) // Data about system-wide memory consumption. Values are in KB. Available on // Windows, Mac, Linux, Android and Chrome OS. // -@@ -351,7 +351,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -352,7 +352,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { #endif - #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ -- defined(OS_AIX) -+ defined(OS_AIX) || defined(OS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ +- BUILDFLAG(IS_AIX) ++ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD) // 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 -@@ -366,7 +366,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -367,7 +367,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { #endif - #if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -- defined(OS_AIX) || defined(OS_FUCHSIA) -+ defined(OS_AIX) || defined(OS_FUCHSIA) || defined(OS_BSD) + #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_AIX) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) int buffers = 0; int cached = 0; int active_anon = 0; -@@ -403,7 +403,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK - // defined(OS_FUCHSIA) +@@ -404,7 +404,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK + // BUILDFLAG(IS_FUCHSIA) - #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ -- defined(OS_AIX) -+ defined(OS_AIX) || defined(OS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ +- BUILDFLAG(IS_AIX) ++ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD) // 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. -@@ -590,7 +590,7 @@ class BASE_EXPORT SystemMetrics { +@@ -591,7 +591,7 @@ class BASE_EXPORT SystemMetrics { FRIEND_TEST_ALL_PREFIXES(SystemMetricsTest, SystemMetrics); size_t committed_memory_; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) SystemMemoryInfoKB memory_info_; VmStatInfo vmstat_info_; SystemDiskInfo disk_info_; diff --git a/www/chromium/files/patch-base_process_process__metrics__posix.cc b/www/chromium/files/patch-base_process_process__metrics__posix.cc index 9e3e19fc7abb..e51334a26d54 100644 --- a/www/chromium/files/patch-base_process_process__metrics__posix.cc +++ b/www/chromium/files/patch-base_process_process__metrics__posix.cc @@ -1,20 +1,20 @@ ---- base/process/process_metrics_posix.cc.orig 2022-02-07 13:39:41 UTC +--- base/process/process_metrics_posix.cc.orig 2022-02-28 16:54:41 UTC +++ base/process/process_metrics_posix.cc @@ -20,6 +20,8 @@ - #if defined(OS_APPLE) + #if BUILDFLAG(IS_APPLE) #include <malloc/malloc.h> -+#elif defined(OS_OPENBSD) ++#elif BUILDFLAG(IS_OPENBSD) +#include <stdlib.h> #else #include <malloc.h> #endif -@@ -136,7 +138,7 @@ size_t ProcessMetrics::GetMallocUsage() { +@@ -133,7 +135,7 @@ size_t ProcessMetrics::GetMallocUsage() { return stats.size_in_use; - #elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) + #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) return GetMallocUsageMallinfo(); --#elif defined(OS_FUCHSIA) -+#elif defined(OS_FUCHSIA) || defined(OS_BSD) +-#elif BUILDFLAG(IS_FUCHSIA) ++#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) // TODO(fuchsia): Not currently exposed. https://crbug.com/735087. return 0; #endif diff --git a/www/chromium/files/patch-base_process_process__posix.cc b/www/chromium/files/patch-base_process_process__posix.cc index b2245b1ea796..8a7b5721a4a7 100644 --- a/www/chromium/files/patch-base_process_process__posix.cc +++ b/www/chromium/files/patch-base_process_process__posix.cc @@ -1,6 +1,11 @@ ---- base/process/process_posix.cc.orig 2022-02-07 13:39:41 UTC +--- base/process/process_posix.cc.orig 2022-02-28 16:54:41 UTC +++ base/process/process_posix.cc -@@ -27,6 +27,11 @@ +@@ -23,10 +23,15 @@ + #include "build/build_config.h" + #include "third_party/abseil-cpp/absl/types/optional.h" + +-#if BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) #include <sys/event.h> #endif @@ -12,6 +17,24 @@ #if BUILDFLAG(CLANG_PROFILING) #include "base/test/clang_profiling.h" #endif +@@ -95,7 +100,7 @@ bool WaitpidWithTimeout(base::ProcessHandle handle, + return ret_pid > 0; + } + +-#if BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + // Using kqueue on Mac so that we can wait on non-child processes. + // We can't use kqueues on child processes because we need to reap + // our own children using wait. +@@ -200,7 +205,7 @@ bool WaitForExitWithTimeoutImpl(base::ProcessHandle ha + const bool exited = (parent_pid < 0); + + if (!exited && parent_pid != our_pid) { +-#if BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + // On Mac we can wait on non child processes. + return WaitForSingleNonChildProcess(handle, timeout); + #else @@ -358,7 +363,55 @@ void Process::Exited(int exit_code) const {} int Process::GetPriority() const { diff --git a/www/chromium/files/patch-base_process_process__unittest.cc b/www/chromium/files/patch-base_process_process__unittest.cc new file mode 100644 index 000000000000..0b87a05680b7 --- /dev/null +++ b/www/chromium/files/patch-base_process_process__unittest.cc @@ -0,0 +1,11 @@ +--- base/process/process_unittest.cc.orig 2022-02-28 16:54:41 UTC ++++ base/process/process_unittest.cc +@@ -140,7 +140,7 @@ TEST_F(ProcessTest, CreationTimeOtherProcess) { + // was spawned and a time recorded after it was spawned. However, since the + // base::Time and process creation clocks don't match, tolerate some error. + constexpr base::TimeDelta kTolerance = +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // On Linux, process creation time is relative to boot time which has a + // 1-second resolution. Tolerate 1 second for the imprecise boot time and + // 100 ms for the imprecise clock. diff --git a/www/chromium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc b/www/chromium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc new file mode 100644 index 000000000000..3fd7776ba195 --- /dev/null +++ b/www/chromium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc @@ -0,0 +1,11 @@ +--- base/profiler/stack_sampling_profiler_test_util.cc.orig 2022-02-28 16:54:41 UTC ++++ base/profiler/stack_sampling_profiler_test_util.cc +@@ -32,7 +32,7 @@ + // Fortunately, it provides _alloca, which functions identically. + #include <malloc.h> + #define alloca _alloca +-#else ++#elif !BUILDFLAG(IS_BSD) + #include <alloca.h> + #endif + diff --git a/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc b/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc new file mode 100644 index 000000000000..d739c9137c77 --- /dev/null +++ b/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc @@ -0,0 +1,11 @@ +--- base/profiler/stack_sampling_profiler_unittest.cc.orig 2022-02-28 16:54:41 UTC ++++ base/profiler/stack_sampling_profiler_unittest.cc +@@ -41,7 +41,7 @@ + #include <intrin.h> + #include <malloc.h> + #include <windows.h> +-#else ++#elif !BUILDFLAG(IS_BSD) + #include <alloca.h> + #endif + diff --git a/www/chromium/files/patch-base_rand__util.h b/www/chromium/files/patch-base_rand__util.h index 1b379c09a366..7afa38819627 100644 --- a/www/chromium/files/patch-base_rand__util.h +++ b/www/chromium/files/patch-base_rand__util.h @@ -1,11 +1,11 @@ ---- base/rand_util.h.orig 2022-02-07 13:39:41 UTC +--- base/rand_util.h.orig 2022-02-28 16:54:41 UTC +++ base/rand_util.h @@ -77,7 +77,7 @@ void RandomShuffle(Itr first, Itr last) { std::shuffle(first, last, RandomBitGenerator()); } --#if defined(OS_POSIX) -+#if defined(OS_POSIX) && !defined(OS_OPENBSD) +-#if BUILDFLAG(IS_POSIX) ++#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_OPENBSD) BASE_EXPORT int GetUrandomFD(); #endif diff --git a/www/chromium/files/patch-base_rand__util__posix.cc b/www/chromium/files/patch-base_rand__util__posix.cc index 0d7503d62921..5e00097c8aa2 100644 --- a/www/chromium/files/patch-base_rand__util__posix.cc +++ b/www/chromium/files/patch-base_rand__util__posix.cc @@ -1,19 +1,19 @@ ---- base/rand_util_posix.cc.orig 2022-02-07 13:39:41 UTC +--- base/rand_util_posix.cc.orig 2022-02-28 16:54:41 UTC +++ base/rand_util_posix.cc @@ -17,7 +17,7 @@ #include "base/posix/eintr_wrapper.h" #include "build/build_config.h" --#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(OS_NACL) -+#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(OS_NACL) && !defined(OS_BSD) +-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_NACL) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD) #include "third_party/lss/linux_syscall_support.h" - #elif defined(OS_MAC) + #elif BUILDFLAG(IS_MAC) // TODO(crbug.com/995996): Waiting for this header to appear in the iOS SDK. @@ -34,6 +34,7 @@ static constexpr int kOpenFlags = O_RDONLY; static constexpr int kOpenFlags = O_RDONLY | O_CLOEXEC; #endif -+#if !defined(OS_OPENBSD) ++#if !BUILDFLAG(IS_OPENBSD) // 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 @@ -29,8 +29,8 @@ // (https://chromium-review.googlesource.com/c/chromium/src/+/1545096) and land // it or some form of it. void RandBytes(void* output, size_t output_length) { -+#if !defined(OS_OPENBSD) - #if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(OS_NACL) ++#if !BUILDFLAG(IS_OPENBSD) + #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_NACL) // We have to call `getrandom` via Linux Syscall Support, rather than through // the libc wrapper, because we might not have an up-to-date libc (e.g. on @@ -93,11 +96,16 @@ void RandBytes(void* output, size_t output_length) { @@ -42,7 +42,7 @@ +#endif } -+#if !defined(OS_OPENBSD) ++#if !BUILDFLAG(IS_OPENBSD) int GetUrandomFD() { static NoDestructor<URandomFd> urandom_fd; return urandom_fd->fd(); diff --git a/www/chromium/files/patch-base_strings_safe__sprintf__unittest.cc b/www/chromium/files/patch-base_strings_safe__sprintf__unittest.cc new file mode 100644 index 000000000000..f4353c3b265d --- /dev/null +++ b/www/chromium/files/patch-base_strings_safe__sprintf__unittest.cc @@ -0,0 +1,18 @@ +--- base/strings/safe_sprintf_unittest.cc.orig 2022-02-28 16:54:41 UTC ++++ base/strings/safe_sprintf_unittest.cc +@@ -731,6 +731,7 @@ TEST(SafeSPrintfTest, EmbeddedNul) { + #endif + } + ++#if !BUILDFLAG(IS_BSD) + TEST(SafeSPrintfTest, EmitNULL) { + char buf[40]; + #if defined(__GNUC__) +@@ -747,6 +748,7 @@ TEST(SafeSPrintfTest, EmitNULL) { + #pragma GCC diagnostic pop + #endif + } ++#endif + + TEST(SafeSPrintfTest, PointerSize) { + // The internal data representation is a 64bit value, independent of the diff --git a/www/chromium/files/patch-base_strings_string__util.cc b/www/chromium/files/patch-base_strings_string__util.cc deleted file mode 100644 index 1003ec60edef..000000000000 --- a/www/chromium/files/patch-base_strings_string__util.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- base/strings/string_util.cc.orig 2022-02-07 13:39:41 UTC -+++ base/strings/string_util.cc -@@ -36,7 +36,7 @@ namespace base { - bool IsWprintfFormatPortable(const wchar_t* format) { - // This snippet of code checks that we can build C++17 code. - // TODO(thakis): Enable this on all platforms, and then remove it again. --#if !defined(OS_LINUX) && !BUILDFLAG(CFI_ICALL_CHECK) && \ -+#if !defined(OS_LINUX) && !defined(OS_BSD) && !BUILDFLAG(CFI_ICALL_CHECK) && \ - !BUILDFLAG(CFI_CAST_CHECK) - if constexpr (constexpr int i = 0; i > 0) { - } diff --git a/www/chromium/files/patch-base_synchronization_lock__impl.h b/www/chromium/files/patch-base_synchronization_lock__impl.h index 5e7c175fb687..f9f875ee3934 100644 --- a/www/chromium/files/patch-base_synchronization_lock__impl.h +++ b/www/chromium/files/patch-base_synchronization_lock__impl.h @@ -1,10 +1,10 @@ ---- base/synchronization/lock_impl.h.orig 2022-02-07 13:39:41 UTC +--- base/synchronization/lock_impl.h.orig 2022-02-28 16:54:41 UTC +++ base/synchronization/lock_impl.h @@ -107,6 +107,10 @@ void LockImpl::Unlock() { } - #elif defined(OS_POSIX) || defined(OS_FUCHSIA) -+#if defined(OS_FREEBSD) + #elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA) ++#if BUILDFLAG(IS_FREEBSD) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wthread-safety-analysis" +#endif @@ -15,7 +15,7 @@ int rv = pthread_mutex_unlock(&native_handle_); DCHECK_EQ(rv, 0) << ". " << strerror(rv); } -+#if defined(OS_FREEBSD) ++#if BUILDFLAG(IS_FREEBSD) +#pragma GCC diagnostic pop +#endif #endif diff --git a/www/chromium/files/patch-base_syslog__logging.cc b/www/chromium/files/patch-base_syslog__logging.cc index 9c9bf076d52b..5c1921e82d4a 100644 --- a/www/chromium/files/patch-base_syslog__logging.cc +++ b/www/chromium/files/patch-base_syslog__logging.cc @@ -1,20 +1,20 @@ ---- base/syslog_logging.cc.orig 2021-12-31 00:57:18 UTC +--- base/syslog_logging.cc.orig 2022-02-28 16:54:41 UTC +++ base/syslog_logging.cc -@@ -13,7 +13,7 @@ +@@ -15,7 +15,7 @@ #include "base/strings/string_util.h" #include "base/win/scoped_handle.h" #include "base/win/win_util.h" --#elif defined(OS_LINUX) || defined(OS_CHROMEOS) -+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // <syslog.h> defines LOG_INFO, LOG_WARNING macros that could conflict with // base::LOG_INFO, base::LOG_WARNING. #include <syslog.h> -@@ -145,7 +145,7 @@ EventLogMessage::~EventLogMessage() { +@@ -147,7 +147,7 @@ EventLogMessage::~EventLogMessage() { if (user_sid != nullptr) ::LocalFree(user_sid); --#elif defined(OS_LINUX) || defined(OS_CHROMEOS) -+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) const char kEventSource[] = "chrome"; openlog(kEventSource, LOG_NOWAIT | LOG_PID, LOG_USER); // We can't use the defined names for the logging severity from syslog.h diff --git a/www/chromium/files/patch-base_system_sys__info.cc b/www/chromium/files/patch-base_system_sys__info.cc index 66ca14e577d0..f991071fe48a 100644 --- a/www/chromium/files/patch-base_system_sys__info.cc +++ b/www/chromium/files/patch-base_system_sys__info.cc @@ -1,11 +1,11 @@ ---- base/system/sys_info.cc.orig 2022-02-07 13:39:41 UTC +--- base/system/sys_info.cc.orig 2022-02-28 16:54:41 UTC +++ base/system/sys_info.cc @@ -100,7 +100,7 @@ void SysInfo::GetHardwareInfo(base::OnceCallback<void( - #if defined(OS_WIN) || defined(OS_ANDROID) || defined(OS_APPLE) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_APPLE) base::ThreadPool::PostTaskAndReplyWithResult( FROM_HERE, {}, base::BindOnce(&GetHardwareInfoSync), std::move(callback)); --#elif defined(OS_LINUX) || defined(OS_CHROMEOS) -+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) base::ThreadPool::PostTaskAndReplyWithResult( FROM_HERE, {base::MayBlock()}, base::BindOnce(&GetHardwareInfoSync), std::move(callback)); diff --git a/www/chromium/files/patch-base_system_sys__info.h b/www/chromium/files/patch-base_system_sys__info.h index 4991e13686f3..0b5c5c8cefa4 100644 --- a/www/chromium/files/patch-base_system_sys__info.h +++ b/www/chromium/files/patch-base_system_sys__info.h @@ -1,4 +1,4 @@ ---- base/system/sys_info.h.orig 2022-02-07 13:39:41 UTC +--- base/system/sys_info.h.orig 2022-02-28 16:54:41 UTC +++ base/system/sys_info.h @@ -236,6 +236,8 @@ class BASE_EXPORT SysInfo { // On Desktop this returns true when memory <= 2GB. @@ -12,9 +12,9 @@ @@ -246,7 +248,7 @@ class BASE_EXPORT SysInfo { static HardwareInfo GetHardwareInfoSync(); - #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ -- defined(OS_AIX) -+ defined(OS_AIX) || defined(OS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ +- BUILDFLAG(IS_AIX) ++ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD) static int64_t AmountOfAvailablePhysicalMemory( const SystemMemoryInfoKB& meminfo); #endif diff --git a/www/chromium/files/patch-base_system_sys__info__unittest.cc b/www/chromium/files/patch-base_system_sys__info__unittest.cc new file mode 100644 index 000000000000..590b817eaf49 --- /dev/null +++ b/www/chromium/files/patch-base_system_sys__info__unittest.cc @@ -0,0 +1,19 @@ +--- base/system/sys_info_unittest.cc.orig 2022-02-28 16:54:41 UTC ++++ base/system/sys_info_unittest.cc +@@ -228,12 +228,15 @@ TEST_F(SysInfoTest, GetHardwareInfo) { + EXPECT_TRUE(IsStringUTF8(hardware_info->model)); + bool empty_result_expected = + #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN) || \ +- BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + false; + #else + true; + #endif + EXPECT_EQ(hardware_info->manufacturer.empty(), empty_result_expected); ++#if BUILDFLAG(IS_BSD) ++ empty_result_expected = true; ++#endif + EXPECT_EQ(hardware_info->model.empty(), empty_result_expected); + } + diff --git a/www/chromium/files/patch-base_task_thread__pool_environment__config__unittest.cc b/www/chromium/files/patch-base_task_thread__pool_environment__config__unittest.cc new file mode 100644 index 000000000000..18a649f3ba84 --- /dev/null +++ b/www/chromium/files/patch-base_task_thread__pool_environment__config__unittest.cc @@ -0,0 +1,11 @@ +--- base/task/thread_pool/environment_config_unittest.cc.orig 2022-02-28 16:54:41 UTC ++++ base/task/thread_pool/environment_config_unittest.cc +@@ -15,7 +15,7 @@ TEST(ThreadPoolEnvironmentConfig, CanUseBackgroundPrio + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) + EXPECT_TRUE(CanUseBackgroundPriorityForWorkerThread()); + #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_NACL) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_NACL) || BUILDFLAG(IS_BSD) + EXPECT_FALSE(CanUseBackgroundPriorityForWorkerThread()); + #else + #error Platform doesn't match any block diff --git a/www/chromium/files/patch-base_test_launcher_test__launcher.cc b/www/chromium/files/patch-base_test_launcher_test__launcher.cc index 9625a1f0bd0d..adf2c80b15ce 100644 --- a/www/chromium/files/patch-base_test_launcher_test__launcher.cc +++ b/www/chromium/files/patch-base_test_launcher_test__launcher.cc @@ -1,9 +1,9 @@ ---- base/test/launcher/test_launcher.cc.orig 2022-02-07 13:39:41 UTC +--- base/test/launcher/test_launcher.cc.orig 2022-02-28 16:54:41 UTC +++ base/test/launcher/test_launcher.cc @@ -63,6 +63,7 @@ #include "testing/gtest/include/gtest/gtest.h" - #if defined(OS_POSIX) + #if BUILDFLAG(IS_POSIX) +#include <signal.h> #include <fcntl.h> diff --git a/www/chromium/files/patch-base_test_test__file__util__linux.cc b/www/chromium/files/patch-base_test_test__file__util__linux.cc index 137d156cf616..21b4b25775a0 100644 --- a/www/chromium/files/patch-base_test_test__file__util__linux.cc +++ b/www/chromium/files/patch-base_test_test__file__util__linux.cc @@ -1,6 +1,6 @@ ---- base/test/test_file_util_linux.cc.orig 2022-02-07 13:39:41 UTC +--- base/test/test_file_util_linux.cc.orig 2022-02-28 16:54:41 UTC +++ base/test/test_file_util_linux.cc -@@ -52,8 +52,10 @@ bool EvictFileFromSystemCache(const FilePath& file) { +@@ -54,8 +54,10 @@ bool EvictFileFromSystemCache(const FilePath& file) { return false; if (fdatasync(fd.get()) != 0) return false; diff --git a/www/chromium/files/patch-base_test_test__file__util__posix.cc b/www/chromium/files/patch-base_test_test__file__util__posix.cc new file mode 100644 index 000000000000..37c9bbbb70ec --- /dev/null +++ b/www/chromium/files/patch-base_test_test__file__util__posix.cc @@ -0,0 +1,11 @@ +--- base/test/test_file_util_posix.cc.orig 2022-02-28 16:54:41 UTC ++++ base/test/test_file_util_posix.cc +@@ -88,7 +88,7 @@ void SyncPageCacheToDisk() { + } + + #if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_APPLE) && \ +- !BUILDFLAG(IS_ANDROID) ++ !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_BSD) + bool EvictFileFromSystemCache(const FilePath& file) { + // There doesn't seem to be a POSIX way to cool the disk cache. + NOTIMPLEMENTED(); diff --git a/www/chromium/files/patch-base_third__party_symbolize_symbolize.cc b/www/chromium/files/patch-base_third__party_symbolize_symbolize.cc index c73aac47312a..774ea24cf00c 100644 --- a/www/chromium/files/patch-base_third__party_symbolize_symbolize.cc +++ b/www/chromium/files/patch-base_third__party_symbolize_symbolize.cc @@ -1,10 +1,10 @@ ---- base/third_party/symbolize/symbolize.cc.orig 2022-02-07 13:39:41 UTC +--- base/third_party/symbolize/symbolize.cc.orig 2022-02-28 16:54:41 UTC +++ base/third_party/symbolize/symbolize.cc -@@ -113,7 +113,7 @@ _END_GOOGLE_NAMESPACE_ +@@ -114,7 +114,7 @@ _END_GOOGLE_NAMESPACE_ #if defined(HAVE_DLFCN_H) #include <dlfcn.h> #endif --#if defined(OS_OPENBSD) +-#if BUILDFLAG(IS_OPENBSD) +#if defined(__OpenBSD__) #include <sys/exec_elf.h> #else diff --git a/www/chromium/files/patch-base_threading_platform__thread.h b/www/chromium/files/patch-base_threading_platform__thread.h index b1b6cf3f78e9..fcbe67b6616c 100644 --- a/www/chromium/files/patch-base_threading_platform__thread.h +++ b/www/chromium/files/patch-base_threading_platform__thread.h @@ -1,11 +1,11 @@ ---- base/threading/platform_thread.h.orig 2022-02-07 13:39:41 UTC +--- base/threading/platform_thread.h.orig 2022-02-28 16:54:41 UTC +++ base/threading/platform_thread.h -@@ -243,7 +243,7 @@ class BASE_EXPORT PlatformThread { +@@ -205,7 +205,7 @@ class BASE_EXPORT PlatformThread { // Returns a realtime period provided by `delegate`. static TimeDelta GetRealtimePeriod(Delegate* delegate); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Toggles a specific thread's priority at runtime. This can be used to // change the priority of a thread in a different process and will fail // if the calling process does not have proper permissions. The diff --git a/www/chromium/files/patch-base_threading_platform__thread__linux.cc b/www/chromium/files/patch-base_threading_platform__thread__linux.cc index fcd82b84be44..a63f03e00a9e 100644 --- a/www/chromium/files/patch-base_threading_platform__thread__linux.cc +++ b/www/chromium/files/patch-base_threading_platform__thread__linux.cc @@ -1,21 +1,21 @@ ---- base/threading/platform_thread_linux.cc.orig 2022-02-07 13:39:41 UTC +--- base/threading/platform_thread_linux.cc.orig 2022-02-28 16:54:41 UTC +++ base/threading/platform_thread_linux.cc @@ -29,7 +29,9 @@ - #if !defined(OS_NACL) && !defined(OS_AIX) + #if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX) #include <pthread.h> -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) #include <sys/prctl.h> +#endif #include <sys/resource.h> #include <sys/time.h> #include <sys/types.h> @@ -132,7 +134,7 @@ int sched_setattr(pid_t pid, - #endif // !defined(OS_NACL) && !defined(OS_AIX) + #endif // !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX) #endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) --#if !defined(OS_NACL) -+#if !defined(OS_NACL) && !defined(OS_BSD) +-#if !BUILDFLAG(IS_NACL) ++#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD) const FilePath::CharType kCgroupDirectory[] = FILE_PATH_LITERAL("/sys/fs/cgroup"); @@ -23,8 +23,8 @@ namespace internal { namespace { --#if !defined(OS_NACL) -+#if !defined(OS_NACL) && !defined(OS_BSD) +-#if !BUILDFLAG(IS_NACL) ++#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD) const struct sched_param kRealTimePrio = {8}; #endif } // namespace @@ -32,8 +32,8 @@ }; bool CanSetThreadPriorityToRealtimeAudio() { --#if !defined(OS_NACL) -+#if !defined(OS_NACL) && !defined(OS_BSD) +-#if !BUILDFLAG(IS_NACL) ++#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD) // A non-zero soft-limit on RLIMIT_RTPRIO is required to be allowed to invoke // pthread_setschedparam in SetCurrentThreadPriorityForPlatform(). struct rlimit rlim; @@ -41,8 +41,8 @@ } bool SetCurrentThreadPriorityForPlatform(ThreadPriority priority) { --#if !defined(OS_NACL) -+#if !defined(OS_NACL) && !defined(OS_BSD) +-#if !BUILDFLAG(IS_NACL) ++#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD) // For legacy schedtune interface SetThreadCgroupsForThreadPriority(PlatformThread::CurrentId(), priority); @@ -50,8 +50,8 @@ } absl::optional<ThreadPriority> GetCurrentThreadPriorityForPlatform() { --#if !defined(OS_NACL) -+#if !defined(OS_NACL) && !defined(OS_BSD) +-#if !BUILDFLAG(IS_NACL) ++#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD) int maybe_sched_rr = 0; struct sched_param maybe_realtime_prio = {0}; if (pthread_getschedparam(pthread_self(), &maybe_sched_rr, @@ -59,8 +59,8 @@ void PlatformThread::SetName(const std::string& name) { ThreadIdNameManager::GetInstance()->SetName(name); --#if !defined(OS_NACL) && !defined(OS_AIX) -+#if !defined(OS_NACL) && !defined(OS_AIX) && !defined(OS_BSD) +-#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX) ++#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX) && !BUILDFLAG(IS_BSD) // On linux we can get the thread names to show up in the debugger by setting // the process name for the LWP. We don't want to do this for the main // thread because that would rename the process, causing tools like killall @@ -68,7 +68,7 @@ // priority. CHECK_NE(thread_id, process_id); -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) // For legacy schedtune interface SetThreadCgroupsForThreadPriority(thread_id, priority); +#endif diff --git a/www/chromium/files/patch-base_threading_platform__thread__posix.cc b/www/chromium/files/patch-base_threading_platform__thread__posix.cc index 071a25201e45..3eda63205158 100644 --- a/www/chromium/files/patch-base_threading_platform__thread__posix.cc +++ b/www/chromium/files/patch-base_threading_platform__thread__posix.cc @@ -1,21 +1,21 @@ ---- base/threading/platform_thread_posix.cc.orig 2022-02-07 13:39:41 UTC +--- base/threading/platform_thread_posix.cc.orig 2022-02-28 16:54:41 UTC +++ base/threading/platform_thread_posix.cc -@@ -74,7 +74,7 @@ void* ThreadFunc(void* params) { +@@ -75,7 +75,7 @@ void* ThreadFunc(void* params) { if (!thread_params->joinable) base::DisallowSingleton(); --#if !defined(OS_NACL) -+#if !defined(OS_NACL) && !defined(OS_BSD) +-#if !BUILDFLAG(IS_NACL) ++#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD) #if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) internal::PCScan::NotifyThreadCreated(internal::GetStackPointer()); #endif -@@ -333,6 +333,9 @@ bool PlatformThread::CanChangeThreadPriority(ThreadPri +@@ -362,6 +362,9 @@ bool PlatformThread::CanChangeThreadPriority(ThreadPri // static void PlatformThread::SetCurrentThreadPriorityImpl(ThreadPriority priority) { - #if defined(OS_NACL) + #if BUILDFLAG(IS_NACL) + NOTIMPLEMENTED(); +// avoid pledge(2) violation -+#elif defined(OS_BSD) ++#elif BUILDFLAG(IS_BSD) NOTIMPLEMENTED(); #else if (internal::SetCurrentThreadPriorityForPlatform(priority)) diff --git a/www/chromium/files/patch-base_threading_platform__thread__unittest.cc b/www/chromium/files/patch-base_threading_platform__thread__unittest.cc new file mode 100644 index 000000000000..ddb1bc00ca9f --- /dev/null +++ b/www/chromium/files/patch-base_threading_platform__thread__unittest.cc @@ -0,0 +1,47 @@ +--- base/threading/platform_thread_unittest.cc.orig 2022-02-28 16:54:41 UTC ++++ base/threading/platform_thread_unittest.cc +@@ -30,7 +30,7 @@ + #include "base/time/time.h" + #endif + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include <pthread.h> + #include <sys/syscall.h> + #include <sys/types.h> +@@ -319,7 +319,7 @@ TEST(PlatformThreadTest, + // and hardcodes what we know. Please inform scheduler-dev@chromium.org if this + // proprerty changes for a given platform. + TEST(PlatformThreadTest, CanChangeThreadPriority) { +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // On Ubuntu, RLIMIT_NICE and RLIMIT_RTPRIO are 0 by default, so we won't be + // able to increase priority to any level. + constexpr bool kCanIncreasePriority = false; +@@ -417,7 +417,7 @@ TEST(PlatformThreadTest, SetHugeThreadName) { + TEST(PlatformThreadTest, GetDefaultThreadStackSize) { + size_t stack_size = PlatformThread::GetDefaultThreadStackSize(); + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_FUCHSIA) || \ +- ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \ ++ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && \ + !defined(THREAD_SANITIZER)) || \ + (BUILDFLAG(IS_ANDROID) && !defined(ADDRESS_SANITIZER)) + EXPECT_EQ(0u, stack_size); +@@ -578,12 +578,16 @@ INSTANTIATE_TEST_SUITE_P( + + #endif // BUILDFLAG(IS_APPLE) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + + namespace { + + bool IsTidCacheCorrect() { ++#if BUILDFLAG(IS_BSD) ++ return PlatformThread::CurrentId() == reinterpret_cast<int64_t>(pthread_self()); ++#else + return PlatformThread::CurrentId() == syscall(__NR_gettid); ++#endif + } + + void* CheckTidCacheCorrectWrapper(void*) { diff --git a/www/chromium/files/patch-base_threading_thread__local__storage__unittest.cc b/www/chromium/files/patch-base_threading_thread__local__storage__unittest.cc new file mode 100644 index 000000000000..6ea93f8745fd --- /dev/null +++ b/www/chromium/files/patch-base_threading_thread__local__storage__unittest.cc @@ -0,0 +1,11 @@ +--- base/threading/thread_local_storage_unittest.cc.orig 2022-02-28 16:54:41 UTC ++++ base/threading/thread_local_storage_unittest.cc +@@ -90,7 +90,7 @@ class ThreadLocalStorageRunner : public DelegateSimple + void ThreadLocalStorageCleanup(void *value) { + int *ptr = reinterpret_cast<int*>(value); + // Destructors should never be called with a NULL. +- ASSERT_NE(reinterpret_cast<int*>(NULL), ptr); ++ ASSERT_NE(NULL, ptr); + if (*ptr == kFinalTlsValue) + return; // We've been called enough times. + ASSERT_LT(kFinalTlsValue, *ptr); diff --git a/www/chromium/files/patch-base_time_time.cc b/www/chromium/files/patch-base_time_time.cc index b2f0f148e1a8..de90c9b11c34 100644 --- a/www/chromium/files/patch-base_time_time.cc +++ b/www/chromium/files/patch-base_time_time.cc @@ -1,11 +1,11 @@ ---- base/time/time.cc.orig 2022-02-07 13:39:41 UTC +--- base/time/time.cc.orig 2022-02-28 16:54:41 UTC +++ base/time/time.cc -@@ -4,7 +4,7 @@ +@@ -6,7 +6,7 @@ - #include "base/time/time.h" + #include "build/build_config.h" --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // time.h is a widely included header and its size impacts build time. // Try not to raise this limit unless necessary. See // https://chromium.googlesource.com/chromium/src/+/HEAD/docs/wmax_tokens.md diff --git a/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc b/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc index 0ccf72a1fbf6..42b6b8e0f162 100644 --- a/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc +++ b/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc @@ -1,17 +1,17 @@ ---- base/trace_event/malloc_dump_provider.cc.orig 2021-12-14 11:44:55 UTC +--- base/trace_event/malloc_dump_provider.cc.orig 2022-02-28 16:54:41 UTC +++ base/trace_event/malloc_dump_provider.cc @@ -23,6 +23,8 @@ - #if defined(OS_APPLE) + #if BUILDFLAG(IS_APPLE) #include <malloc/malloc.h> +#elif defined(OS_BSD) +#include <stdlib.h> #else #include <malloc.h> #endif -@@ -217,6 +219,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump +@@ -220,6 +222,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump &allocated_objects_count); - #elif defined(OS_FUCHSIA) + #elif BUILDFLAG(IS_FUCHSIA) // TODO(fuchsia): Port, see https://crbug.com/706592. +#elif defined(OS_BSD) + total_virtual_size = 0; diff --git a/www/chromium/files/patch-base_trace__event_process__memory__dump.cc b/www/chromium/files/patch-base_trace__event_process__memory__dump.cc index dc76336b3bc7..d31975d16574 100644 --- a/www/chromium/files/patch-base_trace__event_process__memory__dump.cc +++ b/www/chromium/files/patch-base_trace__event_process__memory__dump.cc @@ -1,20 +1,20 @@ ---- base/trace_event/process_memory_dump.cc.orig 2022-02-07 13:39:41 UTC +--- base/trace_event/process_memory_dump.cc.orig 2022-02-28 16:54:41 UTC +++ base/trace_event/process_memory_dump.cc @@ -105,7 +105,7 @@ absl::optional<size_t> ProcessMemoryDump::CountResiden - #if defined(OS_WIN) + #if BUILDFLAG(IS_WIN) std::unique_ptr<PSAPI_WORKING_SET_EX_INFORMATION[]> vec( new PSAPI_WORKING_SET_EX_INFORMATION[max_vec_size]); --#elif defined(OS_APPLE) -+#elif defined(OS_APPLE) || defined(OS_BSD) +-#elif BUILDFLAG(IS_APPLE) ++#elif BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) std::unique_ptr<char[]> vec(new char[max_vec_size]); - #elif defined(OS_POSIX) || defined(OS_FUCHSIA) + #elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA) std::unique_ptr<unsigned char[]> vec(new unsigned char[max_vec_size]); -@@ -127,7 +127,7 @@ absl::optional<size_t> ProcessMemoryDump::CountResiden +@@ -130,7 +130,7 @@ absl::optional<size_t> ProcessMemoryDump::CountResiden for (size_t i = 0; i < page_count; i++) resident_page_count += vec[i].VirtualAttributes.Valid; --#elif defined(OS_FUCHSIA) -+#elif defined(OS_FUCHSIA) | defined(OS_BSD) +-#elif BUILDFLAG(IS_FUCHSIA) ++#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) // TODO(fuchsia): Port, see https://crbug.com/706592. - ALLOW_UNUSED_LOCAL(chunk_start); - ALLOW_UNUSED_LOCAL(page_count); + #elif BUILDFLAG(IS_APPLE) + // mincore in MAC does not fail with EAGAIN. diff --git a/www/chromium/files/patch-base_tracing_trace__time.cc b/www/chromium/files/patch-base_tracing_trace__time.cc index b391966234ab..36c6113518f4 100644 --- a/www/chromium/files/patch-base_tracing_trace__time.cc +++ b/www/chromium/files/patch-base_tracing_trace__time.cc @@ -1,10 +1,10 @@ ---- base/tracing/trace_time.cc.orig 2022-02-07 13:39:41 UTC +--- base/tracing/trace_time.cc.orig 2022-02-28 16:54:41 UTC +++ base/tracing/trace_time.cc @@ -8,13 +8,17 @@ #include "build/build_config.h" #include "third_party/perfetto/include/perfetto/base/time.h" -+#if defined(OS_FREEBSD) ++#if BUILDFLAG(IS_FREEBSD) +#define CLOCK_BOOTTIME CLOCK_UPTIME +#endif + @@ -13,9 +13,9 @@ int64_t TraceBootTicksNow() { // On Windows and Mac, TRACE_TIME_TICKS_NOW() behaves like boottime already. - #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ -- defined(OS_FUCHSIA) -+ defined(OS_FUCHSIA) || defined(OS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) struct timespec ts; int res = clock_gettime(CLOCK_BOOTTIME, &ts); if (res != -1) diff --git a/www/chromium/files/patch-base_tracing_trace__time.h b/www/chromium/files/patch-base_tracing_trace__time.h index 670469229ceb..0394e382ee6e 100644 --- a/www/chromium/files/patch-base_tracing_trace__time.h +++ b/www/chromium/files/patch-base_tracing_trace__time.h @@ -1,11 +1,11 @@ ---- base/tracing/trace_time.h.orig 2022-02-07 13:39:41 UTC +--- base/tracing/trace_time.h.orig 2022-02-28 16:54:41 UTC +++ base/tracing/trace_time.h @@ -12,7 +12,7 @@ namespace base { namespace tracing { - #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ -- defined(OS_FUCHSIA) -+ defined(OS_FUCHSIA) || defined(OS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) // Linux, Android, and Fuchsia all use CLOCK_MONOTONIC. See crbug.com/166153 // about efforts to unify base::TimeTicks across all platforms. constexpr perfetto::protos::pbzero::BuiltinClock kTraceClockId = diff --git a/www/chromium/files/patch-build_config_BUILD.gn b/www/chromium/files/patch-build_config_BUILD.gn index 2f3841e1bb68..13b50eb433dd 100644 --- a/www/chromium/files/patch-build_config_BUILD.gn +++ b/www/chromium/files/patch-build_config_BUILD.gn @@ -1,6 +1,6 @@ ---- build/config/BUILD.gn.orig 2022-02-07 13:39:41 UTC +--- build/config/BUILD.gn.orig 2022-02-28 16:54:41 UTC +++ build/config/BUILD.gn -@@ -222,13 +222,17 @@ config("default_libs") { +@@ -218,13 +218,17 @@ config("default_libs") { "CoreText.framework", "Foundation.framework", ] diff --git a/www/chromium/files/patch-build_config_compiler_BUILD.gn b/www/chromium/files/patch-build_config_compiler_BUILD.gn index b2cb7fa98158..1c9d854a4148 100644 --- a/www/chromium/files/patch-build_config_compiler_BUILD.gn +++ b/www/chromium/files/patch-build_config_compiler_BUILD.gn @@ -1,4 +1,4 @@ ---- build/config/compiler/BUILD.gn.orig 2022-02-07 13:39:41 UTC +--- build/config/compiler/BUILD.gn.orig 2022-02-28 16:54:41 UTC +++ build/config/compiler/BUILD.gn @@ -236,13 +236,16 @@ config("default_include_dirs") { # Compiler instrumentation can introduce dependencies in DSOs to symbols in @@ -38,7 +38,7 @@ cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ] # TODO(hans): Remove this once Clang generates better optimized debug info -@@ -903,7 +910,7 @@ config("compiler_cpu_abi") { +@@ -902,7 +909,7 @@ config("compiler_cpu_abi") { ] } } else if (current_cpu == "arm") { @@ -47,7 +47,7 @@ cflags += [ "--target=arm-linux-gnueabihf" ] ldflags += [ "--target=arm-linux-gnueabihf" ] } -@@ -917,7 +924,7 @@ config("compiler_cpu_abi") { +@@ -916,7 +923,7 @@ config("compiler_cpu_abi") { cflags += [ "-mtune=$arm_tune" ] } } else if (current_cpu == "arm64") { @@ -56,7 +56,7 @@ cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] } -@@ -1238,7 +1245,7 @@ config("compiler_deterministic") { +@@ -1237,7 +1244,7 @@ config("compiler_deterministic") { # different build directory like "out/feature_a" and "out/feature_b" if # we build same files with same compile flag. # Other paths are already given in relative, no need to normalize them. @@ -65,7 +65,7 @@ # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here. cflags += [ "-Xclang", -@@ -1525,7 +1532,7 @@ config("default_warnings") { +@@ -1524,7 +1531,7 @@ config("default_warnings") { "-Wno-ignored-pragma-optimize", ] @@ -74,7 +74,7 @@ # TODO(https://crbug.com/1016945): Re-enable once ChromeOS toolchain is up to date cflags += [ "-Wno-builtin-assume-aligned-alignment" ] } -@@ -1676,7 +1683,7 @@ config("no_chromium_code") { +@@ -1709,7 +1716,7 @@ config("no_chromium_code") { # third-party libraries. "-Wno-c++11-narrowing", ] @@ -83,7 +83,7 @@ cflags += [ # Disabled for similar reasons as -Wunused-variable. "-Wno-unused-but-set-variable", -@@ -2191,7 +2198,7 @@ config("afdo_optimize_size") { +@@ -2224,7 +2231,7 @@ config("afdo_optimize_size") { # between //base/allocator:tcmalloc and AFDO on GCC), so we provide a separate # config to allow AFDO to be disabled per-target. config("afdo") { @@ -92,7 +92,7 @@ cflags = [] if (clang_emit_debug_info_for_profiling) { # Add the following flags to generate debug info for profiling. -@@ -2207,7 +2214,7 @@ config("afdo") { +@@ -2240,7 +2247,7 @@ config("afdo") { cflags += [ "-fprofile-sample-use=${rebased_clang_sample_profile}" ] inputs = [ _clang_sample_profile ] } @@ -101,7 +101,7 @@ cflags = [ "-fauto-profile=${auto_profile_path}" ] inputs = [ auto_profile_path ] } -@@ -2346,7 +2353,8 @@ config("symbols") { +@@ -2379,7 +2386,8 @@ config("symbols") { } } diff --git a/www/chromium/files/patch-build_linux_chrome.map b/www/chromium/files/patch-build_linux_chrome.map index 8e8c35005efb..992585036b7b 100644 --- a/www/chromium/files/patch-build_linux_chrome.map +++ b/www/chromium/files/patch-build_linux_chrome.map @@ -1,4 +1,4 @@ ---- build/linux/chrome.map.orig 2022-02-07 13:39:41 UTC +--- build/linux/chrome.map.orig 2022-02-28 16:54:41 UTC +++ build/linux/chrome.map @@ -20,6 +20,10 @@ global: # Program entry point. @@ -10,4 +10,4 @@ + # Memory allocation symbols. We want chrome and any libraries to # share the same heap, so it is correct to export these symbols. - calloc; + aligned_alloc; diff --git a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni index b440c70df873..4d018d8b2dee 100644 --- a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni +++ b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni @@ -1,6 +1,6 @@ ---- build/toolchain/gcc_toolchain.gni.orig 2022-02-07 13:39:41 UTC +--- build/toolchain/gcc_toolchain.gni.orig 2022-02-28 16:54:41 UTC +++ build/toolchain/gcc_toolchain.gni -@@ -49,6 +49,12 @@ if (enable_resource_allowlist_generation) { +@@ -53,6 +53,12 @@ if (enable_resource_allowlist_generation) { "enable_resource_allowlist_generation=true does not work for target_os=$target_os") } @@ -13,7 +13,7 @@ # This template defines a toolchain for something that works like gcc # (including clang). # -@@ -737,13 +743,17 @@ template("gcc_toolchain") { +@@ -747,13 +753,17 @@ template("gcc_toolchain") { # use_gold too. template("clang_toolchain") { gcc_toolchain(target_name) { diff --git a/www/chromium/files/patch-cc_BUILD.gn b/www/chromium/files/patch-cc_BUILD.gn index 80e9e0adb0a0..88c78da6873d 100644 --- a/www/chromium/files/patch-cc_BUILD.gn +++ b/www/chromium/files/patch-cc_BUILD.gn @@ -1,6 +1,6 @@ ---- cc/BUILD.gn.orig 2022-02-07 13:39:41 UTC +--- cc/BUILD.gn.orig 2022-02-28 16:54:41 UTC +++ cc/BUILD.gn -@@ -659,7 +659,7 @@ cc_test_static_library("test_support") { +@@ -660,7 +660,7 @@ cc_test_static_library("test_support") { if (enable_vulkan) { deps += [ "//gpu/vulkan/init" ] } @@ -9,11 +9,11 @@ data_deps = [ "//third_party/mesa_headers" ] } } -@@ -884,7 +884,6 @@ cc_test("cc_unittests") { - ] +@@ -886,7 +886,6 @@ cc_test("cc_unittests") { + data = [ "//components/viz/test/data/" ] data_deps = [ "//testing/buildbot/filters:cc_unittests_filters", - "//third_party/mesa_headers", ] - if (is_fuchsia) { + if (is_android && enable_chrome_android_internal) { diff --git a/www/chromium/files/patch-chrome_app_chrome__command__ids.h b/www/chromium/files/patch-chrome_app_chrome__command__ids.h index 87bae79ebd41..34fe446304f1 100644 --- a/www/chromium/files/patch-chrome_app_chrome__command__ids.h +++ b/www/chromium/files/patch-chrome_app_chrome__command__ids.h @@ -1,11 +1,11 @@ ---- chrome/app/chrome_command_ids.h.orig 2021-07-19 18:45:06 UTC +--- chrome/app/chrome_command_ids.h.orig 2022-02-28 16:54:41 UTC +++ chrome/app/chrome_command_ids.h @@ -66,7 +66,7 @@ #define IDC_NAME_WINDOW 34049 // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) #define IDC_USE_SYSTEM_TITLE_BAR 34051 #define IDC_RESTORE_WINDOW 34052 #endif diff --git a/www/chromium/files/patch-chrome_app_chrome__main.cc b/www/chromium/files/patch-chrome_app_chrome__main.cc index 25aa85dc6643..6dcdad77169d 100644 --- a/www/chromium/files/patch-chrome_app_chrome__main.cc +++ b/www/chromium/files/patch-chrome_app_chrome__main.cc @@ -1,20 +1,20 @@ ---- chrome/app/chrome_main.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/app/chrome_main.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/app/chrome_main.cc -@@ -26,7 +26,7 @@ +@@ -25,7 +25,7 @@ #include "chrome/app/notification_metrics.h" #endif --#if defined(OS_WIN) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "base/base_switches.h" #endif -@@ -147,7 +147,7 @@ int ChromeMain(int argc, const char** argv) { +@@ -146,7 +146,7 @@ int ChromeMain(int argc, const char** argv) { headless::SetUpCommandLine(command_line); } else { - #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ -- defined(OS_WIN) -+ defined(OS_WIN) || defined(OS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) if (command_line->HasSwitch(switches::kHeadless)) { #if BUILDFLAG(GOOGLE_CHROME_BRANDING) command_line->AppendSwitch(::headless::switches::kEnableCrashReporter); diff --git a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc index 97abda5f5a89..9935801ef7b3 100644 --- a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc +++ b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc @@ -1,107 +1,107 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/app/chrome_main_delegate.cc -@@ -112,7 +112,7 @@ +@@ -113,7 +113,7 @@ #include "chrome/app/chrome_crash_reporter_client.h" #endif --#if BUILDFLAG(ENABLE_NACL) && (defined(OS_LINUX) || defined(OS_CHROMEOS)) -+#if BUILDFLAG(ENABLE_NACL) && (defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(OS_BSD) +-#if BUILDFLAG(ENABLE_NACL) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) ++#if BUILDFLAG(ENABLE_NACL) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_BSD) #include "components/nacl/common/nacl_paths.h" #include "components/nacl/zygote/nacl_fork_delegate_linux.h" #endif -@@ -156,12 +156,12 @@ +@@ -157,12 +157,12 @@ #include "v8/include/v8.h" #endif --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "base/environment.h" #endif - #if defined(OS_MAC) || defined(OS_WIN) || defined(OS_ANDROID) || \ -- defined(OS_LINUX) || defined(OS_CHROMEOS) -+ defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || \ +- BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "chrome/browser/policy/policy_path_parser.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -309,7 +309,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty +@@ -310,7 +310,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty // and resources loaded. bool SubprocessNeedsResourceBundle(const std::string& process_type) { return --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // The zygote process opens the resources for the renderers. process_type == switches::kZygoteProcess || #endif -@@ -349,7 +349,7 @@ bool HandleVersionSwitches(const base::CommandLine& co +@@ -350,7 +350,7 @@ bool HandleVersionSwitches(const base::CommandLine& co // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) // 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) || -@@ -413,7 +413,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -414,7 +414,7 @@ void InitializeUserDataDir(base::CommandLine* command_ std::string process_type = command_line->GetSwitchValueASCII(switches::kProcessType); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // 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. -@@ -497,7 +497,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat +@@ -498,7 +498,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat #endif - #if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || \ -- defined(OS_CHROMEOS) -+ defined(OS_CHROMEOS) || defined(OS_BSD) + #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Record the startup process creation time on supported platforms. On Android // this is recorded in ChromeMainDelegateAndroid. startup_metric_utils::RecordStartupProcessCreationTime( -@@ -685,6 +685,8 @@ void ChromeMainDelegate::PostFieldTrialInitialization( +@@ -679,6 +679,8 @@ void ChromeMainDelegate::PostFieldTrialInitialization( // not always enabled on Linux/ChromeOS. - #if defined(OS_LINUX) || defined(OS_CHROMEOS) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) bool enable_gwp_asan = crash_reporter::IsCrashpadEnabled(); -+#elif defined(OS_BSD) ++#elif BUILDFLAG(IS_BSD) + bool enable_gwp_asan = false; #else bool enable_gwp_asan = true; #endif -@@ -809,7 +811,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -801,7 +803,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi } // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) // This will directly exit if the user asked for help. HandleHelpSwitches(command_line); #endif -@@ -840,7 +842,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -832,7 +834,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) chromeos::dbus_paths::RegisterPathProvider(); #endif --#if BUILDFLAG(ENABLE_NACL) && (defined(OS_LINUX) || defined(OS_CHROMEOS)) -+#if BUILDFLAG(ENABLE_NACL) && (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) +-#if BUILDFLAG(ENABLE_NACL) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) ++#if BUILDFLAG(ENABLE_NACL) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) nacl::RegisterPathProvider(); #endif -@@ -1154,7 +1156,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1146,7 +1148,7 @@ void ChromeMainDelegate::PreSandboxStartup() { locale; } --#if defined(OS_POSIX) && !defined(OS_MAC) -+#if defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_BSD) +-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD) // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess) { - #if defined(OS_ANDROID) -@@ -1237,7 +1239,7 @@ absl::variant<int, content::MainFunctionParams> Chrome + #if BUILDFLAG(IS_ANDROID) +@@ -1222,7 +1224,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. --#if BUILDFLAG(ENABLE_NACL) && !defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if BUILDFLAG(ENABLE_NACL) && !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_BSD) +-#if BUILDFLAG(ENABLE_NACL) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(ENABLE_NACL) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD) {switches::kNaClLoaderProcess, NaClMain}, #else {"<invalid>", nullptr}, // To avoid constant array of size 0 diff --git a/www/chromium/files/patch-chrome_app_chromium__strings.grd b/www/chromium/files/patch-chrome_app_chromium__strings.grd index 7db2405e0ab4..c7410f592b87 100644 --- a/www/chromium/files/patch-chrome_app_chromium__strings.grd +++ b/www/chromium/files/patch-chrome_app_chromium__strings.grd @@ -1,6 +1,6 @@ ---- chrome/app/chromium_strings.grd.orig 2022-02-07 13:39:41 UTC +--- chrome/app/chromium_strings.grd.orig 2022-02-28 16:54:41 UTC +++ chrome/app/chromium_strings.grd -@@ -296,7 +296,7 @@ If you update this file, be sure also to update google +@@ -298,7 +298,7 @@ If you update this file, be sure also to update google Welcome to Chromium; new browser window opened </message> </if> @@ -9,7 +9,7 @@ <message name="IDS_FIRST_RUN_DIALOG_WINDOW_TITLE" desc="Window title of First Run dialog on Mac and Linux, displayed in title bar"> Welcome to Chromium </message> -@@ -808,7 +808,7 @@ Chromium is unable to recover your settings. +@@ -810,7 +810,7 @@ Chromium is unable to recover your settings. </if> <!-- about:browser-switch strings --> @@ -18,7 +18,7 @@ <message name="IDS_ABOUT_BROWSER_SWITCH_DESCRIPTION_UNKNOWN_BROWSER" desc="Description shown while waiting for an alternative browser to open, when the browser name is not auto-detected"> Your system administrator has configured Chromium to open an alternative browser to access <ph name="TARGET_URL_HOSTNAME">$1<ex>example.com</ex></ph>. </message> -@@ -934,7 +934,7 @@ Chromium is unable to recover your settings. +@@ -936,7 +936,7 @@ Chromium is unable to recover your settings. </message> <!-- ProcessSingleton --> diff --git a/www/chromium/files/patch-chrome_app_generated__resources.grd b/www/chromium/files/patch-chrome_app_generated__resources.grd index 1603c775fd26..31e633027c98 100644 --- a/www/chromium/files/patch-chrome_app_generated__resources.grd +++ b/www/chromium/files/patch-chrome_app_generated__resources.grd @@ -1,4 +1,4 @@ ---- chrome/app/generated_resources.grd.orig 2022-02-07 13:39:41 UTC +--- chrome/app/generated_resources.grd.orig 2022-02-28 16:54:41 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. --> -@@ -296,7 +296,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -298,7 +298,7 @@ are declared in tools/grit/grit_rule.gni. <part file="profiles_strings.grdp" /> <!-- Web app intent picker strings --> @@ -18,7 +18,7 @@ <part file="url_handler_intent_picker_strings.grdp" /> </if> -@@ -2811,7 +2811,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -2813,7 +2813,7 @@ are declared in tools/grit/grit_rule.gni. </if> <!-- Bluetooth Device Credentials (i.e. PIN/Passkey) dialog --> @@ -27,7 +27,7 @@ <message name="IDS_BLUETOOTH_DEVICE_CREDENTIALS_TITLE" desc="Title of the Bluetooth device credentials prompt dialog."> Device Credentials </message> -@@ -5557,7 +5557,7 @@ Keep your key file in a safe place. You will need it t +@@ -5568,7 +5568,7 @@ Keep your key file in a safe place. You will need it t </if> <!-- chrome://browser-switch strings --> @@ -36,7 +36,7 @@ <message name="IDS_ABOUT_BROWSER_SWITCH_TITLE" desc="about:browser-switch page title"> Legacy Browser Support </message> -@@ -8016,7 +8016,7 @@ Keep your key file in a safe place. You will need it t +@@ -8043,7 +8043,7 @@ Keep your key file in a safe place. You will need it t Google Pay </message> @@ -45,7 +45,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> -@@ -9104,7 +9104,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -9134,7 +9134,7 @@ Please help our engineers fix this problem. Tell us wh Set as default </message> diff --git a/www/chromium/files/patch-chrome_app_google__chrome__strings.grd b/www/chromium/files/patch-chrome_app_google__chrome__strings.grd index f30963321403..c257a13fb957 100644 --- a/www/chromium/files/patch-chrome_app_google__chrome__strings.grd +++ b/www/chromium/files/patch-chrome_app_google__chrome__strings.grd @@ -1,6 +1,6 @@ ---- chrome/app/google_chrome_strings.grd.orig 2022-02-07 13:39:41 UTC +--- chrome/app/google_chrome_strings.grd.orig 2022-02-28 16:54:41 UTC +++ chrome/app/google_chrome_strings.grd -@@ -301,7 +301,7 @@ chromium_strings.grd. --> +@@ -303,7 +303,7 @@ chromium_strings.grd. --> Welcome to Chrome; new browser window opened </message> </if> @@ -9,7 +9,7 @@ <message name="IDS_FIRST_RUN_DIALOG_WINDOW_TITLE" desc="Window title of First Run dialog on Mac and Linux, displayed in title bar"> Welcome to Google Chrome </message> -@@ -816,7 +816,7 @@ Google Chrome is unable to recover your settings. +@@ -818,7 +818,7 @@ Google Chrome is unable to recover your settings. </if> <!-- about:browser-switch strings --> @@ -18,7 +18,7 @@ <message name="IDS_ABOUT_BROWSER_SWITCH_DESCRIPTION_UNKNOWN_BROWSER" desc="Description shown while waiting for an alternative browser to open, when the browser name is not auto-detected"> Your system administrator has configured Google Chrome to open an alternative browser to access <ph name="TARGET_URL_HOSTNAME">$1<ex>example.com</ex></ph>. </message> -@@ -942,7 +942,7 @@ Google Chrome is unable to recover your settings. +@@ -944,7 +944,7 @@ Google Chrome is unable to recover your settings. </message> <!-- ProcessSingleton --> diff --git a/www/chromium/files/patch-chrome_app_settings__strings.grdp b/www/chromium/files/patch-chrome_app_settings__strings.grdp index e0be89211d5f..017a675fc6cd 100644 --- a/www/chromium/files/patch-chrome_app_settings__strings.grdp +++ b/www/chromium/files/patch-chrome_app_settings__strings.grdp @@ -1,6 +1,6 @@ ---- chrome/app/settings_strings.grdp.orig 2021-10-08 06:25:37 UTC +--- chrome/app/settings_strings.grdp.orig 2022-02-28 16:54:41 UTC +++ chrome/app/settings_strings.grdp -@@ -123,7 +123,7 @@ +@@ -131,7 +131,7 @@ Theme </message> </if> @@ -9,12 +9,12 @@ <message name="IDS_SETTINGS_SYSTEM_THEME" desc="Text of the label describing the system (GTK+) browser theme on Linux"> GTK+ </message> -@@ -137,7 +137,7 @@ +@@ -145,7 +145,7 @@ Use Classic </message> </if> -- <if expr="not is_linux or chromeos or lacros or is_fuchsia"> -+ <if expr="not is_posix or chromeos or lacros or is_fuchsia"> +- <if expr="not is_linux or chromeos_ash or chromeos_lacros or is_fuchsia"> ++ <if expr="not is_posix or chromeos_ash or chromeos_lacros or is_fuchsia"> <message name="IDS_SETTINGS_RESET_TO_DEFAULT_THEME" desc="Name of the control which resets the browser theme back to the default theme."> Reset to default </message> diff --git a/www/chromium/files/patch-chrome_browser_about__flags.cc b/www/chromium/files/patch-chrome_browser_about__flags.cc index 5cc17e7ac79f..e0474b9664a0 100644 --- a/www/chromium/files/patch-chrome_browser_about__flags.cc +++ b/www/chromium/files/patch-chrome_browser_about__flags.cc @@ -1,155 +1,137 @@ ---- chrome/browser/about_flags.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/about_flags.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/about_flags.cc -@@ -203,7 +203,7 @@ +@@ -205,7 +205,7 @@ #include "ui/native_theme/native_theme_features.h" #include "ui/ui_features.h" --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "base/allocator/buildflags.h" #endif -@@ -271,7 +271,7 @@ +@@ -273,7 +273,7 @@ #include "chrome/browser/supervised_user/supervised_user_features/supervised_user_features.h" #endif // ENABLE_SUPERVISED_USERS --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) #include "ui/ozone/buildflags.h" #include "ui/ozone/public/ozone_switches.h" - #endif // OS_LINUX || BUILDFLAG(IS_CHROMEOS_ASH) -@@ -358,7 +358,7 @@ const FeatureEntry::Choice kUseAngleChoicesMac[] = { + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) +@@ -360,7 +360,7 @@ const FeatureEntry::Choice kUseAngleChoicesMac[] = { gl::kANGLEImplementationMetalName}}; #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = { {flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""}, {flag_descriptions::kOzonePlatformHintChoiceAuto, -@@ -941,7 +941,7 @@ const FeatureEntry::FeatureVariation kPageContentAnnot +@@ -966,7 +966,7 @@ const FeatureEntry::FeatureVariation kPageContentAnnot }; - #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ -- defined(OS_WIN) || defined(OS_FUCHSIA) -+ defined(OS_WIN) || defined(OS_FUCHSIA) || defined(OS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) const FeatureEntry::FeatureParam kOmniboxDocumentProviderServerScoring[] = { {"DocumentUseServerScore", "true"}, {"DocumentUseClientScore", "false"}, -@@ -2344,7 +2344,7 @@ const FeatureEntry::FeatureVariation kPasswordChangeFe - nullptr}}; - #endif // defined(OS_ANDROID) - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - const FeatureEntry::FeatureParam - kSendWebUIJavaScriptErrorReportsVariationSendToStaging[] = { - {features::kSendWebUIJavaScriptErrorReportsSendToProductionVariation, -@@ -2699,7 +2699,7 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kWebKioskEnableLacrosDescription, kOsCrOS, - FEATURE_VALUE_TYPE(features::kWebKioskEnableLacros)}, - #endif // BUILDFLAG(IS_CHROMEOS_ASH) --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - {"send-webui-javascript-error-reports", - flag_descriptions::kSendWebUIJavaScriptErrorReportsName, - flag_descriptions::kSendWebUIJavaScriptErrorReportsDescription, -@@ -3208,7 +3208,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3243,7 +3243,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(chromeos::kLacrosTtsSupport)}, - #endif // defined(OS_CHROMEOS) + #endif // BUILDFLAG(IS_CHROMEOS) --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) { "enable-accelerated-video-decode", flag_descriptions::kAcceleratedVideoDecodeName, -@@ -3620,7 +3620,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3648,7 +3648,7 @@ const FeatureEntry kFeatureEntries[] = { {"enable-login-detection", flag_descriptions::kEnableLoginDetectionName, flag_descriptions::kEnableLoginDetectionDescription, kOsAll, FEATURE_VALUE_TYPE(login_detection::kLoginDetection)}, --#if defined(OS_CHROMEOS) || defined(OS_LINUX) -+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) {"enable-save-data", flag_descriptions::kEnableSaveDataName, flag_descriptions::kEnableSaveDataDescription, kOsCrOS | kOsLinux, SINGLE_VALUE_TYPE( -@@ -3808,7 +3808,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3835,7 +3835,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kWebShare)}, - #endif // BUILDFLAG(IS_CHROMEOS_ASH) || OS_WIN || OS_MAC + #endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) {"ozone-platform-hint", flag_descriptions::kOzonePlatformHintName, flag_descriptions::kOzonePlatformHintDescription, kOsLinux, MULTI_VALUE_TYPE(kOzonePlatformHintRuntimeChoices)}, -@@ -4493,7 +4493,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4518,7 +4518,7 @@ const FeatureEntry kFeatureEntries[] = { "OmniboxBundledExperimentV1")}, - #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ -- defined(OS_WIN) || defined(OS_FUCHSIA) -+ defined(OS_WIN) || defined(OS_FUCHSIA) || defined(OS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) {"omnibox-experimental-keyword-mode", flag_descriptions::kOmniboxExperimentalKeywordModeName, flag_descriptions::kOmniboxExperimentalKeywordModeDescription, kOsDesktop, -@@ -4870,7 +4870,7 @@ const FeatureEntry kFeatureEntries[] = { - #endif // !defined(OS_ANDROID) +@@ -4887,7 +4887,7 @@ const FeatureEntry kFeatureEntries[] = { + #endif // BUILDFLAG(IS_ANDROID) - #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ -- defined(OS_CHROMEOS) || defined(OS_FUCHSIA) -+ defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) {"webui-feedback", flag_descriptions::kWebuiFeedbackName, flag_descriptions::kWebuiFeedbackDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kWebUIFeedback)}, -@@ -5492,7 +5492,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(kSharingSendViaSync)}, - - #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ -- defined(OS_FUCHSIA) -+ defined(OS_FUCHSIA) || defined(OS_BSD) - {"sharing-hub-desktop-app-menu", - flag_descriptions::kSharingHubDesktopAppMenuName, - flag_descriptions::kSharingHubDesktopAppMenuDescription, kOsDesktop, -@@ -5917,7 +5917,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5897,7 +5897,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kMouseSubframeNoImplicitCapture)}, - #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ -- defined(OS_CHROMEOS) || defined(OS_FUCHSIA) -+ defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) {"global-media-controls-modern-ui", flag_descriptions::kGlobalMediaControlsModernUIName, flag_descriptions::kGlobalMediaControlsModernUIDescription, -@@ -6606,7 +6606,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6607,7 +6607,7 @@ const FeatureEntry kFeatureEntries[] = { #endif - #if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || \ -- defined(OS_CHROMEOS) || defined(OS_FUCHSIA) -+ defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD) + #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) {"incognito-brand-consistency-for-desktop", flag_descriptions::kIncognitoBrandConsistencyForDesktopName, flag_descriptions::kIncognitoBrandConsistencyForDesktopDescription, -@@ -6739,7 +6739,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6740,7 +6740,7 @@ const FeatureEntry kFeatureEntries[] = { #endif - #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ -- defined(OS_FUCHSIA) -+ defined(OS_FUCHSIA) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) {"commander", flag_descriptions::kCommanderName, flag_descriptions::kCommanderDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kCommander)}, -@@ -6982,7 +6982,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(media::kVp9kSVCHWDecoding)}, +@@ -6985,7 +6985,7 @@ const FeatureEntry kFeatureEntries[] = { - #if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ -- defined(OS_MAC) || defined(OS_FUCHSIA) -+ defined(OS_MAC) || defined(OS_FUCHSIA) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || \ + (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ +- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) { "ui-debug-tools", flag_descriptions::kUIDebugToolsName, -@@ -7124,7 +7124,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7129,7 +7129,7 @@ const FeatureEntry kFeatureEntries[] = { #endif - #if BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_MAC) || defined(OS_LINUX) || \ -- defined(OS_FUCHSIA) -+ defined(OS_FUCHSIA) || defined(OS_BSD) + #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) {"enable-desktop-pwas-app-icon-shortcuts-menu-ui", flag_descriptions::kDesktopPWAsAppIconShortcutsMenuUIName, flag_descriptions::kDesktopPWAsAppIconShortcutsMenuUIDescription, +@@ -7685,7 +7685,7 @@ const FeatureEntry kFeatureEntries[] = { + SINGLE_VALUE_TYPE(switches::kPervasiveSystemAccentColor)}, + #endif + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + {"improve-accessibility-tree-using-local-ml", + flag_descriptions::kImproveAccessibilityTreeUsingLocalMLName, + flag_descriptions::kImproveAccessibilityTreeUsingLocalMLDescription, diff --git a/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc b/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc index 43dc49863e1b..8ca400175f0c 100644 --- a/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc +++ b/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc @@ -1,20 +1,20 @@ ---- chrome/browser/after_startup_task_utils.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/after_startup_task_utils.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/after_startup_task_utils.cc @@ -25,7 +25,7 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) #include "ui/views/linux_ui/linux_ui.h" #endif @@ -111,7 +111,7 @@ void SetBrowserStartupIsComplete() { g_startup_complete_flag.Get().Set(); - #if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || \ -- defined(OS_CHROMEOS) -+ defined(OS_CHROMEOS) || defined(OS_BSD) + #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Process::Current().CreationTime() is not available on all platforms. const base::Time process_creation_time = base::Process::Current().CreationTime(); @@ -22,8 +22,8 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) // Make sure we complete the startup notification sequence, or launchers will // get confused by not receiving the expected message from the main process. views::LinuxUI* linux_ui = views::LinuxUI::instance(); diff --git a/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_music__manager__private_device__id__linux.cc b/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_music__manager__private_device__id__linux.cc index dad818ce9cf0..3b4e28b819a9 100644 --- a/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_music__manager__private_device__id__linux.cc +++ b/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_music__manager__private_device__id__linux.cc @@ -1,4 +1,4 @@ ---- chrome/browser/apps/platform_apps/api/music_manager_private/device_id_linux.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/apps/platform_apps/api/music_manager_private/device_id_linux.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/apps/platform_apps/api/music_manager_private/device_id_linux.cc @@ -4,6 +4,15 @@ @@ -16,7 +16,7 @@ #include <ifaddrs.h> #include <net/if.h> #include <stddef.h> -@@ -105,11 +114,33 @@ class MacAddressProcessor { +@@ -106,11 +115,33 @@ class MacAddressProcessor { const char* const prefixes[], size_t prefixes_count) { const int MAC_LENGTH = 6; @@ -51,7 +51,7 @@ int sd = socket(AF_INET, SOCK_DGRAM, 0); int result = ioctl(sd, SIOCGIFHWADDR, &ifinfo); close(sd); -@@ -119,11 +150,17 @@ class MacAddressProcessor { +@@ -120,11 +151,17 @@ class MacAddressProcessor { const char* mac_address = static_cast<const char*>(ifinfo.ifr_hwaddr.sa_data); diff --git a/www/chromium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.cc b/www/chromium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.cc index 8567bb517f11..914a8f443f2c 100644 --- a/www/chromium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.cc +++ b/www/chromium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.cc @@ -1,20 +1,20 @@ ---- chrome/browser/apps/platform_apps/platform_app_launch.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/apps/platform_apps/platform_app_launch.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/apps/platform_apps/platform_app_launch.cc -@@ -17,7 +17,7 @@ +@@ -18,7 +18,7 @@ #include "extensions/common/constants.h" #include "extensions/common/extension.h" --#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_navigator.h" #include "chrome/browser/ui/browser_window.h" -@@ -122,7 +122,7 @@ bool OpenExtensionApplicationTab(Profile* profile, con +@@ -121,7 +121,7 @@ bool OpenExtensionApplicationTab(Profile* profile, con return app_tab != nullptr; } --#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) bool OpenDeprecatedApplicationPrompt(Profile* profile, const std::string& app_id) { if (!extensions::IsExtensionUnsupportedDeprecatedApp(profile, app_id)) diff --git a/www/chromium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.h b/www/chromium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.h index a133bcabdb34..393b6f62495b 100644 --- a/www/chromium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.h +++ b/www/chromium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.h @@ -1,11 +1,11 @@ ---- chrome/browser/apps/platform_apps/platform_app_launch.h.orig 2021-09-24 18:17:59 UTC +--- chrome/browser/apps/platform_apps/platform_app_launch.h.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/apps/platform_apps/platform_app_launch.h @@ -36,7 +36,7 @@ bool OpenExtensionApplicationWindow(Profile* profile, // and false otherwise. bool OpenExtensionApplicationTab(Profile* profile, const std::string& app_id); --#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Opens the deprecated Chrome Apps flow if |app_id| refers to a Chrome App and // Chrome Apps are deprecated on the |profile|. Returns true if that was the // case, or false otherwise. diff --git a/www/chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc b/www/chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc index d6aa299207f8..7d62b3c9c226 100644 --- a/www/chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc +++ b/www/chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc @@ -1,11 +1,11 @@ ---- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc @@ -89,7 +89,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForSch return metrics::OmniboxInputType::QUERY; case ExternalProtocolHandler::UNKNOWN: { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Linux impl of GetApplicationNameForProtocol doesn't distinguish // between URL schemes with handers and those without. This will // make the default behaviour be search on Linux. diff --git a/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc b/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc index 8d3f48160b1a..c3e6446c375d 100644 --- a/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc +++ b/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc @@ -1,11 +1,11 @@ ---- chrome/browser/background/background_mode_manager.cc.orig 2021-09-24 04:25:58 UTC +--- chrome/browser/background/background_mode_manager.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/background/background_mode_manager.cc @@ -892,7 +892,7 @@ gfx::ImageSkia GetStatusTrayIcon() { return gfx::ImageSkia(); return family->CreateExact(size).AsImageSkia(); --#elif defined(OS_LINUX) || defined(OS_CHROMEOS) -+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) return *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed( IDR_PRODUCT_LOGO_128); - #elif defined(OS_MAC) + #elif BUILDFLAG(IS_MAC) diff --git a/www/chromium/files/patch-chrome_browser_background_background__mode__optimizer.cc b/www/chromium/files/patch-chrome_browser_background_background__mode__optimizer.cc index 28a83f9c9559..37083840f5bd 100644 --- a/www/chromium/files/patch-chrome_browser_background_background__mode__optimizer.cc +++ b/www/chromium/files/patch-chrome_browser_background_background__mode__optimizer.cc @@ -1,11 +1,11 @@ ---- chrome/browser/background/background_mode_optimizer.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/background/background_mode_optimizer.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/background/background_mode_optimizer.cc @@ -31,7 +31,7 @@ std::unique_ptr<BackgroundModeOptimizer> BackgroundMod switches::kKeepAliveForTest)) return nullptr; --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (base::FeatureList::IsEnabled(features::kBackgroundModeAllowRestart)) return base::WrapUnique(new BackgroundModeOptimizer()); - #endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-chrome_browser_browser__process__impl.cc b/www/chromium/files/patch-chrome_browser_browser__process__impl.cc index 512a65dad887..88bf739e9f2e 100644 --- a/www/chromium/files/patch-chrome_browser_browser__process__impl.cc +++ b/www/chromium/files/patch-chrome_browser_browser__process__impl.cc @@ -1,29 +1,29 @@ ---- chrome/browser/browser_process_impl.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/browser_process_impl.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/browser_process_impl.cc -@@ -208,7 +208,7 @@ +@@ -209,7 +209,7 @@ #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h" #endif --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "chrome/browser/error_reporting/chrome_js_error_report_processor.h" // nogncheck #endif -@@ -1160,7 +1160,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { +@@ -1157,7 +1157,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { + ApplyMetricsReportingPolicy(); - #endif --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) ChromeJsErrorReportProcessor::Create(); #endif -@@ -1420,7 +1420,7 @@ void BrowserProcessImpl::Unpin() { +@@ -1418,7 +1418,7 @@ void BrowserProcessImpl::Unpin() { // Mac is currently not supported. // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. --#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) +-#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD) bool BrowserProcessImpl::IsRunningInBackground() const { // Check if browser is in the background. diff --git a/www/chromium/files/patch-chrome_browser_browser__process__impl.h b/www/chromium/files/patch-chrome_browser_browser__process__impl.h index 9ede1407b876..14ccde8270cd 100644 --- a/www/chromium/files/patch-chrome_browser_browser__process__impl.h +++ b/www/chromium/files/patch-chrome_browser_browser__process__impl.h @@ -1,11 +1,11 @@ ---- chrome/browser/browser_process_impl.h.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/browser_process_impl.h.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/browser_process_impl.h @@ -373,7 +373,7 @@ class BrowserProcessImpl : public BrowserProcess, // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) +-#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD) base::RepeatingTimer autoupdate_timer_; // Gets called by autoupdate timer to see if browser needs restart and can be diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc index ed429a3889e5..1d3a0cb745bf 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc @@ -1,56 +1,56 @@ ---- chrome/browser/chrome_browser_interface_binders.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/chrome_browser_interface_binders.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/chrome_browser_interface_binders.cc @@ -97,7 +97,7 @@ #endif // BUILDFLAG(FULL_SAFE_BROWSING) - #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS_ASH) -+ BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_BSD) ++ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) #include "chrome/browser/ui/webui/connectors_internals/connectors_internals.mojom.h" #include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h" #endif @@ -165,7 +165,7 @@ - #endif // defined(OS_ANDROID) + #endif // BUILDFLAG(IS_ANDROID) - #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ -- defined(OS_CHROMEOS) -+ defined(OS_CHROMEOS) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #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" -@@ -654,7 +654,7 @@ void PopulateChromeFrameBinders( +@@ -658,7 +658,7 @@ void PopulateChromeFrameBinders( #endif - #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ -- defined(OS_CHROMEOS) -+ defined(OS_CHROMEOS) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (!render_frame_host->GetParent()) { map->Add<chrome::mojom::DraggableRegions>( base::BindRepeating(&DraggableRegionsHostImpl::CreateIfAllowed)); -@@ -662,7 +662,7 @@ void PopulateChromeFrameBinders( +@@ -666,7 +666,7 @@ void PopulateChromeFrameBinders( #endif - #if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MAC) || \ -- defined(OS_WIN) -+ defined(OS_WIN) || defined(OS_BSD) + #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->GetParent()) { - map->Add<blink::mojom::SubAppsProvider>( -@@ -702,7 +702,7 @@ void PopulateChromeWebUIFrameBinders( + map->Add<blink::mojom::SubAppsService>( +@@ -706,7 +706,7 @@ void PopulateChromeWebUIFrameBinders( SegmentationInternalsUI>(map); - #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS_ASH) -+ BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_BSD) ++ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) RegisterWebUIControllerInterfaceBinder< connectors_internals::mojom::PageHandler, enterprise_connectors::ConnectorsInternalsUI>(map); -@@ -1003,7 +1003,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -1013,7 +1013,7 @@ void PopulateChromeWebUIFrameBinders( #endif - #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ -- defined(OS_CHROMEOS) -+ defined(OS_CHROMEOS) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) RegisterWebUIControllerInterfaceBinder<discards::mojom::DetailsProvider, DiscardsUI>(map); diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc index 995770294b88..ee6b20867dee 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc @@ -1,52 +1,52 @@ ---- chrome/browser/chrome_browser_main.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/chrome_browser_main.cc -@@ -224,11 +224,11 @@ +@@ -228,11 +228,11 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) #include "chrome/browser/first_run/upgrade_util_linux.h" - #endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "components/crash/core/app/breakpad_linux.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -263,7 +263,7 @@ +@@ -267,7 +267,7 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_WIN) || defined(OS_MAC) || \ -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) || \ - (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) +-#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/metrics/desktop_session_duration/desktop_session_duration_tracker.h" #include "chrome/browser/metrics/desktop_session_duration/touch_mode_stats_tracker.h" -@@ -949,7 +949,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1007,7 +1007,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { AddFirstRunNewTabs(browser_creator_.get(), master_prefs_->new_tabs); } --#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // 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 . -@@ -962,7 +962,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1020,7 +1020,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { } - #endif // !defined(OS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH) + #endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH) --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_OPENBSD) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OPENBSD) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) // Set the product channel for crash reports. if (!crash_reporter::IsCrashpadEnabled()) { breakpad::SetChannelCrashKey( -@@ -982,7 +982,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1041,7 +1041,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_WIN) || defined(OS_MAC) || \ -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) || \ - (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ + (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) metrics::DesktopSessionDurationTracker::Initialize(); ProfileActivityMetricsRecorder::Initialize(); diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc index bfe5cf2b7ccc..009b0cbbe1e2 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc @@ -1,11 +1,11 @@ ---- chrome/browser/chrome_browser_main_extra_parts_linux.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/chrome_browser_main_extra_parts_linux.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/chrome_browser_main_extra_parts_linux.cc @@ -120,7 +120,7 @@ ChromeBrowserMainExtraPartsLinux::ChromeBrowserMainExt ChromeBrowserMainExtraPartsLinux::~ChromeBrowserMainExtraPartsLinux() = default; void ChromeBrowserMainExtraPartsLinux::PreEarlyInitialization() { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // On the desktop, we fix the platform name if necessary. // See https://crbug.com/1246928. auto* const command_line = base::CommandLine::ForCurrentProcess(); diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc index fa6f25a6beab..711142efa19a 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_main_linux.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/chrome_browser_main_linux.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/chrome_browser_main_linux.cc -@@ -86,7 +86,7 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() { +@@ -57,7 +57,7 @@ ChromeBrowserMainPartsLinux::~ChromeBrowserMainPartsLi } void ChromeBrowserMainPartsLinux::PostCreateMainMessageLoop() { @@ -9,8 +9,8 @@ // No-op: Ash and Lacros Bluetooth DBusManager initialization depend on // FeatureList, and is done elsewhere. #else -@@ -115,7 +115,7 @@ void ChromeBrowserMainPartsLinux::PostBrowserStart() { - #endif // defined(USE_DBUS) && !defined(OS_CHROMEOS) +@@ -122,7 +122,7 @@ void ChromeBrowserMainPartsLinux::PostBrowserStart() { + #endif // defined(USE_DBUS) && !BUILDFLAG(IS_CHROMEOS) void ChromeBrowserMainPartsLinux::PostDestroyThreads() { -#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc index f1af0f25cc94..78f929dfa12f 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc @@ -1,11 +1,11 @@ ---- chrome/browser/chrome_browser_main_posix.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/chrome_browser_main_posix.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/chrome_browser_main_posix.cc @@ -72,7 +72,7 @@ void ExitHandler::ExitWhenPossibleOnUIThread(int signa } else { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) switch (signal) { case SIGINT: case SIGHUP: diff --git a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc index 20ddbcd0d54d..e7e35569e08c 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc @@ -1,136 +1,136 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/chrome_content_browser_client.cc @@ -373,7 +373,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" --#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) + #include "third_party/cros_system_api/switches/chrome_switches.h" +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) #include "chrome/browser/chrome_browser_main_linux.h" - #elif defined(OS_ANDROID) + #elif BUILDFLAG(IS_ANDROID) #include "base/android/application_status_listener.h" -@@ -437,17 +437,17 @@ +@@ -442,17 +442,17 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_WIN) || defined(OS_MAC) || \ -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) || \ - (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) +-#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/browser_switcher/browser_switcher_navigation_throttle.h" #endif --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "components/crash/core/app/crash_switches.h" #include "components/crash/core/app/crashpad.h" #endif --#if defined(OS_POSIX) && !defined(OS_MAC) -+#if defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_BSD) - #if !defined(OS_ANDROID) +-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD) + #if !BUILDFLAG(IS_ANDROID) #include "base/debug/leak_annotations.h" #include "components/crash/core/app/breakpad_linux.h" -@@ -456,7 +456,7 @@ +@@ -461,7 +461,7 @@ #endif - #if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || \ + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ - BUILDFLAG(IS_CHROMEOS_ASH) -+ BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_BSD) ++ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) #include "chrome/browser/enterprise/connectors/device_trust/navigation_throttle.h" - #endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || // BUILDFLAG(IS_CHROMEOS_ASH) -@@ -478,11 +478,11 @@ +@@ -483,11 +483,11 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h" #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/browser/chrome_browser_main_extra_parts_linux.h" #elif defined(USE_OZONE) #include "chrome/browser/chrome_browser_main_extra_parts_ozone.h" -@@ -866,7 +866,7 @@ blink::mojom::AutoplayPolicy GetAutoplayPolicyForWebCo +@@ -870,7 +870,7 @@ blink::mojom::AutoplayPolicy GetAutoplayPolicyForWebCo int GetCrashSignalFD(const base::CommandLine& command_line) { return crashpad::CrashHandlerHost::Get()->GetDeathSignalSocket(); } --#elif defined(OS_POSIX) && !defined(OS_MAC) -+#elif defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_BSD) +-#elif BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) ++#elif BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD) breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost( const std::string& process_type) { base::FilePath dumps_path; -@@ -1361,7 +1361,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( +@@ -1370,7 +1370,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( #elif BUILDFLAG(IS_CHROMEOS_LACROS) main_parts = std::make_unique<ChromeBrowserMainPartsLacros>( std::move(parameters), &startup_data_); --#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) main_parts = std::make_unique<ChromeBrowserMainPartsLinux>( std::move(parameters), &startup_data_); - #elif defined(OS_ANDROID) -@@ -1395,7 +1395,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( + #elif BUILDFLAG(IS_ANDROID) +@@ -1404,7 +1404,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( std::make_unique<ChromeBrowserMainExtraPartsViewsLacros>()); // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) main_parts->AddParts( std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>()); #else -@@ -1412,7 +1412,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( +@@ -1421,7 +1421,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLacros>()); #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>()); #elif defined(USE_OZONE) main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>()); -@@ -2184,6 +2184,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin - #elif defined(OS_POSIX) - #if defined(OS_ANDROID) +@@ -2161,6 +2161,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin + #elif BUILDFLAG(IS_POSIX) + #if BUILDFLAG(IS_ANDROID) bool enable_crash_reporter = true; -+#elif defined(OS_BSD) ++#elif BUILDFLAG(IS_BSD) + bool enable_crash_reporter = false; #else bool enable_crash_reporter = false; if (crash_reporter::IsCrashpadEnabled()) { -@@ -2497,7 +2499,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2474,7 +2476,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin ThreadProfilerConfiguration::Get()->AppendCommandLineSwitchForChildProcess( command_line); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Processes may only query perf_event_open with the BPF sandbox disabled. if (browser_command_line.HasSwitch(switches::kEnableThreadInstructionCount) && command_line->HasSwitch(sandbox::policy::switches::kNoSandbox)) { -@@ -3858,7 +3860,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst +@@ -3846,7 +3848,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst } } --#if defined(OS_POSIX) && !defined(OS_MAC) -+#if defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_BSD) +-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD) void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -4266,7 +4268,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -4258,7 +4260,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati } - #if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || \ + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ - BUILDFLAG(IS_CHROMEOS_ASH) -+ BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_BSD) ++ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle:: MaybeCreateThrottleFor(handle), &throttles); -@@ -4299,7 +4301,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -4291,7 +4293,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_WIN) || defined(OS_MAC) || \ -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) || \ - (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ + (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle:: MaybeCreateThrottleFor(handle), diff --git a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h index 4c3aff5fb455..ff16b8c5387c 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h +++ b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h @@ -1,11 +1,11 @@ ---- chrome/browser/chrome_content_browser_client.h.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/chrome_content_browser_client.h.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/chrome_content_browser_client.h -@@ -412,7 +412,7 @@ class ChromeContentBrowserClient : public content::Con +@@ -410,7 +410,7 @@ class ChromeContentBrowserClient : public content::Con void OverridePageVisibilityState( content::RenderFrameHost* render_frame_host, content::PageVisibilityState* visibility_state) override; --#if defined(OS_POSIX) && !defined(OS_MAC) -+#if defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_BSD) +-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD) void GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, diff --git a/www/chromium/files/patch-chrome_browser_crash__upload__list_crash__upload__list.cc b/www/chromium/files/patch-chrome_browser_crash__upload__list_crash__upload__list.cc index 63fec6929287..a7fe163ba2e5 100644 --- a/www/chromium/files/patch-chrome_browser_crash__upload__list_crash__upload__list.cc +++ b/www/chromium/files/patch-chrome_browser_crash__upload__list_crash__upload__list.cc @@ -1,11 +1,11 @@ ---- chrome/browser/crash_upload_list/crash_upload_list.cc.orig 2021-09-24 04:25:58 UTC +--- chrome/browser/crash_upload_list/crash_upload_list.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/crash_upload_list/crash_upload_list.cc @@ -52,7 +52,7 @@ scoped_refptr<UploadList> CreateCrashUploadList() { // to log uploads in CrashUploadList::kReporterLogFilename. // Linux is handled below. #if !(BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ -- defined(OS_LINUX)) -+ defined(OS_LINUX) || defined(OS_BSD)) +- BUILDFLAG(IS_LINUX)) ++ BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) if (crash_reporter::IsCrashpadEnabled()) { return new CrashUploadListCrashpad(); } diff --git a/www/chromium/files/patch-chrome_browser_custom__handlers_chrome__protocol__handler__registry__delegate.cc b/www/chromium/files/patch-chrome_browser_custom__handlers_chrome__protocol__handler__registry__delegate.cc index 89bbf2da0605..8b9b9115d38e 100644 --- a/www/chromium/files/patch-chrome_browser_custom__handlers_chrome__protocol__handler__registry__delegate.cc +++ b/www/chromium/files/patch-chrome_browser_custom__handlers_chrome__protocol__handler__registry__delegate.cc @@ -1,11 +1,11 @@ ---- chrome/browser/custom_handlers/chrome_protocol_handler_registry_delegate.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/custom_handlers/chrome_protocol_handler_registry_delegate.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/custom_handlers/chrome_protocol_handler_registry_delegate.cc @@ -69,7 +69,7 @@ void ChromeProtocolHandlerRegistryDelegate::CheckDefau // If true default protocol handlers will be removed if the OS level // registration for a protocol is no longer Chrome. bool ChromeProtocolHandlerRegistryDelegate::ShouldRemoveHandlersNotInOS() { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // We don't do this on Linux as the OS registration there is not reliable, // and Chrome OS doesn't have any notion of OS registration. // TODO(benwells): When Linux support is more reliable remove this diff --git a/www/chromium/files/patch-chrome_browser_defaults.cc b/www/chromium/files/patch-chrome_browser_defaults.cc index 8ccc3075788f..f7270b716bdd 100644 --- a/www/chromium/files/patch-chrome_browser_defaults.cc +++ b/www/chromium/files/patch-chrome_browser_defaults.cc @@ -1,11 +1,11 @@ ---- chrome/browser/defaults.cc.orig 2021-12-14 11:44:58 UTC +--- chrome/browser/defaults.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/defaults.cc @@ -50,7 +50,7 @@ const bool kSyncAutoStarts = false; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) const bool kScrollEventChangesTab = true; #else const bool kScrollEventChangesTab = false; diff --git a/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd b/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd index c15238834196..4b0f3ecbf844 100644 --- a/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd +++ b/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd @@ -1,8 +1,8 @@ ---- chrome/browser/dev_ui_browser_resources.grd.orig 2021-05-12 22:05:43 UTC +--- chrome/browser/dev_ui_browser_resources.grd.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/dev_ui_browser_resources.grd -@@ -47,7 +47,7 @@ This file specifies browser resources for developer-fa - <include name="IDR_MEDIA_SESSION_MOJOM_LITE_JS" file="${root_gen_dir}\services\media_session\public\mojom\media_session.mojom-lite.js" use_base_dir="false" type="BINDATA" /> - <include name="IDR_UI_GEOMETRY_MOJOM_LITE_JS" file="${root_gen_dir}\ui\gfx\geometry\mojom\geometry.mojom-lite.js" use_base_dir="false" type="BINDATA" /> +@@ -46,7 +46,7 @@ This file specifies browser resources for developer-fa + <include name="IDR_PREDICTORS_RESOURCE_PREFETCH_PREDICTOR_JS" file="resources\predictors\resource_prefetch_predictor.js" type="BINDATA" /> + <include name="IDR_MEDIA_SESSION_MOJOM_WEBUI_JS" file="${root_gen_dir}\mojom-webui\services\media_session\public\mojom\media_session.mojom-webui.js" use_base_dir="false" type="BINDATA" /> - <if expr="is_android or is_linux"> + <if expr="is_android or is_posix"> diff --git a/www/chromium/files/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc b/www/chromium/files/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc index e3a763d30322..e5e00061d6ab 100644 --- a/www/chromium/files/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc +++ b/www/chromium/files/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc @@ -1,11 +1,11 @@ ---- chrome/browser/device_identity/device_oauth2_token_service_factory.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/device_identity/device_oauth2_token_service_factory.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/device_identity/device_oauth2_token_service_factory.cc @@ -28,7 +28,7 @@ std::unique_ptr<DeviceOAuth2TokenStore> CreatePlatform return std::make_unique<chromeos::DeviceOAuth2TokenStoreChromeOS>( local_state); - #elif defined(OS_WIN) || defined(OS_MAC) || defined(OS_FUCHSIA) || \ -- (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+ (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) + #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || \ +- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD) return std::make_unique<DeviceOAuth2TokenStoreDesktop>(local_state); #else NOTREACHED(); diff --git a/www/chromium/files/patch-chrome_browser_devtools_devtools__eye__dropper.cc b/www/chromium/files/patch-chrome_browser_devtools_devtools__eye__dropper.cc index a4fdabda91cb..6b9f8c54bad4 100644 --- a/www/chromium/files/patch-chrome_browser_devtools_devtools__eye__dropper.cc +++ b/www/chromium/files/patch-chrome_browser_devtools_devtools__eye__dropper.cc @@ -1,11 +1,11 @@ ---- chrome/browser/devtools/devtools_eye_dropper.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/devtools/devtools_eye_dropper.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/devtools/devtools_eye_dropper.cc @@ -186,7 +186,7 @@ void DevToolsEyeDropper::UpdateCursor() { // magnified projection only with centered hotspot. // Mac Retina requires cursor to be > 120px in order to render smoothly. --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) const float kCursorSize = 63; const float kDiameter = 63; const float kHotspotOffset = 32; diff --git a/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc b/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc index 2fe459b66614..e50b9ab03679 100644 --- a/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc +++ b/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc @@ -1,47 +1,47 @@ ---- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/download/chrome_download_manager_delegate.cc @@ -1539,7 +1539,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe target_info->is_filetype_handled_safely) DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (item->GetOriginalMimeType() == "application/x-x509-user-cert") DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true); #endif @@ -1608,7 +1608,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile( const base::FilePath& path) { - #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -- defined(OS_MAC) -+ defined(OS_MAC) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) if (path.MatchesExtension(FILE_PATH_LITERAL(".pdf"))) { return !download_prefs_->ShouldOpenPdfInSystemReader(); } @@ -1716,7 +1716,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow content::CheckDownloadAllowedCallback check_download_allowed_cb) { DCHECK_CURRENTLY_ON(BrowserThread::UI); - #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -- defined(OS_MAC) -+ defined(OS_MAC) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) // 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()) { @@ -1758,7 +1758,7 @@ std::unique_ptr<download::DownloadItemRenameHandler> ChromeDownloadManagerDelegate::GetRenameHandlerForDownload( download::DownloadItem* download_item) { - #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -- defined(OS_MAC) -+ defined(OS_MAC) || defined(OS_BSD) + #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 @@ -1774,7 +1774,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl DCHECK(download_item->IsSavePackageDownload()); - #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -- defined(OS_MAC) -+ defined(OS_MAC) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) if (!base::FeatureList::IsEnabled( download::features::kAllowSavePackageScanning)) { std::move(callback).Run(true); diff --git a/www/chromium/files/patch-chrome_browser_download_download__commands.cc b/www/chromium/files/patch-chrome_browser_download_download__commands.cc index 450356c57c46..7322bb2b635c 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__commands.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__commands.cc @@ -1,20 +1,20 @@ ---- chrome/browser/download/download_commands.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/download/download_commands.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/download/download_commands.cc @@ -27,7 +27,7 @@ #include "ui/base/clipboard/scoped_clipboard_writer.h" - #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -- defined(OS_MAC) || defined(OS_FUCHSIA) -+ defined(OS_MAC) || defined(OS_FUCHSIA) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" @@ -168,7 +168,7 @@ void DownloadCommands::ExecuteCommand(Command command) } - #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ -- defined(OS_CHROMEOS) || defined(OS_FUCHSIA) -+ defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) Browser* DownloadCommands::GetBrowser() const { if (!model_) diff --git a/www/chromium/files/patch-chrome_browser_download_download__commands.h b/www/chromium/files/patch-chrome_browser_download_download__commands.h index de608693e66a..b06c4d936816 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__commands.h +++ b/www/chromium/files/patch-chrome_browser_download_download__commands.h @@ -1,11 +1,11 @@ ---- chrome/browser/download/download_commands.h.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/download/download_commands.h.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/download/download_commands.h @@ -54,7 +54,7 @@ class DownloadCommands { void ExecuteCommand(Command command); - #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -- defined(OS_MAC) || defined(OS_FUCHSIA) -+ defined(OS_MAC) || defined(OS_FUCHSIA) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) bool IsDownloadPdf() const; bool CanOpenPdfInSystemViewer() const; Browser* GetBrowser() const; diff --git a/www/chromium/files/patch-chrome_browser_download_download__item__model.cc b/www/chromium/files/patch-chrome_browser_download_download__item__model.cc index a3f2e3a5db43..de6f03b8595d 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__item__model.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__item__model.cc @@ -1,20 +1,20 @@ ---- chrome/browser/download/download_item_model.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/download/download_item_model.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/download/download_item_model.cc -@@ -635,7 +635,7 @@ bool DownloadItemModel::IsCommandChecked( +@@ -636,7 +636,7 @@ bool DownloadItemModel::IsCommandChecked( download_crx_util::IsExtensionDownload(*download_); case DownloadCommands::ALWAYS_OPEN_TYPE: - #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -- defined(OS_MAC) -+ defined(OS_MAC) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) if (download_commands->CanOpenPdfInSystemViewer()) { DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile()); return prefs->ShouldOpenPdfInSystemReader(); -@@ -676,7 +676,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand +@@ -677,7 +677,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand DownloadCommands::ALWAYS_OPEN_TYPE); DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile()); - #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -- defined(OS_MAC) -+ defined(OS_MAC) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) if (download_commands->CanOpenPdfInSystemViewer()) { prefs->SetShouldOpenPdfInSystemReader(!is_checked); SetShouldPreferOpeningInBrowser(is_checked); diff --git a/www/chromium/files/patch-chrome_browser_download_download__prefs.cc b/www/chromium/files/patch-chrome_browser_download_download__prefs.cc index 09000d57351d..9dbb2956cd6f 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__prefs.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__prefs.cc @@ -1,4 +1,4 @@ ---- chrome/browser/download/download_prefs.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/download/download_prefs.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/download/download_prefs.cc @@ -13,6 +13,7 @@ #include "base/callback_helpers.h" @@ -21,66 +21,66 @@ // Consider downloads 'dangerous' if they go to the home directory on Linux and // to the desktop on any platform. bool DownloadPathIsDangerous(const base::FilePath& download_path) { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) base::FilePath home_dir = base::GetHomeDir(); if (download_path == home_dir) { return true; @@ -168,7 +171,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi #endif // BUILDFLAG(IS_CHROMEOS_ASH) - #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -- defined(OS_MAC) -+ defined(OS_MAC) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) should_open_pdf_in_system_reader_ = prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader); #endif @@ -287,7 +290,7 @@ void DownloadPrefs::RegisterProfilePrefs( registry->RegisterFilePathPref(prefs::kSaveFileDefaultDirectory, default_download_path); - #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -- defined(OS_MAC) -+ defined(OS_MAC) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false); #endif - #if defined(OS_ANDROID) + #if BUILDFLAG(IS_ANDROID) @@ -421,7 +424,7 @@ bool DownloadPrefs::IsDownloadPathManaged() const { bool DownloadPrefs::IsAutoOpenByUserUsed() const { - #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -- defined(OS_MAC) -+ defined(OS_MAC) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) if (ShouldOpenPdfInSystemReader()) return true; #endif @@ -436,7 +439,7 @@ bool DownloadPrefs::IsAutoOpenEnabled(const GURL& url, DCHECK(extension[0] == base::FilePath::kExtensionSeparator); extension.erase(0, 1); - #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -- defined(OS_MAC) -+ defined(OS_MAC) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) if (base::FilePath::CompareEqualIgnoreCase(extension, FILE_PATH_LITERAL("pdf")) && ShouldOpenPdfInSystemReader()) @@ -491,7 +494,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens } - #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -- defined(OS_MAC) -+ defined(OS_MAC) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) { if (should_open_pdf_in_system_reader_ == should_open) return; @@ -513,7 +516,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons void DownloadPrefs::ResetAutoOpenByUser() { - #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -- defined(OS_MAC) -+ defined(OS_MAC) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) SetShouldOpenPdfInSystemReader(false); #endif auto_open_by_user_.clear(); -@@ -630,9 +633,13 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa +@@ -651,9 +654,13 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa // Fall back to the default download directory for all other paths. return GetDefaultDownloadDirectoryForProfile(); #else diff --git a/www/chromium/files/patch-chrome_browser_download_download__prefs.h b/www/chromium/files/patch-chrome_browser_download_download__prefs.h index 9dfc3dcb070d..7ad6d7876c19 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__prefs.h +++ b/www/chromium/files/patch-chrome_browser_download_download__prefs.h @@ -1,20 +1,20 @@ ---- chrome/browser/download/download_prefs.h.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/download/download_prefs.h.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/download/download_prefs.h @@ -122,7 +122,7 @@ class DownloadPrefs { void DisableAutoOpenByUserBasedOnExtension(const base::FilePath& file_name); - #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -- defined(OS_MAC) -+ defined(OS_MAC) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) // Store the user preference to disk. If |should_open| is true, also disable // the built-in PDF plugin. If |should_open| is false, enable the PDF plugin. void SetShouldOpenPdfInSystemReader(bool should_open); @@ -181,7 +181,7 @@ class DownloadPrefs { std::unique_ptr<policy::URLBlocklist> auto_open_allowed_by_urls_; - #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -- defined(OS_MAC) -+ defined(OS_MAC) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) bool should_open_pdf_in_system_reader_; #endif diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc index d9ebefbbd7f4..4bef52efb9e8 100644 --- a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc +++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc @@ -1,11 +1,11 @@ ---- chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc @@ -12,7 +12,7 @@ #include "components/keyed_service/content/browser_context_dependency_manager.h" #include "components/keyed_service/core/keyed_service.h" --#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) -+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) #include "chrome/browser/browser_process.h" #include "chrome/browser/enterprise/connectors/device_trust/browser/browser_device_trust_connector_service.h" #include "chrome/browser/policy/chrome_browser_policy_connector.h" @@ -13,8 +13,8 @@ bool DeviceTrustConnectorServiceFactory::ServiceIsCreatedWithBrowserContext() const { --#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) -+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) return IsDeviceTrustConnectorFeatureEnabled(); #else return false; @@ -22,8 +22,8 @@ DeviceTrustConnectorService* service = nullptr; --#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) -+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) if (IsDeviceTrustConnectorFeatureEnabled()) { auto* key_manager = g_browser_process->browser_policy_connector() ->chrome_browser_cloud_management_controller() diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc index c8de763196d0..62f759813b08 100644 --- a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc +++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc @@ -1,11 +1,11 @@ ---- chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc @@ -21,7 +21,7 @@ #include "components/policy/content/policy_blocklist_service.h" #include "content/public/browser/browser_context.h" --#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) -+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) #include "chrome/browser/browser_process.h" #include "chrome/browser/enterprise/connectors/device_trust/attestation/desktop/desktop_attestation_service.h" #include "chrome/browser/policy/chrome_browser_policy_connector.h" diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_core_persistence_key__persistence__delegate__factory.cc b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_core_persistence_key__persistence__delegate__factory.cc index bdaa9bca00f1..8268b3ffef16 100644 --- a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_core_persistence_key__persistence__delegate__factory.cc +++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_core_persistence_key__persistence__delegate__factory.cc @@ -1,20 +1,20 @@ ---- chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/key_persistence_delegate_factory.cc.orig 2022-01-21 13:09:59 UTC +--- chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/key_persistence_delegate_factory.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/key_persistence_delegate_factory.cc @@ -13,7 +13,7 @@ #include "chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/win_key_persistence_delegate.h" - #elif defined(OS_MAC) + #elif BUILDFLAG(IS_MAC) #include "chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/mac_key_persistence_delegate.h" --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/linux_key_persistence_delegate.h" #endif @@ -44,7 +44,7 @@ KeyPersistenceDelegateFactory::CreateKeyPersistenceDel return std::make_unique<WinKeyPersistenceDelegate>(); - #elif defined(OS_MAC) + #elif BUILDFLAG(IS_MAC) return std::make_unique<MacKeyPersistenceDelegate>(); --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return std::make_unique<LinuxKeyPersistenceDelegate>(); #else NOTREACHED(); diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc index 8c2c05f45f9a..e7c6c5dfc77e 100644 --- a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc +++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc @@ -1,11 +1,11 @@ ---- chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc @@ -14,7 +14,7 @@ #include "chrome/browser/enterprise/connectors/device_trust/signals/signals_service_impl.h" #include "chrome/browser/profiles/profile.h" --#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) -+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) #include "base/check.h" #include "chrome/browser/enterprise/connectors/device_trust/signals/decorators/browser/browser_signals_decorator.h" #include "chrome/browser/policy/chrome_browser_policy_connector.h" @@ -13,8 +13,8 @@ decorators.push_back( std::make_unique<ContentSignalsDecorator>(policy_blocklist_service)); --#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) -+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) policy::ChromeBrowserPolicyConnector* browser_policy_connector = g_browser_process->browser_policy_connector(); DCHECK(browser_policy_connector); diff --git a/www/chromium/files/patch-chrome_browser_enterprise_remote__commands_cbcm__remote__commands__factory.cc b/www/chromium/files/patch-chrome_browser_enterprise_remote__commands_cbcm__remote__commands__factory.cc new file mode 100644 index 000000000000..255d96a1e284 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_enterprise_remote__commands_cbcm__remote__commands__factory.cc @@ -0,0 +1,20 @@ +--- chrome/browser/enterprise/remote_commands/cbcm_remote_commands_factory.cc.orig 2022-02-28 16:54:41 UTC ++++ chrome/browser/enterprise/remote_commands/cbcm_remote_commands_factory.cc +@@ -11,7 +11,7 @@ + #include "chrome/browser/profiles/profile_manager.h" + #include "components/policy/core/common/remote_commands/remote_command_job.h" + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + #include "chrome/browser/enterprise/connectors/device_trust/device_trust_features.h" + #include "chrome/browser/enterprise/remote_commands/rotate_attestation_credential_job.h" + #include "chrome/browser/policy/chrome_browser_policy_connector.h" +@@ -31,7 +31,7 @@ CBCMRemoteCommandsFactory::BuildJobForType( + g_browser_process->profile_manager()); + } + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + if (enterprise_connectors::IsDeviceTrustConnectorFeatureEnabled() && + type == enterprise_management:: + RemoteCommand_Type_BROWSER_ROTATE_ATTESTATION_CREDENTIAL) { diff --git a/www/chromium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher.cc b/www/chromium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher.cc index f47f4f273fd5..cef049635caf 100644 --- a/www/chromium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher.cc +++ b/www/chromium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher.cc @@ -1,20 +1,20 @@ ---- chrome/browser/enterprise/signals/device_info_fetcher.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/enterprise/signals/device_info_fetcher.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/enterprise/signals/device_info_fetcher.cc @@ -10,7 +10,7 @@ #include "chrome/browser/enterprise/signals/device_info_fetcher_mac.h" - #elif defined(OS_WIN) + #elif BUILDFLAG(IS_WIN) #include "chrome/browser/enterprise/signals/device_info_fetcher_win.h" --#elif defined(OS_LINUX) || defined(OS_CHROMEOS) -+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "chrome/browser/enterprise/signals/device_info_fetcher_linux.h" #endif @@ -70,7 +70,7 @@ std::unique_ptr<DeviceInfoFetcher> DeviceInfoFetcher:: return std::make_unique<DeviceInfoFetcherMac>(); - #elif defined(OS_WIN) + #elif BUILDFLAG(IS_WIN) return std::make_unique<DeviceInfoFetcherWin>(); --#elif defined(OS_LINUX) || defined(OS_CHROMEOS) -+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) return std::make_unique<DeviceInfoFetcherLinux>(); #else return std::make_unique<StubDeviceFetcher>(); diff --git a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn index d76569f1c6aa..c415a0336962 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn +++ b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/BUILD.gn.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/extensions/BUILD.gn.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/extensions/BUILD.gn -@@ -1303,6 +1303,10 @@ static_library("extensions") { +@@ -1298,6 +1298,10 @@ static_library("extensions") { deps += [ "//chrome/services/printing/public/mojom" ] } diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_chrome__desktop__report__request__helper.cc b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_chrome__desktop__report__request__helper.cc index 184921c28f0b..59e2bb1525d0 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_chrome__desktop__report__request__helper.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_chrome__desktop__report__request__helper.cc @@ -1,29 +1,29 @@ ---- chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc -@@ -23,7 +23,7 @@ +@@ -24,7 +24,7 @@ #include "base/win/registry.h" #endif --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "base/environment.h" #include "base/nix/xdg_util.h" #endif -@@ -228,7 +228,7 @@ base::FilePath GetEndpointVerificationDir() { +@@ -208,7 +208,7 @@ base::FilePath GetEndpointVerificationDir() { bool got_path = false; - #if defined(OS_WIN) + #if BUILDFLAG(IS_WIN) got_path = base::PathService::Get(base::DIR_LOCAL_APP_DATA, &path); --#elif defined(OS_LINUX) || defined(OS_CHROMEOS) -+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) std::unique_ptr<base::Environment> env(base::Environment::Create()); path = base::nix::GetXDGDirectory(env.get(), base::nix::kXdgConfigHomeEnvVar, base::nix::kDotConfigDir); -@@ -239,7 +239,7 @@ base::FilePath GetEndpointVerificationDir() { +@@ -219,7 +219,7 @@ base::FilePath GetEndpointVerificationDir() { if (!got_path) return path; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) path = path.AppendASCII("google"); #else path = path.AppendASCII("Google"); diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc index 318ce33580c5..a88036a55cae 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc @@ -1,11 +1,11 @@ ---- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc @@ -155,7 +155,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction:: // getPersistentSecret --#if !defined(OS_LINUX) -+#if !defined(OS_LINUX) && !defined(OS_BSD) +-#if !BUILDFLAG(IS_LINUX) ++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) EnterpriseReportingPrivateGetPersistentSecretFunction:: EnterpriseReportingPrivateGetPersistentSecretFunction() = default; diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.h b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.h index 6428727febf6..885f7e4d295e 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.h +++ b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.h @@ -1,11 +1,11 @@ ---- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.h.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.h.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.h @@ -45,7 +45,7 @@ class EnterpriseReportingPrivateGetDeviceIdFunction : ~EnterpriseReportingPrivateGetDeviceIdFunction() override; }; --#if !defined(OS_LINUX) -+#if !defined(OS_LINUX) && !defined(OS_BSD) +-#if !BUILDFLAG(IS_LINUX) ++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) class EnterpriseReportingPrivateGetPersistentSecretFunction : public ExtensionFunction { diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_messaging_native__process__launcher__posix.cc b/www/chromium/files/patch-chrome_browser_extensions_api_messaging_native__process__launcher__posix.cc index e760b5589021..657717257a26 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_messaging_native__process__launcher__posix.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_messaging_native__process__launcher__posix.cc @@ -1,11 +1,11 @@ ---- chrome/browser/extensions/api/messaging/native_process_launcher_posix.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/extensions/api/messaging/native_process_launcher_posix.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/extensions/api/messaging/native_process_launcher_posix.cc @@ -82,7 +82,7 @@ bool NativeProcessLauncher::LaunchNativeProcess( // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) // Don't use no_new_privs mode, e.g. in case the host needs to use sudo. options.allow_new_privs = true; #endif diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc b/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc index c8ea0be62458..5e1c8a8a0917 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc @@ -1,20 +1,20 @@ ---- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2021-09-14 01:51:50 UTC +--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -182,7 +182,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -181,7 +181,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) (*s_allowlist)[::prefs::kUseCustomChromeFrame] = settings_api::PrefType::PREF_TYPE_BOOLEAN; #endif -@@ -196,7 +196,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -195,7 +195,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist settings_api::PrefType::PREF_TYPE_NUMBER; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) (*s_allowlist)[::prefs::kUsesSystemTheme] = settings_api::PrefType::PREF_TYPE_BOOLEAN; #endif diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc b/www/chromium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc index 1150bf672f0d..8e814e8a9a64 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc @@ -1,11 +1,11 @@ ---- chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc @@ -30,7 +30,7 @@ #include "extensions/browser/process_manager.h" #include "extensions/common/error_utils.h" --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "extensions/common/permissions/permissions_data.h" #endif @@ -13,8 +13,8 @@ bool CanEnableAudioDebugRecordingsFromExtension( const extensions::Extension* extension) { bool enabled_by_permissions = false; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (extension) { enabled_by_permissions = extension->permissions_data()->active_permissions().HasAPIPermission( @@ -22,8 +22,8 @@ ExtensionFunction::ResponseAction WebrtcLoggingPrivateGetLogsDirectoryFunction::Run() { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Unlike other WebrtcLoggingPrivate functions that take a RequestInfo object, // this function shouldn't be called by a component extension on behalf of // some web code. It returns a DirectoryEntry for use directly in the calling diff --git a/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc b/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc index 132a4b35a2ba..ccfb84227366 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc @@ -1,20 +1,20 @@ ---- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/extensions/browser_context_keyed_service_factories.cc -@@ -53,7 +53,7 @@ +@@ -52,7 +52,7 @@ #include "extensions/browser/api/networking_private/networking_private_delegate_factory.h" #include "ppapi/buildflags/buildflags.h" --#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) #include "chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.h" #endif -@@ -126,7 +126,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() +@@ -124,7 +124,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() extensions::SettingsPrivateEventRouterFactory::GetInstance(); extensions::SettingsOverridesAPI::GetFactoryInstance(); extensions::SignedInDevicesManager::GetFactoryInstance(); --#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) extensions::SystemIndicatorManagerFactory::GetInstance(); #endif extensions::TabGroupsEventRouterFactory::GetInstance(); diff --git a/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc b/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc index 20346cba311a..ef8769083bb5 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc @@ -1,20 +1,20 @@ ---- chrome/browser/extensions/external_provider_impl.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/extensions/external_provider_impl.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/extensions/external_provider_impl.cc -@@ -815,7 +815,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -816,7 +816,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. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) provider_list->push_back(std::make_unique<ExternalProviderImpl>( service, base::MakeRefCounted<ExternalPrefLoader>( -@@ -843,7 +843,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -844,7 +844,7 @@ void ExternalProviderImpl::CreateExternalProviders( bundled_extension_creation_flags)); // Define a per-user source of external extensions. --#if defined(OS_MAC) || ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && \ -+#if defined(OS_MAC) || ((defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && \ - BUILDFLAG(CHROMIUM_BRANDING)) +-#if BUILDFLAG(IS_MAC) || ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \ ++#if BUILDFLAG(IS_MAC) || ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && \ + BUILDFLAG(CHROMIUM_BRANDING)) provider_list->push_back(std::make_unique<ExternalProviderImpl>( service, diff --git a/www/chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc b/www/chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc index b03f80a4a3b9..ebbdbd6295d6 100644 --- a/www/chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc +++ b/www/chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc @@ -1,11 +1,11 @@ ---- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc -@@ -216,7 +216,7 @@ const struct { +@@ -217,7 +217,7 @@ const struct { {base::DIR_HOME, FILE_PATH_LITERAL("Library/Mobile Documents"), kDontBlockChildren}, #endif --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // On Linux also block access to devices via /dev, as well as security // sensitive data in /sys and /proc. {kNoBasePathKey, FILE_PATH_LITERAL("/dev"), kBlockAllChildren}, diff --git a/www/chromium/files/patch-chrome_browser_first__run_first__run__dialog.h b/www/chromium/files/patch-chrome_browser_first__run_first__run__dialog.h index d0700ee0815a..3accb34d0e25 100644 --- a/www/chromium/files/patch-chrome_browser_first__run_first__run__dialog.h +++ b/www/chromium/files/patch-chrome_browser_first__run_first__run__dialog.h @@ -1,11 +1,11 @@ ---- chrome/browser/first_run/first_run_dialog.h.orig 2021-04-14 18:40:53 UTC +--- chrome/browser/first_run/first_run_dialog.h.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/first_run/first_run_dialog.h @@ -12,7 +12,7 @@ // Hide this function on platforms where the dialog does not exist. // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_MAC) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+#if defined(OS_MAC) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) +-#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD) class Profile; diff --git a/www/chromium/files/patch-chrome_browser_first__run_first__run__internal.h b/www/chromium/files/patch-chrome_browser_first__run_first__run__internal.h index 14310d4cb9ac..e354427b6e15 100644 --- a/www/chromium/files/patch-chrome_browser_first__run_first__run__internal.h +++ b/www/chromium/files/patch-chrome_browser_first__run_first__run__internal.h @@ -1,11 +1,11 @@ ---- chrome/browser/first_run/first_run_internal.h.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/first_run/first_run_internal.h.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/first_run/first_run_internal.h @@ -58,7 +58,7 @@ FirstRunState DetermineFirstRunState(bool has_sentinel // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_MAC) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+#if defined(OS_MAC) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) +-#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD) // For testing, forces the first run dialog to either be shown or not. If not // called, the decision to show the dialog or not will be made by Chrome based // on a number of factors (such as install type, whether it's a Chrome-branded diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc index 161dfa92d8e6..6338e2b7acaa 100644 --- a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc @@ -1,47 +1,56 @@ ---- chrome/browser/flag_descriptions.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/flag_descriptions.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/flag_descriptions.cc -@@ -5314,7 +5314,7 @@ const char kDownloadShelfWebUIDescription[] = +@@ -5323,7 +5323,7 @@ const char kDownloadShelfWebUIDescription[] = // Random platform combinations ----------------------------------------------- - #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ -- defined(OS_CHROMEOS) || defined(OS_FUCHSIA) -+ defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) const char kWebUIBrandingUpdateName[] = "WebUI Branding Update"; const char kWebUIBrandingUpdateDescription[] = -@@ -5329,7 +5329,7 @@ const char kWebuiFeedbackDescription[] = - // defined(OS_CHROMEOS) || defined(OS_FUCHSIA) +@@ -5338,7 +5338,7 @@ const char kWebuiFeedbackDescription[] = + // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) - #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ -- defined(OS_FUCHSIA) -+ defined(OS_FUCHSIA) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) const char kCommanderName[] = "Commander"; const char kCommanderDescription[] = -@@ -5348,7 +5348,7 @@ const char kDesktopDetailedLanguageSettingsDescription - #endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || - // defined(OS_FUCHSIA) - --#if defined(OS_CHROMEOS) || defined(OS_LINUX) -+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) - #if BUILDFLAG(USE_TCMALLOC) - const char kDynamicTcmallocName[] = "Dynamic Tcmalloc Tuning"; - const char kDynamicTcmallocDescription[] = -@@ -5364,7 +5364,7 @@ const char kWebShareDescription[] = +@@ -5357,7 +5357,7 @@ const char kDesktopDetailedLanguageSettingsDescription + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || + // BUILDFLAG(IS_FUCHSIA) + +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + const char kImproveAccessibilityTreeUsingLocalMLName[] = + "Enable improving accessibility tree using local machine learning library."; + const char kImproveAccessibilityTreeUsingLocalMLDescription[] = +@@ -5372,7 +5372,7 @@ const char kWebShareDescription[] = "platforms."; - #endif // defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_MAC) + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) ++#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)) || BUILDFLAG(IS_BSD) const char kOzonePlatformHintChoiceDefault[] = "Default"; const char kOzonePlatformHintChoiceAuto[] = "Auto"; const char kOzonePlatformHintChoiceX11[] = "X11"; -@@ -5482,7 +5482,7 @@ const char kElasticOverscrollDescription[] = - #endif // defined(OS_WIN) || defined(OS_ANDROID) +@@ -5384,7 +5384,7 @@ const char kOzonePlatformHintDescription[] = + "\"X11\". \"Auto\" selects Wayland if possible, X11 otherwise. "; + #endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + const char kCleanUndecryptablePasswordsLinuxName[] = + "Cleanup local undecryptable passwords during initial sync flow"; + const char kCleanUndecryptablePasswordsLinuxDescription[] = +@@ -5500,7 +5500,7 @@ const char kElasticOverscrollDescription[] = - #if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ -- defined(OS_MAC) || defined(OS_FUCHSIA) -+ defined(OS_MAC) || defined(OS_FUCHSIA) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || \ + (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ +- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) const char kUIDebugToolsName[] = "Debugging tools for UI"; const char kUIDebugToolsDescription[] = "Enables additional keyboard shortcuts to help debugging."; diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.h b/www/chromium/files/patch-chrome_browser_flag__descriptions.h index b7b8292e6415..0772dee1e296 100644 --- a/www/chromium/files/patch-chrome_browser_flag__descriptions.h +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.h @@ -1,56 +1,47 @@ ---- chrome/browser/flag_descriptions.h.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/flag_descriptions.h.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/flag_descriptions.h -@@ -22,7 +22,7 @@ - #include "printing/buildflags/buildflags.h" - #include "third_party/blink/public/common/buildflags.h" - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - #include "base/allocator/buildflags.h" - #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) - -@@ -3081,7 +3081,7 @@ extern const char kDownloadShelfWebUIDescription[]; +@@ -3070,7 +3070,7 @@ extern const char kDownloadShelfWebUIDescription[]; // Random platform combinations ----------------------------------------------- - #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ -- defined(OS_CHROMEOS) || defined(OS_FUCHSIA) -+ defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) extern const char kWebUIBrandingUpdateName[]; extern const char kWebUIBrandingUpdateDescription[]; -@@ -3093,7 +3093,7 @@ extern const char kWebuiFeedbackDescription[]; - // defined(OS_CHROMEOS) || defined(OS_FUCHSIA) +@@ -3082,7 +3082,7 @@ extern const char kWebuiFeedbackDescription[]; + // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) - #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ -- defined(OS_FUCHSIA) -+ defined(OS_FUCHSIA) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) extern const char kCommanderName[]; extern const char kCommanderDescription[]; -@@ -3107,7 +3107,7 @@ extern const char kDesktopDetailedLanguageSettingsDesc - #endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined - // (OS_FUCHSIA) - --#if defined(OS_CHROMEOS) || defined(OS_LINUX) -+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) - #if BUILDFLAG(USE_TCMALLOC) - extern const char kDynamicTcmallocName[]; - extern const char kDynamicTcmallocDescription[]; -@@ -3119,7 +3119,7 @@ extern const char kWebShareName[]; +@@ -3096,7 +3096,7 @@ extern const char kDesktopDetailedLanguageSettingsDesc + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || + // defined (OS_FUCHSIA) + +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + + extern const char kImproveAccessibilityTreeUsingLocalMLName[]; + extern const char kImproveAccessibilityTreeUsingLocalMLDescription[]; +@@ -3107,7 +3107,7 @@ extern const char kWebShareName[]; extern const char kWebShareDescription[]; - #endif // defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_MAC) + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) extern const char kOzonePlatformHintChoiceDefault[]; extern const char kOzonePlatformHintChoiceAuto[]; extern const char kOzonePlatformHintChoiceX11[]; -@@ -3201,7 +3201,7 @@ extern const char kElasticOverscrollDescription[]; - #endif // defined(OS_WIN) || defined(OS_ANDROID) +@@ -3197,7 +3197,7 @@ extern const char kElasticOverscrollDescription[]; - #if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ -- defined(OS_MAC) || defined(OS_FUCHSIA) -+ defined(OS_MAC) || defined(OS_FUCHSIA) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || \ + (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ +- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) extern const char kUIDebugToolsName[]; extern const char kUIDebugToolsDescription[]; #endif diff --git a/www/chromium/files/patch-chrome_browser_headless_headless__mode__util.cc b/www/chromium/files/patch-chrome_browser_headless_headless__mode__util.cc index 212403f82033..dd8f461c2568 100644 --- a/www/chromium/files/patch-chrome_browser_headless_headless__mode__util.cc +++ b/www/chromium/files/patch-chrome_browser_headless_headless__mode__util.cc @@ -1,11 +1,11 @@ ---- chrome/browser/headless/headless_mode_util.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/headless/headless_mode_util.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/headless/headless_mode_util.cc @@ -9,7 +9,7 @@ // Native headless is currently available only on Linux and Windows platforms. // More platforms will be added later, so avoid function level clutter by // providing stub implementations at the end of the file. --#if defined(OS_LINUX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) #include <cstdlib> #include <vector> @@ -13,17 +13,17 @@ #include "base/base_switches.h" #include "ui/gfx/switches.h" --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "ui/ozone/public/ozone_switches.h" - #endif // defined(OS_LINUX) + #endif // BUILDFLAG(IS_LINUX) @@ -51,7 +51,7 @@ void SetUpCommandLine(const base::CommandLine* command base::CommandLine::ForCurrentProcess()->AppendSwitch( ::switches::kNoErrorDialogs); } --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Native headless chrome on Linux relies on ozone/headless platform. base::CommandLine::ForCurrentProcess()->AppendSwitchASCII( ::switches::kOzonePlatform, switches::kHeadless); diff --git a/www/chromium/files/patch-chrome_browser_intranet__redirect__detector.h b/www/chromium/files/patch-chrome_browser_intranet__redirect__detector.h index 3e6bbefc0095..cb20abe773a3 100644 --- a/www/chromium/files/patch-chrome_browser_intranet__redirect__detector.h +++ b/www/chromium/files/patch-chrome_browser_intranet__redirect__detector.h @@ -1,11 +1,11 @@ ---- chrome/browser/intranet_redirect_detector.h.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/intranet_redirect_detector.h.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/intranet_redirect_detector.h @@ -27,7 +27,7 @@ class SimpleURLLoader; class PrefRegistrySimple; - #if !(defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || \ -- defined(OS_CHROMEOS) || defined(OS_FUCHSIA)) -+ defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD)) + #if !(BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)) #error "IntranetRedirectDetector should only be built on Desktop platforms." #endif diff --git a/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc b/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc index 1ba9df1cf86a..b3fb3adedf5e 100644 --- a/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc +++ b/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc @@ -1,6 +1,6 @@ ---- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/media_galleries/media_file_system_registry.cc -@@ -743,7 +743,12 @@ class MediaFileSystemRegistry::MediaFileSystemContextI +@@ -744,7 +744,12 @@ class MediaFileSystemRegistry::MediaFileSystemContextI // Constructor in 'private' section because depends on private class definition. MediaFileSystemRegistry::MediaFileSystemRegistry() : file_system_context_(new MediaFileSystemContextImpl) { diff --git a/www/chromium/files/patch-chrome_browser_media_audio__service__util.cc b/www/chromium/files/patch-chrome_browser_media_audio__service__util.cc index 3810e1791dac..be8233631306 100644 --- a/www/chromium/files/patch-chrome_browser_media_audio__service__util.cc +++ b/www/chromium/files/patch-chrome_browser_media_audio__service__util.cc @@ -1,20 +1,20 @@ ---- chrome/browser/media/audio_service_util.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/media/audio_service_util.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/media/audio_service_util.cc -@@ -20,7 +20,7 @@ +@@ -21,7 +21,7 @@ namespace { --#if defined(OS_WIN) || defined(OS_MAC) || \ -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) || \ - (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ + (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) bool GetPolicyOrFeature(const char* policy_name, const base::Feature& feature) { const policy::PolicyMap& policies = -@@ -40,7 +40,7 @@ bool GetPolicyOrFeature(const char* policy_name, const +@@ -41,7 +41,7 @@ bool GetPolicyOrFeature(const char* policy_name, const bool IsAudioServiceSandboxEnabled() { // TODO(crbug.com/1052397): Remove !IS_CHROMEOS_LACROS once lacros starts being // built with OS_CHROMEOS instead of OS_LINUX. --#if defined(OS_WIN) || defined(OS_MAC) || \ -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) || \ - (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ + (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) return GetPolicyOrFeature(policy::key::kAudioSandboxEnabled, features::kAudioServiceSandbox); diff --git a/www/chromium/files/patch-chrome_browser_media_router_discovery_BUILD.gn b/www/chromium/files/patch-chrome_browser_media_router_discovery_BUILD.gn new file mode 100644 index 000000000000..2d1225b3ad1a --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_media_router_discovery_BUILD.gn @@ -0,0 +1,11 @@ +--- chrome/browser/media/router/discovery/BUILD.gn.orig 2022-02-28 16:54:41 UTC ++++ chrome/browser/media/router/discovery/BUILD.gn +@@ -93,7 +93,7 @@ static_library("discovery") { + "media_sink_discovery_metrics.h", + ] + +- if (is_linux || is_chromeos) { ++ if ((is_linux || is_chromeos) && !is_bsd) { + sources += [ "discovery_network_list_wifi_linux.cc" ] + } + diff --git a/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__posix.cc b/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__posix.cc index de533cff8cd7..71650219d44a 100644 --- a/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__posix.cc +++ b/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__posix.cc @@ -1,4 +1,4 @@ ---- chrome/browser/media/router/discovery/discovery_network_list_posix.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/media/router/discovery/discovery_network_list_posix.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/media/router/discovery/discovery_network_list_posix.cc @@ -5,11 +5,12 @@ #include "chrome/browser/media/router/discovery/discovery_network_list.h" @@ -19,8 +19,8 @@ #include "chrome/browser/media/router/discovery/discovery_network_list_wifi.h" #include "net/base/net_errors.h" --#if !defined(OS_MAC) -+#if !defined(OS_MAC) && !defined(OS_BSD) +-#if !BUILDFLAG(IS_MAC) ++#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD) #include <netpacket/packet.h> #else #include <net/if_dl.h> @@ -28,8 +28,21 @@ namespace media_router { namespace { --#if !defined(OS_MAC) -+#if !defined(OS_MAC) && !defined(OS_BSD) +-#if !BUILDFLAG(IS_MAC) ++#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD) using sll = struct sockaddr_ll; #define SOCKET_ARP_TYPE(s) ((s)->sll_hatype) #define SOCKET_ADDRESS_LEN(s) ((s)->sll_halen) +@@ -38,6 +39,12 @@ using sll = struct sockaddr_dl; + #define SOCKET_ARP_TYPE(s) ((s)->sdl_type) + #define SOCKET_ADDRESS_LEN(s) ((s)->sdl_alen) + #define SOCKET_ADDRESS(s) (LLADDR(s)) ++#endif ++ ++#if BUILDFLAG(IS_BSD) ++bool MaybeGetWifiSSID(const std::string& if_name, std::string* ssid_out) { ++ return false; ++} + #endif + + void GetDiscoveryNetworkInfoListImpl( diff --git a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc index 23421173ffa6..5e7159774a61 100644 --- a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc +++ b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc @@ -1,11 +1,11 @@ ---- chrome/browser/media/webrtc/webrtc_event_log_uploader.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/media/webrtc/webrtc_event_log_uploader.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/media/webrtc/webrtc_event_log_uploader.cc @@ -40,7 +40,7 @@ const char kProduct[] = "Chrome"; const char kProduct[] = "Chrome_Mac"; #elif BUILDFLAG(IS_CHROMEOS_ASH) const char kProduct[] = "Chrome_ChromeOS"; --#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) const char kProduct[] = "Chrome_Linux"; - #elif defined(OS_ANDROID) + #elif BUILDFLAG(IS_ANDROID) const char kProduct[] = "Chrome_Android"; diff --git a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc index 3955e908aa1c..0d84ec44ea96 100644 --- a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc +++ b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc @@ -1,8 +1,8 @@ ---- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/media/webrtc/webrtc_log_uploader.cc @@ -363,6 +363,10 @@ void WebRtcLogUploader::SetupMultipart( const char product[] = "Chrome_ChromeOS"; - #elif defined(OS_FUCHSIA) + #elif BUILDFLAG(IS_FUCHSIA) const char product[] = "Chrome_Fuchsia"; +#elif defined(OS_OPENBSD) + const char product[] = "Chrome_OpenBSD"; diff --git a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc index ce1a69947c1d..5266ccb476a1 100644 --- a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc +++ b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc @@ -1,33 +1,33 @@ ---- chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig 2021-12-14 11:44:58 UTC +--- chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/media/webrtc/webrtc_logging_controller.cc -@@ -24,10 +24,10 @@ +@@ -25,10 +25,10 @@ #include "content/public/browser/browser_context.h" #include "content/public/browser/render_process_host.h" --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "content/public/browser/child_process_security_policy.h" #include "storage/browser/file_system/isolated_context.h" --#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) -+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) using webrtc_event_logging::WebRtcEventLogManager; -@@ -281,7 +281,7 @@ void WebRtcLoggingController::StartEventLogging( +@@ -282,7 +282,7 @@ void WebRtcLoggingController::StartEventLogging( web_app_id, callback); } --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) void WebRtcLoggingController::GetLogsDirectory( LogsDirectoryCallback callback, LogsDirectoryErrorCallback error_callback) { -@@ -327,7 +327,7 @@ void WebRtcLoggingController::GrantLogsDirectoryAccess +@@ -328,7 +328,7 @@ void WebRtcLoggingController::GrantLogsDirectoryAccess FROM_HERE, base::BindOnce(std::move(callback), file_system.id(), registered_name)); } --#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) -+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) void WebRtcLoggingController::OnRtpPacket( std::unique_ptr<uint8_t[]> packet_header, diff --git a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.h b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.h index 13788e46d8a8..9232d0b58ff7 100644 --- a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.h +++ b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.h @@ -1,11 +1,11 @@ ---- chrome/browser/media/webrtc/webrtc_logging_controller.h.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/media/webrtc/webrtc_logging_controller.h.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/media/webrtc/webrtc_logging_controller.h @@ -132,7 +132,7 @@ class WebRtcLoggingController size_t web_app_id, const StartEventLoggingCallback& callback); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // 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. @@ -13,8 +13,8 @@ bool success, const std::string& error_message); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Grants the render process access to the 'WebRTC Logs' directory, and // invokes |callback| with the ids necessary to create a DirectoryEntry // object. If the |logs_path| couldn't be created or found, |error_callback| diff --git a/www/chromium/files/patch-chrome_browser_memory__details.cc b/www/chromium/files/patch-chrome_browser_memory__details.cc index f89d5faa9ab3..18dd4eaf463f 100644 --- a/www/chromium/files/patch-chrome_browser_memory__details.cc +++ b/www/chromium/files/patch-chrome_browser_memory__details.cc @@ -1,20 +1,20 @@ ---- chrome/browser/memory_details.cc.orig 2021-12-31 00:57:23 UTC +--- chrome/browser/memory_details.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/memory_details.cc -@@ -37,7 +37,7 @@ +@@ -38,7 +38,7 @@ #include "services/resource_coordinator/public/cpp/memory_instrumentation/memory_instrumentation.h" #include "ui/base/l10n/l10n_util.h" --#if defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_ANDROID) -+#if defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_ANDROID) && !defined(OS_BSD) +-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_BSD) #include "content/public/browser/zygote_host/zygote_host_linux.h" #endif -@@ -325,7 +325,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() { +@@ -329,7 +329,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() { std::ref(process))); } --#if defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_ANDROID) -+#if defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_ANDROID) && !defined(OS_BSD) +-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_BSD) if (content::ZygoteHost::GetInstance()->IsZygotePid(process.pid)) { process.process_type = content::PROCESS_TYPE_ZYGOTE; } diff --git a/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc b/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc index 74704b2e05ee..e1174816f336 100644 --- a/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc +++ b/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc @@ -1,33 +1,23 @@ ---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc -@@ -61,8 +61,10 @@ +@@ -58,8 +58,10 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) -+#if !defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) ++#if !BUILDFLAG(IS_BSD) #include <gnu/libc-version.h> +#endif #include "base/linux_util.h" #include "base/strings/string_split.h" -@@ -223,15 +225,18 @@ void RecordStartupMetrics() { - base::UmaHistogramBoolean("Windows.ApplockerRunning", IsApplockerRunning()); - #endif // defined(OS_WIN) - -+#if !defined(OS_BSD) - // TODO(crbug.com/1216328) Remove logging. - LOG(ERROR) << "START: ReportBluetoothAvailability(). " - "If you don't see the END: message, this is crbug.com/1216328."; - bluetooth_utility::ReportBluetoothAvailability(); - LOG(ERROR) << "END: ReportBluetoothAvailability()"; -+#endif +@@ -224,7 +226,7 @@ void RecordStartupMetrics() { // Record whether Chrome is the default browser or not. // Disabled on Linux due to hanging browser tests, see crbug.com/1216328. - #if !BUILDFLAG(IS_LINUX) -+#error out - LOG(ERROR) << "START: GetDefaultBrowser(). " - "If you don't see the END: message, this is crbug.com/1216328."; +-#if !BUILDFLAG(IS_LINUX) ++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) shell_integration::DefaultWebClientState default_state = + shell_integration::GetDefaultBrowser(); + base::UmaHistogramEnumeration("DefaultBrowser.State", default_state, diff --git a/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc b/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc index 45aa8736a957..ec09b0349062 100644 --- a/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc +++ b/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc @@ -1,29 +1,29 @@ ---- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/metrics/chrome_metrics_service_client.cc -@@ -742,7 +742,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -752,7 +752,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_WIN) || defined(OS_MAC) || \ -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) || \ - (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ + (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) metrics_service_->RegisterMetricsProvider( std::make_unique<DesktopPlatformFeaturesMetricsProvider>()); -@@ -838,7 +838,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -848,7 +848,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic std::make_unique<PowerMetricsProvider>()); #endif --#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) metrics_service_->RegisterMetricsProvider( metrics::CreateDesktopSessionMetricsProvider()); - #endif // defined(OS_WIN) || defined(OS_MAC) || (defined(OS_LINUX) -@@ -1014,7 +1014,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) +@@ -1024,7 +1024,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_WIN) || defined(OS_MAC) || \ -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) || \ - (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ + (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) // This creates the DesktopProfileSessionDurationsServices if it didn't exist // already. diff --git a/www/chromium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc b/www/chromium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc index 1458181621b2..804cc8cb640a 100644 --- a/www/chromium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc +++ b/www/chromium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc @@ -1,11 +1,11 @@ ---- chrome/browser/metrics/perf/cpu_identity.cc.orig 2021-07-28 07:40:29 UTC +--- chrome/browser/metrics/perf/cpu_identity.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/metrics/perf/cpu_identity.cc @@ -106,7 +106,7 @@ CPUIdentity GetCPUIdentity() { result.release = #if BUILDFLAG(IS_CHROMEOS_ASH) base::SysInfo::KernelVersion(); --#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) base::SysInfo::OperatingSystemVersion(); #else #error "Unsupported configuration" diff --git a/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc index 5f63460fb5ac..58b38715d304 100644 --- a/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc +++ b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc @@ -1,47 +1,38 @@ ---- chrome/browser/net/system_network_context_manager.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/net/system_network_context_manager.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/net/system_network_context_manager.cc @@ -84,7 +84,7 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) #include "chrome/common/chrome_paths_internal.h" #include "chrome/grit/chromium_strings.h" #include "ui/base/l10n/l10n_util.h" -@@ -139,7 +139,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -137,7 +137,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut auth_dynamic_params->basic_over_http_enabled = local_state->GetBoolean(prefs::kBasicAuthOverHttpEnabled); --#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) auth_dynamic_params->delegate_by_kdc_policy = local_state->GetBoolean(prefs::kAuthNegotiateDelegateByKdcPolicy); - #endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) -@@ -370,7 +370,7 @@ SystemNetworkContextManager::SystemNetworkContextManag + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) +@@ -369,7 +369,7 @@ SystemNetworkContextManager::SystemNetworkContextManag pref_change_registrar_.Add(prefs::kBasicAuthOverHttpEnabled, auth_pref_callback); --#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy, auth_pref_callback); - #endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) -@@ -428,7 +428,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) +@@ -427,7 +427,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe registry->RegisterStringPref(prefs::kAuthServerAllowlist, std::string()); registry->RegisterStringPref(prefs::kAuthNegotiateDelegateAllowlist, std::string()); --#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) registry->RegisterBooleanPref(prefs::kAuthNegotiateDelegateByKdcPolicy, false); - #endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) -@@ -575,7 +575,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea - - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) - const base::CommandLine& command_line = - *base::CommandLine::ForCurrentProcess(); - + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc b/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc index 8c5b62eaca96..d57ebf908539 100644 --- a/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc +++ b/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc @@ -1,11 +1,11 @@ ---- chrome/browser/notifications/notification_display_service_impl.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/notifications/notification_display_service_impl.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/notifications/notification_display_service_impl.cc @@ -31,7 +31,7 @@ #endif - #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ -- defined(OS_WIN) || defined(OS_FUCHSIA) -+ defined(OS_WIN) || defined(OS_FUCHSIA) || defined(OS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) #include "chrome/browser/send_tab_to_self/desktop_notification_handler.h" #include "chrome/browser/sharing/sharing_notification_handler.h" #endif @@ -13,26 +13,26 @@ // static void NotificationDisplayServiceImpl::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) registry->RegisterBooleanPref(prefs::kAllowNativeNotifications, true); registry->RegisterBooleanPref(prefs::kAllowSystemNotifications, true); #endif @@ -81,7 +81,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer std::make_unique<PersistentNotificationHandler>()); - #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ -- defined(OS_WIN) -+ defined(OS_WIN) || defined(OS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) AddNotificationHandler( NotificationHandler::Type::SEND_TAB_TO_SELF, std::make_unique<send_tab_to_self::DesktopNotificationHandler>( @@ -89,7 +89,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer #endif - #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ -- defined(OS_WIN) -+ defined(OS_WIN) || defined(OS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) AddNotificationHandler( NotificationHandler::Type::TAILORED_SECURITY, std::make_unique<safe_browsing::TailoredSecurityNotificationHandler>()); diff --git a/www/chromium/files/patch-chrome_browser_notifications_notification__platform__bridge__delegator.cc b/www/chromium/files/patch-chrome_browser_notifications_notification__platform__bridge__delegator.cc index 9826c93c7a70..1d138c9c3cb0 100644 --- a/www/chromium/files/patch-chrome_browser_notifications_notification__platform__bridge__delegator.cc +++ b/www/chromium/files/patch-chrome_browser_notifications_notification__platform__bridge__delegator.cc @@ -1,11 +1,11 @@ ---- chrome/browser/notifications/notification_platform_bridge_delegator.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/notifications/notification_platform_bridge_delegator.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/notifications/notification_platform_bridge_delegator.cc @@ -57,7 +57,7 @@ bool SystemNotificationsEnabled(Profile* profile) { - #elif defined(OS_WIN) + #elif BUILDFLAG(IS_WIN) return NotificationPlatformBridgeWin::SystemNotificationEnabled(); #else --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (profile) { // Prefs take precedence over flags. PrefService* prefs = profile->GetPrefs(); diff --git a/www/chromium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc b/www/chromium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc index dcccaeaa5380..5800a8f3fd1a 100644 --- a/www/chromium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc +++ b/www/chromium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc @@ -1,11 +1,11 @@ ---- chrome/browser/password_manager/password_reuse_manager_factory.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/password_manager/password_reuse_manager_factory.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/password_manager/password_reuse_manager_factory.cc @@ -94,7 +94,7 @@ KeyedService* PasswordReuseManagerFactory::BuildServic // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. - #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS_LACROS) -+ BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) ++ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) std::unique_ptr<password_manager::PasswordStoreSigninNotifier> notifier = std::make_unique<password_manager::PasswordStoreSigninNotifierImpl>( IdentityManagerFactory::GetForProfile(profile)); diff --git a/www/chromium/files/patch-chrome_browser_performance__manager_policies_high__pmf__discard__policy.cc b/www/chromium/files/patch-chrome_browser_performance__manager_policies_high__pmf__discard__policy.cc index a809c0a6f185..b76fb7634ea3 100644 --- a/www/chromium/files/patch-chrome_browser_performance__manager_policies_high__pmf__discard__policy.cc +++ b/www/chromium/files/patch-chrome_browser_performance__manager_policies_high__pmf__discard__policy.cc @@ -1,11 +1,11 @@ ---- chrome/browser/performance_manager/policies/high_pmf_discard_policy.cc.orig 2021-09-24 18:27:13 UTC +--- chrome/browser/performance_manager/policies/high_pmf_discard_policy.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/performance_manager/policies/high_pmf_discard_policy.cc @@ -17,7 +17,7 @@ #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" --#if !defined(OS_LINUX) -+#if !defined(OS_LINUX) && !defined(OS_BSD) +-#if !BUILDFLAG(IS_LINUX) ++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) #include "base/memory/memory_pressure_monitor.h" #endif @@ -13,8 +13,8 @@ if (should_discard) { discard_attempt_in_progress_ = true; --#if !defined(OS_LINUX) -+#if !defined(OS_LINUX) && !defined(OS_BSD) +-#if !BUILDFLAG(IS_LINUX) ++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) // Record the memory pressure level before discarding a tab. content::GetUIThreadTaskRunner({})->PostTask( FROM_HERE, base::BindOnce([]() { diff --git a/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__recorder__util.cc b/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__recorder__util.cc index 1772808f5a58..a70e5774afa5 100644 --- a/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__recorder__util.cc +++ b/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__recorder__util.cc @@ -1,11 +1,11 @@ ---- chrome/browser/performance_monitor/process_metrics_recorder_util.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/performance_monitor/process_metrics_recorder_util.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/performance_monitor/process_metrics_recorder_util.cc @@ -42,7 +42,7 @@ void RecordProcessHistograms(const char* histogram_suf metrics.cpu_usage * kCPUUsageFactor, kCPUUsageHistogramMin, kCPUUsageHistogramMax, kCPUUsageHistogramBucketCount); - #if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -- defined(OS_AIX) -+ defined(OS_AIX) || defined(OS_BSD) + #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_AIX) ++ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD) base::UmaHistogramCounts10000( base::JoinString({"PerformanceMonitor.IdleWakeups.", histogram_suffix}, ""), diff --git a/www/chromium/files/patch-chrome_browser_performance__monitor_process__monitor.cc b/www/chromium/files/patch-chrome_browser_performance__monitor_process__monitor.cc index 0849e8e1662f..a5d771754212 100644 --- a/www/chromium/files/patch-chrome_browser_performance__monitor_process__monitor.cc +++ b/www/chromium/files/patch-chrome_browser_performance__monitor_process__monitor.cc @@ -1,11 +1,11 @@ ---- chrome/browser/performance_monitor/process_monitor.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/performance_monitor/process_monitor.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/performance_monitor/process_monitor.cc -@@ -80,7 +80,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me +@@ -82,7 +82,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me lhs.cpu_usage += rhs.cpu_usage; - #if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -- defined(OS_AIX) -+ defined(OS_AIX) || defined(OS_BSD) + #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_AIX) ++ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD) lhs.idle_wakeups += rhs.idle_wakeups; #endif diff --git a/www/chromium/files/patch-chrome_browser_performance__monitor_process__monitor.h b/www/chromium/files/patch-chrome_browser_performance__monitor_process__monitor.h index 7420e47f1360..d3867265beed 100644 --- a/www/chromium/files/patch-chrome_browser_performance__monitor_process__monitor.h +++ b/www/chromium/files/patch-chrome_browser_performance__monitor_process__monitor.h @@ -1,11 +1,11 @@ ---- chrome/browser/performance_monitor/process_monitor.h.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/performance_monitor/process_monitor.h.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/performance_monitor/process_monitor.h @@ -56,7 +56,7 @@ class ProcessMonitor { double cpu_usage = 0.0; - #if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -- defined(OS_AIX) -+ defined(OS_AIX) || defined(OS_BSD) + #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_AIX) ++ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD) // Returns the number of average idle cpu wakeups per second since the last // time the metric was sampled. int idle_wakeups = 0; diff --git a/www/chromium/files/patch-chrome_browser_platform__util__linux.cc b/www/chromium/files/patch-chrome_browser_platform__util__linux.cc index 0ca2e07e3e4b..6c677548e70d 100644 --- a/www/chromium/files/patch-chrome_browser_platform__util__linux.cc +++ b/www/chromium/files/patch-chrome_browser_platform__util__linux.cc @@ -1,6 +1,6 @@ ---- chrome/browser/platform_util_linux.cc.orig 2021-09-14 01:51:50 UTC +--- chrome/browser/platform_util_linux.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/platform_util_linux.cc -@@ -297,7 +297,9 @@ void RunCommand(const std::string& command, +@@ -298,7 +298,9 @@ void RunCommand(const std::string& command, base::LaunchOptions options; options.current_directory = working_directory; diff --git a/www/chromium/files/patch-chrome_browser_plugins_plugins__resource__service.cc b/www/chromium/files/patch-chrome_browser_plugins_plugins__resource__service.cc index c741db0784ac..6762dc97c10f 100644 --- a/www/chromium/files/patch-chrome_browser_plugins_plugins__resource__service.cc +++ b/www/chromium/files/patch-chrome_browser_plugins_plugins__resource__service.cc @@ -1,11 +1,11 @@ ---- chrome/browser/plugins/plugins_resource_service.cc.orig 2021-04-14 18:40:54 UTC +--- chrome/browser/plugins/plugins_resource_service.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/plugins/plugins_resource_service.cc @@ -62,7 +62,7 @@ GURL GetPluginsServerURL() { filename = "plugins_win.json"; #elif BUILDFLAG(IS_CHROMEOS_ASH) filename = "plugins_chromeos.json"; --#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) filename = "plugins_linux.json"; - #elif defined(OS_MAC) + #elif BUILDFLAG(IS_MAC) filename = "plugins_mac.json"; diff --git a/www/chromium/files/patch-chrome_browser_policy_browser__signin__policy__handler.cc b/www/chromium/files/patch-chrome_browser_policy_browser__signin__policy__handler.cc index 259f40114c52..53796a9dfae2 100644 --- a/www/chromium/files/patch-chrome_browser_policy_browser__signin__policy__handler.cc +++ b/www/chromium/files/patch-chrome_browser_policy_browser__signin__policy__handler.cc @@ -1,11 +1,11 @@ ---- chrome/browser/policy/browser_signin_policy_handler.cc.orig 2021-09-14 01:51:50 UTC +--- chrome/browser/policy/browser_signin_policy_handler.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/policy/browser_signin_policy_handler.cc @@ -43,7 +43,7 @@ void BrowserSigninPolicyHandler::ApplyPolicySettings(c const base::Value* value = policies.GetValue(policy_name()); switch (static_cast<BrowserSigninMode>(value->GetInt())) { case BrowserSigninMode::kForced: --#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_BSD) +-#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) ++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD) prefs->SetValue(prefs::kForceBrowserSignin, base::Value(true)); #endif - FALLTHROUGH; + [[fallthrough]]; diff --git a/www/chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc b/www/chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc index 01e01264b438..15c89668c143 100644 --- a/www/chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc +++ b/www/chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc @@ -1,38 +1,38 @@ ---- chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc @@ -46,7 +46,7 @@ #include "chrome/browser/policy/browser_dm_token_storage_mac.h" - #endif // defined(OS_MAC) + #endif // BUILDFLAG(IS_MAC) --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "chrome/browser/policy/browser_dm_token_storage_linux.h" - #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -55,7 +55,7 @@ #include "chrome/install_static/install_util.h" - #endif // defined(OS_WIN) + #endif // BUILDFLAG(IS_WIN) --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) || defined(OS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) #include "chrome/browser/enterprise/connectors/device_trust/device_trust_features.h" #include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/device_trust_key_manager_impl.h" #include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/key_rotation_launcher.h" @@ -88,7 +88,7 @@ void ChromeBrowserCloudManagementControllerDesktop:: - #if defined(OS_MAC) + #if BUILDFLAG(IS_MAC) storage_delegate = std::make_unique<BrowserDMTokenStorageMac>(); --#elif defined(OS_LINUX) || defined(OS_CHROMEOS) -+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) storage_delegate = std::make_unique<BrowserDMTokenStorageLinux>(); - #elif defined(OS_WIN) + #elif BUILDFLAG(IS_WIN) storage_delegate = std::make_unique<BrowserDMTokenStorageWin>(); @@ -243,7 +243,7 @@ ChromeBrowserCloudManagementControllerDesktop::CreateC std::unique_ptr<enterprise_connectors::DeviceTrustKeyManager> ChromeBrowserCloudManagementControllerDesktop::CreateDeviceTrustKeyManager() { --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) || defined(OS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) if (enterprise_connectors::IsDeviceTrustConnectorFeatureEnabled()) { auto key_rotation_launcher = enterprise_connectors::KeyRotationLauncher::Create( diff --git a/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc b/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc index c77867ed9e8e..17638cef1e0f 100644 --- a/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc +++ b/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc @@ -1,47 +1,47 @@ ---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -1432,7 +1432,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1443,7 +1443,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, - #endif // !defined(OS_MAC) && !defined(OS_CHROMEOS) + #endif // !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_CHROMEOS) --#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) { key::kAuthNegotiateDelegateByKdcPolicy, prefs::kAuthNegotiateDelegateByKdcPolicy, base::Value::Type::BOOLEAN }, -@@ -1541,7 +1541,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1552,7 +1552,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(IS_CHROMEOS_ASH) --#if BUILDFLAG(ENABLE_EXTENSIONS) && (defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX)) -+#if BUILDFLAG(ENABLE_EXTENSIONS) && (defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD)) +-#if BUILDFLAG(ENABLE_EXTENSIONS) && (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)) ++#if BUILDFLAG(ENABLE_EXTENSIONS) && (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) { key::kChromeAppsEnabled, extensions::pref_names::kChromeAppsEnabled, base::Value::Type::BOOLEAN }, -@@ -1828,7 +1828,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH - #endif // defined(OS_ANDROID) +@@ -1848,7 +1848,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH + #endif // BUILDFLAG(IS_ANDROID) - #if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || \ -- defined(OS_CHROMEOS) || defined(OS_FUCHSIA) -+ defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) handlers->AddHandler( std::make_unique< enterprise_connectors::EnterpriseConnectorsPolicyHandler>( -@@ -2193,7 +2193,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2213,7 +2213,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH SimpleSchemaValidatingPolicyHandler::MANDATORY_ALLOWED)); - #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ -- defined(OS_FUCHSIA) -+ defined(OS_FUCHSIA) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) handlers->AddHandler(std::make_unique<SimpleSchemaValidatingPolicyHandler>( key::kWebAppSettings, prefs::kWebAppSettings, chrome_schema, SCHEMA_ALLOW_UNKNOWN, -@@ -2224,7 +2224,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2244,7 +2244,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH policy::key::kSpellcheckLanguageBlocklist)); #endif // BUILDFLAG(ENABLE_SPELLCHECK) --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) handlers->AddHandler(std::make_unique<SimpleDeprecatingPolicyHandler>( std::make_unique<SimplePolicyHandler>(key::kAllowNativeNotifications, prefs::kAllowNativeNotifications, diff --git a/www/chromium/files/patch-chrome_browser_policy_device__management__service__configuration.cc b/www/chromium/files/patch-chrome_browser_policy_device__management__service__configuration.cc index ecc41e4e4b39..56bc422f9731 100644 --- a/www/chromium/files/patch-chrome_browser_policy_device__management__service__configuration.cc +++ b/www/chromium/files/patch-chrome_browser_policy_device__management__service__configuration.cc @@ -1,20 +1,20 @@ ---- chrome/browser/policy/device_management_service_configuration.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/policy/device_management_service_configuration.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/policy/device_management_service_configuration.cc -@@ -19,7 +19,7 @@ - #include "chromeos/system/statistics_provider.h" - #endif +@@ -21,7 +21,7 @@ --#if defined(OS_WIN) || defined(OS_MAC) || \ -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) || \ - ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(OS_ANDROID)) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ + ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \ +- !BUILDFLAG(IS_ANDROID)) ++ !BUILDFLAG(IS_ANDROID)) || BUILDFLAG(IS_BSD) #include "chrome/browser/enterprise/connectors/common.h" #include "chrome/browser/enterprise/connectors/connectors_service.h" -@@ -97,7 +97,7 @@ DeviceManagementServiceConfiguration::GetEncryptedRepo - std::string - DeviceManagementServiceConfiguration::GetReportingConnectorServerUrl( + #endif +@@ -100,7 +100,7 @@ DeviceManagementServiceConfiguration::GetReportingConn content::BrowserContext* context) const { --#if defined(OS_WIN) || defined(OS_MAC) || \ -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) || \ - ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(OS_ANDROID)) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ + ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \ +- !BUILDFLAG(IS_ANDROID)) ++ !BUILDFLAG(IS_ANDROID)) || BUILDFLAG(IS_BSD) auto* service = enterprise_connectors::ConnectorsServiceFactory::GetForBrowserContext( + context); diff --git a/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc b/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc index 5090d1971a8d..765d014c725f 100644 --- a/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc +++ b/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc @@ -1,46 +1,46 @@ ---- chrome/browser/prefs/browser_prefs.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/prefs/browser_prefs.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/prefs/browser_prefs.cc -@@ -415,14 +415,14 @@ +@@ -418,14 +418,14 @@ #include "components/os_crypt/os_crypt.h" #endif --#if defined(OS_WIN) || defined(OS_MAC) || \ -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) || \ - (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) +-#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/url_handler_prefs.h" #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_WIN) || defined(OS_MAC) || \ -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) || \ - (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) +-#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/browser_switcher/browser_switcher_prefs.h" #endif -@@ -1069,7 +1069,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) +@@ -1133,7 +1133,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) // TODO(crbug/1169547) Remove `BUILDFLAG(IS_CHROMEOS_LACROS)` once the // migration is complete. - #if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || \ + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ - BUILDFLAG(IS_CHROMEOS_LACROS) -+ BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) ++ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) enterprise_connectors::RegisterLocalPrefs(registry); - #endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) -@@ -1101,7 +1101,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) +@@ -1165,7 +1165,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) - #endif // defined(OS_WIN) + #endif // BUILDFLAG(IS_WIN) --#if defined(OS_WIN) || defined(OS_MAC) || \ -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) || \ - (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ + (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) web_app::url_handler_prefs::RegisterLocalStatePrefs(registry); #endif -@@ -1396,7 +1396,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync +@@ -1462,7 +1462,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_WIN) || defined(OS_MAC) || \ -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) || \ - (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ + (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) browser_switcher::BrowserSwitcherPrefs::RegisterProfilePrefs(registry); #endif diff --git a/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc b/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc index d7e49d174568..832e4f781f80 100644 --- a/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc +++ b/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc @@ -1,11 +1,11 @@ ---- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2021-09-14 01:51:50 UTC +--- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/prefs/pref_service_incognito_allowlist.cc @@ -139,7 +139,7 @@ const char* const kPersistentPrefNames[] = { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) // Toggleing custom frames affects all open windows in the profile, hence // should be written to the regular profile when changed in incognito mode. prefs::kUseCustomChromeFrame, diff --git a/www/chromium/files/patch-chrome_browser_printing_print__job__worker.cc b/www/chromium/files/patch-chrome_browser_printing_print__job__worker.cc index c6418795ec69..fbf6389c8630 100644 --- a/www/chromium/files/patch-chrome_browser_printing_print__job__worker.cc +++ b/www/chromium/files/patch-chrome_browser_printing_print__job__worker.cc @@ -1,11 +1,11 @@ ---- chrome/browser/printing/print_job_worker.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/printing/print_job_worker.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/printing/print_job_worker.cc -@@ -231,7 +231,7 @@ void PrintJobWorker::UpdatePrintSettings(base::Value n +@@ -225,7 +225,7 @@ void PrintJobWorker::UpdatePrintSettings(base::Value n crash_key = std::make_unique<crash_keys::ScopedPrinterInfo>( print_backend->GetPrinterDriverInfo(printer_name)); --#if defined(OS_LINUX) && defined(USE_CUPS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_CUPS) +-#if BUILDFLAG(IS_LINUX) && defined(USE_CUPS) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(USE_CUPS) PrinterBasicInfo basic_info; if (print_backend->GetPrinterBasicInfo(printer_name, &basic_info) == mojom::ResultCode::kSuccess) { diff --git a/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc b/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc index 13496fa7614a..66ce87c56787 100644 --- a/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc +++ b/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc @@ -1,17 +1,17 @@ ---- chrome/browser/process_singleton_posix.cc.orig 2021-12-14 11:44:58 UTC +--- chrome/browser/process_singleton_posix.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/process_singleton_posix.cc @@ -97,12 +97,12 @@ #include "net/base/network_interfaces.h" #include "ui/base/l10n/l10n_util.h" --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "chrome/browser/ui/process_singleton_dialog_linux.h" #endif #if defined(TOOLKIT_VIEWS) && \ -- (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+ (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) +- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) #include "ui/views/linux_ui/linux_ui.h" #endif @@ -19,8 +19,8 @@ if (g_disable_prompt) return g_user_opted_unlock_in_use_profile; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) std::u16string relaunch_button_text = l10n_util::GetStringUTF16(IDS_PROFILE_IN_USE_LINUX_RELAUNCH); return ShowProcessSingletonDialog(error, relaunch_button_text); @@ -28,8 +28,8 @@ return PROCESS_NONE; } else if (strncmp(buf, kACKToken, base::size(kACKToken) - 1) == 0) { #if defined(TOOLKIT_VIEWS) && \ -- (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+ (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) +- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) // Likely NULL in unit tests. views::LinuxUI* linux_ui = views::LinuxUI::instance(); if (linux_ui) diff --git a/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc b/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc index 56f01d1a7bbc..83a59c11089e 100644 --- a/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc +++ b/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc @@ -1,11 +1,11 @@ ---- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -384,7 +384,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -385,7 +385,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_WIN) || defined(OS_MAC) || \ -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) || \ - (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ + (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance(); #endif diff --git a/www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc b/www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc index ba2d9b1e4223..eedb1286b9ff 100644 --- a/www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc +++ b/www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/profiles/profile_impl.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/profiles/profile_impl.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/profiles/profile_impl.cc -@@ -181,6 +181,7 @@ +@@ -182,6 +182,7 @@ #include "services/preferences/public/mojom/preferences.mojom.h" #include "services/preferences/public/mojom/tracked_preference_validation_delegate.mojom.h" #include "services/service_manager/public/cpp/service.h" @@ -8,7 +8,7 @@ #include "ui/base/l10n/l10n_util.h" #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -846,7 +847,13 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) +@@ -850,7 +851,13 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) } base::FilePath ProfileImpl::last_selected_directory() { diff --git a/www/chromium/files/patch-chrome_browser_profiles_profiles__state.cc b/www/chromium/files/patch-chrome_browser_profiles_profiles__state.cc index a413ea0d2112..497ec10d4120 100644 --- a/www/chromium/files/patch-chrome_browser_profiles_profiles__state.cc +++ b/www/chromium/files/patch-chrome_browser_profiles_profiles__state.cc @@ -1,11 +1,11 @@ ---- chrome/browser/profiles/profiles_state.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/profiles/profiles_state.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/profiles/profiles_state.cc @@ -176,7 +176,7 @@ bool IsGuestModeRequested(const base::CommandLine& com PrefService* local_state, bool show_warning) { - #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || \ -- defined(OS_MAC) -+ defined(OS_MAC) || defined(OS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) DCHECK(local_state); // Check if guest mode enforcement commandline switch or policy are provided. diff --git a/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc b/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc index d676169653ed..b85855ca3911 100644 --- a/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc +++ b/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc @@ -1,11 +1,11 @@ ---- chrome/browser/renderer_preferences_util.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/renderer_preferences_util.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/renderer_preferences_util.cc @@ -41,7 +41,7 @@ #include "ui/base/cocoa/defaults_utils.h" #endif --#if defined(USE_AURA) && (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+#if defined(USE_AURA) && (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) +-#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" #include "ui/views/linux_ui/linux_ui.h" @@ -13,17 +13,17 @@ prefs->caret_blink_interval = interval; #endif --#if defined(USE_AURA) && (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+#if defined(USE_AURA) && (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) +-#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) views::LinuxUI* linux_ui = views::LinuxUI::instance(); if (linux_ui) { if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) { @@ -189,7 +189,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc #endif - #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ -- defined(OS_WIN) -+ defined(OS_WIN) || defined(OS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) content::UpdateFontRendererPreferencesFromSystemSettings(prefs); #endif diff --git a/www/chromium/files/patch-chrome_browser_resources_new__tab__page_new__tab__page.js b/www/chromium/files/patch-chrome_browser_resources_new__tab__page_new__tab__page.js index 4808ad2f96b9..e82d989ae51f 100644 --- a/www/chromium/files/patch-chrome_browser_resources_new__tab__page_new__tab__page.js +++ b/www/chromium/files/patch-chrome_browser_resources_new__tab__page_new__tab__page.js @@ -1,13 +1,13 @@ ---- chrome/browser/resources/new_tab_page/new_tab_page.js.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/resources/new_tab_page/new_tab_page.js.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/resources/new_tab_page/new_tab_page.js @@ -21,10 +21,6 @@ export {chromeCartDescriptor as chromeCartV2Descriptor export {DriveProxy} from './modules/drive/drive_module_proxy.js'; export {driveDescriptor} from './modules/drive/module.js'; export {driveDescriptor as driveV2Descriptor} from './modules/drive_v2/module.js'; -// <if expr="not is_official_build"> --export {FooProxy} from './modules/dummy/foo_proxy.js'; --export {dummyDescriptor} from './modules/dummy/module.js'; +-export {FooProxy} from './modules/dummy_v2/foo_proxy.js'; +-export {dummyV2Descriptor} from './modules/dummy_v2/module.js'; -// </if> export {InfoDialogElement} from './modules/info_dialog.js'; - export {InitializeModuleCallback, Module, ModuleDescriptor} from './modules/module_descriptor.js'; + export {InitializeModuleCallback, Module, ModuleDescriptor, ModuleDescriptorV2, ModuleHeight} from './modules/module_descriptor.js'; export {ModuleHeaderElement} from './modules/module_header.js'; diff --git a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html index aa0737875900..522102aa1e38 100644 --- a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html +++ b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html @@ -1,11 +1,11 @@ ---- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2021-09-14 01:51:51 UTC +--- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/resources/settings/appearance_page/appearance_page.html @@ -27,7 +27,7 @@ <cr-link-row class="first" hidden="[[!pageVisibility.setTheme]]" label="$i18n{themes}" sub-label="[[themeSublabel_]]" on-click="openThemeUrl_" external></cr-link-row> --<if expr="not is_linux or chromeos or lacros"> -+<if expr="not is_posix or chromeos or lacros"> +-<if expr="not is_linux or chromeos_ash or chromeos_lacros"> ++<if expr="not is_posix or chromeos_ash or chromeos_lacros"> <template is="dom-if" if="[[prefs.extensions.theme.id.value]]"> <div class="separator"></div> <cr-button id="useDefault" on-click="onUseDefaultTap_"> diff --git a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.ts b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.ts index f3d9de0b7d11..e928508bc496 100644 --- a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.ts +++ b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.ts @@ -1,11 +1,11 @@ ---- chrome/browser/resources/settings/appearance_page/appearance_page.ts.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/resources/settings/appearance_page/appearance_page.ts.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/resources/settings/appearance_page/appearance_page.ts @@ -145,7 +145,7 @@ export class SettingsAppearancePageElement extends 'prefs.autogenerated.theme.policy.color.controlledBy)', }, - // <if expr="is_linux and not chromeos and not lacros"> -+ // <if expr="is_bsd and not chromeos and not lacros"> ++ // <if expr="is_posix and not chromeos and not lacros"> /** * Whether to show the "Custom Chrome Frame" setting. */ @@ -14,7 +14,7 @@ 'prefs.extensions.theme.id.value, useSystemTheme_, isForcedTheme_)', - // <if expr="is_linux and not chromeos"> -+ // <if expr="is_bsd and not chromeos"> ++ // <if expr="is_posix and not chromeos"> // NOTE: this pref only exists on Linux. 'useSystemThemePrefChanged_(prefs.extensions.theme.use_system.value)', // </if> @@ -23,7 +23,7 @@ private isForcedTheme_: boolean; - // <if expr="is_linux and not chromeos and not lacros"> -+ // <if expr="is_bsd and not chromeos and not lacros"> ++ // <if expr="is_posix and not chromeos and not lacros"> private showCustomChromeFrame_: boolean; // </if> @@ -32,7 +32,7 @@ } - // <if expr="is_linux and not chromeos"> -+ // <if expr="is_bsd and not chromeos"> ++ // <if expr="is_posix and not chromeos"> private useSystemThemePrefChanged_(useSystemTheme: boolean) { this.useSystemTheme_ = useSystemTheme; } @@ -41,11 +41,11 @@ let i18nId; - // <if expr="is_linux and not chromeos and not lacros"> -+ // <if expr="is_bsd and not chromeos and not lacros"> ++ // <if expr="is_posix and not chromeos and not lacros"> i18nId = useSystemTheme ? 'systemTheme' : 'classicTheme'; // </if> -- // <if expr="not is_linux or chromeos or lacros"> -+ // <if expr="not is_bsd or chromeos or lacros"> +- // <if expr="not is_linux or chromeos_ash or chromeos_lacros"> ++ // <if expr="not is_posix or chromeos_ash or chromeos_lacros"> i18nId = 'chooseFromWebStore'; // </if> this.themeSublabel_ = this.i18n(i18nId); diff --git a/www/chromium/files/patch-chrome_browser_resources_settings_autofill__page_passwords__shared__css.html b/www/chromium/files/patch-chrome_browser_resources_settings_autofill__page_passwords__shared__css.html index 93eb51ca53d2..86eb435f271b 100644 --- a/www/chromium/files/patch-chrome_browser_resources_settings_autofill__page_passwords__shared__css.html +++ b/www/chromium/files/patch-chrome_browser_resources_settings_autofill__page_passwords__shared__css.html @@ -1,11 +1,11 @@ ---- chrome/browser/resources/settings/autofill_page/passwords_shared_css.html.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/resources/settings/autofill_page/passwords_shared_css.html.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/resources/settings/autofill_page/passwords_shared_css.html @@ -64,7 +64,7 @@ * necessary to prevent Chrome from using the operating system's font * instead of the Material Design font. * TODO(dbeam): why not font: inherit? */ --<if expr="chromeos or lacros or is_linux"> -+<if expr="chromeos or lacros or is_posix"> +-<if expr="chromeos_ash or chromeos_lacros or is_linux"> ++<if expr="chromeos_ash or chromeos_lacros or is_posix"> font-family: 'DejaVu Sans Mono', monospace; </if> <if expr="is_win"> diff --git a/www/chromium/files/patch-chrome_browser_resources_settings_route.ts b/www/chromium/files/patch-chrome_browser_resources_settings_route.ts index 9b5c0cbb5dac..239ee4522709 100644 --- a/www/chromium/files/patch-chrome_browser_resources_settings_route.ts +++ b/www/chromium/files/patch-chrome_browser_resources_settings_route.ts @@ -1,6 +1,6 @@ ---- chrome/browser/resources/settings/route.ts.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/resources/settings/route.ts.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/resources/settings/route.ts -@@ -177,7 +177,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes +@@ -179,7 +179,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes r.ACCESSIBILITY = r.ADVANCED.createSection('/accessibility', 'a11y'); diff --git a/www/chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc b/www/chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc index f0ae727beba1..2fa19a4b6262 100644 --- a/www/chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc +++ b/www/chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc @@ -1,29 +1,29 @@ ---- chrome/browser/safe_browsing/download_protection/file_analyzer.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/safe_browsing/download_protection/file_analyzer.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/safe_browsing/download_protection/file_analyzer.cc -@@ -19,7 +19,7 @@ +@@ -20,7 +20,7 @@ #include "components/safe_browsing/core/common/features.h" #include "content/public/browser/browser_thread.h" --#if defined(OS_LINUX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_WIN) | defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) | BUILDFLAG(IS_BSD) #include "chrome/browser/safe_browsing/download_protection/document_analysis_service.h" #endif -@@ -100,7 +100,7 @@ void FileAnalyzer::Start(const base::FilePath& target_ +@@ -101,7 +101,7 @@ void FileAnalyzer::Start(const base::FilePath& target_ } else if (inspection_type == DownloadFileType::DMG) { StartExtractDmgFeatures(); #endif --#if defined(OS_LINUX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) } else if (base::FeatureList::IsEnabled( safe_browsing::kClientSideDetectionDocumentScanning) && inspection_type == DownloadFileType::OFFICE_DOCUMENT) { -@@ -284,7 +284,7 @@ void FileAnalyzer::OnDmgAnalysisFinished( +@@ -285,7 +285,7 @@ void FileAnalyzer::OnDmgAnalysisFinished( } - #endif // defined(OS_MAC) + #endif // BUILDFLAG(IS_MAC) --#if defined(OS_LINUX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) void FileAnalyzer::StartExtractDocumentFeatures() { DCHECK_CURRENTLY_ON(BrowserThread::UI); diff --git a/www/chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.h b/www/chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.h index 493f4618ae0e..10862fcee8b9 100644 --- a/www/chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.h +++ b/www/chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.h @@ -1,11 +1,11 @@ ---- chrome/browser/safe_browsing/download_protection/file_analyzer.h.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/safe_browsing/download_protection/file_analyzer.h.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/safe_browsing/download_protection/file_analyzer.h @@ -16,7 +16,7 @@ #include "components/safe_browsing/core/common/proto/csd.pb.h" #include "third_party/protobuf/src/google/protobuf/repeated_field.h" --#if defined(OS_LINUX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) #include "chrome/services/file_util/public/cpp/sandboxed_document_analyzer.h" #endif @@ -13,8 +13,8 @@ const safe_browsing::ArchiveAnalyzerResults& archive_results); #endif --#if defined(OS_LINUX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) void StartExtractDocumentFeatures(); void OnDocumentAnalysisFinished( const DocumentAnalyzerResults& document_results); @@ -22,8 +22,8 @@ scoped_refptr<SandboxedDMGAnalyzer> dmg_analyzer_; #endif --#if defined(OS_LINUX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) scoped_refptr<SandboxedDocumentAnalyzer> document_analyzer_; base::TimeTicks document_analysis_start_time_; #endif diff --git a/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc b/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc index 758731442ab7..a49548e1d673 100644 --- a/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc +++ b/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc @@ -1,11 +1,11 @@ ---- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc @@ -709,7 +709,7 @@ void IncidentReportingService::OnEnvironmentDataCollec // Process::Current().CreationTime() is missing on some platforms. - #if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || \ -- defined(OS_CHROMEOS) -+ defined(OS_CHROMEOS) || defined(OS_BSD) + #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) base::TimeDelta uptime = first_incident_time_ - base::Process::Current().CreationTime(); environment_data->mutable_process()->set_uptime_msec(uptime.InMilliseconds()); diff --git a/www/chromium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc b/www/chromium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc index 2c5912c7d673..aab704eb461e 100644 --- a/www/chromium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc +++ b/www/chromium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc @@ -1,29 +1,20 @@ ---- chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc @@ -16,7 +16,7 @@ #include "components/send_tab_to_self/features.h" - #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ -- defined(OS_WIN) || defined(OS_FUCHSIA) -+ defined(OS_WIN) || defined(OS_FUCHSIA) || defined(OS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) #include "chrome/browser/send_tab_to_self/desktop_notification_handler.h" #include "chrome/browser/ui/send_tab_to_self/send_tab_to_self_toolbar_icon_controller.h" #endif -@@ -39,7 +39,7 @@ ReceivingUiHandlerRegistry* ReceivingUiHandlerRegistry - void ReceivingUiHandlerRegistry::InstantiatePlatformSpecificHandlers( - Profile* profile) { - #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ -- defined(OS_WIN) || defined(OS_FUCHSIA) -+ defined(OS_WIN) || defined(OS_FUCHSIA) || defined(OS_BSD) - - // If STTS 2.0 is enabled the handler will be created when the toolbar - // button registers itself as the delegate. -@@ -59,7 +59,7 @@ SendTabToSelfToolbarIconController* +@@ -48,7 +48,7 @@ SendTabToSelfToolbarIconController* ReceivingUiHandlerRegistry::GetToolbarButtonControllerForProfile( Profile* profile) { - #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ -- defined(OS_WIN) || defined(OS_FUCHSIA) -+ defined(OS_WIN) || defined(OS_FUCHSIA) || defined(OS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) for (const std::unique_ptr<ReceivingUiHandler>& handler : applicable_handlers_) { auto* button_controller = diff --git a/www/chromium/files/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc b/www/chromium/files/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc index c0db6c411453..5e174e544e28 100644 --- a/www/chromium/files/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc +++ b/www/chromium/files/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc @@ -1,20 +1,20 @@ ---- chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc @@ -17,7 +17,7 @@ #include "components/send_tab_to_self/send_tab_to_self_model.h" - #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ -- defined(OS_WIN) -+ defined(OS_WIN) || defined(OS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) #include "chrome/browser/ui/send_tab_to_self/send_tab_to_self_toolbar_icon_controller.h" #endif @@ -51,7 +51,7 @@ void SendTabToSelfClientService::EntriesAddedRemotely( const std::vector<const SendTabToSelfEntry*>& new_entries) { for (const std::unique_ptr<ReceivingUiHandler>& handler : GetHandlers()) { - #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ -- defined(OS_WIN) -+ defined(OS_WIN) || defined(OS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) // Only respond to notifications corresponding to this service's profile // for these OSes; mobile does not have a Profile. // Cast note: on desktop, handlers are guaranteed to be the derived class diff --git a/www/chromium/files/patch-chrome_browser_sharing_sharing__device__registration.cc b/www/chromium/files/patch-chrome_browser_sharing_sharing__device__registration.cc index bbe47111dd05..e838c9848c9e 100644 --- a/www/chromium/files/patch-chrome_browser_sharing_sharing__device__registration.cc +++ b/www/chromium/files/patch-chrome_browser_sharing_sharing__device__registration.cc @@ -1,11 +1,11 @@ ---- chrome/browser/sharing/sharing_device_registration.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/sharing/sharing_device_registration.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/sharing/sharing_device_registration.cc @@ -327,7 +327,7 @@ bool SharingDeviceRegistration::IsSmsFetcherSupported( bool SharingDeviceRegistration::IsRemoteCopySupported() const { - #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ -- defined(OS_CHROMEOS) -+ defined(OS_CHROMEOS) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) return true; #else return false; diff --git a/www/chromium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc b/www/chromium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc index c0258fd9f5a5..391bddbfef9b 100644 --- a/www/chromium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc +++ b/www/chromium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc @@ -1,20 +1,20 @@ ---- chrome/browser/sharing/sharing_handler_registry_impl.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/sharing/sharing_handler_registry_impl.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/sharing/sharing_handler_registry_impl.cc @@ -24,7 +24,7 @@ - #endif // defined(OS_ANDROID) + #endif // BUILDFLAG(IS_ANDROID) - #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ -- defined(OS_CHROMEOS) -+ defined(OS_CHROMEOS) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "chrome/browser/sharing/shared_clipboard/remote_copy_message_handler.h" - #endif // defined(OS_WIN) || defined(OS_MAC) || (defined(OS_LINUX) || - // BUILDFLAG(IS_CHROMEOS_LACROS)) defined(OS_CHROMEOS) + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) || + // BUILDFLAG(IS_CHROMEOS_LACROS)) BUILDFLAG(IS_CHROMEOS) @@ -77,7 +77,7 @@ SharingHandlerRegistryImpl::SharingHandlerRegistryImpl } - #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ -- defined(OS_CHROMEOS) -+ defined(OS_CHROMEOS) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (sharing_device_registration->IsRemoteCopySupported()) { AddSharingHandler( std::make_unique<RemoteCopyMessageHandler>(profile), diff --git a/www/chromium/files/patch-chrome_browser_signin_signin__util.cc b/www/chromium/files/patch-chrome_browser_signin_signin__util.cc index 1248d5d3f5e9..7498200c5c59 100644 --- a/www/chromium/files/patch-chrome_browser_signin_signin__util.cc +++ b/www/chromium/files/patch-chrome_browser_signin_signin__util.cc @@ -1,11 +1,11 @@ ---- chrome/browser/signin/signin_util.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/signin/signin_util.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/signin/signin_util.cc -@@ -40,7 +40,7 @@ +@@ -41,7 +41,7 @@ #include "ui/base/l10n/l10n_util.h" - #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -- defined(OS_MAC) -+ defined(OS_MAC) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_list_observer.h" diff --git a/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc b/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc index b71d1abb2a1d..e2c334970d8b 100644 --- a/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc +++ b/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc @@ -1,11 +1,11 @@ ---- chrome/browser/sync/chrome_sync_client.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/sync/chrome_sync_client.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/sync/chrome_sync_client.cc -@@ -462,7 +462,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy +@@ -420,7 +420,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. --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) // Dictionary sync is enabled by default. - if (!disabled_types.Has(syncer::DICTIONARY) && - GetPrefService()->GetBoolean(spellcheck::prefs::kSpellCheckEnable)) { + if (GetPrefService()->GetBoolean(spellcheck::prefs::kSpellCheckEnable)) { + controllers.push_back( diff --git a/www/chromium/files/patch-chrome_browser_sync_device__info__sync__client__impl.cc b/www/chromium/files/patch-chrome_browser_sync_device__info__sync__client__impl.cc index cecf948ecc81..8b124e3d21f9 100644 --- a/www/chromium/files/patch-chrome_browser_sync_device__info__sync__client__impl.cc +++ b/www/chromium/files/patch-chrome_browser_sync_device__info__sync__client__impl.cc @@ -1,11 +1,11 @@ ---- chrome/browser/sync/device_info_sync_client_impl.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/sync/device_info_sync_client_impl.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/sync/device_info_sync_client_impl.cc @@ -38,7 +38,7 @@ std::string DeviceInfoSyncClientImpl::GetSigninScopedD // in lacros-chrome once build flag switch of lacros-chrome is // complete. - #if defined(OS_WIN) || defined(OS_MAC) || \ -- (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+ (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ +- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) syncer::SyncPrefs prefs(profile_->GetPrefs()); if (prefs.IsLocalSyncEnabled()) { return "local_device"; diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc index 154ce10da646..2079cf64a819 100644 --- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc +++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc @@ -1,38 +1,38 @@ ---- chrome/browser/task_manager/sampling/task_group.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/task_manager/sampling/task_group.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/task_manager/sampling/task_group.cc @@ -37,7 +37,7 @@ const int kBackgroundRefreshTypesMask = - #if defined(OS_WIN) + #if BUILDFLAG(IS_WIN) REFRESH_TYPE_START_TIME | REFRESH_TYPE_CPU_TIME | - #endif // defined(OS_WIN) --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) + #endif // BUILDFLAG(IS_WIN) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) REFRESH_TYPE_FD_COUNT | - #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) #if BUILDFLAG(ENABLE_NACL) @@ -122,7 +122,7 @@ TaskGroup::TaskGroup( #if BUILDFLAG(ENABLE_NACL) nacl_debug_stub_port_(nacl::kGdbDebugStubPortUnknown), #endif // BUILDFLAG(ENABLE_NACL) --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) open_fd_count_(-1), - #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) idle_wakeups_per_second_(-1), @@ -141,7 +141,7 @@ TaskGroup::TaskGroup( weak_ptr_factory_.GetWeakPtr()), base::BindRepeating(&TaskGroup::OnIdleWakeupsRefreshDone, weak_ptr_factory_.GetWeakPtr()), --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) base::BindRepeating(&TaskGroup::OnOpenFdCountRefreshDone, weak_ptr_factory_.GetWeakPtr()), - #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) @@ -321,7 +321,7 @@ void TaskGroup::OnRefreshNaClDebugStubPortDone(int nac } #endif // BUILDFLAG(ENABLE_NACL) --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) void TaskGroup::OnOpenFdCountRefreshDone(int open_fd_count) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h index 0a9b5ee942cf..0cc1453db2f4 100644 --- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h +++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h @@ -1,11 +1,11 @@ ---- chrome/browser/task_manager/sampling/task_group.h.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/task_manager/sampling/task_group.h.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/task_manager/sampling/task_group.h @@ -42,7 +42,7 @@ constexpr int kUnsupportedVMRefreshFlags = REFRESH_TYPE_WEBCACHE_STATS | REFRESH_TYPE_NETWORK_USAGE | REFRESH_TYPE_NACL | REFRESH_TYPE_IDLE_WAKEUPS | REFRESH_TYPE_HANDLES | REFRESH_TYPE_START_TIME | REFRESH_TYPE_CPU_TIME | REFRESH_TYPE_PRIORITY | --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) REFRESH_TYPE_FD_COUNT | #endif REFRESH_TYPE_HARD_FAULTS; @@ -13,26 +13,26 @@ } #endif // BUILDFLAG(ENABLE_NACL) --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) int open_fd_count() const { return open_fd_count_; } void set_open_fd_count(int open_fd_count) { open_fd_count_ = open_fd_count; } - #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) @@ -168,7 +168,7 @@ class TaskGroup { void RefreshNaClDebugStubPort(int child_process_unique_id); void OnRefreshNaClDebugStubPortDone(int port); #endif --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) void OnOpenFdCountRefreshDone(int open_fd_count); - #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) @@ -240,7 +240,7 @@ class TaskGroup { #if BUILDFLAG(ENABLE_NACL) int nacl_debug_stub_port_; #endif // BUILDFLAG(ENABLE_NACL) --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) // The number of file descriptors currently open by the process. int open_fd_count_; - #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc index 9b8b00b548d9..df5a800d54e6 100644 --- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc +++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc @@ -1,38 +1,38 @@ ---- chrome/browser/task_manager/sampling/task_group_sampler.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/task_manager/sampling/task_group_sampler.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/task_manager/sampling/task_group_sampler.cc @@ -44,7 +44,7 @@ TaskGroupSampler::TaskGroupSampler( const OnCpuRefreshCallback& on_cpu_refresh, const OnSwappedMemRefreshCallback& on_swapped_mem_refresh, const OnIdleWakeupsCallback& on_idle_wakeups, --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) const OnOpenFdCountCallback& on_open_fd_count, - #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) const OnProcessPriorityCallback& on_process_priority) @@ -54,7 +54,7 @@ TaskGroupSampler::TaskGroupSampler( on_cpu_refresh_callback_(on_cpu_refresh), on_swapped_mem_refresh_callback_(on_swapped_mem_refresh), on_idle_wakeups_callback_(on_idle_wakeups), --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) on_open_fd_count_callback_(on_open_fd_count), - #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) + #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) base::BindOnce(on_swapped_mem_refresh_callback_)); } --#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_IDLE_WAKEUPS, refresh_flags)) { base::PostTaskAndReplyWithResult( @@ -96,7 +96,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) } - #endif // defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) + #endif // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_FD_COUNT, refresh_flags)) { base::PostTaskAndReplyWithResult( @@ -40,8 +40,8 @@ return process_metrics_->GetIdleWakeupsPerSecond(); } --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) +-#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()); diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h index 52c1318c6878..d1a7fe6608f4 100644 --- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h +++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h @@ -1,38 +1,38 @@ ---- chrome/browser/task_manager/sampling/task_group_sampler.h.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/task_manager/sampling/task_group_sampler.h.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/task_manager/sampling/task_group_sampler.h @@ -31,7 +31,7 @@ class TaskGroupSampler : public base::RefCountedThread using OnCpuRefreshCallback = base::RepeatingCallback<void(double)>; using OnSwappedMemRefreshCallback = base::RepeatingCallback<void(int64_t)>; using OnIdleWakeupsCallback = base::RepeatingCallback<void(int)>; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) using OnOpenFdCountCallback = base::RepeatingCallback<void(int)>; - #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) using OnProcessPriorityCallback = base::RepeatingCallback<void(bool)>; @@ -42,7 +42,7 @@ class TaskGroupSampler : public base::RefCountedThread const OnCpuRefreshCallback& on_cpu_refresh, const OnSwappedMemRefreshCallback& on_memory_refresh, const OnIdleWakeupsCallback& on_idle_wakeups, --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) const OnOpenFdCountCallback& on_open_fd_count, - #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) const OnProcessPriorityCallback& on_process_priority); @@ -62,7 +62,7 @@ class TaskGroupSampler : public base::RefCountedThread double RefreshCpuUsage(); int64_t RefreshSwappedMem(); int RefreshIdleWakeupsPerSecond(); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) int RefreshOpenFdCount(); - #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) bool RefreshProcessPriority(); @@ -86,7 +86,7 @@ class TaskGroupSampler : public base::RefCountedThread const OnCpuRefreshCallback on_cpu_refresh_callback_; const OnSwappedMemRefreshCallback on_swapped_mem_refresh_callback_; const OnIdleWakeupsCallback on_idle_wakeups_callback_; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) const OnOpenFdCountCallback on_open_fd_count_callback_; - #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) const OnProcessPriorityCallback on_process_priority_callback_; diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc index f3ff05f393d8..7f1052143a43 100644 --- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc +++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc @@ -1,11 +1,11 @@ ---- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/task_manager/sampling/task_manager_impl.cc @@ -217,7 +217,7 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id, } int TaskManagerImpl::GetOpenFdCount(TaskId task_id) const { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) return GetTaskGroupByTaskId(task_id)->open_fd_count(); #else return -1; diff --git a/www/chromium/files/patch-chrome_browser_task__manager_task__manager__observer.h b/www/chromium/files/patch-chrome_browser_task__manager_task__manager__observer.h index 78d46e3bc6e2..a2f4e51049f7 100644 --- a/www/chromium/files/patch-chrome_browser_task__manager_task__manager__observer.h +++ b/www/chromium/files/patch-chrome_browser_task__manager_task__manager__observer.h @@ -1,11 +1,11 @@ ---- chrome/browser/task_manager/task_manager_observer.h.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/task_manager/task_manager_observer.h.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/task_manager/task_manager_observer.h @@ -47,7 +47,7 @@ enum RefreshType { // or backgrounded. REFRESH_TYPE_PRIORITY = 1 << 13, --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) // For observers interested in getting the number of open file descriptors of // processes. REFRESH_TYPE_FD_COUNT = 1 << 14, diff --git a/www/chromium/files/patch-chrome_browser_themes_theme__helper.cc b/www/chromium/files/patch-chrome_browser_themes_theme__helper.cc index dd9309404c97..d54f4fe80196 100644 --- a/www/chromium/files/patch-chrome_browser_themes_theme__helper.cc +++ b/www/chromium/files/patch-chrome_browser_themes_theme__helper.cc @@ -1,11 +1,11 @@ ---- chrome/browser/themes/theme_helper.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/themes/theme_helper.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/themes/theme_helper.cc @@ -334,7 +334,7 @@ bool ThemeHelper::ShouldUseIncreasedContrastThemeSuppl ui::NativeTheme* native_theme) const { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) // On Linux the GTK system theme provides the high contrast colors, // so don't use the IncreasedContrastThemeSupplier. return false; diff --git a/www/chromium/files/patch-chrome_browser_themes_theme__service__factory.cc b/www/chromium/files/patch-chrome_browser_themes_theme__service__factory.cc index 196a58b27779..90d412db52c8 100644 --- a/www/chromium/files/patch-chrome_browser_themes_theme__service__factory.cc +++ b/www/chromium/files/patch-chrome_browser_themes_theme__service__factory.cc @@ -1,11 +1,11 @@ ---- chrome/browser/themes/theme_service_factory.cc.orig 2021-04-14 18:40:55 UTC +--- chrome/browser/themes/theme_service_factory.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/themes/theme_service_factory.cc @@ -25,7 +25,7 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) #include "chrome/browser/themes/theme_service_aura_linux.h" #include "ui/views/linux_ui/linux_ui.h" #endif @@ -13,8 +13,8 @@ content::BrowserContext* profile) const { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) using ThemeService = ThemeServiceAuraLinux; #endif @@ -22,8 +22,8 @@ user_prefs::PrefRegistrySyncable* registry) { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#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; const views::LinuxUI* linux_ui = views::LinuxUI::instance(); diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc b/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc index e9a74790cccf..c7a539c74fcd 100644 --- a/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc +++ b/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/browser_command_controller.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/ui/browser_command_controller.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/ui/browser_command_controller.cc @@ -88,7 +88,7 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" #endif @@ -13,8 +13,8 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) // If this key was registered by the user as a content editing hotkey, then // it is not reserved. ui::TextEditKeyBindingsDelegateAuraLinux* delegate = @@ -22,8 +22,8 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) case IDC_MINIMIZE_WINDOW: browser_->window()->Minimize(); break; @@ -31,8 +31,8 @@ #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) command_updater_.UpdateCommandEnabled(IDC_MINIMIZE_WINDOW, true); command_updater_.UpdateCommandEnabled(IDC_MAXIMIZE_WINDOW, true); command_updater_.UpdateCommandEnabled(IDC_RESTORE_WINDOW, true); diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__dialogs.h b/www/chromium/files/patch-chrome_browser_ui_browser__dialogs.h index 06c2732ddbd7..1480cab7017a 100644 --- a/www/chromium/files/patch-chrome_browser_ui_browser__dialogs.h +++ b/www/chromium/files/patch-chrome_browser_ui_browser__dialogs.h @@ -1,29 +1,29 @@ ---- chrome/browser/ui/browser_dialogs.h.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/ui/browser_dialogs.h.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/ui/browser_dialogs.h @@ -26,7 +26,7 @@ #include "ui/base/models/dialog_model.h" #include "ui/gfx/native_widget_types.h" --#if defined(OS_WIN) || defined(OS_MAC) || \ -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) || \ - (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) +-#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 @@ -80,7 +80,7 @@ class WebDialogDelegate; struct SelectedFileInfo; } // namespace ui --#if defined(OS_WIN) || defined(OS_MAC) || \ -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) || \ - (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ + (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) namespace web_app { struct UrlHandlerLaunchParams; @@ -207,7 +207,7 @@ void ShowWebAppFileLaunchDialog(const std::vector<base WebAppLaunchAcceptanceCallback close_callback); - #endif // !defined(OS_ANDROID) + #endif // !BUILDFLAG(IS_ANDROID) --#if defined(OS_WIN) || defined(OS_MAC) || \ -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) || \ - (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ + (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) // Callback that runs when the Web App URL Handler Intent Picker dialog is // closed. `accepted` is true when the dialog is accepted, false otherwise. diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc b/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc index d841ee810a45..d2d058b53690 100644 --- a/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc +++ b/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/browser_view_prefs.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/ui/browser_view_prefs.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/ui/browser_view_prefs.cc @@ -17,7 +17,7 @@ namespace { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) bool GetCustomFramePrefDefault() { #if defined(USE_OZONE) return ui::OzonePlatform::GetInstance() @@ -13,8 +13,8 @@ user_prefs::PrefRegistrySyncable* registry) { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) registry->RegisterBooleanPref(prefs::kUseCustomChromeFrame, GetCustomFramePrefDefault()); - #endif // (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && + #endif diff --git a/www/chromium/files/patch-chrome_browser_ui_exclusive__access_exclusive__access__bubble.cc b/www/chromium/files/patch-chrome_browser_ui_exclusive__access_exclusive__access__bubble.cc index 3afbc76c8d7d..fb0ba06d6b5e 100644 --- a/www/chromium/files/patch-chrome_browser_ui_exclusive__access_exclusive__access__bubble.cc +++ b/www/chromium/files/patch-chrome_browser_ui_exclusive__access_exclusive__access__bubble.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc.orig 2021-04-14 18:40:55 UTC +--- chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc @@ -16,7 +16,7 @@ // NOTE(koz): Linux doesn't use the thick shadowed border, so we add padding // here. --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) const int ExclusiveAccessBubble::kPaddingPx = 8; #else const int ExclusiveAccessBubble::kPaddingPx = 15; diff --git a/www/chromium/files/patch-chrome_browser_ui_sad__tab.cc b/www/chromium/files/patch-chrome_browser_ui_sad__tab.cc index ad34cd323688..8b4620cbf1c5 100644 --- a/www/chromium/files/patch-chrome_browser_ui_sad__tab.cc +++ b/www/chromium/files/patch-chrome_browser_ui_sad__tab.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/sad_tab.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/ui/sad_tab.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/ui/sad_tab.cc @@ -188,7 +188,7 @@ std::vector<int> SadTab::GetSubMessages() { // Only show Incognito suggestion if not already in Incognito mode. if (!web_contents_->GetBrowserContext()->IsOffTheRecord()) message_ids.insert(message_ids.begin(), IDS_SAD_TAB_RELOAD_INCOGNITO); --#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Note: on macOS, Linux and ChromeOS, the first bullet is either one of // IDS_SAD_TAB_RELOAD_CLOSE_TABS or IDS_SAD_TAB_RELOAD_CLOSE_NOTABS // followed by one of the above suggestions. diff --git a/www/chromium/files/patch-chrome_browser_ui_signin__view__controller.cc b/www/chromium/files/patch-chrome_browser_ui_signin__view__controller.cc index ab2b61434e96..ee0af9eba9ff 100644 --- a/www/chromium/files/patch-chrome_browser_ui_signin__view__controller.cc +++ b/www/chromium/files/patch-chrome_browser_ui_signin__view__controller.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/signin_view_controller.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/ui/signin_view_controller.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/ui/signin_view_controller.cc -@@ -242,7 +242,7 @@ void SigninViewController::ShowModalEnterpriseConfirma +@@ -253,7 +253,7 @@ void SigninViewController::ShowModalEnterpriseConfirma SkColor profile_color, base::OnceCallback<void(bool)> callback) { - #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS_LACROS) -+ BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) ++ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) CloseModalSignin(); - // The delegate will delete itself on request of the UI code when the widget - // is closed. + dialog_ = std::make_unique<SigninModalDialogImpl>( + SigninViewControllerDelegate::CreateEnterpriseConfirmationDelegate( diff --git a/www/chromium/files/patch-chrome_browser_ui_signin__view__controller__delegate.h b/www/chromium/files/patch-chrome_browser_ui_signin__view__controller__delegate.h index 0a9d2af20c45..576db126de2e 100644 --- a/www/chromium/files/patch-chrome_browser_ui_signin__view__controller__delegate.h +++ b/www/chromium/files/patch-chrome_browser_ui_signin__view__controller__delegate.h @@ -1,11 +1,11 @@ ---- chrome/browser/ui/signin_view_controller_delegate.h.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/ui/signin_view_controller_delegate.h.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/ui/signin_view_controller_delegate.h -@@ -64,7 +64,7 @@ class SigninViewControllerDelegate { - signin_metrics::ReauthAccessPoint access_point); +@@ -74,7 +74,7 @@ class SigninViewControllerDelegate { + #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) - #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS_LACROS) -+ BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) ++ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) // Returns a platform-specific SigninViewContolllerDelegate instance that // displays the enterprise confirmation modal dialog. The returned object // should delete itself when the window it's managing is closed. diff --git a/www/chromium/files/patch-chrome_browser_ui_signin_dice__web__signin__interceptor__delegate.cc b/www/chromium/files/patch-chrome_browser_ui_signin_dice__web__signin__interceptor__delegate.cc index c893c28b27e7..8b528e8d6035 100644 --- a/www/chromium/files/patch-chrome_browser_ui_signin_dice__web__signin__interceptor__delegate.cc +++ b/www/chromium/files/patch-chrome_browser_ui_signin_dice__web__signin__interceptor__delegate.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/signin/dice_web_signin_interceptor_delegate.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/ui/signin/dice_web_signin_interceptor_delegate.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/ui/signin/dice_web_signin_interceptor_delegate.cc -@@ -59,7 +59,7 @@ class ForcedEnterpriseSigninInterceptionHandle +@@ -66,7 +66,7 @@ class ForcedEnterpriseSigninInterceptionHandle void ShowEnterpriseProfileInterceptionDialog(const AccountInfo& account_info, SkColor profile_color) { - #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS_LACROS) -+ BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) ++ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) if (base::FeatureList::IsEnabled(kAccountPoliciesLoadedWithoutSync)) { browser_->signin_view_controller()->ShowModalEnterpriseConfirmationDialog( account_info, profile_color, diff --git a/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc b/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc index 57b20c95a293..0d83620f6d3c 100644 --- a/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc +++ b/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2021-09-24 04:26:00 UTC +--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/ui/startup/bad_flags_prompt.cc -@@ -95,7 +95,7 @@ static const char* kBadFlags[] = { +@@ -90,7 +90,7 @@ static const char* kBadFlags[] = { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) // Speech dispatcher is buggy, it can crash and it can make Chrome freeze. // http://crbug.com/327295 switches::kEnableSpeechDispatcher, diff --git a/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc index 7e5f7f79e3ad..2ab25d68304d 100644 --- a/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc +++ b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc @@ -1,38 +1,53 @@ ---- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/ui/startup/startup_browser_creator.cc -@@ -124,7 +124,7 @@ +@@ -124,12 +124,12 @@ #endif // BUILDFLAG(ENABLE_PRINT_PREVIEW) - #endif // defined(OS_WIN) + #endif // BUILDFLAG(IS_WIN) --#if defined(OS_WIN) || defined(OS_MAC) || \ -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) || \ - (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) +-#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/ui/startup/web_app_url_handling_startup_utils.h" #endif -@@ -403,7 +403,7 @@ bool MaybeLaunchAppShortcutWindow(const base::CommandL + +-#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/ui/startup/web_app_info_recorder_utils.h" + #endif + +@@ -414,7 +414,7 @@ bool MaybeLaunchAppShortcutWindow(const base::CommandL return false; } --#if defined(OS_WIN) || (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) -+#if defined(OS_WIN) || (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) +-#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) ++#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD) bool MaybeLaunchUrlHandlerWebAppFromCmd( const base::CommandLine& command_line, const base::FilePath& cur_dir, -@@ -1038,7 +1038,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -908,7 +908,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( + silent_launch = true; + } + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + // Writes open and installed web apps to the specified file without + // launching a new browser window or tab. + if (base::FeatureList::IsEnabled(features::kListWebAppsSwitch) && +@@ -1057,7 +1057,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( if (command_line.HasSwitch(switches::kAppId)) { std::string app_id = command_line.GetSwitchValueASCII(switches::kAppId); --#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // If Chrome Apps are deprecated and |app_id| is a Chrome App, display the // deprecation UI instead of launching the app. if (apps::OpenDeprecatedApplicationPrompt(privacy_safe_profile, app_id)) -@@ -1074,7 +1074,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -1094,7 +1094,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( web_app::startup::MaybeHandleWebAppLaunch( command_line, cur_dir, privacy_safe_profile, is_first_run); --#if defined(OS_WIN) || (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) -+#if defined(OS_WIN) || (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) +-#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) ++#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD) handled_as_app = handled_as_app || // Give web apps a chance to handle a URL. MaybeLaunchUrlHandlerWebAppFromCmd( diff --git a/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc index 349c592b4498..cbc3b83a1620 100644 --- a/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc +++ b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc @@ -1,36 +1,36 @@ ---- chrome/browser/ui/tab_helpers.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/ui/tab_helpers.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/ui/tab_helpers.cc -@@ -175,7 +175,7 @@ +@@ -178,7 +178,7 @@ #endif - #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ -- defined(OS_CHROMEOS) || defined(OS_FUCHSIA) -+ defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) #include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/hats/hats_helper.h" -@@ -479,13 +479,13 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con +@@ -495,13 +495,13 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_WIN) || defined(OS_MAC) || \ -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) || \ - (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ + (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) metrics::DesktopSessionDurationObserver::CreateForWebContents(web_contents); #endif - #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ -- defined(OS_CHROMEOS) -+ defined(OS_CHROMEOS) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (base::FeatureList::IsEnabled( features::kHappinessTrackingSurveysForDesktopDemo) || base::FeatureList::IsEnabled(features::kTrustSafetySentimentSurvey) || -@@ -496,7 +496,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con +@@ -512,7 +512,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con #endif - #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ -- defined(OS_CHROMEOS) -+ defined(OS_CHROMEOS) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (Browser* browser = chrome::FindBrowserWithProfile(profile)) { SharedHighlightingPromo::CreateForWebContents(web_contents, browser); } diff --git a/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.cc b/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.cc index 7156c0165491..2c0f824455ce 100644 --- a/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.cc +++ b/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/task_manager/task_manager_columns.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/ui/task_manager/task_manager_columns.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/ui/task_manager/task_manager_columns.cc @@ -94,7 +94,7 @@ const TableColumnData kColumns[] = { base::size("100000") * kCharWidth, -1, true, false, false}, #endif --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) {IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN, ui::TableColumn::RIGHT, -1, 0, base::size("999") * kCharWidth, -1, true, false, false}, - #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) diff --git a/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc b/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc index ddcb60da4e16..010f9d21e664 100644 --- a/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc +++ b/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/ui/task_manager/task_manager_table_model.cc @@ -451,7 +451,7 @@ std::u16string TaskManagerTableModel::GetText(int row, ? stringifier_->backgrounded_string() : stringifier_->foregrounded_string(); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: { const int fd_count = observed_task_manager()->GetOpenFdCount(tasks_[row]); return fd_count >= 0 ? base::FormatNumber(fd_count) @@ -13,8 +13,8 @@ return BooleanCompare(is_proc1_bg, is_proc2_bg); } --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: { const int proc1_fd_count = observed_task_manager()->GetOpenFdCount(tasks_[row1]); @@ -22,8 +22,8 @@ type = REFRESH_TYPE_KEEPALIVE_COUNT; break; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: type = REFRESH_TYPE_FD_COUNT; break; diff --git a/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc b/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc index 3f196e28de4d..d72fbed5d990 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/views/accelerator_table.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/ui/views/accelerator_table.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/ui/views/accelerator_table.cc @@ -62,7 +62,7 @@ const AcceleratorMapping kAcceleratorMap[] = { {ui::VKEY_NUMPAD9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB}, // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) {ui::VKEY_9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB}, {ui::VKEY_NUMPAD9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB}, {ui::VKEY_NEXT, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, IDC_MOVE_TAB_NEXT}, @@ -13,8 +13,8 @@ {ui::VKEY_NUMPAD8, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_7}, // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) {ui::VKEY_1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0}, {ui::VKEY_NUMPAD1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0}, {ui::VKEY_2, ui::EF_ALT_DOWN, IDC_SELECT_TAB_1}, @@ -22,8 +22,8 @@ IDC_SHOW_AVATAR_MENU}, // Platform-specific key maps. --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) {ui::VKEY_BROWSER_BACK, ui::EF_NONE, IDC_BACK}, {ui::VKEY_BROWSER_FORWARD, ui::EF_NONE, IDC_FORWARD}, {ui::VKEY_BROWSER_HOME, ui::EF_NONE, IDC_HOME}, diff --git a/www/chromium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc b/www/chromium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc index 63b43df7d09c..05f95bde60a2 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc @@ -19,7 +19,7 @@ #include "ui/gfx/image/image_skia.h" #include "ui/views/widget/widget.h" --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/browser/shell_integration_linux.h" #endif @@ -13,8 +13,8 @@ const AppWindow::CreateParams& create_params, views::Widget::InitParams* init_params, views::Widget* widget) { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) std::string app_name = web_app::GenerateApplicationNameFromAppId(app_window()->extension_id()); // Set up a custom WM_CLASS for app windows. This allows task switchers in diff --git a/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc b/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc index b76ad95e95bd..8bd455d0e7f3 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc @@ -41,7 +41,7 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) #include <sys/stat.h> #include <sys/types.h> #include <unistd.h> @@ -13,8 +13,8 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) // On the Linux desktop, we want to prevent the user from logging in as root, // so that we don't destroy the profile. Now that we have some minimal ui // initialized, check to see if we're running as root and bail if we are. diff --git a/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h b/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h index 7d5a3e2e2a9d..384e3fabd16e 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h +++ b/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h @@ -1,11 +1,11 @@ ---- chrome/browser/ui/views/chrome_views_delegate.h.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/ui/views/chrome_views_delegate.h.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/ui/views/chrome_views_delegate.h -@@ -52,7 +52,7 @@ class ChromeViewsDelegate : public views::ViewsDelegat +@@ -51,7 +51,7 @@ class ChromeViewsDelegate : public views::ViewsDelegat base::OnceClosure callback) override; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) gfx::ImageSkia* GetDefaultWindowIcon() const override; bool WindowManagerProvidesTitleBar(bool maximized) override; #endif diff --git a/www/chromium/files/patch-chrome_browser_ui_views_download_download__item__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_download_download__item__view.cc index 325476f1c690..52bc71a149c4 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_download_download__item__view.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_download_download__item__view.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/views/download/download_item_view.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/ui/views/download/download_item_view.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/ui/views/download/download_item_view.cc @@ -195,7 +195,7 @@ bool UseNewWarnings() { } int GetFilenameStyle(const views::Label& label) { --#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_BSD) +-#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) ++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD) if (UseNewWarnings()) return STYLE_EMPHASIZED; #endif @@ -13,8 +13,8 @@ } int GetFilenameStyle(const views::StyledLabel& label) { --#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_BSD) +-#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) ++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD) if (UseNewWarnings()) return STYLE_EMPHASIZED; #endif diff --git a/www/chromium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view.cc index a61fc484d48b..11c440c6a76c 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/views/eye_dropper/eye_dropper_view.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/ui/views/eye_dropper/eye_dropper_view.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/ui/views/eye_dropper/eye_dropper_view.cc @@ -155,7 +155,7 @@ EyeDropperView::EyeDropperView(content::RenderFrameHos // EyeDropper/WidgetDelegate. set_owned_by_client(); SetPreferredSize(GetSize()); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Use TYPE_MENU for Linux to ensure that the eye dropper view is displayed // above the color picker. views::Widget::InitParams params(views::Widget::InitParams::TYPE_MENU); diff --git a/www/chromium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view__aura.cc b/www/chromium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view__aura.cc index e6c9534e5088..ebbe59d763bb 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view__aura.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view__aura.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/views/eye_dropper/eye_dropper_view_aura.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/ui/views/eye_dropper/eye_dropper_view_aura.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/ui/views/eye_dropper/eye_dropper_view_aura.cc @@ -81,7 +81,7 @@ void EyeDropperView::MoveViewToFront() { } void EyeDropperView::CaptureInputIfNeeded() { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // The eye dropper needs to capture input since it is not activated // in order to avoid dismissing the color picker. GetWidget()->GetNativeWindow()->SetCapture(); diff --git a/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc b/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc index 89a6cb88de14..4e75ddb2b7d9 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc @@ -1,20 +1,20 @@ ---- chrome/browser/ui/views/first_run_dialog.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/ui/views/first_run_dialog.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/ui/views/first_run_dialog.cc @@ -38,7 +38,7 @@ namespace { --#if !defined(OS_MAC) -+#if !defined(OS_MAC) && !defined(OS_BSD) +-#if !BUILDFLAG(IS_MAC) ++#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD) void InitCrashReporterIfEnabled(bool enabled) { if (!crash_reporter::IsCrashpadEnabled() && enabled) breakpad::InitCrashReporter(std::string()); @@ -122,7 +122,7 @@ bool FirstRunDialog::Accept() { - #if defined(OS_MAC) + #if BUILDFLAG(IS_MAC) ChangeMetricsReportingState(report_crashes_->GetChecked()); -#else -+#elif !defined(OS_BSD) ++#elif !BUILDFLAG(IS_BSD) #if BUILDFLAG(IS_CHROMEOS_ASH) metrics::structured::NeutrinoDevicesLog( metrics::structured::NeutrinoDevicesLocation::kFirstRunDialog); diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__desktop__window__tree__host__linux.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__desktop__window__tree__host__linux.cc index c5972b933a71..ac49ba40e61b 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__desktop__window__tree__host__linux.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__desktop__window__tree__host__linux.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/views/frame/browser_desktop_window_tree_host_linux.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/ui/views/frame/browser_desktop_window_tree_host_linux.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/ui/views/frame/browser_desktop_window_tree_host_linux.cc @@ -146,7 +146,7 @@ bool BrowserDesktopWindowTreeHostLinux::SupportsClient } void BrowserDesktopWindowTreeHostLinux::UpdateFrameHints() { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) auto* view = static_cast<BrowserFrameViewLinux*>( native_frame_->browser_frame()->GetFrameView()); auto* layout = view->layout(); diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__desktop__window__tree__host__linux.h b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__desktop__window__tree__host__linux.h index 574e1d37632a..8b456b44c4f1 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__desktop__window__tree__host__linux.h +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__desktop__window__tree__host__linux.h @@ -1,11 +1,11 @@ ---- chrome/browser/ui/views/frame/browser_desktop_window_tree_host_linux.h.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/ui/views/frame/browser_desktop_window_tree_host_linux.h.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/ui/views/frame/browser_desktop_window_tree_host_linux.h @@ -95,7 +95,7 @@ class BrowserDesktopWindowTreeHostLinux // browser_desktop_window_tree_host_lacros.cc. #if BUILDFLAG(IS_CHROMEOS_LACROS) using DesktopBrowserFrameAuraPlatform = DesktopBrowserFrameLacros; --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) using DesktopBrowserFrameAuraPlatform = DesktopBrowserFrameAuraLinux; #else #error Unknown platform diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc index 359cbcd74f69..09d242c51b33 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc @@ -1,16 +1,16 @@ ---- chrome/browser/ui/views/frame/browser_frame.cc.orig 2021-12-14 11:44:59 UTC +--- chrome/browser/ui/views/frame/browser_frame.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/ui/views/frame/browser_frame.cc @@ -48,11 +48,11 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) #include "ui/display/screen.h" #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "ui/views/linux_ui/linux_ui.h" #endif @@ -18,8 +18,8 @@ bool IsUsingGtkTheme(Profile* profile) { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) return ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme(); #else return false; @@ -27,8 +27,8 @@ IsVisibleOnAllWorkspaces()); // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || 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() @@ -36,8 +36,8 @@ } } --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) const views::LinuxUI* linux_ui = views::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 @@ -45,8 +45,8 @@ bool need_regenerate = false; // TODO(crbug.com/1052397): Revisit the macro expression once build flag // switch of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#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 // always needs to be regenerated on Linux. need_regenerate = true; diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc index 1c36b5278920..acec7ddb493f 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc.orig 2021-12-14 11:44:59 UTC +--- chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc @@ -15,7 +15,7 @@ #include "chrome/browser/ui/views/frame/glass_browser_frame_view.h" #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#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" @@ -13,8 +13,8 @@ std::unique_ptr<OpaqueBrowserFrameView> CreateOpaqueBrowserFrameView( BrowserFrame* frame, BrowserView* browser_view) { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) auto* linux_ui = views::LinuxUI::instance(); auto* profile = browser_view->browser()->profile(); auto* theme_service_factory = ThemeServiceFactory::GetForProfile(profile); diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc index c436b4c06217..df9a5321a462 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/views/frame/browser_view.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/ui/views/frame/browser_view.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/ui/views/frame/browser_view.cc -@@ -1748,7 +1748,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra +@@ -1750,7 +1750,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. --#if !(defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+#if !(defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) +-#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) contents_web_view_->SetFastResize(is_dragging); if (!is_dragging) { // When tab dragging is ended, we need to make sure the web contents get diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc index d0c788912539..98befea058f7 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc @@ -53,7 +53,7 @@ #include "ui/views/window/vector_icons/vector_icons.h" #include "ui/views/window/window_shape.h" --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "ui/views/controls/menu/menu_runner.h" #endif @@ -13,8 +13,8 @@ OpaqueBrowserFrameView::GetFrameButtonStyle() const { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) return FrameButtonStyle::kMdButton; #else return FrameButtonStyle::kImageButton; @@ -22,8 +22,8 @@ } void OpaqueBrowserFrameView::WindowIconPressed() { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Chrome OS doesn't show the window icon, and Windows handles this on its own // due to the hit test being HTSYSMENU. menu_runner_ = std::make_unique<views::MenuRunner>( diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h index a01fa72f0fbe..83585943ccc7 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h @@ -1,11 +1,11 @@ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view.h.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/ui/views/frame/opaque_browser_frame_view.h.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/ui/views/frame/opaque_browser_frame_view.h @@ -224,7 +224,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient // Background painter for the window frame. std::unique_ptr<views::FrameBackground> frame_background_; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) std::unique_ptr<views::MenuRunner> menu_runner_; #endif diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc index 37f8582b4110..8afa8e836fff 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/ui/views/frame/system_menu_model_builder.cc @@ -77,7 +77,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser ui::SimpleMenuModel* model) { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !BUILDFLAG(IS_CHROMEOS_LACROS) +-#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_LACROS) model->AddItemWithStringId(IDC_MINIMIZE_WINDOW, IDS_MINIMIZE_WINDOW_MENU); model->AddItemWithStringId(IDC_MAXIMIZE_WINDOW, IDS_MAXIMIZE_WINDOW_MENU); model->AddItemWithStringId(IDC_RESTORE_WINDOW, IDS_RESTORE_WINDOW_MENU); @@ -13,8 +13,8 @@ } // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !BUILDFLAG(IS_CHROMEOS_LACROS) +-#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_LACROS) model->AddSeparator(ui::NORMAL_SEPARATOR); bool supports_server_side_decorations = true; #if defined(USE_OZONE) && \ @@ -22,8 +22,8 @@ } // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) model->AddSeparator(ui::NORMAL_SEPARATOR); model->AddItemWithStringId(IDC_CLOSE_WINDOW, IDS_CLOSE); #endif diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc index 93ffd454516c..f53f1ecaf5b6 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/views/frame/system_menu_model_delegate.cc.orig 2021-12-14 11:44:59 UTC +--- chrome/browser/ui/views/frame/system_menu_model_delegate.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/ui/views/frame/system_menu_model_delegate.cc @@ -23,7 +23,7 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) #include "chrome/common/pref_names.h" #include "components/prefs/pref_service.h" #endif @@ -13,8 +13,8 @@ bool SystemMenuModelDelegate::IsCommandIdChecked(int command_id) const { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) if (command_id == IDC_USE_SYSTEM_TITLE_BAR) { PrefService* prefs = browser_->profile()->GetPrefs(); return !prefs->GetBoolean(prefs::kUseCustomChromeFrame); @@ -22,8 +22,8 @@ bool SystemMenuModelDelegate::IsCommandIdVisible(int command_id) const { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) bool is_maximized = browser_->window()->IsMaximized(); switch (command_id) { case IDC_MAXIMIZE_WINDOW: diff --git a/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc index d3446ac08e38..5c4323c49c43 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/views/hung_renderer_view.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/ui/views/hung_renderer_view.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/ui/views/hung_renderer_view.cc @@ -403,7 +403,7 @@ void HungRendererDialogView::ForceCrashHungRenderer() content::RenderProcessHost* rph = hung_pages_table_model_->GetRenderWidgetHost()->GetProcess(); if (rph) { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // A generic |CrashDumpHungChildProcess()| is not implemented for Linux. // Instead we send an explicit IPC to crash on the renderer's IO thread. rph->ForceCrash(); diff --git a/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc b/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc index 00eb29867dc0..d24d754243c8 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/ui/views/profiles/profile_menu_view_base.cc @@ -612,7 +612,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo( // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) // crbug.com/1161166: Orca does not read the accessible window title of the // bubble, so we duplicate it in the top-level menu item. To be revisited // after considering other options, including fixes on the AT side. diff --git a/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc b/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc index b31ba90d8738..addcc9063f22 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc @@ -1,20 +1,20 @@ ---- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc -@@ -82,7 +82,7 @@ SigninViewControllerDelegateViews::CreateReauthConfirm - } +@@ -117,7 +117,7 @@ SigninViewControllerDelegateViews::CreateProfileCustom + #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) - #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS_LACROS) -+ BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) ++ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) // static std::unique_ptr<views::WebView> SigninViewControllerDelegateViews::CreateEnterpriseConfirmationWebView( -@@ -341,7 +341,7 @@ SigninViewControllerDelegate::CreateReauthConfirmation - } +@@ -392,7 +392,7 @@ SigninViewControllerDelegate::CreateProfileCustomizati + #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) - #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS_LACROS) -+ BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) ++ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) // static SigninViewControllerDelegate* SigninViewControllerDelegate::CreateEnterpriseConfirmationDelegate( diff --git a/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h b/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h index 38cbde268fa8..6fcdbb7001d8 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h +++ b/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h @@ -1,11 +1,11 @@ ---- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h -@@ -64,7 +64,7 @@ class SigninViewControllerDelegateViews - signin_metrics::ReauthAccessPoint); +@@ -71,7 +71,7 @@ class SigninViewControllerDelegateViews + #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) - #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS_LACROS) -+ BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) ++ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) static std::unique_ptr<views::WebView> CreateEnterpriseConfirmationWebView( Browser* browser, const AccountInfo& account_info, diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc index 778a83ee2768..2edc92cd28d5 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/views/tabs/new_tab_button.cc.orig 2021-12-31 00:57:25 UTC +--- chrome/browser/ui/views/tabs/new_tab_button.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/ui/views/tabs/new_tab_button.cc @@ -59,7 +59,7 @@ NewTabButton::NewTabButton(TabStrip* tab_strip, Presse SetAnimateOnStateChange(true); // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) SetTriggerableEventFlags(GetTriggerableEventFlags() | ui::EF_MIDDLE_MOUSE_BUTTON); #endif diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc index 663831637fbc..801819e17c4e 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/views/tabs/tab.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/ui/views/tabs/tab.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/ui/views/tabs/tab.cc @@ -576,7 +576,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& if (mouse_hovered_ || !GetWidget()->IsMouseEventsEnabled()) return; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Move the hit test area for hovering up so that it is not overlapped by tab // hover cards when they are shown. // TODO(crbug.com/978134): Once Linux/CrOS widget transparency is solved, diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc index 80b3c86875fa..79840ce9979a 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc @@ -1,29 +1,29 @@ ---- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/ui/views/tabs/tab_drag_controller.cc -@@ -447,7 +447,7 @@ void TabDragController::Init(TabDragContext* source_co +@@ -468,7 +468,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. --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) can_release_capture_ = false; #endif start_point_in_screen_ = gfx::Point(source_view_offset, mouse_offset.y()); -@@ -895,7 +895,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon +@@ -916,7 +916,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if !(defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+#if !(defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) +-#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) // 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. -@@ -2105,7 +2105,7 @@ TabDragController::Liveness TabDragController::GetLoca +@@ -2128,7 +2128,7 @@ TabDragController::Liveness TabDragController::GetLoca } // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) // Exclude windows which are pending deletion via Browser::TabStripEmpty(). // These windows can be returned in the Linux Aura port because the browser // window which was used for dragging is not hidden once all of its tabs are diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__controller.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__controller.cc index 7cb22c534e19..6a00059963ad 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__controller.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__controller.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/views/tabs/tab_hover_card_controller.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/ui/views/tabs/tab_hover_card_controller.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/ui/views/tabs/tab_hover_card_controller.cc @@ -36,7 +36,7 @@ namespace { // Fetches the Omnibox drop-down widget, or returns null if the drop-down is // not visible. void FixWidgetStackOrder(views::Widget* widget, const Browser* browser) { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Ensure the hover card Widget assumes the highest z-order to avoid occlusion // by other secondary UI Widgets (such as the omnibox Widget, see // crbug.com/1226536). diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc b/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc index 13076bd76d43..462a0554c9df 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/webui/about_ui.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/ui/webui/about_ui.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/ui/webui/about_ui.cc @@ -656,7 +656,7 @@ std::string ChromeURLs() { return html; } --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_OPENBSD) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OPENBSD) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) std::string AboutLinuxProxyConfig() { std::string data; AppendHeader(&data, @@ -13,8 +13,8 @@ response = ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(idr); } --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_OPENBSD) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OPENBSD) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) } else if (source_name_ == chrome::kChromeUILinuxProxyConfigHost) { response = AboutLinuxProxyConfig(); #endif diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc b/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc index 22e2467e1821..24ef0bb1f1df 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc @@ -1,86 +1,86 @@ ---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -280,7 +280,7 @@ +@@ -284,7 +284,7 @@ #include "chrome/browser/ui/webui/app_launcher_page_ui.h" #endif --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "chrome/browser/ui/webui/webui_js_error/webui_js_error_ui.h" #endif -@@ -304,17 +304,17 @@ +@@ -308,17 +308,17 @@ #endif - #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ -- defined(OS_CHROMEOS) -+ defined(OS_CHROMEOS) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "chrome/browser/ui/webui/discards/discards_ui.h" #endif - #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -- defined(OS_ANDROID) -+ defined(OS_ANDROID) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) #include "chrome/browser/ui/webui/sandbox/sandbox_internals_ui.h" #endif - #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS_ASH) -+ BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_BSD) ++ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) #include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h" #endif -@@ -592,7 +592,7 @@ bool IsAboutUI(const GURL& url) { - #if !defined(OS_ANDROID) +@@ -611,7 +611,7 @@ bool IsAboutUI(const GURL& url) { + #if !BUILDFLAG(IS_ANDROID) || url.host_piece() == chrome::kChromeUITermsHost #endif --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_OPENBSD) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OPENBSD) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) || url.host_piece() == chrome::kChromeUILinuxProxyConfigHost #endif #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -985,7 +985,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we - } +@@ -1003,7 +1003,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we + return &NewWebUI<ash::SampleSystemWebAppUI>; #endif // !defined(OFFICIAL_BUILD) #endif // BUILDFLAG(IS_CHROMEOS_ASH) --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (url.host_piece() == chrome::kChromeUIWebUIJsErrorHost) return &NewWebUI<WebUIJsErrorUI>; #endif -@@ -1043,7 +1043,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -1061,7 +1061,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we if (url.host_piece() == chrome::kChromeUINaClHost) return &NewWebUI<NaClUI>; #endif --#if ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(TOOLKIT_VIEWS)) || \ -+#if ((defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(TOOLKIT_VIEWS)) || \ +-#if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \ ++#if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && \ + defined(TOOLKIT_VIEWS)) || \ defined(USE_AURA) if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost) - return &NewWebUI<ConstrainedWebDialogUI>; -@@ -1098,22 +1098,22 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -1117,22 +1117,22 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we } #endif - #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -- defined(OS_ANDROID) -+ defined(OS_ANDROID) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) if (url.host_piece() == chrome::kChromeUISandboxHost) { return &NewWebUI<SandboxInternalsUI>; } #endif - #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS_ASH) -+ BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_BSD) ++ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) if (url.host_piece() == chrome::kChromeUIConnectorsInternalsHost) return &NewWebUI<enterprise_connectors::ConnectorsInternalsUI>; #endif - #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ -- defined(OS_CHROMEOS) -+ defined(OS_CHROMEOS) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (url.host_piece() == chrome::kChromeUIDiscardsHost) return &NewWebUI<DiscardsUI>; #endif --#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (url.host_piece() == chrome::kChromeUIBrowserSwitchHost) return &NewWebUI<BrowserSwitchUI>; #endif diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_connectors__internals_zero__trust__utils.cc b/www/chromium/files/patch-chrome_browser_ui_webui_connectors__internals_zero__trust__utils.cc index 792f8ca0dacb..ac2334aba092 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_connectors__internals_zero__trust__utils.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_connectors__internals_zero__trust__utils.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/webui/connectors_internals/zero_trust_utils.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/ui/webui/connectors_internals/zero_trust_utils.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/ui/webui/connectors_internals/zero_trust_utils.cc @@ -9,7 +9,7 @@ #include "base/strings/string_util.h" #include "build/build_config.h" --#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) -+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) #include "chrome/browser/browser_process.h" #include "chrome/browser/policy/chrome_browser_policy_connector.h" #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h" @@ -13,8 +13,8 @@ std::vector<base::StringPiece>(values.begin(), values.end()), ", "); } --#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) -+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) connectors_internals::mojom::KeyTrustLevel ParseTrustLevel( BPKUR::KeyTrustLevel trust_level) { @@ -22,8 +22,8 @@ } connectors_internals::mojom::KeyInfoPtr GetKeyInfo() { --#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) -+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) auto* key_manager = g_browser_process->browser_policy_connector() ->chrome_browser_cloud_management_controller() ->GetDeviceTrustKeyManager(); diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc index 0431a2e82a0b..7b809aede864 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc @@ -1,29 +1,29 @@ ---- chrome/browser/ui/webui/ntp/app_launcher_handler.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/ui/webui/ntp/app_launcher_handler.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/ui/webui/ntp/app_launcher_handler.cc -@@ -315,7 +315,7 @@ void AppLauncherHandler::CreateExtensionInfo(const Ext +@@ -306,7 +306,7 @@ void AppLauncherHandler::CreateExtensionInfo(const Ext base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode)); bool is_deprecated_app = false; --#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) is_deprecated_app = extensions::IsExtensionUnsupportedDeprecatedApp( extension_service_->GetBrowserContext(), extension->id()); #endif -@@ -765,7 +765,7 @@ void AppLauncherHandler::HandleLaunchApp(const base::L +@@ -735,7 +735,7 @@ void AppLauncherHandler::HandleLaunchApp(const base::L Profile* profile = extension_service_->profile(); --#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (extensions::IsExtensionUnsupportedDeprecatedApp(profile, extension_id)) { // TODO(crbug.com/1225779): Show the deprecated apps dialog. return; -@@ -1361,7 +1361,7 @@ void AppLauncherHandler::InstallOsHooks(const web_app: +@@ -1328,7 +1328,7 @@ void AppLauncherHandler::InstallOsHooks(const web_app: options.os_hooks[web_app::OsHookType::kUninstallationViaOsSettings] = web_app->CanUserUninstallWebApp(); --#if defined(OS_WIN) || defined(OS_MAC) || \ -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) || \ - (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ + (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) options.os_hooks[web_app::OsHookType::kUrlHandlers] = true; #else diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc index c6d1b37c93ff..782c04267d74 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/webui/settings/appearance_handler.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/ui/webui/settings/appearance_handler.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/ui/webui/settings/appearance_handler.cc @@ -31,7 +31,7 @@ void AppearanceHandler::RegisterMessages() { base::Unretained(this))); // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !BUILDFLAG(IS_CHROMEOS_LACROS) +-#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_LACROS) web_ui()->RegisterDeprecatedMessageCallback( "useSystemTheme", base::BindRepeating(&AppearanceHandler::HandleUseSystemTheme, @@ -13,8 +13,8 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !BUILDFLAG(IS_CHROMEOS_LACROS) +-#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_LACROS) void AppearanceHandler::HandleUseSystemTheme(const base::ListValue* args) { if (profile_->IsChild()) NOTREACHED(); diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.h b/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.h index ffa2618e1a8e..f0f8a86ec04f 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.h +++ b/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.h @@ -1,11 +1,11 @@ ---- chrome/browser/ui/webui/settings/appearance_handler.h.orig 2021-12-14 11:45:00 UTC +--- chrome/browser/ui/webui/settings/appearance_handler.h.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/ui/webui/settings/appearance_handler.h @@ -44,7 +44,7 @@ class AppearanceHandler : public SettingsPageUIHandler // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#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::ListValue* args); #endif diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc b/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc index 19564cdfff3e..9e7eb20c1b60 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc @@ -1,47 +1,47 @@ ---- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2022-02-28 16:54:41 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 --#if defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !BUILDFLAG(IS_CHROMEOS_LACROS) +-#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_LACROS) #include "ui/display/screen.h" #endif -@@ -136,7 +136,7 @@ +@@ -137,7 +137,7 @@ #include "chrome/browser/ui/webui/certificate_manager_localized_strings_provider.h" #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "ui/ozone/public/ozone_platform.h" #endif -@@ -365,7 +365,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -370,7 +370,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht {"huge", IDS_SETTINGS_HUGE_FONT_SIZE}, // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !BUILDFLAG(IS_CHROMEOS_LACROS) +-#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}, -@@ -373,7 +373,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -378,7 +378,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht #else {"resetToDefaultTheme", IDS_SETTINGS_RESET_TO_DEFAULT_THEME}, #endif --#if defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !BUILDFLAG(IS_CHROMEOS_LACROS) +-#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_LACROS) {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS}, #endif - #if defined(OS_MAC) -@@ -394,7 +394,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht + #if BUILDFLAG(IS_MAC) +@@ -399,7 +399,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !BUILDFLAG(IS_CHROMEOS_LACROS) +-#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_LACROS) bool show_custom_chrome_frame = ui::OzonePlatform::GetInstance() ->GetPlatformRuntimeProperties() .supports_server_side_window_decorations; diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__ui.cc b/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__ui.cc index ac0c0ffb1ca1..5177cb1f8fb5 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__ui.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__ui.cc @@ -1,20 +1,20 @@ ---- chrome/browser/ui/webui/settings/settings_ui.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/ui/webui/settings/settings_ui.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/ui/webui/settings/settings_ui.cc -@@ -140,7 +140,7 @@ +@@ -141,7 +141,7 @@ #include "chrome/browser/ui/webui/settings/native_certificates_handler.h" - #endif // defined(USE_NSS_CERTS) + #endif // BUILDFLAG(USE_NSS_CERTS) --#if defined(OS_WIN) || defined(OS_MAC) || \ -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) || \ - (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) +-#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/ui/webui/settings/url_handlers_handler.h" #include "chrome/browser/web_applications/web_app_provider.h" -@@ -243,7 +243,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui) +@@ -245,7 +245,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui) AddSettingsPageUIHandler(std::make_unique<ChromeCleanupHandler>(profile)); - #endif // defined(OS_WIN) + #endif // BUILDFLAG(IS_WIN) --#if defined(OS_WIN) || defined(OS_MAC) || \ -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) || \ - (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ + (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) if (web_app::WebAppProvider::GetForWebApps(profile) != nullptr) { AddSettingsPageUIHandler(std::make_unique<UrlHandlersHandler>( diff --git a/www/chromium/files/patch-chrome_browser_ui_window__sizer_window__sizer.cc b/www/chromium/files/patch-chrome_browser_ui_window__sizer_window__sizer.cc index dd5e2703c132..f5e4edc63ee2 100644 --- a/www/chromium/files/patch-chrome_browser_ui_window__sizer_window__sizer.cc +++ b/www/chromium/files/patch-chrome_browser_ui_window__sizer_window__sizer.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/window_sizer/window_sizer.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/ui/window_sizer/window_sizer.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/ui/window_sizer/window_sizer.cc -@@ -166,7 +166,7 @@ void WindowSizer::GetBrowserWindowBoundsAndShowState( +@@ -173,7 +173,7 @@ void WindowSizer::GetBrowserWindowBoundsAndShowState( browser, window_bounds, show_state); } --#if !defined(OS_LINUX) -+#if !defined(OS_LINUX) || defined(OS_BSD) +-#if !BUILDFLAG(IS_LINUX) ++#if !BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Linux has its own implementation, see WindowSizerLinux. // static void WindowSizer::GetBrowserWindowBoundsAndShowState( diff --git a/www/chromium/files/patch-chrome_browser_web__applications_extension__status__utils.h b/www/chromium/files/patch-chrome_browser_web__applications_extension__status__utils.h index ee999aca20a0..58ee36e0c4f5 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_extension__status__utils.h +++ b/www/chromium/files/patch-chrome_browser_web__applications_extension__status__utils.h @@ -1,11 +1,11 @@ ---- chrome/browser/web_applications/extension_status_utils.h.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/web_applications/extension_status_utils.h.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/web_applications/extension_status_utils.h @@ -42,7 +42,7 @@ bool IsExtensionDefaultInstalled(content::BrowserConte bool IsExternalExtensionUninstalled(content::BrowserContext* context, const std::string& extension_id); --#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Returns whether |extension_id| is a Chrome App and should be blocked by the // Chrome Apps Deprecation. Policy installed Chrome Apps are still allowed, and // all apps are allowed if the deprecation feature flag is not enabled. diff --git a/www/chromium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc b/www/chromium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc index fa03be004187..5b903976722b 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc +++ b/www/chromium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc @@ -1,11 +1,11 @@ ---- chrome/browser/web_applications/extensions/extension_status_utils.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/web_applications/extensions/extension_status_utils.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/web_applications/extensions/extension_status_utils.cc @@ -87,7 +87,7 @@ bool IsExternalExtensionUninstalled(content::BrowserCo return prefs && prefs->IsExternalExtensionUninstalled(extension_id); } --#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) bool IsExtensionUnsupportedDeprecatedApp(content::BrowserContext* context, const std::string& extension_id) { if (!base::FeatureList::IsEnabled(features::kChromeAppsDeprecation)) diff --git a/www/chromium/files/patch-chrome_browser_web__applications_externally__managed__app__install__task.cc b/www/chromium/files/patch-chrome_browser_web__applications_externally__managed__app__install__task.cc index 2d9cdef7ca96..8a5cd71c584c 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_externally__managed__app__install__task.cc +++ b/www/chromium/files/patch-chrome_browser_web__applications_externally__managed__app__install__task.cc @@ -1,11 +1,11 @@ ---- chrome/browser/web_applications/externally_managed_app_install_task.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/web_applications/externally_managed_app_install_task.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/web_applications/externally_managed_app_install_task.cc -@@ -310,7 +310,7 @@ void ExternallyManagedAppInstallTask::OnWebAppInstalle +@@ -363,7 +363,7 @@ void ExternallyManagedAppInstallTask::OnWebAppInstalle const WebApp* web_app = registrar_->GetAppById(app_id); options.os_hooks[OsHookType::kUninstallationViaOsSettings] = web_app->CanUserUninstallWebApp(); --#if defined(OS_WIN) || defined(OS_MAC) || \ -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) || \ - (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ + (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) options.os_hooks[OsHookType::kUrlHandlers] = true; #else diff --git a/www/chromium/files/patch-chrome_browser_web__applications_web__app__file__handler__registration.h b/www/chromium/files/patch-chrome_browser_web__applications_web__app__file__handler__registration.h index 7e5687a24676..0e4ff5c7c04c 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_web__app__file__handler__registration.h +++ b/www/chromium/files/patch-chrome_browser_web__applications_web__app__file__handler__registration.h @@ -1,11 +1,11 @@ ---- chrome/browser/web_applications/web_app_file_handler_registration.h.orig 2021-12-31 00:57:25 UTC +--- chrome/browser/web_applications/web_app_file_handler_registration.h.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/web_applications/web_app_file_handler_registration.h @@ -44,7 +44,7 @@ void UnregisterFileHandlersWithOs(const AppId& app_id, Profile* profile, ResultCallback callback); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Exposed for testing purposes. Register the set of // MIME-type-to-file-extensions mappings corresponding to |file_handlers|. File // I/O and a a callout to the Linux shell are performed asynchronously. diff --git a/www/chromium/files/patch-chrome_browser_web__applications_web__app__install__task.cc b/www/chromium/files/patch-chrome_browser_web__applications_web__app__install__task.cc index 31a59e6db424..967e60092ef1 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_web__app__install__task.cc +++ b/www/chromium/files/patch-chrome_browser_web__applications_web__app__install__task.cc @@ -1,11 +1,11 @@ ---- chrome/browser/web_applications/web_app_install_task.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/web_applications/web_app_install_task.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/web_applications/web_app_install_task.cc -@@ -919,7 +919,7 @@ void WebAppInstallTask::OnInstallFinalizedCreateShortc +@@ -915,7 +915,7 @@ void WebAppInstallTask::OnInstallFinalizedCreateShortc web_app->CanUserUninstallWebApp(); } --#if defined(OS_WIN) || defined(OS_MAC) || \ -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) || \ - (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ + (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) options.os_hooks[OsHookType::kUrlHandlers] = true; #else diff --git a/www/chromium/files/patch-chrome_browser_web__applications_web__app__provider.cc b/www/chromium/files/patch-chrome_browser_web__applications_web__app__provider.cc index 295a1316db32..883bdc4cb29b 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_web__app__provider.cc +++ b/www/chromium/files/patch-chrome_browser_web__applications_web__app__provider.cc @@ -1,11 +1,11 @@ ---- chrome/browser/web_applications/web_app_provider.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/web_applications/web_app_provider.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/web_applications/web_app_provider.cc -@@ -276,7 +276,7 @@ void WebAppProvider::CreateSubsystems(Profile* profile +@@ -281,7 +281,7 @@ void WebAppProvider::CreateSubsystems(Profile* profile protocol_handler_manager.get()); std::unique_ptr<UrlHandlerManager> url_handler_manager; --#if defined(OS_WIN) || defined(OS_MAC) || \ -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) || \ - (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ + (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) url_handler_manager = std::make_unique<UrlHandlerManagerImpl>(profile); #endif diff --git a/www/chromium/files/patch-chrome_browser_web__applications_web__app__shortcut.cc b/www/chromium/files/patch-chrome_browser_web__applications_web__app__shortcut.cc index 89a8fc84c75d..8bfe2aad8808 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_web__app__shortcut.cc +++ b/www/chromium/files/patch-chrome_browser_web__applications_web__app__shortcut.cc @@ -1,38 +1,38 @@ ---- chrome/browser/web_applications/web_app_shortcut.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/web_applications/web_app_shortcut.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/web_applications/web_app_shortcut.cc -@@ -44,7 +44,7 @@ namespace { +@@ -43,7 +43,7 @@ namespace { - #if defined(OS_MAC) + #if BUILDFLAG(IS_MAC) const int kDesiredIconSizesForShortcut[] = {16, 32, 128, 256, 512}; --#elif defined(OS_LINUX) || defined(OS_CHROMEOS) -+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // 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}; -@@ -134,7 +134,7 @@ ScopedShortcutOverrideForTesting::~ScopedShortcutOverr +@@ -133,7 +133,7 @@ ScopedShortcutOverrideForTesting::~ScopedShortcutOverr } } } --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) directories = {&desktop}; #endif for (base::ScopedTempDir* dir : directories) { -@@ -178,7 +178,7 @@ std::unique_ptr<ScopedShortcutOverrideForTesting> Over +@@ -177,7 +177,7 @@ std::unique_ptr<ScopedShortcutOverrideForTesting> Over scoped_override->chrome_apps_folder.CreateUniqueTempDirUnderPath( base_path); DCHECK(success); --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) bool success = scoped_override->desktop.CreateUniqueTempDirUnderPath(base_path); DCHECK(success); -@@ -196,7 +196,7 @@ std::unique_ptr<ScopedShortcutOverrideForTesting> Over - #elif defined(OS_MAC) +@@ -195,7 +195,7 @@ std::unique_ptr<ScopedShortcutOverrideForTesting> Over + #elif BUILDFLAG(IS_MAC) bool success = scoped_override->chrome_apps_folder.CreateUniqueTempDir(); DCHECK(success); --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) bool success = scoped_override->desktop.CreateUniqueTempDir(); DCHECK(success); #endif diff --git a/www/chromium/files/patch-chrome_browser_web__applications_web__app__shortcut.h b/www/chromium/files/patch-chrome_browser_web__applications_web__app__shortcut.h index 9804468e2ef0..e4c212a51b62 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_web__app__shortcut.h +++ b/www/chromium/files/patch-chrome_browser_web__applications_web__app__shortcut.h @@ -1,20 +1,20 @@ ---- chrome/browser/web_applications/web_app_shortcut.h.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/web_applications/web_app_shortcut.h.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/web_applications/web_app_shortcut.h @@ -19,7 +19,7 @@ #include "ui/gfx/image/image_family.h" #include "url/gurl.h" --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/browser/web_applications/web_app_shortcut_linux.h" - #endif // defined(OS_LINUX) + #endif // BUILDFLAG(IS_LINUX) @@ -47,7 +47,7 @@ struct ScopedShortcutOverrideForTesting { base::ScopedTempDir startup; - #elif defined(OS_MAC) + #elif BUILDFLAG(IS_MAC) base::ScopedTempDir chrome_apps_folder; --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) base::ScopedTempDir desktop; #endif }; @@ -22,8 +22,8 @@ std::set<std::string> file_handler_extensions; std::set<std::string> file_handler_mime_types; std::set<std::string> protocol_handlers; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) std::set<DesktopActionInfo> actions; - #endif // defined(OS_LINUX) + #endif // BUILDFLAG(IS_LINUX) diff --git a/www/chromium/files/patch-chrome_browser_web__applications_web__app__shortcut__manager.cc b/www/chromium/files/patch-chrome_browser_web__applications_web__app__shortcut__manager.cc index 9e82f3bf3771..edf893e6ed24 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_web__app__shortcut__manager.cc +++ b/www/chromium/files/patch-chrome_browser_web__applications_web__app__shortcut__manager.cc @@ -1,20 +1,20 @@ ---- chrome/browser/web_applications/web_app_shortcut_manager.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/browser/web_applications/web_app_shortcut_manager.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/browser/web_applications/web_app_shortcut_manager.cc @@ -35,7 +35,7 @@ namespace web_app { namespace { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Aligns with other platform implementations that only support 10 items. constexpr int kMaxApplicationDockMenuItems = 10; - #endif // defined(OS_LINUX) + #endif // BUILDFLAG(IS_LINUX) @@ -382,7 +382,7 @@ std::unique_ptr<ShortcutInfo> WebAppShortcutManager::B } } --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) const std::vector<WebAppShortcutsMenuItemInfo>& shortcuts_menu_item_infos = app->shortcuts_menu_item_infos(); int num_entries = std::min(static_cast<int>(shortcuts_menu_item_infos.size()), diff --git a/www/chromium/files/patch-chrome_common_channel__info.h b/www/chromium/files/patch-chrome_common_channel__info.h index db63e5cdfff8..d90a2ca8726d 100644 --- a/www/chromium/files/patch-chrome_common_channel__info.h +++ b/www/chromium/files/patch-chrome_common_channel__info.h @@ -1,11 +1,11 @@ ---- chrome/common/channel_info.h.orig 2021-12-14 11:45:00 UTC +--- chrome/common/channel_info.h.orig 2022-02-28 16:54:41 UTC +++ chrome/common/channel_info.h @@ -107,7 +107,7 @@ std::string GetChannelSuffixForDataDir(); // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) // Returns the channel-specific filename of the desktop shortcut used to launch // the browser. std::string GetDesktopName(base::Environment* env); diff --git a/www/chromium/files/patch-chrome_common_channel__info__posix.cc b/www/chromium/files/patch-chrome_common_channel__info__posix.cc index 6c60ade0a03d..87afe0e0f846 100644 --- a/www/chromium/files/patch-chrome_common_channel__info__posix.cc +++ b/www/chromium/files/patch-chrome_common_channel__info__posix.cc @@ -1,11 +1,11 @@ ---- chrome/common/channel_info_posix.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/common/channel_info_posix.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/common/channel_info_posix.cc @@ -93,7 +93,7 @@ std::string GetChannelSuffixForDataDir() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) std::string GetDesktopName(base::Environment* env) { #if BUILDFLAG(GOOGLE_CHROME_BRANDING) // Google Chrome packaged as a snap is a special case: the application name diff --git a/www/chromium/files/patch-chrome_common_chrome__features.cc b/www/chromium/files/patch-chrome_common_chrome__features.cc index e364888836f0..687a0039eb93 100644 --- a/www/chromium/files/patch-chrome_common_chrome__features.cc +++ b/www/chromium/files/patch-chrome_common_chrome__features.cc @@ -1,83 +1,101 @@ ---- chrome/common/chrome_features.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/common/chrome_features.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/common/chrome_features.cc -@@ -110,7 +110,7 @@ const base::Feature kAsyncDns { +@@ -113,7 +113,7 @@ const base::Feature kAsyncDns { }; - #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ -- defined(OS_CHROMEOS) || defined(OS_FUCHSIA) -+ defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) // Enables or disables the Autofill survey triggered by opening a prompt to // save address info. const base::Feature kAutofillAddressSurvey{"AutofillAddressSurvey", -@@ -125,7 +125,7 @@ const base::Feature kAutofillPasswordSurvey{"AutofillP +@@ -128,7 +128,7 @@ const base::Feature kAutofillPasswordSurvey{"AutofillP base::FEATURE_DISABLED_BY_DEFAULT}; #endif --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Enables the Restart background mode optimization. When all Chrome UI is // closed and it goes in the background, allows to restart the browser to // discard memory. -@@ -142,7 +142,7 @@ const base::Feature kBorealis{"Borealis", base::FEATUR +@@ -145,7 +145,7 @@ const base::Feature kBorealis{"Borealis", base::FEATUR const base::Feature kChangePictureVideoMode{"ChangePictureVideoMode", base::FEATURE_ENABLED_BY_DEFAULT}; --#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // 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. -@@ -255,7 +255,7 @@ const base::Feature kPreinstalledWebAppInstallation{ +@@ -258,7 +258,7 @@ const base::Feature kPreinstalledWebAppInstallation{ #endif - #if BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_MAC) || defined(OS_LINUX) || \ -- defined(OS_FUCHSIA) -+ defined(OS_FUCHSIA) || defined(OS_BSD) + #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) // Enables Desktop PWAs shortcuts menu to be visible and executable in ChromeOS, // MacOS and Linux. const base::Feature kDesktopPWAsAppIconShortcutsMenuUI{ -@@ -303,7 +303,7 @@ const base::Feature kDesktopPWAsNotificationIconAndTit +@@ -305,7 +305,7 @@ const base::Feature kDesktopPWAsNotificationIconAndTit // Enables or disables Desktop PWAs to be auto-started on OS login. const base::Feature kDesktopPWAsRunOnOsLogin { "DesktopPWAsRunOnOsLogin", --#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -337,7 +337,7 @@ const base::FeatureParam<int> kDisableHttpDiskCacheMem +@@ -339,7 +339,7 @@ const base::FeatureParam<int> kDisableHttpDiskCacheMem const base::Feature kDnsOverHttps { "DnsOverHttps", - #if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ -- defined(OS_ANDROID) || defined(OS_LINUX) -+ defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -359,7 +359,7 @@ const base::FeatureParam<bool> kDnsOverHttpsFallbackPa +@@ -361,7 +361,7 @@ const base::FeatureParam<bool> kDnsOverHttpsFallbackPa const base::FeatureParam<bool> kDnsOverHttpsShowUiParam { &kDnsOverHttps, "ShowUi", - #if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ -- defined(OS_ANDROID) || defined(OS_LINUX) -+ defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) true #else false -@@ -633,7 +633,7 @@ const base::Feature kIncognitoNtpRevamp{"IncognitoNtpR +@@ -608,7 +608,7 @@ const base::Feature kImmersiveFullscreen{"ImmersiveFul + base::FEATURE_DISABLED_BY_DEFAULT}; + #endif + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + const base::Feature kImproveAccessibilityTreeUsingLocalML{ + "ImproveAccessibilityTreeUsingLocalML", base::FEATURE_DISABLED_BY_DEFAULT}; + #endif +@@ -645,7 +645,7 @@ const base::Feature kIncognitoNtpRevamp{"IncognitoNtpR base::FEATURE_DISABLED_BY_DEFAULT}; - #if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || \ -- defined(OS_CHROMEOS) || defined(OS_FUCHSIA) -+ defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD) + #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) // When enabled, removes any theme or background customization done by the user // on the Incognito UI. const base::Feature kIncognitoBrandConsistencyForDesktop{ -@@ -675,7 +675,7 @@ const base::Feature kKernelnextVMs{"KernelnextVMs", - base::FEATURE_DISABLED_BY_DEFAULT}; +@@ -681,7 +681,7 @@ const base::Feature kLinkCapturingUiUpdate{"LinkCaptur + base::FEATURE_DISABLED_BY_DEFAULT}; #endif --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) ++#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)) || BUILDFLAG(IS_BSD) COMPONENT_EXPORT(CHROME_FEATURES) const base::Feature kLinuxLowMemoryMonitor{"LinuxLowMemoryMonitor", base::FEATURE_DISABLED_BY_DEFAULT}; +@@ -694,7 +694,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit + &kLinuxLowMemoryMonitor, "critical_level", 255}; + #endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + const base::Feature kListWebAppsSwitch{"ListWebAppsSwitch", + base::FEATURE_DISABLED_BY_DEFAULT}; + #endif diff --git a/www/chromium/files/patch-chrome_common_chrome__features.h b/www/chromium/files/patch-chrome_common_chrome__features.h index 86290c7e4766..d4dd4115b750 100644 --- a/www/chromium/files/patch-chrome_common_chrome__features.h +++ b/www/chromium/files/patch-chrome_common_chrome__features.h @@ -1,56 +1,74 @@ ---- chrome/common/chrome_features.h.orig 2022-02-07 13:39:41 UTC +--- chrome/common/chrome_features.h.orig 2022-02-28 16:54:41 UTC +++ chrome/common/chrome_features.h -@@ -92,7 +92,7 @@ extern const base::Feature kArcPiGhostWindow; +@@ -95,7 +95,7 @@ extern const base::Feature kArcPiGhostWindow; COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kAsyncDns; - #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ -- defined(OS_CHROMEOS) || defined(OS_FUCHSIA) -+ defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kAutofillAddressSurvey; COMPONENT_EXPORT(CHROME_FEATURES) -@@ -101,7 +101,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) +@@ -104,7 +104,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kAutofillPasswordSurvey; #endif --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kBackgroundModeAllowRestart; - #endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) -@@ -118,7 +118,7 @@ extern const base::Feature kBrowserAppInstanceTracking + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +@@ -121,7 +121,7 @@ extern const base::Feature kBrowserAppInstanceTracking COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kChangePictureVideoMode; --#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kChromeAppsDeprecation; #endif -@@ -183,7 +183,7 @@ extern const base::Feature kPreinstalledWebAppInstalla +@@ -186,7 +186,7 @@ extern const base::Feature kPreinstalledWebAppInstalla #endif - #if BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_MAC) || defined(OS_LINUX) || \ -- defined(OS_FUCHSIA) -+ defined(OS_FUCHSIA) || defined(OS_BSD) + #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kDesktopPWAsAppIconShortcutsMenuUI; #endif -@@ -418,7 +418,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) +@@ -410,7 +410,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) + extern const base::Feature kImmersiveFullscreen; + #endif + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + COMPONENT_EXPORT(CHROME_FEATURES) + extern const base::Feature kImproveAccessibilityTreeUsingLocalML; + #endif +@@ -435,7 +435,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kIncognitoNtpRevamp; - #if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || \ -- defined(OS_CHROMEOS) || defined(OS_FUCHSIA) -+ defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD) + #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kIncognitoBrandConsistencyForDesktop; -@@ -445,7 +445,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) - extern const base::Feature kKernelnextVMs; +@@ -462,7 +462,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) + extern const base::Feature kLinkCapturingUiUpdate; #endif --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) ++#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)) || BUILDFLAG(IS_BSD) COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kLinuxLowMemoryMonitor; COMPONENT_EXPORT(CHROME_FEATURES) +@@ -471,7 +471,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) + extern const base::FeatureParam<int> kLinuxLowMemoryMonitorCriticalLevel; + #endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + COMPONENT_EXPORT(CHROME_FEATURES) + extern const base::Feature kListWebAppsSwitch; + #endif diff --git a/www/chromium/files/patch-chrome_common_chrome__paths.cc b/www/chromium/files/patch-chrome_common_chrome__paths.cc index 10be66446f93..b4e70028f87d 100644 --- a/www/chromium/files/patch-chrome_common_chrome__paths.cc +++ b/www/chromium/files/patch-chrome_common_chrome__paths.cc @@ -1,11 +1,11 @@ ---- chrome/common/chrome_paths.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/common/chrome_paths.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/common/chrome_paths.cc @@ -44,14 +44,14 @@ namespace { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // The path to the external extension <id>.json files. // /usr/share seems like a good choice, see: http://www.pathname.com/fhs/ const base::FilePath::CharType kFilepathSinglePrefExtensions[] = @@ -17,13 +17,13 @@ + FILE_PATH_LITERAL("/usr/local/share/chromium/extensions"); #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) - #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -178,7 +178,7 @@ bool PathProvider(int key, base::FilePath* result) { return false; break; case chrome::DIR_DEFAULT_DOWNLOADS_SAFE: --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (!GetUserDownloadsDirectorySafe(&cur)) return false; break; @@ -31,31 +31,31 @@ if (!base::PathExists(cur)) // We don't want to create this return false; break; --#if defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_OPENBSD) -+#if defined(OS_POSIX) && !defined(OS_MAC) +-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_OPENBSD) ++#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) case chrome::DIR_POLICY_FILES: { #if BUILDFLAG(GOOGLE_CHROME_BRANDING) cur = base::FilePath(FILE_PATH_LITERAL("/etc/opt/chrome/policies")); -+#elif defined(OS_FREEBSD) ++#elif BUILDFLAG(IS_FREEBSD) + cur = base::FilePath(FILE_PATH_LITERAL("/usr/local/etc/chromium/policies")); #else cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies")); #endif -@@ -424,7 +426,7 @@ bool PathProvider(int key, base::FilePath* result) { - // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is - // complete. - #if BUILDFLAG(IS_CHROMEOS_ASH) || \ -- ((defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ -+ ((defined(OS_LINUX) || defined(OS_BSD) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ - BUILDFLAG(CHROMIUM_BRANDING)) || \ - defined(OS_MAC) +@@ -426,7 +428,7 @@ bool PathProvider(int key, base::FilePath* result) { + #if BUILDFLAG(IS_CHROMEOS_ASH) || \ + ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ + BUILDFLAG(CHROMIUM_BRANDING)) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) case chrome::DIR_USER_EXTERNAL_EXTENSIONS: { + if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) + return false; @@ -434,7 +436,7 @@ bool PathProvider(int key, base::FilePath* result) { break; } #endif --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: { cur = base::FilePath(kFilepathSinglePrefExtensions); break; @@ -63,16 +63,16 @@ break; #endif --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) case chrome::DIR_NATIVE_MESSAGING: - #if defined(OS_MAC) + #if BUILDFLAG(IS_MAC) #if BUILDFLAG(GOOGLE_CHROME_BRANDING) @@ -493,6 +495,9 @@ bool PathProvider(int key, base::FilePath* result) { #if BUILDFLAG(GOOGLE_CHROME_BRANDING) cur = base::FilePath(FILE_PATH_LITERAL( "/etc/opt/chrome/native-messaging-hosts")); -+#elif defined(OS_FREEBSD) ++#elif BUILDFLAG(IS_FREEBSD) + cur = base::FilePath(FILE_PATH_LITERAL( + "/usr/local/etc/chromium/native-messaging-hosts")); #else diff --git a/www/chromium/files/patch-chrome_common_chrome__paths.h b/www/chromium/files/patch-chrome_common_chrome__paths.h index 35700831e2fd..f46d13f76e3d 100644 --- a/www/chromium/files/patch-chrome_common_chrome__paths.h +++ b/www/chromium/files/patch-chrome_common_chrome__paths.h @@ -1,20 +1,20 @@ ---- chrome/common/chrome_paths.h.orig 2022-02-07 13:39:41 UTC +--- chrome/common/chrome_paths.h.orig 2022-02-28 16:54:41 UTC +++ chrome/common/chrome_paths.h -@@ -54,7 +54,7 @@ enum { - // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is - // complete. - #if BUILDFLAG(IS_CHROMEOS_ASH) || \ -- ((defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ -+ ((defined(OS_LINUX) || defined(OS_BSD) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ - BUILDFLAG(CHROMIUM_BRANDING)) || \ - defined(OS_MAC) +@@ -56,7 +56,7 @@ enum { + #if BUILDFLAG(IS_CHROMEOS_ASH) || \ + ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ + BUILDFLAG(CHROMIUM_BRANDING)) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) DIR_USER_EXTERNAL_EXTENSIONS, // Directory for per-user external extensions + // on Chrome Mac and Chromium Linux. + // On Chrome OS, this path is used for OEM @@ -64,7 +64,7 @@ enum { // create it. #endif --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) DIR_STANDALONE_EXTERNAL_EXTENSIONS, // Directory for 'per-extension' // definition manifest files that // describe extensions which are to be @@ -22,8 +22,8 @@ DIR_CHROMEOS_CUSTOM_WALLPAPERS, // Directory where custom wallpapers // reside. #endif --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) DIR_NATIVE_MESSAGING, // System directory where native messaging host // manifest files are stored. DIR_USER_NATIVE_MESSAGING, // Directory with Native Messaging Hosts diff --git a/www/chromium/files/patch-chrome_common_chrome__paths__internal.h b/www/chromium/files/patch-chrome_common_chrome__paths__internal.h index b67db3825813..a4d0a1e1465c 100644 --- a/www/chromium/files/patch-chrome_common_chrome__paths__internal.h +++ b/www/chromium/files/patch-chrome_common_chrome__paths__internal.h @@ -1,11 +1,11 @@ ---- chrome/common/chrome_paths_internal.h.orig 2021-04-14 18:40:56 UTC +--- chrome/common/chrome_paths_internal.h.orig 2022-02-28 16:54:41 UTC +++ chrome/common/chrome_paths_internal.h @@ -45,7 +45,7 @@ void GetUserCacheDirectory(const base::FilePath& profi // Get the path to the user's documents directory. bool GetUserDocumentsDirectory(base::FilePath* result); --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Gets the path to a safe default download directory for a user. bool GetUserDownloadsDirectorySafe(base::FilePath* result); #endif diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.cc b/www/chromium/files/patch-chrome_common_chrome__switches.cc index c24c55f0a33d..d210de79a0fa 100644 --- a/www/chromium/files/patch-chrome_common_chrome__switches.cc +++ b/www/chromium/files/patch-chrome_common_chrome__switches.cc @@ -1,11 +1,19 @@ ---- chrome/common/chrome_switches.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/common/chrome_switches.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/common/chrome_switches.cc -@@ -801,7 +801,7 @@ const char kAllowNaClSocketAPI[] = "allow-n +@@ -790,14 +790,14 @@ const char kAllowNaClSocketAPI[] = "allow-n #endif - #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ -- defined(OS_WIN) || defined(OS_FUCHSIA) -+ defined(OS_WIN) || defined(OS_FUCHSIA) || defined(OS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) const char kEnableNewAppMenuIcon[] = "enable-new-app-menu-icon"; // Causes the browser to launch directly in guest mode. + const char kGuest[] = "guest"; + #endif + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + // Writes open and installed web apps for each profile to the specified file + // without launching a new browser window or tab. Pass a absolute file path to + // specify where to output the information. Can be used together with optional diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.h b/www/chromium/files/patch-chrome_common_chrome__switches.h index 951ad445ceb1..ad091d68a2c5 100644 --- a/www/chromium/files/patch-chrome_common_chrome__switches.h +++ b/www/chromium/files/patch-chrome_common_chrome__switches.h @@ -1,11 +1,17 @@ ---- chrome/common/chrome_switches.h.orig 2022-02-07 13:39:41 UTC +--- chrome/common/chrome_switches.h.orig 2022-02-28 16:54:41 UTC +++ chrome/common/chrome_switches.h -@@ -249,7 +249,7 @@ extern const char kAllowNaClSocketAPI[]; +@@ -247,12 +247,12 @@ extern const char kAllowNaClSocketAPI[]; #endif - #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ -- defined(OS_WIN) || defined(OS_FUCHSIA) -+ defined(OS_WIN) || defined(OS_FUCHSIA) || defined(OS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) extern const char kEnableNewAppMenuIcon[]; extern const char kGuest[]; #endif + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + extern const char kListApps[]; + extern const char kProfileBaseName[]; + #endif diff --git a/www/chromium/files/patch-chrome_common_extensions_command.cc b/www/chromium/files/patch-chrome_common_extensions_command.cc index ef7a1d6c1b37..1bfcbdc3573a 100644 --- a/www/chromium/files/patch-chrome_common_extensions_command.cc +++ b/www/chromium/files/patch-chrome_common_extensions_command.cc @@ -1,11 +1,11 @@ ---- chrome/common/extensions/command.cc.orig 2021-09-24 04:26:00 UTC +--- chrome/common/extensions/command.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/common/extensions/command.cc @@ -294,7 +294,7 @@ std::string Command::CommandPlatform() { return values::kKeybindingPlatformMac; #elif BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) return values::kKeybindingPlatformChromeOs; --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return values::kKeybindingPlatformLinux; #else return ""; diff --git a/www/chromium/files/patch-chrome_common_media_cdm__host__file__path.cc b/www/chromium/files/patch-chrome_common_media_cdm__host__file__path.cc index fc95a0ba855f..873a1ba191c0 100644 --- a/www/chromium/files/patch-chrome_common_media_cdm__host__file__path.cc +++ b/www/chromium/files/patch-chrome_common_media_cdm__host__file__path.cc @@ -1,11 +1,11 @@ ---- chrome/common/media/cdm_host_file_path.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/common/media/cdm_host_file_path.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/common/media/cdm_host_file_path.cc @@ -95,7 +95,7 @@ void AddCdmHostFilePaths( cdm_host_file_paths->emplace_back(chrome_framework_path, chrome_framework_sig_path); --#elif defined(OS_LINUX) || defined(OS_CHROMEOS) -+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) base::FilePath chrome_exe_dir; if (!base::PathService::Get(base::DIR_EXE, &chrome_exe_dir)) diff --git a/www/chromium/files/patch-chrome_common_pref__names.cc b/www/chromium/files/patch-chrome_common_pref__names.cc index 3bf6b7313996..5a5f6a362d4f 100644 --- a/www/chromium/files/patch-chrome_common_pref__names.cc +++ b/www/chromium/files/patch-chrome_common_pref__names.cc @@ -1,56 +1,56 @@ ---- chrome/common/pref_names.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/common/pref_names.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/common/pref_names.cc -@@ -1176,7 +1176,7 @@ const char kUseAshProxy[] = "lacros.proxy.use_ash_prox +@@ -1194,7 +1194,7 @@ const char kUseAshProxy[] = "lacros.proxy.use_ash_prox // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#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 -@@ -1279,7 +1279,7 @@ const char kShowUpdatePromotionInfoBar[] = +@@ -1297,7 +1297,7 @@ const char kShowUpdatePromotionInfoBar[] = // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) // 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"; -@@ -1753,7 +1753,7 @@ const char kDownloadDefaultDirectory[] = "download.def +@@ -1776,7 +1776,7 @@ const char kDownloadDefaultDirectory[] = "download.def const char kDownloadDirUpgraded[] = "download.directory_upgrade"; - #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -- defined(OS_MAC) -+ defined(OS_MAC) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) const char kOpenPdfDownloadInSystemReader[] = "download.open_pdf_in_system_reader"; #endif -@@ -2040,7 +2040,7 @@ const char kWebAppsPreferences[] = "web_apps.web_app_i +@@ -2065,7 +2065,7 @@ const char kWebAppsPreferences[] = "web_apps.web_app_i // its isolation requirements. const char kWebAppsIsolationState[] = "web_apps.isolation_state"; --#if defined(OS_WIN) || defined(OS_MAC) || \ -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) || \ - (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ + (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"; -@@ -2168,7 +2168,7 @@ const char kAmbientAuthenticationInPrivateModesEnabled +@@ -2193,7 +2193,7 @@ const char kAmbientAuthenticationInPrivateModesEnabled // requests. const char kBasicAuthOverHttpEnabled[] = "auth.basic_over_http_enabled"; --#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Boolean that specifies whether OK-AS-DELEGATE flag from KDC is respected // along with kAuthNegotiateDelegateAllowlist. const char kAuthNegotiateDelegateByKdcPolicy[] = -@@ -3124,7 +3124,7 @@ const char kBlockAutoplayEnabled[] = "media.block_auto +@@ -3117,7 +3117,7 @@ const char kBlockAutoplayEnabled[] = "media.block_auto const char kSandboxExternalProtocolBlocked[] = "profile.sandbox_external_protocol_blocked"; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Boolean that indicates if native notifications are allowed to be used in // place of Chrome notifications. Will be replaced by kAllowSystemNotifications. const char kAllowNativeNotifications[] = "native_notifications.allowed"; diff --git a/www/chromium/files/patch-chrome_common_pref__names.h b/www/chromium/files/patch-chrome_common_pref__names.h index 06441b388200..357f824911bc 100644 --- a/www/chromium/files/patch-chrome_common_pref__names.h +++ b/www/chromium/files/patch-chrome_common_pref__names.h @@ -1,56 +1,56 @@ ---- chrome/common/pref_names.h.orig 2022-02-07 13:39:41 UTC +--- chrome/common/pref_names.h.orig 2022-02-28 16:54:41 UTC +++ chrome/common/pref_names.h -@@ -371,7 +371,7 @@ extern const char kUseAshProxy[]; +@@ -375,7 +375,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 defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#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[]; -@@ -400,7 +400,7 @@ extern const char kShowUpdatePromotionInfoBar[]; +@@ -404,7 +404,7 @@ extern const char kShowUpdatePromotionInfoBar[]; #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) extern const char kUseCustomChromeFrame[]; #endif #if BUILDFLAG(ENABLE_PLUGINS) -@@ -583,7 +583,7 @@ extern const char kDownloadExtensionsToOpenByPolicy[]; +@@ -587,7 +587,7 @@ extern const char kDownloadExtensionsToOpenByPolicy[]; extern const char kDownloadAllowedURLsForOpenByPolicy[]; extern const char kDownloadDirUpgraded[]; - #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -- defined(OS_MAC) -+ defined(OS_MAC) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) extern const char kOpenPdfDownloadInSystemReader[]; #endif - #if defined(OS_ANDROID) -@@ -689,7 +689,7 @@ extern const char kWebAppsUninstalledDefaultChromeApps + #if BUILDFLAG(IS_ANDROID) +@@ -694,7 +694,7 @@ extern const char kWebAppsUninstalledDefaultChromeApps extern const char kWebAppsPreferences[]; extern const char kWebAppsIsolationState[]; --#if defined(OS_WIN) || defined(OS_MAC) || \ -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) || \ - (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ + (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) extern const char kWebAppsUrlHandlerInfo[]; #endif -@@ -830,7 +830,7 @@ extern const char kGloballyScopeHTTPAuthCacheEnabled[] +@@ -834,7 +834,7 @@ extern const char kGloballyScopeHTTPAuthCacheEnabled[] extern const char kAmbientAuthenticationInPrivateModesEnabled[]; extern const char kBasicAuthOverHttpEnabled[]; --#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) extern const char kAuthNegotiateDelegateByKdcPolicy[]; - #endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -1074,7 +1074,7 @@ extern const char kBlockAutoplayEnabled[]; +@@ -1068,7 +1068,7 @@ extern const char kBlockAutoplayEnabled[]; #endif extern const char kSandboxExternalProtocolBlocked[]; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) extern const char kAllowNativeNotifications[]; extern const char kAllowSystemNotifications[]; #endif diff --git a/www/chromium/files/patch-chrome_common_webui__url__constants.cc b/www/chromium/files/patch-chrome_common_webui__url__constants.cc index 97ad0864ac25..d4d4fff2e595 100644 --- a/www/chromium/files/patch-chrome_common_webui__url__constants.cc +++ b/www/chromium/files/patch-chrome_common_webui__url__constants.cc @@ -1,81 +1,81 @@ ---- chrome/common/webui_url_constants.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/common/webui_url_constants.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/common/webui_url_constants.cc -@@ -424,18 +424,18 @@ const char kOsUIFlagsURL[] = "os://flags"; +@@ -428,18 +428,18 @@ const char kOsUIFlagsURL[] = "os://flags"; const char kOsUIVersionURL[] = "os://version"; #endif --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) const char kChromeUIWebUIJsErrorHost[] = "webuijserror"; const char kChromeUIWebUIJsErrorURL[] = "chrome://webuijserror/"; #endif - #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ -- defined(OS_CHROMEOS) -+ defined(OS_CHROMEOS) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) const char kChromeUIConnectorsInternalsHost[] = "connectors-internals"; #endif - #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ -- defined(OS_CHROMEOS) -+ defined(OS_CHROMEOS) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) const char kChromeUIDiscardsHost[] = "discards"; const char kChromeUIDiscardsURL[] = "chrome://discards/"; #endif -@@ -450,14 +450,14 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-pr +@@ -454,14 +454,14 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-pr #endif - #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -- defined(OS_ANDROID) -+ defined(OS_ANDROID) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) const char kChromeUISandboxHost[] = "sandbox"; #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. - #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_FUCHSIA) || \ -- (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+ (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || \ +- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD) const char kChromeUIBrowserSwitchHost[] = "browser-switch"; const char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/"; const char kChromeUIEnterpriseProfileWelcomeHost[] = -@@ -472,7 +472,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro +@@ -476,7 +476,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro const char kChromeUIProfilePickerStartupQuery[] = "startup"; #endif --#if ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(TOOLKIT_VIEWS)) || \ -+#if ((defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(TOOLKIT_VIEWS)) || \ +-#if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \ ++#if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && \ + defined(TOOLKIT_VIEWS)) || \ defined(USE_AURA) const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog"; - #endif -@@ -661,18 +661,18 @@ const char* const kChromeHostURLs[] = { +@@ -668,18 +668,18 @@ const char* const kChromeHostURLs[] = { kChromeUIAssistantOptInHost, #endif - #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ -- defined(OS_CHROMEOS) -+ defined(OS_CHROMEOS) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) kChromeUIConnectorsInternalsHost, #endif - #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ -- defined(OS_CHROMEOS) -+ defined(OS_CHROMEOS) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) kChromeUIDiscardsHost, #endif - #if defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_ANDROID) + #if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_ANDROID) kChromeUILinuxProxyConfigHost, #endif - #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -- defined(OS_ANDROID) -+ defined(OS_ANDROID) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) kChromeUISandboxHost, #endif - #if defined(OS_WIN) -@@ -729,7 +729,7 @@ const char* const kChromeDebugURLs[] = { + #if BUILDFLAG(IS_WIN) +@@ -736,7 +736,7 @@ const char* const kChromeDebugURLs[] = { blink::kChromeUIGpuJavaCrashURL, kChromeUIJavaCrashURL, #endif --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) kChromeUIWebUIJsErrorURL, #endif kChromeUIQuitURL, diff --git a/www/chromium/files/patch-chrome_common_webui__url__constants.h b/www/chromium/files/patch-chrome_common_webui__url__constants.h index 4193da7b7956..2c6b78cbd6b5 100644 --- a/www/chromium/files/patch-chrome_common_webui__url__constants.h +++ b/www/chromium/files/patch-chrome_common_webui__url__constants.h @@ -1,50 +1,50 @@ ---- chrome/common/webui_url_constants.h.orig 2022-02-07 13:39:41 UTC +--- chrome/common/webui_url_constants.h.orig 2022-02-28 16:54:41 UTC +++ chrome/common/webui_url_constants.h -@@ -368,18 +368,18 @@ extern const char kOsUIFlagsURL[]; +@@ -371,18 +371,18 @@ extern const char kOsUIFlagsURL[]; extern const char kOsUIVersionURL[]; #endif --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) extern const char kChromeUIWebUIJsErrorHost[]; extern const char kChromeUIWebUIJsErrorURL[]; #endif - #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ -- defined(OS_CHROMEOS) -+ defined(OS_CHROMEOS) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) extern const char kChromeUIConnectorsInternalsHost[]; #endif - #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ -- defined(OS_CHROMEOS) || defined(OS_FUCHSIA) -+ defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) extern const char kChromeUIDiscardsHost[]; extern const char kChromeUIDiscardsURL[]; #endif -@@ -394,14 +394,14 @@ extern const char kChromeUILinuxProxyConfigHost[]; +@@ -397,14 +397,14 @@ extern const char kChromeUILinuxProxyConfigHost[]; #endif - #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -- defined(OS_ANDROID) -+ defined(OS_ANDROID) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) extern const char kChromeUISandboxHost[]; #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. - #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_FUCHSIA) || \ -- (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+ (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || \ +- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD) extern const char kChromeUIBrowserSwitchHost[]; extern const char kChromeUIBrowserSwitchURL[]; extern const char kChromeUIEnterpriseProfileWelcomeHost[]; -@@ -413,7 +413,7 @@ extern const char kChromeUIProfilePickerUrl[]; +@@ -416,7 +416,7 @@ extern const char kChromeUIProfilePickerUrl[]; extern const char kChromeUIProfilePickerStartupQuery[]; #endif --#if ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(TOOLKIT_VIEWS)) || \ -+#if ((defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(TOOLKIT_VIEWS)) || \ +-#if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \ ++#if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && \ + defined(TOOLKIT_VIEWS)) || \ defined(USE_AURA) extern const char kChromeUITabModalConfirmDialogHost[]; - #endif diff --git a/www/chromium/files/patch-chrome_renderer_chrome__render__frame__observer.cc b/www/chromium/files/patch-chrome_renderer_chrome__render__frame__observer.cc index 1a96c74f899d..0d6941cf82d8 100644 --- a/www/chromium/files/patch-chrome_renderer_chrome__render__frame__observer.cc +++ b/www/chromium/files/patch-chrome_renderer_chrome__render__frame__observer.cc @@ -1,11 +1,11 @@ ---- chrome/renderer/chrome_render_frame_observer.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/renderer/chrome_render_frame_observer.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/renderer/chrome_render_frame_observer.cc -@@ -281,7 +281,7 @@ void ChromeRenderFrameObserver::OnDestruct() { +@@ -280,7 +280,7 @@ void ChromeRenderFrameObserver::OnDestruct() { void ChromeRenderFrameObserver::DraggableRegionsChanged() { - #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ -- defined(OS_CHROMEOS) -+ defined(OS_CHROMEOS) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Only the main frame is allowed to control draggable regions, to avoid other // frames manipulate the regions in the browser process. if (!render_frame()->IsMainFrame()) diff --git a/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.cc b/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.cc index 4b99eb331ea7..4d85f8661941 100644 --- a/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.cc +++ b/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.cc @@ -1,20 +1,20 @@ ---- chrome/renderer/pepper/pepper_flash_font_file_host.cc.orig 2021-09-14 01:51:52 UTC +--- chrome/renderer/pepper/pepper_flash_font_file_host.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/renderer/pepper/pepper_flash_font_file_host.cc @@ -16,7 +16,7 @@ #include "ppapi/proxy/ppapi_messages.h" #include "ppapi/proxy/serialized_structs.h" --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_OPENBSD) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OPENBSD) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "components/services/font/public/cpp/font_loader.h" #include "pdf/font_table_linux.h" - #elif defined(OS_WIN) + #elif BUILDFLAG(IS_WIN) @@ -30,7 +30,7 @@ PepperFlashFontFileHost::PepperFlashFontFileHost( const ppapi::proxy::SerializedFontDescription& description, PP_PrivateFontCharset charset) : ResourceHost(host->GetPpapiHost(), instance, resource) { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // The global SkFontConfigInterface is configured and initialized with a // SkFontconfigInterface compatible font_service::FontLoader in // RendererBlinkPlatformImpl (called from RenderThreadImpl::Init) at startup @@ -22,8 +22,8 @@ void* buffer, size_t* length) { bool result = false; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (font_file_.IsValid()) { result = pdf::GetFontTable(font_file_.GetPlatformFile(), table, /*offset=*/0, diff --git a/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.h b/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.h index bd033f536abb..187f57b7afe2 100644 --- a/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.h +++ b/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.h @@ -1,20 +1,20 @@ ---- chrome/renderer/pepper/pepper_flash_font_file_host.h.orig 2022-02-07 13:39:41 UTC +--- chrome/renderer/pepper/pepper_flash_font_file_host.h.orig 2022-02-28 16:54:41 UTC +++ chrome/renderer/pepper/pepper_flash_font_file_host.h @@ -12,7 +12,7 @@ #include "ppapi/c/private/pp_private_font_charset.h" #include "ppapi/host/resource_host.h" --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_OPENBSD) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OPENBSD) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "base/files/file.h" - #elif defined(OS_WIN) + #elif BUILDFLAG(IS_WIN) #include "third_party/skia/include/core/SkRefCnt.h" @@ -52,7 +52,7 @@ class PepperFlashFontFileHost : public ppapi::host::Re uint32_t table); bool GetFontData(uint32_t table, void* buffer, size_t* length); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) base::File font_file_; - #elif defined(OS_WIN) + #elif BUILDFLAG(IS_WIN) sk_sp<SkTypeface> typeface_; diff --git a/www/chromium/files/patch-chrome_service_cloud__print_print__system.cc b/www/chromium/files/patch-chrome_service_cloud__print_print__system.cc deleted file mode 100644 index d2222fe9cabb..000000000000 --- a/www/chromium/files/patch-chrome_service_cloud__print_print__system.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/service/cloud_print/print_system.cc.orig 2021-04-14 18:40:56 UTC -+++ chrome/service/cloud_print/print_system.cc -@@ -36,7 +36,7 @@ std::string PrintSystem::GenerateProxyId() { - return base::GenerateGUID(); - } - --#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(USE_CUPS) -+#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && !defined(USE_CUPS) - scoped_refptr<PrintSystem> PrintSystem::CreateInstance( - const base::DictionaryValue*) { - return nullptr; diff --git a/www/chromium/files/patch-chrome_services_file__util_public_mojom_safe__document__analyzer__mojom__traits.h b/www/chromium/files/patch-chrome_services_file__util_public_mojom_safe__document__analyzer__mojom__traits.h index 901ed553c835..541fef965169 100644 --- a/www/chromium/files/patch-chrome_services_file__util_public_mojom_safe__document__analyzer__mojom__traits.h +++ b/www/chromium/files/patch-chrome_services_file__util_public_mojom_safe__document__analyzer__mojom__traits.h @@ -1,11 +1,11 @@ ---- chrome/services/file_util/public/mojom/safe_document_analyzer_mojom_traits.h.orig 2022-02-07 13:39:41 UTC +--- chrome/services/file_util/public/mojom/safe_document_analyzer_mojom_traits.h.orig 2022-02-28 16:54:41 UTC +++ chrome/services/file_util/public/mojom/safe_document_analyzer_mojom_traits.h -@@ -14,7 +14,7 @@ - #include "mojo/public/cpp/bindings/enum_traits.h" +@@ -15,7 +15,7 @@ #include "mojo/public/cpp/bindings/struct_traits.h" --#if !BUILDFLAG(FULL_SAFE_BROWSING) || (!defined(OS_LINUX) && !defined(OS_WIN)) -+#if !BUILDFLAG(FULL_SAFE_BROWSING) || (!defined(OS_LINUX) && !defined(OS_WIN) && !defined(OS_BSD)) + #if !BUILDFLAG(FULL_SAFE_BROWSING) || \ +- (!BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_WIN)) ++ (!BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_BSD)) #error BUILDFLAG(FULL_SAFE_BROWSING) should be set and either OS_LINUX or OS_WIN defined. #endif diff --git a/www/chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc b/www/chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc index 83fac7acf3c6..1aea771027f4 100644 --- a/www/chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc +++ b/www/chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc @@ -1,11 +1,11 @@ ---- chrome/services/printing/print_backend_service_impl.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/services/printing/print_backend_service_impl.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/services/printing/print_backend_service_impl.cc -@@ -404,7 +404,7 @@ void PrintBackendServiceImpl::UpdatePrintSettings( +@@ -484,7 +484,7 @@ void PrintBackendServiceImpl::UpdatePrintSettings( crash_keys_ = std::make_unique<crash_keys::ScopedPrinterInfo>( print_backend_->GetPrinterDriverInfo(printer_name)); --#if defined(OS_LINUX) && defined(USE_CUPS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_CUPS) +-#if BUILDFLAG(IS_LINUX) && defined(USE_CUPS) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(USE_CUPS) // Try to fill in advanced settings based upon basic info options. PrinterBasicInfo basic_info; if (print_backend_->GetPrinterBasicInfo(printer_name, &basic_info) == diff --git a/www/chromium/files/patch-chrome_services_speech_audio__source__fetcher__impl.cc b/www/chromium/files/patch-chrome_services_speech_audio__source__fetcher__impl.cc index 5472435c95a7..6a8602dc1797 100644 --- a/www/chromium/files/patch-chrome_services_speech_audio__source__fetcher__impl.cc +++ b/www/chromium/files/patch-chrome_services_speech_audio__source__fetcher__impl.cc @@ -1,11 +1,11 @@ ---- chrome/services/speech/audio_source_fetcher_impl.cc.orig 2021-09-24 04:26:00 UTC +--- chrome/services/speech/audio_source_fetcher_impl.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/services/speech/audio_source_fetcher_impl.cc @@ -68,7 +68,7 @@ void AudioSourceFetcherImpl::Start( // TODO(crbug.com/1185978): Check implementation / sandbox policy on Mac and // Windows. --#if defined(OS_CHROMEOS) || defined(OS_LINUX) -+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) is_started_ = true; // Initialize the AudioCapturerSource with |this| as the CaptureCallback, // get the parameters for the device ID, then start audio capture. diff --git a/www/chromium/files/patch-chrome_test_BUILD.gn b/www/chromium/files/patch-chrome_test_BUILD.gn index b13419bcfc7c..37cdecf1bd06 100644 --- a/www/chromium/files/patch-chrome_test_BUILD.gn +++ b/www/chromium/files/patch-chrome_test_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/test/BUILD.gn.orig 2022-02-07 13:39:41 UTC +--- chrome/test/BUILD.gn.orig 2022-02-28 16:54:41 UTC +++ chrome/test/BUILD.gn -@@ -8820,7 +8820,7 @@ test("chrome_app_unittests") { +@@ -8875,7 +8875,7 @@ test("chrome_app_unittests") { "//components/safe_browsing:buildflags", "//pdf:pdf_ppapi", ] diff --git a/www/chromium/files/patch-chrome_test_chromedriver_key__converter__unittest.cc b/www/chromium/files/patch-chrome_test_chromedriver_key__converter__unittest.cc new file mode 100644 index 000000000000..d8ebede5a9bc --- /dev/null +++ b/www/chromium/files/patch-chrome_test_chromedriver_key__converter__unittest.cc @@ -0,0 +1,20 @@ +--- chrome/test/chromedriver/key_converter_unittest.cc.orig 2022-02-28 16:54:41 UTC ++++ chrome/test/chromedriver/key_converter_unittest.cc +@@ -246,7 +246,7 @@ TEST(KeyConverter, ToggleModifiers) { + CheckEventsReleaseModifiers(keys, key_events); + } + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + // Fails on bots: crbug.com/174962 + #define MAYBE_AllEnglishKeyboardSymbols DISABLED_AllEnglishKeyboardSymbols + #else +@@ -303,7 +303,7 @@ TEST(KeyConverter, AllEnglishKeyboardTextChars) { + TEST(KeyConverter, AllSpecialWebDriverKeysOnEnglishKeyboard) { + ui::ScopedKeyboardLayout keyboard_layout(ui::KEYBOARD_LAYOUT_ENGLISH_US); + const char kTextForKeys[] = { +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_LINUX) + 0, 0, 0, 0, '\t', 0, '\r', '\r', 0, 0, 0, 0, 0, + #else + 0, 0, 0, 0, 0, 0, '\r', '\r', 0, 0, 0, 0, 0, diff --git a/www/chromium/files/patch-chrome_test_chromedriver_keycode__text__conversion__unittest.cc b/www/chromium/files/patch-chrome_test_chromedriver_keycode__text__conversion__unittest.cc new file mode 100644 index 000000000000..c0bf08adb434 --- /dev/null +++ b/www/chromium/files/patch-chrome_test_chromedriver_keycode__text__conversion__unittest.cc @@ -0,0 +1,20 @@ +--- chrome/test/chromedriver/keycode_text_conversion_unittest.cc.orig 2022-02-28 16:54:41 UTC ++++ chrome/test/chromedriver/keycode_text_conversion_unittest.cc +@@ -64,7 +64,7 @@ std::string ConvertKeyCodeToTextNoError(ui::KeyboardCo + + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + // Fails on bots: crbug.com/174962 + #define MAYBE_KeyCodeToText DISABLED_KeyCodeToText + #else +@@ -101,7 +101,7 @@ TEST(KeycodeTextConversionTest, MAYBE_KeyCodeToText) { + + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + // Fails on bots: crbug.com/174962 + #define MAYBE_CharToKeyCode DISABLED_CharToKeyCode + #else diff --git a/www/chromium/files/patch-chrome_updater_app_app__install.cc b/www/chromium/files/patch-chrome_updater_app_app__install.cc index 79395854a082..5918f61e7b11 100644 --- a/www/chromium/files/patch-chrome_updater_app_app__install.cc +++ b/www/chromium/files/patch-chrome_updater_app_app__install.cc @@ -1,11 +1,11 @@ ---- chrome/updater/app/app_install.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/updater/app/app_install.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/updater/app/app_install.cc @@ -155,7 +155,7 @@ void AppInstall::WakeCandidate() { update_service_internal, base::WrapRefCounted(this))); } --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // TODO(crbug.com/1276114) - implement. void AppInstall::WakeCandidateDone() { NOTIMPLEMENTED(); diff --git a/www/chromium/files/patch-chrome_updater_app_app__uninstall.cc b/www/chromium/files/patch-chrome_updater_app_app__uninstall.cc index 400d63f06daf..141b761283b9 100644 --- a/www/chromium/files/patch-chrome_updater_app_app__uninstall.cc +++ b/www/chromium/files/patch-chrome_updater_app_app__uninstall.cc @@ -1,11 +1,11 @@ ---- chrome/updater/app/app_uninstall.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/updater/app/app_uninstall.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/updater/app/app_uninstall.cc -@@ -31,7 +31,7 @@ +@@ -32,7 +32,7 @@ #include "chrome/updater/win/setup/uninstall.h" - #elif defined(OS_MAC) + #elif BUILDFLAG(IS_MAC) #include "chrome/updater/mac/setup/setup.h" --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/updater/linux/setup/setup.h" #endif diff --git a/www/chromium/files/patch-chrome_updater_configurator.cc b/www/chromium/files/patch-chrome_updater_configurator.cc index e54d57641c1f..b7adbc5066fc 100644 --- a/www/chromium/files/patch-chrome_updater_configurator.cc +++ b/www/chromium/files/patch-chrome_updater_configurator.cc @@ -1,11 +1,11 @@ ---- chrome/updater/configurator.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/updater/configurator.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/updater/configurator.cc -@@ -30,7 +30,7 @@ +@@ -37,7 +37,7 @@ #include "chrome/updater/win/net/network.h" - #elif defined(OS_MAC) + #elif BUILDFLAG(IS_MAC) #include "chrome/updater/mac/net/network.h" --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/updater/linux/net/network.h" #endif diff --git a/www/chromium/files/patch-chrome_updater_device__management_cloud__policy__util.cc b/www/chromium/files/patch-chrome_updater_device__management_cloud__policy__util.cc index f3b66083b6c1..9e31a013f94f 100644 --- a/www/chromium/files/patch-chrome_updater_device__management_cloud__policy__util.cc +++ b/www/chromium/files/patch-chrome_updater_device__management_cloud__policy__util.cc @@ -1,11 +1,11 @@ ---- chrome/updater/device_management/cloud_policy_util.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/updater/device_management/cloud_policy_util.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/updater/device_management/cloud_policy_util.cc @@ -22,7 +22,7 @@ #include <wincred.h> #endif --#if defined(OS_LINUX) || defined(OS_MAC) -+#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) #include <pwd.h> #include <sys/types.h> #include <unistd.h> @@ -13,8 +13,8 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include <limits.h> // For HOST_NAME_MAX #endif @@ -22,8 +22,8 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "base/system/sys_info.h" #endif @@ -31,8 +31,8 @@ std::string GetMachineName() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) char hostname[HOST_NAME_MAX]; if (gethostname(hostname, HOST_NAME_MAX) == 0) // Success. return hostname; @@ -40,8 +40,8 @@ } std::string GetOSVersion() { --#if defined(OS_LINUX) || defined(OS_MAC) -+#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) return base::SysInfo::OperatingSystemVersion(); - #elif defined(OS_WIN) + #elif BUILDFLAG(IS_WIN) base::win::OSInfo::VersionNumber version_number = diff --git a/www/chromium/files/patch-chrome_updater_device__management_dm__client.cc b/www/chromium/files/patch-chrome_updater_device__management_dm__client.cc index 3a02b2047746..d86f1d18d3a7 100644 --- a/www/chromium/files/patch-chrome_updater_device__management_dm__client.cc +++ b/www/chromium/files/patch-chrome_updater_device__management_dm__client.cc @@ -1,11 +1,11 @@ ---- chrome/updater/device_management/dm_client.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/updater/device_management/dm_client.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/updater/device_management/dm_client.cc @@ -36,7 +36,7 @@ #include "chrome/updater/win/net/network.h" - #elif defined(OS_MAC) + #elif BUILDFLAG(IS_MAC) #include "chrome/updater/mac/net/network.h" --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/updater/linux/net/network.h" #endif diff --git a/www/chromium/files/patch-chrome_updater_device__management_dm__storage.cc b/www/chromium/files/patch-chrome_updater_device__management_dm__storage.cc index 1335dc38d23e..7cc6932e9745 100644 --- a/www/chromium/files/patch-chrome_updater_device__management_dm__storage.cc +++ b/www/chromium/files/patch-chrome_updater_device__management_dm__storage.cc @@ -1,11 +1,11 @@ ---- chrome/updater/device_management/dm_storage.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/updater/device_management/dm_storage.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/updater/device_management/dm_storage.cc -@@ -69,7 +69,7 @@ bool DeleteObsoletePolicies(const base::FilePath& cach +@@ -70,7 +70,7 @@ bool DeleteObsoletePolicies(const base::FilePath& cach } // namespace --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // crbug.com/1276162 - implement. DMStorage::DMStorage(const base::FilePath& policy_cache_root) : policy_cache_root_(policy_cache_root) { diff --git a/www/chromium/files/patch-chrome_updater_installer.cc b/www/chromium/files/patch-chrome_updater_installer.cc index d4901982d112..07a35f01a7cd 100644 --- a/www/chromium/files/patch-chrome_updater_installer.cc +++ b/www/chromium/files/patch-chrome_updater_installer.cc @@ -1,11 +1,11 @@ ---- chrome/updater/installer.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/updater/installer.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/updater/installer.cc -@@ -267,7 +267,7 @@ absl::optional<base::FilePath> Installer::GetCurrentIn +@@ -225,7 +225,7 @@ absl::optional<base::FilePath> Installer::GetCurrentIn return path->AppendASCII(pv_.GetString()); } --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) Installer::Result Installer::RunApplicationInstaller( const base::FilePath& /*app_installer*/, const std::string& /*arguments*/, diff --git a/www/chromium/files/patch-chrome_updater_lib__util.cc b/www/chromium/files/patch-chrome_updater_lib__util.cc index f6df3ab172bc..cc827bcb8c96 100644 --- a/www/chromium/files/patch-chrome_updater_lib__util.cc +++ b/www/chromium/files/patch-chrome_updater_lib__util.cc @@ -1,11 +1,11 @@ ---- chrome/updater/lib_util.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/updater/lib_util.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/updater/lib_util.cc @@ -11,7 +11,7 @@ namespace updater { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) std::string UnescapeURLComponent(base::StringPiece escaped_text) { return base::UnescapeURLComponent( diff --git a/www/chromium/files/patch-chrome_updater_updater.cc b/www/chromium/files/patch-chrome_updater_updater.cc index d00e7c795110..a584273c3288 100644 --- a/www/chromium/files/patch-chrome_updater_updater.cc +++ b/www/chromium/files/patch-chrome_updater_updater.cc @@ -1,11 +1,11 @@ ---- chrome/updater/updater.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/updater/updater.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/updater/updater.cc @@ -38,7 +38,7 @@ #include "chrome/updater/win/win_util.h" - #elif defined(OS_MAC) + #elif BUILDFLAG(IS_MAC) #include "chrome/updater/app/server/mac/server.h" --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/updater/app/server/linux/server.h" #endif diff --git a/www/chromium/files/patch-chrome_updater_util.cc b/www/chromium/files/patch-chrome_updater_util.cc index 5273fcc2701f..aecad70b06c4 100644 --- a/www/chromium/files/patch-chrome_updater_util.cc +++ b/www/chromium/files/patch-chrome_updater_util.cc @@ -1,11 +1,11 @@ ---- chrome/updater/util.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/updater/util.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/updater/util.cc -@@ -213,7 +213,7 @@ GURL AppendQueryParameter(const GURL& url, +@@ -219,7 +219,7 @@ GURL AppendQueryParameter(const GURL& url, return url.ReplaceComponents(replacements); } --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // TODO(crbug.com/1276188) - implement the functions below. absl::optional<base::FilePath> GetUpdaterFolderPath(UpdaterScope scope) { diff --git a/www/chromium/files/patch-chrome_utility_services.cc b/www/chromium/files/patch-chrome_utility_services.cc index 1971b33322ad..a39bda018943 100644 --- a/www/chromium/files/patch-chrome_utility_services.cc +++ b/www/chromium/files/patch-chrome_utility_services.cc @@ -1,29 +1,29 @@ ---- chrome/utility/services.cc.orig 2022-02-07 13:39:41 UTC +--- chrome/utility/services.cc.orig 2022-02-28 16:54:41 UTC +++ chrome/utility/services.cc -@@ -65,7 +65,7 @@ +@@ -64,7 +64,7 @@ #include "chrome/services/file_util/file_util_service.h" // nogncheck #endif --#if BUILDFLAG(FULL_SAFE_BROWSING) && (defined(OS_LINUX) || defined(OS_WIN)) -+#if BUILDFLAG(FULL_SAFE_BROWSING) && (defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)) +-#if BUILDFLAG(FULL_SAFE_BROWSING) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)) ++#if BUILDFLAG(FULL_SAFE_BROWSING) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)) #include "chrome/services/file_util/document_analysis_service.h" // nogncheck #endif -@@ -219,7 +219,7 @@ auto RunCupsIppParser( +@@ -218,7 +218,7 @@ auto RunCupsIppParser( } #endif --#if BUILDFLAG(FULL_SAFE_BROWSING) && (defined(OS_LINUX) || defined(OS_WIN)) -+#if BUILDFLAG(FULL_SAFE_BROWSING) && (defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)) +-#if BUILDFLAG(FULL_SAFE_BROWSING) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)) ++#if BUILDFLAG(FULL_SAFE_BROWSING) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)) auto RunDocumentAnalysis( mojo::PendingReceiver<chrome::mojom::DocumentAnalysisService> receiver) { return std::make_unique<DocumentAnalysisService>(std::move(receiver)); -@@ -383,7 +383,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -382,7 +382,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& services.Add(RunFileUtil); #endif --#if BUILDFLAG(FULL_SAFE_BROWSING) && (defined(OS_LINUX) || defined(OS_WIN)) -+#if BUILDFLAG(FULL_SAFE_BROWSING) && (defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)) +-#if BUILDFLAG(FULL_SAFE_BROWSING) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)) ++#if BUILDFLAG(FULL_SAFE_BROWSING) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)) services.Add(RunDocumentAnalysis); #endif diff --git a/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc b/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc index a768a0005442..8d74b6fbcf89 100644 --- a/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc +++ b/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc @@ -1,65 +1,65 @@ ---- chromecast/browser/cast_browser_main_parts.cc.orig 2022-02-07 13:39:41 UTC +--- chromecast/browser/cast_browser_main_parts.cc.orig 2022-02-28 16:54:41 UTC +++ chromecast/browser/cast_browser_main_parts.cc -@@ -90,7 +90,7 @@ +@@ -94,7 +94,7 @@ #include "ui/base/ui_base_switches.h" #include "ui/gl/gl_switches.h" --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include <fontconfig/fontconfig.h> #include <signal.h> #include <sys/prctl.h> -@@ -145,7 +145,7 @@ +@@ -149,7 +149,7 @@ #include "extensions/browser/extension_prefs.h" // nogncheck #endif --#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(USE_OZONE) -+#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(USE_OZONE) +-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(USE_OZONE) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(USE_OZONE) #include "chromecast/browser/exo/wayland_server_controller.h" #endif -@@ -281,7 +281,7 @@ class CastViewsDelegate : public views::ViewsDelegate +@@ -285,7 +285,7 @@ class CastViewsDelegate : public views::ViewsDelegate #endif // defined(USE_AURA) --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) base::FilePath GetApplicationFontsDir() { std::unique_ptr<base::Environment> env(base::Environment::Create()); -@@ -327,7 +327,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { +@@ -331,7 +331,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { {cc::switches::kDisableThreadedAnimation, ""}, - #endif // defined(OS_ANDROID) + #endif // BUILDFLAG(IS_ANDROID) #endif // BUILDFLAG(IS_CAST_AUDIO_ONLY) --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #if defined(ARCH_CPU_X86_FAMILY) // This is needed for now to enable the x11 Ozone platform to work with // current Linux/NVidia OpenGL drivers. -@@ -520,7 +520,7 @@ void CastBrowserMainParts::ToolkitInitialized() { +@@ -523,7 +523,7 @@ void CastBrowserMainParts::ToolkitInitialized() { views_delegate_ = std::make_unique<CastViewsDelegate>(); #endif // defined(USE_AURA) --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) base::FilePath dir_font = GetApplicationFontsDir(); const FcChar8 *dir_font_char8 = reinterpret_cast<const FcChar8*>(dir_font.value().data()); if (!FcConfigAppFontAddDir(gfx::GetGlobalFontConfig(), dir_font_char8)) { -@@ -748,7 +748,7 @@ int CastBrowserMainParts::PreMainMessageLoopRun() { +@@ -757,7 +757,7 @@ int CastBrowserMainParts::PreMainMessageLoopRun() { cast_browser_process_->browser_context()); #endif --#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(USE_OZONE) -+#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(USE_OZONE) +-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(USE_OZONE) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(USE_OZONE) wayland_server_controller_ = std::make_unique<WaylandServerController>(window_manager_.get()); #endif -@@ -817,7 +817,7 @@ void CastBrowserMainParts::PostMainMessageLoopRun() { +@@ -832,7 +832,7 @@ void CastBrowserMainParts::PostMainMessageLoopRun() { cast_browser_process_->cast_service()->Stop(); --#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(USE_OZONE) -+#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(USE_OZONE) +-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(USE_OZONE) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(USE_OZONE) wayland_server_controller_.reset(); #endif #if BUILDFLAG(ENABLE_CHROMECAST_EXTENSIONS) diff --git a/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc b/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc index f9a75f6d219e..143f7dc5e906 100644 --- a/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc +++ b/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc @@ -1,29 +1,29 @@ ---- chromecast/browser/cast_content_browser_client.cc.orig 2022-02-07 13:39:41 UTC +--- chromecast/browser/cast_content_browser_client.cc.orig 2022-02-28 16:54:41 UTC +++ chromecast/browser/cast_content_browser_client.cc -@@ -132,7 +132,7 @@ +@@ -133,7 +133,7 @@ #include "extensions/common/constants.h" // nogncheck #endif --#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(USE_OZONE) -+#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(USE_OZONE) +-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(USE_OZONE) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(USE_OZONE) #include "chromecast/browser/webview/webview_controller.h" - #endif // (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(USE_OZONE) + #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(USE_OZONE) -@@ -475,7 +475,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS +@@ -476,7 +476,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS switches::kAudioOutputChannels)); } } else if (process_type == switches::kGpuProcess) { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Necessary for accelerated 2d canvas. By default on Linux, Chromium // assumes GLES2 contexts can be lost to a power-save mode, which breaks GPU // canvas apps. -@@ -867,7 +867,7 @@ CastContentBrowserClient::CreateThrottlesForNavigation +@@ -872,7 +872,7 @@ CastContentBrowserClient::CreateThrottlesForNavigation handle, general_audience_browsing_service_.get())); } --#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(USE_OZONE) -+#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(USE_OZONE) +-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(USE_OZONE) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(USE_OZONE) auto webview_throttle = WebviewController::MaybeGetNavigationThrottle(handle); if (webview_throttle) { throttles.push_back(std::move(webview_throttle)); diff --git a/www/chromium/files/patch-chromecast_browser_cast__content__browser__client__receiver__bindings.cc b/www/chromium/files/patch-chromecast_browser_cast__content__browser__client__receiver__bindings.cc index ab074448aa78..cc85c5c0e2da 100644 --- a/www/chromium/files/patch-chromecast_browser_cast__content__browser__client__receiver__bindings.cc +++ b/www/chromium/files/patch-chromecast_browser_cast__content__browser__client__receiver__bindings.cc @@ -1,20 +1,20 @@ ---- chromecast/browser/cast_content_browser_client_receiver_bindings.cc.orig 2022-02-07 13:39:41 UTC +--- chromecast/browser/cast_content_browser_client_receiver_bindings.cc.orig 2022-02-28 16:54:41 UTC +++ chromecast/browser/cast_content_browser_client_receiver_bindings.cc @@ -35,7 +35,7 @@ #include "media/mojo/services/media_service.h" // nogncheck #endif // BUILDFLAG(ENABLE_CAST_RENDERER) --#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(USE_OZONE) -+#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(USE_OZONE) +-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(USE_OZONE) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(USE_OZONE) #include "chromecast/browser/webview/js_channel_service.h" #include "chromecast/common/mojom/js_channel.mojom.h" #endif -@@ -222,7 +222,7 @@ void CastContentBrowserClient::RunServiceInstance( +@@ -227,7 +227,7 @@ void CastContentBrowserClient::RunServiceInstance( void CastContentBrowserClient::BindHostReceiverForRenderer( content::RenderProcessHost* render_process_host, mojo::GenericPendingReceiver receiver) { --#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(USE_OZONE) -+#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(USE_OZONE) +-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(USE_OZONE) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(USE_OZONE) if (auto r = receiver.As<::chromecast::mojom::JsChannelBindingProvider>()) { JsChannelService::Create(render_process_host, std::move(r), base::ThreadTaskRunnerHandle::Get()); diff --git a/www/chromium/files/patch-chromecast_media_base_default__monotonic__clock.cc b/www/chromium/files/patch-chromecast_media_base_default__monotonic__clock.cc index 081862248bb9..effe33ff128d 100644 --- a/www/chromium/files/patch-chromecast_media_base_default__monotonic__clock.cc +++ b/www/chromium/files/patch-chromecast_media_base_default__monotonic__clock.cc @@ -1,20 +1,20 @@ ---- chromecast/media/base/default_monotonic_clock.cc.orig 2022-02-07 13:39:41 UTC +--- chromecast/media/base/default_monotonic_clock.cc.orig 2022-02-28 16:54:41 UTC +++ chromecast/media/base/default_monotonic_clock.cc @@ -11,7 +11,7 @@ #include "base/time/time.h" #include "build/build_config.h" --#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "chromecast/media/base/buildflags.h" - #endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) - -@@ -27,7 +27,7 @@ std::unique_ptr<MonotonicClock> MonotonicClock::Create + #endif // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || + // BUILDFLAG(IS_CHROMEOS) +@@ -28,7 +28,7 @@ std::unique_ptr<MonotonicClock> MonotonicClock::Create return std::make_unique<DefaultMonotonicClock>(); } --#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) int64_t MonotonicClockNow() { timespec now = {0, 0}; #if BUILDFLAG(MEDIA_CLOCK_MONOTONIC_RAW) diff --git a/www/chromium/files/patch-chromecast_renderer_cast__content__renderer__client.cc b/www/chromium/files/patch-chromecast_renderer_cast__content__renderer__client.cc index a12a991f74ea..24d77aa10902 100644 --- a/www/chromium/files/patch-chromecast_renderer_cast__content__renderer__client.cc +++ b/www/chromium/files/patch-chromecast_renderer_cast__content__renderer__client.cc @@ -1,11 +1,11 @@ ---- chromecast/renderer/cast_content_renderer_client.cc.orig 2022-02-07 13:39:41 UTC +--- chromecast/renderer/cast_content_renderer_client.cc.orig 2022-02-28 16:54:41 UTC +++ chromecast/renderer/cast_content_renderer_client.cc -@@ -192,7 +192,7 @@ void CastContentRendererClient::RenderFrameCreated( +@@ -193,7 +193,7 @@ void CastContentRendererClient::RenderFrameCreated( dispatcher->OnRenderFrameCreated(render_frame); #endif --#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(USE_OZONE) -+#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(USE_OZONE) +-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(USE_OZONE) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(USE_OZONE) // JsChannelBindings destroys itself when the RenderFrame is destroyed. JsChannelBindings::Create(render_frame); #endif diff --git a/www/chromium/files/patch-components_autofill__payments__strings.grdp b/www/chromium/files/patch-components_autofill__payments__strings.grdp new file mode 100644 index 000000000000..1de6884e7991 --- /dev/null +++ b/www/chromium/files/patch-components_autofill__payments__strings.grdp @@ -0,0 +1,11 @@ +--- components/autofill_payments_strings.grdp.orig 2022-02-28 16:54:41 UTC ++++ components/autofill_payments_strings.grdp +@@ -118,7 +118,7 @@ + <message name="IDS_AUTOFILL_FIX_FLOW_PROMPT_SAVE_CARD_LABEL" desc="Text to show on the button to save the card to Google when the fix flow dialog is shown after the Autofill save card prompt." formatter_data="android_java"> + Save card + </message> +- <if expr="is_linux and not chromeos"> ++ <if expr="is_posix and not chromeos"> + <then> + <message name="IDS_AUTOFILL_SAVE_CARD_PROMPT_TITLE_TO_CLOUD" desc="Title text for the Autofill save card prompt when the card is to be saved by uploading it to Google Payments and also saved locally. The prompt can be either a bubble or an infobar."> + Do you want to save this card to your Google Account? diff --git a/www/chromium/files/patch-components_autofill_core_browser_autofill__external__delegate.cc b/www/chromium/files/patch-components_autofill_core_browser_autofill__external__delegate.cc index a3b49c36594c..45dda8a49830 100644 --- a/www/chromium/files/patch-components_autofill_core_browser_autofill__external__delegate.cc +++ b/www/chromium/files/patch-components_autofill_core_browser_autofill__external__delegate.cc @@ -1,11 +1,11 @@ ---- components/autofill/core/browser/autofill_external_delegate.cc.orig 2022-02-07 13:39:41 UTC +--- components/autofill/core/browser/autofill_external_delegate.cc.orig 2022-02-28 16:54:41 UTC +++ components/autofill/core/browser/autofill_external_delegate.cc @@ -130,7 +130,7 @@ void AutofillExternalDelegate::OnSuggestionsReturned( // Append the "Hide Suggestions" menu item for only Autofill Address and // Autocomplete popups. - #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_APPLE) || \ -- defined(OS_CHROMEOS) -+ defined(OS_CHROMEOS) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_APPLE) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (base::FeatureList::IsEnabled( features::kAutofillEnableHideSuggestionsUI)) { // If the user has selected a suggestion, it indicates the suggestions are diff --git a/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc b/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc index 739b9b239db4..0eb22282bd0e 100644 --- a/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc +++ b/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc @@ -1,11 +1,12 @@ ---- components/autofill/core/browser/personal_data_manager.cc.orig 2022-02-07 13:39:41 UTC +--- components/autofill/core/browser/personal_data_manager.cc.orig 2022-02-28 16:54:41 UTC +++ components/autofill/core/browser/personal_data_manager.cc -@@ -2097,7 +2097,7 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp +@@ -2107,7 +2107,8 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. - #if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_WIN) || \ -- defined(OS_APPLE) || defined(OS_FUCHSIA) -+ defined(OS_APPLE) || defined(OS_FUCHSIA) || defined(OS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ +- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FUCHSIA) || \ ++ BUILDFLAG(IS_BSD) // This option should only be shown for users that have not enabled the Sync // Feature and that have server credit cards available. if (!sync_service_ || sync_service_->IsSyncFeatureEnabled() || diff --git a/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc b/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc index 0de49806c9a5..086f5b3bfaa3 100644 --- a/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc +++ b/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc @@ -1,11 +1,11 @@ ---- components/autofill/core/common/autofill_payments_features.cc.orig 2022-02-07 13:39:41 UTC +--- components/autofill/core/common/autofill_payments_features.cc.orig 2022-02-28 16:54:41 UTC +++ components/autofill/core/common/autofill_payments_features.cc -@@ -172,7 +172,7 @@ const base::Feature kAutofillUpstreamAllowAllEmailDoma +@@ -180,7 +180,7 @@ const base::Feature kAutofillUpstreamAllowAllEmailDoma bool ShouldShowImprovedUserConsentForCreditCardSave() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_WIN) || defined(OS_APPLE) || \ -+#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_BSD) || \ - (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || \ ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) || \ + (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) // The new user consent UI is fully launched on MacOS, Windows and Linux. return true; diff --git a/www/chromium/files/patch-components_autofill_core_common_autofill__util.cc b/www/chromium/files/patch-components_autofill_core_common_autofill__util.cc index d7e7f2e7f1a9..9f96534f7fb4 100644 --- a/www/chromium/files/patch-components_autofill_core_common_autofill__util.cc +++ b/www/chromium/files/patch-components_autofill_core_common_autofill__util.cc @@ -1,11 +1,11 @@ ---- components/autofill/core/common/autofill_util.cc.orig 2022-02-07 13:39:41 UTC +--- components/autofill/core/common/autofill_util.cc.orig 2022-02-28 16:54:41 UTC +++ components/autofill/core/common/autofill_util.cc @@ -154,7 +154,7 @@ bool SanitizedFieldIsEmpty(const std::u16string& value bool ShouldAutoselectFirstSuggestionOnArrowDown() { - #if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || \ -- defined(OS_CHROMEOS) -+ defined(OS_CHROMEOS) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) return true; #else return false; diff --git a/www/chromium/files/patch-components_cast__channel_cast__message__util.cc b/www/chromium/files/patch-components_cast__channel_cast__message__util.cc index a8341c0a790b..5ae76b075f2d 100644 --- a/www/chromium/files/patch-components_cast__channel_cast__message__util.cc +++ b/www/chromium/files/patch-components_cast__channel_cast__message__util.cc @@ -1,11 +1,11 @@ ---- components/cast_channel/cast_message_util.cc.orig 2021-09-14 01:51:54 UTC +--- components/cast_channel/cast_message_util.cc.orig 2022-02-28 16:54:41 UTC +++ components/cast_channel/cast_message_util.cc @@ -168,7 +168,7 @@ int GetVirtualConnectPlatformValue() { return 4; #elif BUILDFLAG(IS_CHROMEOS_ASH) return 5; --#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) return 6; #else return 0; diff --git a/www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.cc b/www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.cc index 8fd80c716043..ec6aa3e29ca0 100644 --- a/www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.cc +++ b/www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.cc @@ -1,11 +1,11 @@ ---- components/content_settings/core/browser/website_settings_registry.cc.orig 2021-09-14 01:51:54 UTC +--- components/content_settings/core/browser/website_settings_registry.cc.orig 2022-02-28 16:54:41 UTC +++ components/content_settings/core/browser/website_settings_registry.cc -@@ -67,7 +67,7 @@ const WebsiteSettingsInfo* WebsiteSettingsRegistry::Re - #if defined(OS_WIN) +@@ -66,7 +66,7 @@ const WebsiteSettingsInfo* WebsiteSettingsRegistry::Re + #if BUILDFLAG(IS_WIN) if (!(platform & PLATFORM_WINDOWS)) return nullptr; --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (!(platform & PLATFORM_LINUX)) return nullptr; - #elif defined(OS_MAC) + #elif BUILDFLAG(IS_MAC) diff --git a/www/chromium/files/patch-components_cookie__config_cookie__store__util.cc b/www/chromium/files/patch-components_cookie__config_cookie__store__util.cc index 3705d1512f14..d11bc58134db 100644 --- a/www/chromium/files/patch-components_cookie__config_cookie__store__util.cc +++ b/www/chromium/files/patch-components_cookie__config_cookie__store__util.cc @@ -1,11 +1,11 @@ ---- components/cookie_config/cookie_store_util.cc.orig 2022-02-07 13:39:41 UTC +--- components/cookie_config/cookie_store_util.cc.orig 2022-02-28 16:54:41 UTC +++ components/cookie_config/cookie_store_util.cc @@ -12,7 +12,7 @@ namespace cookie_config { - #if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || \ -- defined(OS_CHROMEOS) -+ defined(OS_CHROMEOS) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) namespace { // Use the operating system's mechanisms to encrypt cookies before writing diff --git a/www/chromium/files/patch-components_crash_core_app_BUILD.gn b/www/chromium/files/patch-components_crash_core_app_BUILD.gn index 776991495a54..20e78250ae4a 100644 --- a/www/chromium/files/patch-components_crash_core_app_BUILD.gn +++ b/www/chromium/files/patch-components_crash_core_app_BUILD.gn @@ -1,4 +1,4 @@ ---- components/crash/core/app/BUILD.gn.orig 2022-02-07 13:39:41 UTC +--- components/crash/core/app/BUILD.gn.orig 2022-02-28 16:54:41 UTC +++ components/crash/core/app/BUILD.gn @@ -52,7 +52,7 @@ static_library("app") { "crashpad.h", @@ -38,7 +38,7 @@ deps += [ "//third_party/breakpad:client" ] } -@@ -215,11 +219,6 @@ if (is_mac || is_android || is_linux || is_chromeos) { +@@ -216,11 +220,6 @@ if (is_mac || is_android || is_linux || is_chromeos) { # define custom UserStreamDataSources. executable("chrome_crashpad_handler") { sources = [ "chrome_crashpad_handler.cc" ] diff --git a/www/chromium/files/patch-components_embedder__support_user__agent__utils__unittest.cc b/www/chromium/files/patch-components_embedder__support_user__agent__utils__unittest.cc new file mode 100644 index 000000000000..def575e44335 --- /dev/null +++ b/www/chromium/files/patch-components_embedder__support_user__agent__utils__unittest.cc @@ -0,0 +1,20 @@ +--- components/embedder_support/user_agent_utils_unittest.cc.orig 2022-02-28 16:54:41 UTC ++++ components/embedder_support/user_agent_utils_unittest.cc +@@ -54,7 +54,7 @@ namespace { + static constexpr char kChromeProductVersionRegex[] = + "Chrome/([0-9]+).([0-9]+).([0-9]+).([0-9]+)"; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + std::string GetMachine() { + struct utsname unixinfo; + uname(&unixinfo); +@@ -162,7 +162,7 @@ void CheckUserAgentStringOrdering(bool mobile_device) + int value; + ASSERT_TRUE(base::StringToInt(pieces[i], &value)); + } +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // X11; Linux x86_64 + ASSERT_EQ(2u, pieces.size()); + ASSERT_EQ("X11", pieces[0]); diff --git a/www/chromium/files/patch-components_feature__engagement_public_event__constants.cc b/www/chromium/files/patch-components_feature__engagement_public_event__constants.cc index 9a31196f60ff..e2eaf62b7d02 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_event__constants.cc +++ b/www/chromium/files/patch-components_feature__engagement_public_event__constants.cc @@ -1,11 +1,11 @@ ---- components/feature_engagement/public/event_constants.cc.orig 2022-02-07 13:39:41 UTC +--- components/feature_engagement/public/event_constants.cc.orig 2022-02-28 16:54:41 UTC +++ components/feature_engagement/public/event_constants.cc @@ -11,7 +11,7 @@ namespace feature_engagement { namespace events { - #if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || \ -- defined(OS_CHROMEOS) || defined(OS_FUCHSIA) -+ defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD) + #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 char kNewTabOpened[] = "new_tab_opened"; const char kSixthTabOpened[] = "sixth_tab_opened"; const char kTabGroupCreated[] = "tab_group_created"; diff --git a/www/chromium/files/patch-components_feature__engagement_public_event__constants.h b/www/chromium/files/patch-components_feature__engagement_public_event__constants.h index 947885aa24dc..1f0fc5c74a24 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_event__constants.h +++ b/www/chromium/files/patch-components_feature__engagement_public_event__constants.h @@ -1,11 +1,11 @@ ---- components/feature_engagement/public/event_constants.h.orig 2022-02-07 13:39:41 UTC +--- components/feature_engagement/public/event_constants.h.orig 2022-02-28 16:54:41 UTC +++ components/feature_engagement/public/event_constants.h @@ -13,7 +13,7 @@ namespace events { // Desktop - #if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || \ -- defined(OS_CHROMEOS) || defined(OS_FUCHSIA) -+ defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD) + #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) // The user has explicitly opened a new tab via an entry point from inside of // Chrome. extern const char kNewTabOpened[]; diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc b/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc index 6c899feda6b7..e06c94beb79b 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc @@ -1,11 +1,21 @@ ---- components/feature_engagement/public/feature_configurations.cc.orig 2022-02-07 13:39:41 UTC +--- components/feature_engagement/public/feature_configurations.cc.orig 2022-02-28 16:54:41 UTC +++ components/feature_engagement/public/feature_configurations.cc -@@ -13,7 +13,7 @@ namespace feature_engagement { +@@ -35,7 +35,7 @@ FeatureConfig CreateAlwaysTriggerConfig(const base::Fe absl::optional<FeatureConfig> GetClientSideFeatureConfig( const base::Feature* feature) { - #if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || \ -- defined(OS_CHROMEOS) -+ defined(OS_CHROMEOS) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (kIPHPasswordsAccountStorageFeature.name == feature->name) { absl::optional<FeatureConfig> config = FeatureConfig(); config->valid = true; +@@ -721,7 +721,8 @@ absl::optional<FeatureConfig> GetClientSideFeatureConf + #endif // BUILDFLAG(IS_ANDROID) + + #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) + if (kIPHAutofillVirtualCardSuggestionFeature.name == feature->name) { + // A config that allows the virtual card credit card suggestion IPH to be + // shown when: diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc index c0efb5eda38f..b99b22929ef7 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc @@ -1,20 +1,20 @@ ---- components/feature_engagement/public/feature_constants.cc.orig 2022-02-07 13:39:41 UTC +--- components/feature_engagement/public/feature_constants.cc.orig 2022-02-28 16:54:41 UTC +++ components/feature_engagement/public/feature_constants.cc -@@ -20,7 +20,7 @@ const base::Feature kIPHDummyFeature{"IPH_Dummy", +@@ -22,7 +22,7 @@ const base::Feature kIPHDummyFeature{"IPH_Dummy", base::FEATURE_DISABLED_BY_DEFAULT}; - #if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || \ -- defined(OS_CHROMEOS) || defined(OS_FUCHSIA) -+ defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD) + #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 kIPHDesktopSharedHighlightingFeature{ "IPH_DesktopSharedHighlighting", base::FEATURE_DISABLED_BY_DEFAULT}; const base::Feature kIPHDesktopTabGroupsNewGroupFeature{ -@@ -257,7 +257,7 @@ const base::Feature kIPHDiscoverFeedHeaderFeature{ +@@ -274,7 +274,7 @@ const base::Feature kIPHDiscoverFeedHeaderFeature{ "IPH_DiscoverFeedHeaderMenu", base::FEATURE_DISABLED_BY_DEFAULT}; - #endif // defined(OS_IOS) + #endif // BUILDFLAG(IS_IOS) --#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || \ -+#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || \ - defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_FUCHSIA) - const base::Feature kIPHUpdatedConnectionSecurityIndicatorsFeature{ - "IPH_UpdatedConnectionSecurityIndicators", +-#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) + const base::Feature kIPHAutofillVirtualCardSuggestionFeature{ + "IPH_AutofillVirtualCardSuggestion", base::FEATURE_ENABLED_BY_DEFAULT}; diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h index 23dfbab1568e..bdd278b1f3b3 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h @@ -1,20 +1,20 @@ ---- components/feature_engagement/public/feature_constants.h.orig 2022-02-07 13:39:41 UTC +--- components/feature_engagement/public/feature_constants.h.orig 2022-02-28 16:54:41 UTC +++ components/feature_engagement/public/feature_constants.h @@ -30,7 +30,7 @@ extern const base::Feature kUseClientConfigIPH; extern const base::Feature kIPHDummyFeature; - #if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || \ -- defined(OS_CHROMEOS) || defined(OS_FUCHSIA) -+ defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD) + #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 kIPHDesktopSharedHighlightingFeature; extern const base::Feature kIPHDesktopTabGroupsNewGroupFeature; extern const base::Feature kIPHFocusHelpBubbleScreenReaderPromoFeature; -@@ -160,7 +160,7 @@ extern const base::Feature kIPHBadgedTranslateManualTr +@@ -169,7 +169,7 @@ extern const base::Feature kIPHBadgedTranslateManualTr extern const base::Feature kIPHDiscoverFeedHeaderFeature; - #endif // defined(OS_IOS) + #endif // BUILDFLAG(IS_IOS) --#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || \ -+#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || \ - defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_FUCHSIA) +-#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) + extern const base::Feature kIPHAutofillVirtualCardSuggestionFeature; extern const base::Feature kIPHUpdatedConnectionSecurityIndicatorsFeature; - #endif diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc b/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc index f5ac07fda73e..66db364cfcf7 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc @@ -1,11 +1,21 @@ ---- components/feature_engagement/public/feature_list.cc.orig 2022-02-07 13:39:41 UTC +--- components/feature_engagement/public/feature_list.cc.orig 2022-02-28 16:54:41 UTC +++ components/feature_engagement/public/feature_list.cc -@@ -111,7 +111,7 @@ const base::Feature* const kAllFeatures[] = { +@@ -117,7 +117,7 @@ const base::Feature* const kAllFeatures[] = { &kIPHDiscoverFeedHeaderFeature, - #endif // defined(OS_IOS) - #if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || \ -- defined(OS_CHROMEOS) || defined(OS_FUCHSIA) -+ defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD) + #endif // BUILDFLAG(IS_IOS) + #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) &kIPHDesktopTabGroupsNewGroupFeature, &kIPHFocusHelpBubbleScreenReaderPromoFeature, &kIPHGMCCastStartStopFeature, +@@ -138,7 +138,8 @@ const base::Feature* const kAllFeatures[] = { + // BUILDFLAG(IS_CHROMEOS) || 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) + &kIPHAutofillVirtualCardSuggestionFeature, + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || + // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__list.h b/www/chromium/files/patch-components_feature__engagement_public_feature__list.h index e419c34ff30b..c037ef9cd66f 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__list.h +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__list.h @@ -1,20 +1,40 @@ ---- components/feature_engagement/public/feature_list.h.orig 2022-02-07 13:39:41 UTC +--- components/feature_engagement/public/feature_list.h.orig 2022-02-28 16:54:41 UTC +++ components/feature_engagement/public/feature_list.h -@@ -211,7 +211,7 @@ DEFINE_VARIATION_PARAM(kIPHDiscoverFeedHeaderFeature, - #endif // defined(OS_IOS) +@@ -223,7 +223,7 @@ DEFINE_VARIATION_PARAM(kIPHDiscoverFeedHeaderFeature, + #endif // BUILDFLAG(IS_IOS) - #if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || \ -- defined(OS_CHROMEOS) || defined(OS_FUCHSIA) -+ defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD) + #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(kIPHDesktopTabGroupsNewGroupFeature, "IPH_DesktopTabGroupsNewGroup"); DEFINE_VARIATION_PARAM(kIPHFocusModeFeature, "IPH_FocusMode"); -@@ -336,7 +336,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation +@@ -252,7 +252,8 @@ DEFINE_VARIATION_PARAM(kIPHDesktopSharedHighlightingFe + // BUILDFLAG(IS_CHROMEOS) || 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) + DEFINE_VARIATION_PARAM(kIPHAutofillVirtualCardSuggestionFeature, + "IPH_AutofillVirtualCardSuggestion"); + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || +@@ -356,7 +357,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation VARIATION_ENTRY(kIPHBadgedTranslateManualTriggerFeature), VARIATION_ENTRY(kIPHDiscoverFeedHeaderFeature), - #elif defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ -- defined(OS_CHROMEOS) || defined(OS_FUCHSIA) -+ defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD) + #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(kIPHDesktopTabGroupsNewGroupFeature), VARIATION_ENTRY(kIPHFocusModeFeature), VARIATION_ENTRY(kIPHGlobalMediaControls), +@@ -378,7 +379,8 @@ constexpr flags_ui::FeatureEntry::FeatureVariation + // BUILDFLAG(IS_CHROMEOS) || 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) + VARIATION_ENTRY(kIPHAutofillVirtualCardSuggestionFeature), + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || + // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || diff --git a/www/chromium/files/patch-components_feed_core_v2_proto__util.cc b/www/chromium/files/patch-components_feed_core_v2_proto__util.cc index 4ad27dcfe4e3..823d074da546 100644 --- a/www/chromium/files/patch-components_feed_core_v2_proto__util.cc +++ b/www/chromium/files/patch-components_feed_core_v2_proto__util.cc @@ -1,4 +1,4 @@ ---- components/feed/core/v2/proto_util.cc.orig 2022-02-07 13:39:41 UTC +--- components/feed/core/v2/proto_util.cc.orig 2022-02-28 16:54:41 UTC +++ components/feed/core/v2/proto_util.cc @@ -88,8 +88,8 @@ feedwire::Version GetPlatformVersionMessage() { @@ -9,7 +9,7 @@ + result.set_gmajor(major); + result.set_gminor(minor); result.set_revision(revision); - #if defined(OS_ANDROID) + #if BUILDFLAG(IS_ANDROID) result.set_api_version(base::android::BuildInfo::GetInstance()->sdk_int()); @@ -104,8 +104,8 @@ feedwire::Version GetAppVersionMessage(const ChromeInf // Chrome's version is in the format: MAJOR,MINOR,BUILD,PATCH. diff --git a/www/chromium/files/patch-components_feed_core_v2_proto__util__unittest.cc b/www/chromium/files/patch-components_feed_core_v2_proto__util__unittest.cc new file mode 100644 index 000000000000..75b5eb8fc90a --- /dev/null +++ b/www/chromium/files/patch-components_feed_core_v2_proto__util__unittest.cc @@ -0,0 +1,13 @@ +--- components/feed/core/v2/proto_util_unittest.cc.orig 2022-02-28 16:54:41 UTC ++++ components/feed/core/v2/proto_util_unittest.cc +@@ -39,8 +39,8 @@ TEST(ProtoUtilTest, CreateClientInfo) { + feedwire::ClientInfo result = CreateClientInfo(request_metadata); + EXPECT_EQ(feedwire::ClientInfo::CHROME_ANDROID, result.app_type()); + EXPECT_EQ(feedwire::Version::RELEASE, result.app_version().build_type()); +- EXPECT_EQ(1, result.app_version().major()); +- EXPECT_EQ(2, result.app_version().minor()); ++ EXPECT_EQ(1, result.app_version().gmajor()); ++ EXPECT_EQ(2, result.app_version().gminor()); + EXPECT_EQ(3, result.app_version().build()); + EXPECT_EQ(4, result.app_version().revision()); + EXPECT_FALSE(result.chrome_client_info().start_surface()); diff --git a/www/chromium/files/patch-components_feed_core_v2_test_proto__printer.cc b/www/chromium/files/patch-components_feed_core_v2_test_proto__printer.cc new file mode 100644 index 000000000000..1417eaed0cb7 --- /dev/null +++ b/www/chromium/files/patch-components_feed_core_v2_test_proto__printer.cc @@ -0,0 +1,13 @@ +--- components/feed/core/v2/test/proto_printer.cc.orig 2022-02-28 16:54:41 UTC ++++ components/feed/core/v2/test/proto_printer.cc +@@ -158,8 +158,8 @@ class TextProtoPrinter { + } + TextProtoPrinter& operator<<(const feedwire::Version& v) { + BeginMessage(); +- PRINT_FIELD(major); +- PRINT_FIELD(minor); ++ PRINT_FIELD(gmajor); ++ PRINT_FIELD(gminor); + PRINT_FIELD(build); + PRINT_FIELD(revision); + PRINT_FIELD(architecture); diff --git a/www/chromium/files/patch-components_flags__ui_flags__state.cc b/www/chromium/files/patch-components_flags__ui_flags__state.cc index 06b191b71cc1..565a4fa973a8 100644 --- a/www/chromium/files/patch-components_flags__ui_flags__state.cc +++ b/www/chromium/files/patch-components_flags__ui_flags__state.cc @@ -1,11 +1,11 @@ ---- components/flags_ui/flags_state.cc.orig 2022-02-07 13:39:41 UTC +--- components/flags_ui/flags_state.cc.orig 2022-02-28 16:54:41 UTC +++ components/flags_ui/flags_state.cc @@ -654,7 +654,7 @@ unsigned short FlagsState::GetCurrentPlatform() { #elif BUILDFLAG(IS_CHROMEOS_ASH) return kOsCrOS; - #elif (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ -- defined(OS_OPENBSD) -+ defined(OS_BSD) + #elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ +- BUILDFLAG(IS_OPENBSD) ++ BUILDFLAG(IS_BSD) return kOsLinux; - #elif defined(OS_ANDROID) + #elif BUILDFLAG(IS_ANDROID) return kOsAndroid; diff --git a/www/chromium/files/patch-components_gwp__asan_crash__handler_crash__analyzer.cc b/www/chromium/files/patch-components_gwp__asan_crash__handler_crash__analyzer.cc index bd90464fb692..aaee4975f5dc 100644 --- a/www/chromium/files/patch-components_gwp__asan_crash__handler_crash__analyzer.cc +++ b/www/chromium/files/patch-components_gwp__asan_crash__handler_crash__analyzer.cc @@ -1,20 +1,20 @@ ---- components/gwp_asan/crash_handler/crash_analyzer.cc.orig 2022-02-07 13:39:41 UTC +--- components/gwp_asan/crash_handler/crash_analyzer.cc.orig 2022-02-28 16:54:41 UTC +++ components/gwp_asan/crash_handler/crash_analyzer.cc @@ -26,7 +26,7 @@ #include "third_party/crashpad/crashpad/snapshot/process_snapshot.h" #include "third_party/crashpad/crashpad/util/process/process_memory.h" --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) #include <signal.h> - #elif defined(OS_APPLE) + #elif BUILDFLAG(IS_APPLE) #include <mach/exception_types.h> @@ -81,7 +81,7 @@ bool CrashAnalyzer::GetExceptionInfo( crashpad::VMAddress CrashAnalyzer::GetAccessAddress( const crashpad::ExceptionSnapshot& exception) { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) if (exception.Exception() == SIGSEGV || exception.Exception() == SIGBUS) return exception.ExceptionAddress(); - #elif defined(OS_APPLE) + #elif BUILDFLAG(IS_APPLE) diff --git a/www/chromium/files/patch-components_invalidation_impl_invalidation__switches.cc b/www/chromium/files/patch-components_invalidation_impl_invalidation__switches.cc index 895324b3352a..48dc68f31107 100644 --- a/www/chromium/files/patch-components_invalidation_impl_invalidation__switches.cc +++ b/www/chromium/files/patch-components_invalidation_impl_invalidation__switches.cc @@ -1,11 +1,11 @@ ---- components/invalidation/impl/invalidation_switches.cc.orig 2022-02-07 13:39:41 UTC +--- components/invalidation/impl/invalidation_switches.cc.orig 2022-02-28 16:54:41 UTC +++ components/invalidation/impl/invalidation_switches.cc @@ -21,7 +21,7 @@ const int kDefaultInstanceIDTokenTTLSeconds = 14 * 24 const base::Feature kSyncInstanceIDTokenTTL { "SyncInstanceIDTokenTTL", - #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ -- defined(OS_CHROMEOS) || defined(OS_IOS) -+ defined(OS_CHROMEOS) || defined(OS_IOS) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_IOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD) base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT diff --git a/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc b/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc index 6c74963e299c..71aa2020a2b9 100644 --- a/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc +++ b/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc @@ -1,11 +1,11 @@ ---- components/network_session_configurator/browser/network_session_configurator.cc.orig 2021-12-31 00:57:29 UTC +--- components/network_session_configurator/browser/network_session_configurator.cc.orig 2022-02-28 16:54:41 UTC +++ components/network_session_configurator/browser/network_session_configurator.cc -@@ -782,7 +782,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C +@@ -784,7 +784,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C } - #endif // #if !defined(OS_ANDROID) + #endif // #if !BUILDFLAG(IS_ANDROID) --#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) return net::URLRequestContextBuilder::HttpCacheParams::DISK_SIMPLE; #else return net::URLRequestContextBuilder::HttpCacheParams::DISK_BLOCKFILE; diff --git a/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator__unittest.cc b/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator__unittest.cc new file mode 100644 index 000000000000..efed2428c33e --- /dev/null +++ b/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator__unittest.cc @@ -0,0 +1,11 @@ +--- components/network_session_configurator/browser/network_session_configurator_unittest.cc.orig 2022-02-28 16:54:41 UTC ++++ components/network_session_configurator/browser/network_session_configurator_unittest.cc +@@ -775,7 +775,7 @@ TEST_F(NetworkSessionConfiguratorTest, HostRules) { + } + + TEST_F(NetworkSessionConfiguratorTest, DefaultCacheBackend) { +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + EXPECT_EQ(net::URLRequestContextBuilder::HttpCacheParams::DISK_SIMPLE, + ChooseCacheType()); + #elif BUILDFLAG(IS_MAC) diff --git a/www/chromium/files/patch-components_os__crypt_os__crypt.h b/www/chromium/files/patch-components_os__crypt_os__crypt.h index 375548c8db43..2442b96d31fd 100644 --- a/www/chromium/files/patch-components_os__crypt_os__crypt.h +++ b/www/chromium/files/patch-components_os__crypt_os__crypt.h @@ -1,38 +1,29 @@ ---- components/os_crypt/os_crypt.h.orig 2022-02-07 13:39:41 UTC +--- components/os_crypt/os_crypt.h.orig 2022-02-28 16:54:41 UTC +++ components/os_crypt/os_crypt.h -@@ -16,7 +16,7 @@ +@@ -14,7 +14,7 @@ + #include "build/build_config.h" + #include "build/chromecast_buildflags.h" - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) class KeyStorageLinux; - #endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) + #endif // BUILDFLAG(IS_LINUX) -@@ -41,7 +41,7 @@ class OSCrypt { +@@ -37,7 +37,7 @@ class OSCrypt { + OSCrypt(const OSCrypt&) = delete; + OSCrypt& operator=(const OSCrypt&) = delete; - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Set the configuration of OSCrypt. - static COMPONENT_EXPORT(OS_CRYPT) void SetConfig( - std::unique_ptr<os_crypt::Config> config); -@@ -49,7 +49,7 @@ class OSCrypt { + // This method, or SetRawEncryptionKey(), must be called before using + // EncryptString() and DecryptString(). +@@ -149,7 +149,7 @@ class OSCrypt { + static COMPONENT_EXPORT(OS_CRYPT) void ResetStateForTesting(); + #endif - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if defined(OS_APPLE) || defined(OS_WIN) || \ -+#if defined(OS_APPLE) || defined(OS_WIN) || defined(OS_BSD) || \ - (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) - // On Linux returns true iff the real secret key (not hardcoded one) is - // available. On MacOS returns true if Keychain is available (for mock -@@ -141,7 +141,7 @@ class OSCrypt { - - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) - // For unit testing purposes, inject methods to be used. - // |get_key_storage_mock| provides the desired |KeyStorage| implementation. - // If the provider returns |nullptr|, a hardcoded password will be used. +-#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) ++#if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMECAST)) + // For unit testing purposes, inject methods to be used. + // |get_key_storage_mock| provides the desired |KeyStorage| implementation. + // If the provider returns |nullptr|, a hardcoded password will be used. diff --git a/www/chromium/files/patch-components_paint__preview_browser_paint__preview__client__unittest.cc b/www/chromium/files/patch-components_paint__preview_browser_paint__preview__client__unittest.cc new file mode 100644 index 000000000000..28c077793e5d --- /dev/null +++ b/www/chromium/files/patch-components_paint__preview_browser_paint__preview__client__unittest.cc @@ -0,0 +1,13 @@ +--- components/paint_preview/browser/paint_preview_client_unittest.cc.orig 2022-02-28 16:54:41 UTC ++++ components/paint_preview/browser/paint_preview_client_unittest.cc +@@ -171,8 +171,8 @@ TEST_P(PaintPreviewClientRenderViewHostTest, CaptureMa + metadata->set_url(expected_url.spec()); + metadata->set_version(kPaintPreviewVersion); + auto* chromeVersion = metadata->mutable_chrome_version(); +- chromeVersion->set_major(CHROME_VERSION_MAJOR); +- chromeVersion->set_minor(CHROME_VERSION_MINOR); ++ chromeVersion->set_gmajor(CHROME_VERSION_MAJOR); ++ chromeVersion->set_gminor(CHROME_VERSION_MINOR); + chromeVersion->set_build(CHROME_VERSION_BUILD); + chromeVersion->set_patch(CHROME_VERSION_PATCH); + PaintPreviewFrameProto* main_frame = expected_proto.mutable_root_frame(); diff --git a/www/chromium/files/patch-components_paint__preview_player_player__compositor__delegate.cc b/www/chromium/files/patch-components_paint__preview_player_player__compositor__delegate.cc new file mode 100644 index 000000000000..9dff7dab1482 --- /dev/null +++ b/www/chromium/files/patch-components_paint__preview_player_player__compositor__delegate.cc @@ -0,0 +1,13 @@ +--- components/paint_preview/player/player_compositor_delegate.cc.orig 2022-02-28 16:54:41 UTC ++++ components/paint_preview/player/player_compositor_delegate.cc +@@ -445,8 +445,8 @@ void PlayerCompositorDelegate::ValidateProtoAndLoadAXT + // use the AXTreeUpdate. + auto chrome_version = capture_result_->proto.metadata().chrome_version(); + if (capture_result_->proto.metadata().has_chrome_version() && +- chrome_version.major() == CHROME_VERSION_MAJOR && +- chrome_version.minor() == CHROME_VERSION_MINOR && ++ chrome_version.gmajor() == CHROME_VERSION_MAJOR && ++ chrome_version.gminor() == CHROME_VERSION_MINOR && + chrome_version.build() == CHROME_VERSION_BUILD && + chrome_version.patch() == CHROME_VERSION_PATCH) { + paint_preview_service_->GetFileMixin()->GetAXTreeUpdate( diff --git a/www/chromium/files/patch-components_password__manager_core_browser_login__database.cc b/www/chromium/files/patch-components_password__manager_core_browser_login__database.cc new file mode 100644 index 000000000000..29b53c8ff4a1 --- /dev/null +++ b/www/chromium/files/patch-components_password__manager_core_browser_login__database.cc @@ -0,0 +1,29 @@ +--- components/password_manager/core/browser/login_database.cc.orig 2022-02-28 16:54:41 UTC ++++ components/password_manager/core/browser/login_database.cc +@@ -645,7 +645,7 @@ std::string GeneratePlaceholders(size_t count) { + return result; + } + +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Fills |form| with necessary data required to be removed from the database + // and returns it. + PasswordForm GetFormForRemoval(sql::Statement& statement) { +@@ -662,7 +662,7 @@ PasswordForm GetFormForRemoval(sql::Statement& stateme + // Whether we should try to return the decryptable passwords while the + // encryption service fails for some passwords. + bool ShouldReturnPartialPasswords() { +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return base::FeatureList::IsEnabled(features::kSkipUndecryptablePasswords); + #else + return false; +@@ -1473,7 +1473,7 @@ bool LoginDatabase::DeleteAndRecreateDatabaseFile() { + } + + DatabaseCleanupResult LoginDatabase::DeleteUndecryptableLogins() { +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + TRACE_EVENT0("passwords", "LoginDatabase::DeleteUndecryptableLogins"); + // If the Keychain in MacOS or the real secret key in Linux is unavailable, + // don't delete any logins. diff --git a/www/chromium/files/patch-components_password__manager_core_browser_login__database__unittest.cc b/www/chromium/files/patch-components_password__manager_core_browser_login__database__unittest.cc new file mode 100644 index 000000000000..da254f96f7ff --- /dev/null +++ b/www/chromium/files/patch-components_password__manager_core_browser_login__database__unittest.cc @@ -0,0 +1,29 @@ +--- components/password_manager/core/browser/login_database_unittest.cc.orig 2022-02-28 16:54:41 UTC ++++ components/password_manager/core/browser/login_database_unittest.cc +@@ -2090,7 +2090,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, DeleteUnd + base::HistogramTester histogram_tester; + ASSERT_TRUE(db.Init()); + +-#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) ++#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) || BUILDFLAG(IS_BSD) + // Make sure that we can't get any logins when database is corrupted. + // Disabling the checks in chromecast because encryption is unavailable. + std::vector<std::unique_ptr<PasswordForm>> result; +@@ -2116,7 +2116,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, DeleteUnd + #endif + + // Check histograms. +-#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) ++#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) || BUILDFLAG(IS_BSD) + histogram_tester.ExpectUniqueSample("PasswordManager.CleanedUpPasswords", 2, + 1); + histogram_tester.ExpectUniqueSample( +@@ -2168,7 +2168,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, KeychainL + } + #endif // BUILDFLAG(IS_MAC) + +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Test getting auto sign in logins when there are undecryptable ones + TEST_F(LoginDatabaseUndecryptableLoginsTest, GetAutoSignInLogins) { + PrimaryKeyToFormMap key_to_form_map; diff --git a/www/chromium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc b/www/chromium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc new file mode 100644 index 000000000000..d69fe4423148 --- /dev/null +++ b/www/chromium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc @@ -0,0 +1,11 @@ +--- components/password_manager/core/browser/sync/password_sync_bridge.cc.orig 2022-02-28 16:54:41 UTC ++++ components/password_manager/core/browser/sync/password_sync_bridge.cc +@@ -181,7 +181,7 @@ bool ShouldRecoverPasswordsDuringMerge() { + // Delete the local undecryptable copy when this is MacOS only. + #if BUILDFLAG(IS_MAC) + return true; +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return base::FeatureList::IsEnabled( + features::kSyncUndecryptablePasswordsLinux); + #else diff --git a/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.cc b/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.cc new file mode 100644 index 000000000000..90c56fa6a632 --- /dev/null +++ b/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.cc @@ -0,0 +1,20 @@ +--- components/password_manager/core/common/password_manager_features.cc.orig 2022-02-28 16:54:41 UTC ++++ components/password_manager/core/common/password_manager_features.cc +@@ -133,7 +133,7 @@ const base::Feature kReparseServerPredictionsFollowing + const base::Feature kSecondaryServerFieldPredictions = { + "SecondaryServerFieldPredictions", base::FEATURE_ENABLED_BY_DEFAULT}; + +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Displays at least the decryptable and never saved logins in the password + // manager + const base::Feature kSkipUndecryptablePasswords = { +@@ -145,7 +145,7 @@ const base::Feature kSkipUndecryptablePasswords = { + const base::Feature kSupportForAddPasswordsInSettings = { + "SupportForAddPasswordsInSettings", base::FEATURE_DISABLED_BY_DEFAULT}; + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // When enabled, all undecryptable passwords are deleted from the local database + // during initial sync flow. + const base::Feature kSyncUndecryptablePasswordsLinux = { diff --git a/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.h b/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.h new file mode 100644 index 000000000000..7015043a1e54 --- /dev/null +++ b/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.h @@ -0,0 +1,16 @@ +--- components/password_manager/core/common/password_manager_features.h.orig 2022-02-28 16:54:41 UTC ++++ components/password_manager/core/common/password_manager_features.h +@@ -41,11 +41,11 @@ extern const base::Feature kPasswordScriptsFetching; + extern const base::Feature kRecoverFromNeverSaveAndroid; + extern const base::Feature kReparseServerPredictionsFollowingFormChange; + extern const base::Feature kSecondaryServerFieldPredictions; +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + extern const base::Feature kSkipUndecryptablePasswords; + #endif + extern const base::Feature kSupportForAddPasswordsInSettings; +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + extern const base::Feature kSyncUndecryptablePasswordsLinux; + #endif + extern const base::Feature kTreatNewPasswordHeuristicsAsReliable; diff --git a/www/chromium/files/patch-components_performance__manager_features.cc b/www/chromium/files/patch-components_performance__manager_features.cc index 5611bc3c9490..2fe2b7ab26f1 100644 --- a/www/chromium/files/patch-components_performance__manager_features.cc +++ b/www/chromium/files/patch-components_performance__manager_features.cc @@ -1,11 +1,11 @@ ---- components/performance_manager/features.cc.orig 2021-12-14 11:45:03 UTC +--- components/performance_manager/features.cc.orig 2022-02-28 16:54:41 UTC +++ components/performance_manager/features.cc @@ -22,7 +22,7 @@ const base::Feature kUrgentDiscardingFromPerformanceMa "UrgentDiscardingFromPerformanceManager", // Ash Chrome uses memory pressure evaluator instead of performance manager to // discard tabs. --#if BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) base::FEATURE_DISABLED_BY_DEFAULT #else base::FEATURE_ENABLED_BY_DEFAULT diff --git a/www/chromium/files/patch-components_permissions_prediction__service_prediction__common.cc b/www/chromium/files/patch-components_permissions_prediction__service_prediction__common.cc new file mode 100644 index 000000000000..a3acfb0f31d5 --- /dev/null +++ b/www/chromium/files/patch-components_permissions_prediction__service_prediction__common.cc @@ -0,0 +1,20 @@ +--- components/permissions/prediction_service/prediction_common.cc.orig 2022-02-28 16:54:41 UTC ++++ components/permissions/prediction_service/prediction_common.cc +@@ -36,7 +36,7 @@ int BucketizeValue(int count) { + + ClientFeatures_Platform GetCurrentPlatformProto() { + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + return permissions::ClientFeatures_Platform_PLATFORM_DESKTOP; + #elif BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) + return permissions::ClientFeatures_Platform_PLATFORM_MOBILE; +@@ -47,7 +47,7 @@ ClientFeatures_Platform GetCurrentPlatformProto() { + + ClientFeatures_PlatformEnum GetCurrentPlatformEnumProto() { + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + return permissions::ClientFeatures_PlatformEnum_PLATFORM_DESKTOP_V2; + #elif BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) + return permissions::ClientFeatures_PlatformEnum_PLATFORM_MOBILE_V2; diff --git a/www/chromium/files/patch-components_permissions_prediction__service_prediction__service__common.cc b/www/chromium/files/patch-components_permissions_prediction__service_prediction__service__common.cc deleted file mode 100644 index 9b4a6f8dffc4..000000000000 --- a/www/chromium/files/patch-components_permissions_prediction__service_prediction__service__common.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- components/permissions/prediction_service/prediction_service_common.cc.orig 2022-02-07 13:39:41 UTC -+++ components/permissions/prediction_service/prediction_service_common.cc -@@ -13,7 +13,7 @@ - namespace permissions { - ClientFeatures_Platform GetCurrentPlatformProto() { - #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -- defined(OS_MAC) -+ defined(OS_MAC) || defined(OS_BSD) - return permissions::ClientFeatures_Platform_PLATFORM_DESKTOP; - #elif defined(OS_ANDROID) || defined(OS_FUCHSIA) - return permissions::ClientFeatures_Platform_PLATFORM_MOBILE; diff --git a/www/chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc b/www/chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc new file mode 100644 index 000000000000..bc5c13d1421c --- /dev/null +++ b/www/chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc @@ -0,0 +1,11 @@ +--- components/policy/core/browser/policy_pref_mapping_test.cc.orig 2022-02-28 16:54:41 UTC ++++ components/policy/core/browser/policy_pref_mapping_test.cc +@@ -340,7 +340,7 @@ class PolicyTestCase { + const std::string os("chromeos_lacros"); + #elif BUILDFLAG(IS_IOS) + const std::string os("ios"); +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + const std::string os("linux"); + #elif BUILDFLAG(IS_MAC) + const std::string os("mac"); diff --git a/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc b/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc index 6d61521bd135..65851aa0cb0a 100644 --- a/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc +++ b/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc @@ -1,11 +1,11 @@ ---- components/policy/core/common/cloud/cloud_policy_client.cc.orig 2022-02-07 13:39:41 UTC +--- components/policy/core/common/cloud/cloud_policy_client.cc.orig 2022-02-28 16:54:41 UTC +++ components/policy/core/common/cloud/cloud_policy_client.cc -@@ -418,7 +418,7 @@ void CloudPolicyClient::FetchPolicy() { +@@ -419,7 +419,7 @@ void CloudPolicyClient::FetchPolicy() { fetch_request->set_invalidation_payload(invalidation_payload_); } } --#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Only set browser device identifier for CBCM Chrome cloud policy on // desktop. if (base::FeatureList::IsEnabled( diff --git a/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc b/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc index 79d961d9684c..2d7172254051 100644 --- a/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc +++ b/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc @@ -1,63 +1,54 @@ ---- components/policy/core/common/cloud/cloud_policy_util.cc.orig 2022-02-07 13:39:41 UTC +--- components/policy/core/common/cloud/cloud_policy_util.cc.orig 2022-02-28 16:54:41 UTC +++ components/policy/core/common/cloud/cloud_policy_util.cc -@@ -18,7 +18,7 @@ - #include <wincred.h> +@@ -19,7 +19,7 @@ #endif --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_APPLE) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_APPLE) || defined(OS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ +- BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) #include <pwd.h> #include <sys/types.h> #include <unistd.h> -@@ -33,10 +33,14 @@ +@@ -34,10 +34,14 @@ #import <SystemConfiguration/SCDynamicStoreCopySpecific.h> #endif --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) #include <limits.h> // For HOST_NAME_MAX #endif -+#if defined(OS_FREEBSD) ++#if BUILDFLAG(IS_FREEBSD) +#define HOST_NAME_MAX MAXHOSTNAMELEN +#endif + #include <utility> #include "base/check.h" -@@ -67,7 +71,7 @@ - #include "base/system/sys_info.h" - #endif - --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) - #include "base/system/sys_info.h" - #endif - -@@ -80,7 +84,7 @@ namespace policy { - namespace em = enterprise_management; +@@ -77,7 +81,7 @@ namespace em = enterprise_management; std::string GetMachineName() { --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) char hostname[HOST_NAME_MAX]; if (gethostname(hostname, HOST_NAME_MAX) == 0) // Success. return hostname; -@@ -138,7 +142,7 @@ std::string GetMachineName() { +@@ -135,7 +139,7 @@ std::string GetMachineName() { std::string GetOSVersion() { - #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_APPLE) || \ -- defined(OS_ANDROID) || defined(OS_FUCHSIA) -+ defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \ +- BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) return base::SysInfo::OperatingSystemVersion(); - #elif defined(OS_WIN) + #elif BUILDFLAG(IS_WIN) base::win::OSInfo::VersionNumber version_number = -@@ -161,7 +165,7 @@ std::string GetOSArchitecture() { +@@ -158,7 +162,7 @@ std::string GetOSArchitecture() { } std::string GetOSUsername() { --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_APPLE) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_APPLE) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_APPLE) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) struct passwd* creds = getpwuid(getuid()); if (!creds || !creds->pw_name) return std::string(); diff --git a/www/chromium/files/patch-components_policy_resources_policy__templates.json b/www/chromium/files/patch-components_policy_resources_policy__templates.json index 065a03eed3d4..2bf0187772d6 100644 --- a/www/chromium/files/patch-components_policy_resources_policy__templates.json +++ b/www/chromium/files/patch-components_policy_resources_policy__templates.json @@ -1,6 +1,6 @@ ---- components/policy/resources/policy_templates.json.orig 2022-02-07 13:39:41 UTC +--- components/policy/resources/policy_templates.json.orig 2022-02-28 16:54:41 UTC +++ components/policy/resources/policy_templates.json -@@ -1398,7 +1398,7 @@ +@@ -1410,7 +1410,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -9,7 +9,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -2500,7 +2500,7 @@ +@@ -2512,7 +2512,7 @@ 'owners': ['file://remoting/OWNERS', 'jamiewalch@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -18,7 +18,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -4231,7 +4231,7 @@ +@@ -4244,7 +4244,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -27,7 +27,7 @@ 'features': { 'dynamic_refresh': False, 'per_profile': False, -@@ -4260,7 +4260,7 @@ +@@ -4273,7 +4273,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, -@@ -5174,7 +5174,7 @@ +@@ -5187,7 +5187,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, -@@ -5235,7 +5235,7 @@ +@@ -5248,7 +5248,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, -@@ -5301,7 +5301,7 @@ +@@ -5314,7 +5314,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, -@@ -10084,7 +10084,7 @@ +@@ -10099,7 +10099,7 @@ 'owners': ['file://net/cert/OWNERS', 'rsleevi@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -72,7 +72,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -10178,7 +10178,7 @@ +@@ -10193,7 +10193,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -81,7 +81,7 @@ 'features': { 'dynamic_refresh': False, 'per_profile': False, -@@ -12116,7 +12116,7 @@ +@@ -12163,7 +12163,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, -@@ -12963,7 +12963,7 @@ +@@ -13021,7 +13021,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -99,7 +99,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': True, -@@ -19753,7 +19753,7 @@ +@@ -19891,7 +19891,7 @@ 'items': { 'type': 'string' } }, # Spell checking is provided by macOS, so can't be controlled on Mac. @@ -108,7 +108,7 @@ 'features': { 'can_be_recommended': False, 'dynamic_refresh': True, -@@ -19784,7 +19784,7 @@ +@@ -19922,7 +19922,7 @@ 'items': { 'type': 'string' } }, # Spell checking is provided by macOS, so can't be controlled on Mac. @@ -117,7 +117,7 @@ 'deprecated': True, 'features': { 'can_be_recommended': False, -@@ -19818,7 +19818,7 @@ +@@ -19956,7 +19956,7 @@ 'items': { 'type': 'string' } }, # Spell checking is provided by macOS, so can't be controlled on Mac. @@ -126,7 +126,7 @@ 'features': { 'can_be_recommended': False, 'dynamic_refresh': True, -@@ -20556,7 +20556,7 @@ +@@ -20694,7 +20694,7 @@ 'owners': ['fbeaufort@chromium.org', 'beccahughes@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -135,7 +135,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': True, -@@ -24742,7 +24742,7 @@ +@@ -24924,7 +24924,7 @@ 'owners': ['file://services/audio/OWNERS', 'dalecurtis@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -144,7 +144,7 @@ 'features': { 'dynamic_refresh': False, 'per_profile': False, -@@ -26084,7 +26084,7 @@ If this policy is left unset, privacy screen is disabl +@@ -26266,7 +26266,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' }, @@ -153,7 +153,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': True, -@@ -26108,7 +26108,7 @@ If set to False, <ph name="PRODUCT_NAME">$1<ex>Google +@@ -26290,7 +26290,7 @@ If set to False, <ph name="PRODUCT_NAME">$1<ex>Google 'owners': ['file://chrome/browser/notifications/OWNERS'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -162,7 +162,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': True, -@@ -27175,7 +27175,7 @@ If you disable this policy, web page scrolling to spec +@@ -27357,7 +27357,7 @@ If you disable this policy, web page scrolling to spec 'owners': ['asumaneev@google.com'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -171,7 +171,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -28410,7 +28410,7 @@ When this policy is set, <ph name="PRODUCT_OS_NAME">$2 +@@ -28593,7 +28593,7 @@ When this policy is set, <ph name="PRODUCT_OS_NAME">$2 }, ], 'default': True, @@ -180,7 +180,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': True, -@@ -28543,7 +28543,7 @@ When this policy is set, <ph name="PRODUCT_OS_NAME">$2 +@@ -28726,7 +28726,7 @@ When this policy is set, <ph name="PRODUCT_OS_NAME">$2 'owners': ['mattm@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, diff --git a/www/chromium/files/patch-components_policy_tools_generate__policy__source.py b/www/chromium/files/patch-components_policy_tools_generate__policy__source.py index 5775551931ab..59fcf22771d0 100644 --- a/www/chromium/files/patch-components_policy_tools_generate__policy__source.py +++ b/www/chromium/files/patch-components_policy_tools_generate__policy__source.py @@ -1,6 +1,6 @@ ---- components/policy/tools/generate_policy_source.py.orig 2022-02-07 13:39:41 UTC +--- components/policy/tools/generate_policy_source.py.orig 2022-02-28 16:54:41 UTC +++ components/policy/tools/generate_policy_source.py -@@ -47,8 +47,10 @@ PLATFORM_STRINGS = { +@@ -48,8 +48,10 @@ PLATFORM_STRINGS = { 'ios': ['ios'], 'chrome.win': ['win'], 'chrome.linux': ['linux'], diff --git a/www/chromium/files/patch-components_safe__browsing_content_common_file__type__policies__unittest.cc b/www/chromium/files/patch-components_safe__browsing_content_common_file__type__policies__unittest.cc new file mode 100644 index 000000000000..99528878ff75 --- /dev/null +++ b/www/chromium/files/patch-components_safe__browsing_content_common_file__type__policies__unittest.cc @@ -0,0 +1,11 @@ +--- components/safe_browsing/content/common/file_type_policies_unittest.cc.orig 2022-02-28 16:54:41 UTC ++++ components/safe_browsing/content/common/file_type_policies_unittest.cc +@@ -137,7 +137,7 @@ TEST_F(FileTypePoliciesTest, UnpackResourceBundle) { + EXPECT_EQ(DownloadFileType::FULL_PING, file_type.ping_setting()); + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + EXPECT_EQ(DownloadFileType::ALLOW_ON_USER_GESTURE, + file_type.platform_settings(0).danger_level()); + EXPECT_EQ(DownloadFileType::DISALLOW_AUTO_OPEN, diff --git a/www/chromium/files/patch-components_safe__browsing_core_browser_db_v4__protocol__manager__util.cc b/www/chromium/files/patch-components_safe__browsing_core_browser_db_v4__protocol__manager__util.cc index a7179c0c5c51..98470bee9ca5 100644 --- a/www/chromium/files/patch-components_safe__browsing_core_browser_db_v4__protocol__manager__util.cc +++ b/www/chromium/files/patch-components_safe__browsing_core_browser_db_v4__protocol__manager__util.cc @@ -1,11 +1,11 @@ ---- components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc.orig 2022-01-21 13:23:10 UTC +--- components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc.orig 2022-02-28 16:54:41 UTC +++ components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc @@ -115,7 +115,7 @@ std::ostream& operator<<(std::ostream& os, const ListI PlatformType GetCurrentPlatformType() { - #if defined(OS_WIN) + #if BUILDFLAG(IS_WIN) return WINDOWS_PLATFORM; --#elif defined(OS_LINUX) || defined(OS_CHROMEOS) -+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) return LINUX_PLATFORM; - #elif defined(OS_IOS) + #elif BUILDFLAG(IS_IOS) return IOS_PLATFORM; diff --git a/www/chromium/files/patch-components_safe__browsing_core_browser_realtime_url__lookup__service__base.cc b/www/chromium/files/patch-components_safe__browsing_core_browser_realtime_url__lookup__service__base.cc index c6b5aabae0a5..93c14e64b7f7 100644 --- a/www/chromium/files/patch-components_safe__browsing_core_browser_realtime_url__lookup__service__base.cc +++ b/www/chromium/files/patch-components_safe__browsing_core_browser_realtime_url__lookup__service__base.cc @@ -1,11 +1,11 @@ ---- components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc.orig 2022-02-07 13:39:41 UTC +--- components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc.orig 2022-02-28 16:54:41 UTC +++ components/safe_browsing/core/browser/realtime/url_lookup_service_base.cc -@@ -107,7 +107,7 @@ RTLookupRequest::OSType GetRTLookupRequestOSType() { +@@ -109,7 +109,7 @@ RTLookupRequest::OSType GetRTLookupRequestOSType() { return RTLookupRequest::OS_TYPE_FUCHSIA; - #elif defined(OS_IOS) + #elif BUILDFLAG(IS_IOS) return RTLookupRequest::OS_TYPE_IOS; --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return RTLookupRequest::OS_TYPE_LINUX; - #elif defined(OS_MAC) + #elif BUILDFLAG(IS_MAC) return RTLookupRequest::OS_TYPE_MAC; diff --git a/www/chromium/files/patch-components_security__interstitials_content_utils.cc b/www/chromium/files/patch-components_security__interstitials_content_utils.cc index 68db1378ce55..475843c8baab 100644 --- a/www/chromium/files/patch-components_security__interstitials_content_utils.cc +++ b/www/chromium/files/patch-components_security__interstitials_content_utils.cc @@ -1,11 +1,11 @@ ---- components/security_interstitials/content/utils.cc.orig 2021-09-24 04:26:04 UTC +--- components/security_interstitials/content/utils.cc.orig 2022-02-28 16:54:41 UTC +++ components/security_interstitials/content/utils.cc @@ -34,7 +34,7 @@ void LaunchDateAndTimeSettings() { - #if defined(OS_ANDROID) + #if BUILDFLAG(IS_ANDROID) JNIEnv* env = base::android::AttachCurrentThread(); Java_DateAndTimeSettingsHelper_openDateAndTimeSettings(env); --#elif defined(OS_LINUX) || defined(OS_CHROMEOS) -+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) struct ClockCommand { const char* const pathname; const char* const argument; diff --git a/www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc b/www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc index 4ecd8ea50a30..8cf119fc0110 100644 --- a/www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc +++ b/www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc @@ -1,20 +1,20 @@ ---- components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.cc.orig 2022-02-07 13:39:41 UTC +--- components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.cc.orig 2022-02-28 16:54:41 UTC +++ components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.cc @@ -19,7 +19,7 @@ - #if defined(OS_WIN) + #if BUILDFLAG(IS_WIN) #include "content/public/child/dwrite_font_proxy_init_win.h" --#elif defined(OS_LINUX) || defined(OS_CHROMEOS) -+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "components/services/font/public/cpp/font_loader.h" #endif @@ -64,7 +64,7 @@ PaintPreviewCompositorCollectionImpl::PaintPreviewComp // Initialize font access for Skia. - #if defined(OS_WIN) + #if BUILDFLAG(IS_WIN) content::InitializeDWriteFontProxy(); --#elif defined(OS_LINUX) || defined(OS_CHROMEOS) -+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) mojo::PendingRemote<font_service::mojom::FontService> font_service; content::UtilityThread::Get()->BindHostReceiver( font_service.InitWithNewPipeAndPassReceiver()); @@ -22,8 +22,8 @@ base::BindOnce([] { SkFontMgr::RefDefault(); })); // Sanity check that fonts are working. --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // No WebSandbox is provided on Linux so the local fonts aren't accessible. // This is fine since since the subsetted fonts are provided in the SkPicture. // However, we still need to check that the SkFontMgr starts as it is used by diff --git a/www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.h b/www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.h index 56e74d23d3ba..7f4b7238d53e 100644 --- a/www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.h +++ b/www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.h @@ -1,11 +1,11 @@ ---- components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.h.orig 2021-07-19 18:45:14 UTC +--- components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.h.orig 2022-02-28 16:54:41 UTC +++ components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.h @@ -21,7 +21,7 @@ #include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/receiver.h" --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "components/services/font/public/cpp/font_loader.h" #include "third_party/skia/include/core/SkRefCnt.h" #endif @@ -13,8 +13,8 @@ std::unique_ptr<PaintPreviewCompositorImpl>> compositors_; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) sk_sp<font_service::FontLoader> font_loader_; #endif diff --git a/www/chromium/files/patch-components_startup__metric__utils_browser_startup__metric__utils.cc b/www/chromium/files/patch-components_startup__metric__utils_browser_startup__metric__utils.cc index 678b36a4e364..235924ee0915 100644 --- a/www/chromium/files/patch-components_startup__metric__utils_browser_startup__metric__utils.cc +++ b/www/chromium/files/patch-components_startup__metric__utils_browser_startup__metric__utils.cc @@ -1,11 +1,11 @@ ---- components/startup_metric_utils/browser/startup_metric_utils.cc.orig 2022-02-07 13:39:41 UTC +--- components/startup_metric_utils/browser/startup_metric_utils.cc.orig 2022-02-28 16:54:41 UTC +++ components/startup_metric_utils/browser/startup_metric_utils.cc @@ -347,7 +347,7 @@ base::TimeTicks StartupTimeToTimeTicks(base::Time time // Enabling this logic on OS X causes a significant performance regression. // https://crbug.com/601270 --#if !defined(OS_APPLE) -+#if !defined(OS_APPLE) && !defined(OS_BSD) +-#if !BUILDFLAG(IS_APPLE) ++#if !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD) static bool statics_initialized = false; base::ThreadPriority previous_priority = base::ThreadPriority::NORMAL; @@ -13,8 +13,8 @@ static const base::Time time_base = base::Time::Now(); static const base::TimeTicks trace_ticks_base = base::TimeTicks::Now(); --#if !defined(OS_APPLE) -+#if !defined(OS_APPLE) && !defined(OS_BSD) +-#if !BUILDFLAG(IS_APPLE) ++#if !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD) if (!statics_initialized) { base::PlatformThread::SetCurrentThreadPriority(previous_priority); } diff --git a/www/chromium/files/patch-components_storage__monitor_BUILD.gn b/www/chromium/files/patch-components_storage__monitor_BUILD.gn new file mode 100644 index 000000000000..1c3dc3ad0240 --- /dev/null +++ b/www/chromium/files/patch-components_storage__monitor_BUILD.gn @@ -0,0 +1,11 @@ +--- components/storage_monitor/BUILD.gn.orig 2022-02-28 16:54:41 UTC ++++ components/storage_monitor/BUILD.gn +@@ -174,7 +174,7 @@ source_set("unit_tests") { + "mtp_manager_client_chromeos_unittest.cc", + "storage_monitor_chromeos_unittest.cc", + ] +- } else if (is_linux || is_chromeos_lacros) { ++ } else if ((is_linux || is_chromeos_lacros) && !is_bsd) { + sources += [ "storage_monitor_linux_unittest.cc" ] + } + } diff --git a/www/chromium/files/patch-components_storage__monitor_removable__device__constants.cc b/www/chromium/files/patch-components_storage__monitor_removable__device__constants.cc index 9dfe77d17b46..b5f275ed96b3 100644 --- a/www/chromium/files/patch-components_storage__monitor_removable__device__constants.cc +++ b/www/chromium/files/patch-components_storage__monitor_removable__device__constants.cc @@ -1,11 +1,11 @@ ---- components/storage_monitor/removable_device_constants.cc.orig 2021-04-14 18:41:00 UTC +--- components/storage_monitor/removable_device_constants.cc.orig 2022-02-28 16:54:41 UTC +++ components/storage_monitor/removable_device_constants.cc @@ -10,7 +10,7 @@ namespace storage_monitor { const char kFSUniqueIdPrefix[] = "UUID:"; const char kVendorModelSerialPrefix[] = "VendorModelSerial:"; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) const char kVendorModelVolumeStoragePrefix[] = "VendorModelVolumeStorage:"; #endif diff --git a/www/chromium/files/patch-components_storage__monitor_removable__device__constants.h b/www/chromium/files/patch-components_storage__monitor_removable__device__constants.h index 57a05ea7efbd..71ac1f80d945 100644 --- a/www/chromium/files/patch-components_storage__monitor_removable__device__constants.h +++ b/www/chromium/files/patch-components_storage__monitor_removable__device__constants.h @@ -1,11 +1,11 @@ ---- components/storage_monitor/removable_device_constants.h.orig 2021-07-19 18:45:14 UTC +--- components/storage_monitor/removable_device_constants.h.orig 2022-02-28 16:54:41 UTC +++ components/storage_monitor/removable_device_constants.h @@ -14,7 +14,7 @@ namespace storage_monitor { extern const char kFSUniqueIdPrefix[]; extern const char kVendorModelSerialPrefix[]; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) extern const char kVendorModelVolumeStoragePrefix[]; #endif diff --git a/www/chromium/files/patch-components_sync__device__info_local__device__info__util.cc b/www/chromium/files/patch-components_sync__device__info_local__device__info__util.cc index 0feeda6eff71..8d2c8ff0d992 100644 --- a/www/chromium/files/patch-components_sync__device__info_local__device__info__util.cc +++ b/www/chromium/files/patch-components_sync__device__info_local__device__info__util.cc @@ -1,11 +1,11 @@ ---- components/sync_device_info/local_device_info_util.cc.orig 2021-05-12 22:05:51 UTC +--- components/sync_device_info/local_device_info_util.cc.orig 2022-02-28 16:54:41 UTC +++ components/sync_device_info/local_device_info_util.cc @@ -75,7 +75,7 @@ std::string GetPersonalizableDeviceNameInternal(); sync_pb::SyncEnums::DeviceType GetLocalDeviceType() { #if BUILDFLAG(IS_CHROMEOS_ASH) return sync_pb::SyncEnums_DeviceType_TYPE_CROS; --#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) return sync_pb::SyncEnums_DeviceType_TYPE_LINUX; - #elif defined(OS_ANDROID) || defined(OS_IOS) + #elif BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) return ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_TABLET diff --git a/www/chromium/files/patch-components_translate_core_browser_translate__prefs.cc b/www/chromium/files/patch-components_translate_core_browser_translate__prefs.cc index a9786e43faac..55e7a54f3a04 100644 --- a/www/chromium/files/patch-components_translate_core_browser_translate__prefs.cc +++ b/www/chromium/files/patch-components_translate_core_browser_translate__prefs.cc @@ -1,11 +1,11 @@ ---- components/translate/core/browser/translate_prefs.cc.orig 2022-02-07 13:39:41 UTC +--- components/translate/core/browser/translate_prefs.cc.orig 2022-02-28 16:54:41 UTC +++ components/translate/core/browser/translate_prefs.cc -@@ -841,7 +841,7 @@ bool TranslatePrefs::CanTranslateLanguage( +@@ -905,7 +905,7 @@ bool TranslatePrefs::CanTranslateLanguage( bool TranslatePrefs::IsDetailedLanguageSettingsEnabled() { - #if defined(OS_ANDROID) + #if BUILDFLAG(IS_ANDROID) return base::FeatureList::IsEnabled(language::kDetailedLanguageSettings); --#elif defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) -+#elif defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) +-#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return base::FeatureList::IsEnabled( language::kDesktopDetailedLanguageSettings); #else diff --git a/www/chromium/files/patch-components_translate_core_common_translate__util.cc b/www/chromium/files/patch-components_translate_core_common_translate__util.cc index 44b87c390f03..a3eb057ee635 100644 --- a/www/chromium/files/patch-components_translate_core_common_translate__util.cc +++ b/www/chromium/files/patch-components_translate_core_common_translate__util.cc @@ -1,11 +1,11 @@ ---- components/translate/core/common/translate_util.cc.orig 2022-02-07 13:39:41 UTC +--- components/translate/core/common/translate_util.cc.orig 2022-02-28 16:54:41 UTC +++ components/translate/core/common/translate_util.cc @@ -29,7 +29,7 @@ const base::Feature kTranslateSubFrames{"TranslateSubF const base::Feature kTFLiteLanguageDetectionEnabled{ "TFLiteLanguageDetectionEnabled", - #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || \ -- defined(OS_MAC) -+ defined(OS_MAC) || defined(OS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) base::FEATURE_ENABLED_BY_DEFAULT - #else // !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_WIN) && - // !defined(OS_MAC) + #else + base::FEATURE_DISABLED_BY_DEFAULT diff --git a/www/chromium/files/patch-components_update__client_update__query__params.cc b/www/chromium/files/patch-components_update__client_update__query__params.cc index 59c55916b34c..7ddb06164b11 100644 --- a/www/chromium/files/patch-components_update__client_update__query__params.cc +++ b/www/chromium/files/patch-components_update__client_update__query__params.cc @@ -1,8 +1,8 @@ ---- components/update_client/update_query_params.cc.orig 2021-04-14 18:41:02 UTC +--- components/update_client/update_query_params.cc.orig 2022-02-28 16:54:41 UTC +++ components/update_client/update_query_params.cc @@ -40,6 +40,8 @@ const char kOs[] = "fuchsia"; - #elif defined(OS_OPENBSD) + #elif BUILDFLAG(IS_OPENBSD) "openbsd"; +#elif defined(OS_FREEBSD) + "freebsd"; diff --git a/www/chromium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc b/www/chromium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc index 98c42cb55989..b66b8c936826 100644 --- a/www/chromium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc +++ b/www/chromium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc @@ -1,11 +1,11 @@ ---- components/url_formatter/spoof_checks/idn_spoof_checker.cc.orig 2022-02-07 13:39:41 UTC +--- components/url_formatter/spoof_checks/idn_spoof_checker.cc.orig 2022-02-28 16:54:41 UTC +++ components/url_formatter/spoof_checks/idn_spoof_checker.cc @@ -285,7 +285,7 @@ IDNSpoofChecker::IDNSpoofChecker() { // The ideal fix would be to change the omnibox font used for Thai. In // that case, the Linux-only list should be revisited and potentially // removed. --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) "[ทนบพรหเแ๐ดลปฟม]", #else "[บพเแ๐]", diff --git a/www/chromium/files/patch-components_viz_common_features.cc b/www/chromium/files/patch-components_viz_common_features.cc index 684e8ab3872c..932c678c81ce 100644 --- a/www/chromium/files/patch-components_viz_common_features.cc +++ b/www/chromium/files/patch-components_viz_common_features.cc @@ -1,11 +1,11 @@ ---- components/viz/common/features.cc.orig 2022-02-07 13:39:41 UTC +--- components/viz/common/features.cc.orig 2022-02-28 16:54:41 UTC +++ components/viz/common/features.cc -@@ -58,7 +58,7 @@ const base::Feature kSimpleFrameRateThrottling{ - const base::Feature kUseSkiaRenderer { +@@ -64,7 +64,7 @@ const base::Feature kUseSkiaRenderer { "UseSkiaRenderer", - #if defined(OS_WIN) || defined(OS_ANDROID) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ -- defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_MAC) -+ defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_MAC) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || \ + BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT diff --git a/www/chromium/files/patch-components_viz_common_gpu_dawn__context__provider.cc b/www/chromium/files/patch-components_viz_common_gpu_dawn__context__provider.cc index 26988e18dbb1..24e03b76bf79 100644 --- a/www/chromium/files/patch-components_viz_common_gpu_dawn__context__provider.cc +++ b/www/chromium/files/patch-components_viz_common_gpu_dawn__context__provider.cc @@ -1,11 +1,11 @@ ---- components/viz/common/gpu/dawn_context_provider.cc.orig 2021-04-14 18:41:02 UTC +--- components/viz/common/gpu/dawn_context_provider.cc.orig 2022-02-28 16:54:41 UTC +++ components/viz/common/gpu/dawn_context_provider.cc @@ -20,7 +20,7 @@ namespace { - dawn_native::BackendType GetDefaultBackendType() { - #if defined(OS_WIN) - return dawn_native::BackendType::D3D12; --#elif defined(OS_LINUX) || defined(OS_CHROMEOS) -+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - return dawn_native::BackendType::Vulkan; + wgpu::BackendType GetDefaultBackendType() { + #if BUILDFLAG(IS_WIN) + return wgpu::BackendType::D3D12; +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + return wgpu::BackendType::Vulkan; #else NOTREACHED(); diff --git a/www/chromium/files/patch-components_viz_host_host__display__client.cc b/www/chromium/files/patch-components_viz_host_host__display__client.cc index 399f7b4130e9..928e130abee9 100644 --- a/www/chromium/files/patch-components_viz_host_host__display__client.cc +++ b/www/chromium/files/patch-components_viz_host_host__display__client.cc @@ -1,11 +1,11 @@ ---- components/viz/host/host_display_client.cc.orig 2021-04-14 18:41:02 UTC +--- components/viz/host/host_display_client.cc.orig 2022-02-28 16:54:41 UTC +++ components/viz/host/host_display_client.cc -@@ -60,7 +60,7 @@ void HostDisplayClient::CreateLayeredWindowUpdater( +@@ -61,7 +61,7 @@ void HostDisplayClient::CreateLayeredWindowUpdater( // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) void HostDisplayClient::DidCompleteSwapWithNewSize(const gfx::Size& size) { NOTIMPLEMENTED(); } diff --git a/www/chromium/files/patch-components_viz_host_host__display__client.h b/www/chromium/files/patch-components_viz_host_host__display__client.h index 598a02a6ba55..2786ca6b69fb 100644 --- a/www/chromium/files/patch-components_viz_host_host__display__client.h +++ b/www/chromium/files/patch-components_viz_host_host__display__client.h @@ -1,11 +1,11 @@ ---- components/viz/host/host_display_client.h.orig 2022-02-07 13:39:41 UTC +--- components/viz/host/host_display_client.h.orig 2022-02-28 16:54:41 UTC +++ components/viz/host/host_display_client.h @@ -48,7 +48,7 @@ class VIZ_HOST_EXPORT HostDisplayClient : public mojom // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) void DidCompleteSwapWithNewSize(const gfx::Size& size) override; #endif diff --git a/www/chromium/files/patch-components_viz_host_renderer__settings__creation.cc b/www/chromium/files/patch-components_viz_host_renderer__settings__creation.cc index c188aa4199ae..9dd671db141b 100644 --- a/www/chromium/files/patch-components_viz_host_renderer__settings__creation.cc +++ b/www/chromium/files/patch-components_viz_host_renderer__settings__creation.cc @@ -1,11 +1,11 @@ ---- components/viz/host/renderer_settings_creation.cc.orig 2021-12-14 11:45:04 UTC +--- components/viz/host/renderer_settings_creation.cc.orig 2022-02-28 16:54:41 UTC +++ components/viz/host/renderer_settings_creation.cc -@@ -56,7 +56,7 @@ RendererSettings CreateRendererSettings() { +@@ -52,7 +52,7 @@ RendererSettings CreateRendererSettings() { renderer_settings.partial_swap_enabled = !command_line->HasSwitch(switches::kUIDisablePartialSwap); --#if defined(OS_APPLE) || defined(OS_LINUX) -+#if defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Simple frame rate throttling only works on macOS and Linux renderer_settings.apply_simple_frame_rate_throttling = features::IsSimpleFrameRateThrottlingEnabled(); diff --git a/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc b/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc index 4e278ad3a591..bbc943db0a0b 100644 --- a/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc +++ b/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc @@ -1,11 +1,11 @@ ---- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2022-02-07 13:39:41 UTC +--- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2022-02-28 16:54:41 UTC +++ components/viz/service/display_embedder/skia_output_surface_impl.cc -@@ -1160,7 +1160,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor +@@ -1162,7 +1162,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor ->GetDeviceQueue() ->GetVulkanPhysicalDevice(), VK_IMAGE_TILING_OPTIMAL, ycbcr_info); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Textures that were allocated _on linux_ with ycbcr info came from // VaapiVideoDecoder, which exports using DRM format modifiers. return GrBackendFormat::MakeVk(gr_ycbcr_info, diff --git a/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc b/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc index 6c3d7cc42786..5dec66679a00 100644 --- a/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc +++ b/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc @@ -1,11 +1,11 @@ ---- components/viz/service/display_embedder/software_output_surface.cc.orig 2022-02-07 13:39:41 UTC +--- components/viz/service/display_embedder/software_output_surface.cc.orig 2022-02-28 16:54:41 UTC +++ components/viz/service/display_embedder/software_output_surface.cc @@ -118,7 +118,7 @@ void SoftwareOutputSurface::SwapBuffersCallback(base:: now.SnappedToNextTick(refresh_timebase_, refresh_interval_) - now; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) if (needs_swap_size_notifications_) client_->DidSwapWithSize(pixel_size); #endif @@ -13,8 +13,8 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) void SoftwareOutputSurface::SetNeedsSwapSizeNotifications( bool needs_swap_size_notifications) { needs_swap_size_notifications_ = needs_swap_size_notifications; diff --git a/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h b/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h index 536e4badad98..88022d438fff 100644 --- a/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h +++ b/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h @@ -1,11 +1,11 @@ ---- components/viz/service/display_embedder/software_output_surface.h.orig 2022-02-07 13:39:41 UTC +--- components/viz/service/display_embedder/software_output_surface.h.orig 2022-02-28 16:54:41 UTC +++ components/viz/service/display_embedder/software_output_surface.h @@ -56,7 +56,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi gfx::OverlayTransform GetDisplayTransform() override; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) void SetNeedsSwapSizeNotifications( bool needs_swap_size_notifications) override; #endif @@ -13,8 +13,8 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) bool needs_swap_size_notifications_ = false; #endif diff --git a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc index acb82b547461..dc1ff46a2f47 100644 --- a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc +++ b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc @@ -1,20 +1,20 @@ ---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2022-02-07 13:39:41 UTC +--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2022-02-28 16:54:41 UTC +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc -@@ -62,7 +62,7 @@ RootCompositorFrameSinkImpl::Create( +@@ -61,7 +61,7 @@ RootCompositorFrameSinkImpl::Create( // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) // For X11, we need notify client about swap completion after resizing, so the // client can use it for synchronize with X11 WM. output_surface->SetNeedsSwapSizeNotifications(true); -@@ -531,7 +531,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw +@@ -529,7 +529,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw display_client_->DidCompleteSwapWithSize(pixel_size); // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) if (display_client_ && pixel_size != last_swap_pixel_size_) { last_swap_pixel_size_ = pixel_size; display_client_->DidCompleteSwapWithNewSize(last_swap_pixel_size_); diff --git a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h index a650a6df96d2..de2571e33adf 100644 --- a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h +++ b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h @@ -1,11 +1,11 @@ ---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2022-02-07 13:39:41 UTC +--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2022-02-28 16:54:41 UTC +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h @@ -189,7 +189,7 @@ class VIZ_SERVICE_EXPORT RootCompositorFrameSinkImpl // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) gfx::Size last_swap_pixel_size_; #endif diff --git a/www/chromium/files/patch-components_viz_test_fake__display__client.cc b/www/chromium/files/patch-components_viz_test_fake__display__client.cc index 486bdb57d937..9d26283bad40 100644 --- a/www/chromium/files/patch-components_viz_test_fake__display__client.cc +++ b/www/chromium/files/patch-components_viz_test_fake__display__client.cc @@ -1,11 +1,11 @@ ---- components/viz/test/fake_display_client.cc.orig 2022-02-07 13:39:41 UTC +--- components/viz/test/fake_display_client.cc.orig 2022-02-28 16:54:41 UTC +++ components/viz/test/fake_display_client.cc -@@ -23,7 +23,7 @@ void FakeDisplayClient::CreateLayeredWindowUpdater( +@@ -25,7 +25,7 @@ void FakeDisplayClient::CreateLayeredWindowUpdater( mojo::PendingReceiver<mojom::LayeredWindowUpdater> receiver) {} #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) void FakeDisplayClient::DidCompleteSwapWithNewSize(const gfx::Size& size) {} #endif diff --git a/www/chromium/files/patch-components_viz_test_fake__display__client.h b/www/chromium/files/patch-components_viz_test_fake__display__client.h new file mode 100644 index 000000000000..04e55d54dd5f --- /dev/null +++ b/www/chromium/files/patch-components_viz_test_fake__display__client.h @@ -0,0 +1,11 @@ +--- components/viz/test/fake_display_client.h.orig 2022-02-28 16:54:41 UTC ++++ components/viz/test/fake_display_client.h +@@ -34,7 +34,7 @@ class FakeDisplayClient : public mojom::DisplayClient + mojo::PendingReceiver<mojom::LayeredWindowUpdater> receiver) override; + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + void DidCompleteSwapWithNewSize(const gfx::Size& size) override; + #endif + diff --git a/www/chromium/files/patch-components_viz_test_mock__display__client.h b/www/chromium/files/patch-components_viz_test_mock__display__client.h index 56af2128edd5..cd9517ad720e 100644 --- a/www/chromium/files/patch-components_viz_test_mock__display__client.h +++ b/www/chromium/files/patch-components_viz_test_mock__display__client.h @@ -1,11 +1,11 @@ ---- components/viz/test/mock_display_client.h.orig 2021-12-14 11:45:05 UTC +--- components/viz/test/mock_display_client.h.orig 2022-02-28 16:54:41 UTC +++ components/viz/test/mock_display_client.h @@ -44,7 +44,7 @@ class MockDisplayClient : public mojom::DisplayClient #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) MOCK_METHOD1(DidCompleteSwapWithNewSize, void(const gfx::Size&)); #endif diff --git a/www/chromium/files/patch-content_app_content__main.cc b/www/chromium/files/patch-content_app_content__main.cc index 9e63e5f4844b..eab8b277ef8a 100644 --- a/www/chromium/files/patch-content_app_content__main.cc +++ b/www/chromium/files/patch-content_app_content__main.cc @@ -1,11 +1,11 @@ ---- content/app/content_main.cc.orig 2022-02-07 13:39:41 UTC +--- content/app/content_main.cc.orig 2022-02-28 16:54:41 UTC +++ content/app/content_main.cc -@@ -251,7 +251,7 @@ RunContentProcess(ContentMainParams params, +@@ -252,7 +252,7 @@ RunContentProcess(ContentMainParams params, #endif base::EnableTerminationOnOutOfMemory(); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // The various desktop environments set this environment variable that // allows the dbus client library to connect directly to the bus. When this // variable is not set (test environments like xvfb-run), the dbus client diff --git a/www/chromium/files/patch-content_app_content__main__runner__impl.cc b/www/chromium/files/patch-content_app_content__main__runner__impl.cc index 18aeb62ee0a6..e948fb0ebca3 100644 --- a/www/chromium/files/patch-content_app_content__main__runner__impl.cc +++ b/www/chromium/files/patch-content_app_content__main__runner__impl.cc @@ -1,52 +1,50 @@ ---- content/app/content_main_runner_impl.cc.orig 2022-02-07 13:39:41 UTC +--- content/app/content_main_runner_impl.cc.orig 2022-02-28 16:54:41 UTC +++ content/app/content_main_runner_impl.cc -@@ -131,13 +131,13 @@ +@@ -130,13 +130,13 @@ #include "base/posix/global_descriptors.h" #include "content/public/common/content_descriptors.h" --#if !defined(OS_MAC) -+#if !defined(OS_MAC) && !defined(OS_BSD) +-#if !BUILDFLAG(IS_MAC) ++#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD) #include "content/public/common/zygote/zygote_fork_delegate_linux.h" #endif - #endif // OS_POSIX || OS_FUCHSIA + #endif // BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA) --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "base/native_library.h" #include "base/rand_util.h" #include "content/public/common/zygote/sandbox_support_linux.h" -@@ -171,6 +171,12 @@ +@@ -170,6 +170,10 @@ #include "media/base/media_switches.h" #endif -+#if defined(OS_BSD) ++#if BUILDFLAG(IS_BSD) +#include "base/system/sys_info.h" -+#include "content/public/common/sandbox_init.h" -+#include "sandbox/policy/linux/sandbox_linux.h" +#endif + - #if defined(OS_ANDROID) + #if BUILDFLAG(IS_ANDROID) #include "base/system/sys_info.h" #include "components/power_scheduler/power_scheduler.h" -@@ -344,7 +350,7 @@ void InitializeZygoteSandboxForBrowserProcess( +@@ -335,7 +339,7 @@ void InitializeZygoteSandboxForBrowserProcess( } #endif // BUILDFLAG(USE_ZYGOTE_HANDLE) --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #if BUILDFLAG(ENABLE_PLUGINS) // Loads the (native) libraries but does not initialize them (i.e., does not -@@ -380,11 +386,14 @@ void PreloadLibraryCdms() { +@@ -371,11 +375,14 @@ void PreloadLibraryCdms() { } #endif // BUILDFLAG(ENABLE_LIBRARY_CDMS) -#if BUILDFLAG(USE_ZYGOTE_HANDLE) -+#if BUILDFLAG(USE_ZYGOTE_HANDLE) || defined(OS_BSD) ++#if BUILDFLAG(USE_ZYGOTE_HANDLE) || BUILDFLAG(IS_BSD) void PreSandboxInit() { + // arc4random -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) // Pre-acquire resources needed by BoringSSL. See // https://boringssl.googlesource.com/boringssl/+/HEAD/SANDBOXING.md CRYPTO_pre_sandbox_init(); @@ -54,11 +52,11 @@ #if BUILDFLAG(ENABLE_PLUGINS) // Ensure access to the Pepper plugins before the sandbox is turned on. -@@ -396,6 +405,11 @@ void PreSandboxInit() { +@@ -387,6 +394,11 @@ void PreSandboxInit() { #endif InitializeWebRtcModule(); -+#if defined(OS_BSD) ++#if BUILDFLAG(IS_BSD) + // "cache" the amount of physical memory before pledge(2) + base::SysInfo::AmountOfPhysicalMemoryMB(); +#endif @@ -66,33 +64,34 @@ // 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. -@@ -565,7 +579,7 @@ int NO_STACK_PROTECTOR RunZygote(ContentMainDelegate* +@@ -556,7 +568,7 @@ int NO_STACK_PROTECTOR RunZygote(ContentMainDelegate* delegate->ZygoteStarting(&zygote_fork_delegates); media::InitializeMediaLibrary(); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) PreSandboxInit(); #endif -@@ -741,10 +755,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -732,11 +744,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam kFieldTrialDescriptor + base::GlobalDescriptors::kBaseDescriptor); - #endif // !OS_ANDROID + #endif // !BUILDFLAG(IS_ANDROID) --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_OPENBSD) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OPENBSD) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) g_fds->Set(kCrashDumpSignal, kCrashDumpSignal + base::GlobalDescriptors::kBaseDescriptor); --#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_OPENBSD) -+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +-#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || +- // BUILDFLAG(IS_OPENBSD) ++#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) - #endif // !OS_WIN + #endif // !BUILDFLAG(IS_WIN) -@@ -933,6 +947,16 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -925,6 +936,16 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam } #endif -+#if defined(OS_BSD) ++#if BUILDFLAG(IS_BSD) + if (process_type.empty()) { + sandbox::policy::SandboxLinux::Options sandbox_options; + sandbox::policy::SandboxLinux::GetInstance()->InitializeSandbox( @@ -105,21 +104,21 @@ delegate_->SandboxInitialized(process_type); #if BUILDFLAG(USE_ZYGOTE_HANDLE) -@@ -988,7 +1012,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { +@@ -980,7 +1001,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { mojo::core::InitFeatures(); } --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // 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 -@@ -1021,6 +1045,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { +@@ -1013,6 +1034,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { content_main_params_.reset(); RegisterMainThreadFactories(); + -+#if defined(OS_BSD) ++#if BUILDFLAG(IS_BSD) + if (!process_type.empty()) + PreSandboxInit(); +#endif diff --git a/www/chromium/files/patch-content_browser_BUILD.gn b/www/chromium/files/patch-content_browser_BUILD.gn index e46f0adca63f..945f6dd7e7a9 100644 --- a/www/chromium/files/patch-content_browser_BUILD.gn +++ b/www/chromium/files/patch-content_browser_BUILD.gn @@ -1,6 +1,6 @@ ---- content/browser/BUILD.gn.orig 2022-02-07 13:39:41 UTC +--- content/browser/BUILD.gn.orig 2022-02-28 16:54:41 UTC +++ content/browser/BUILD.gn -@@ -2317,6 +2317,13 @@ source_set("browser") { +@@ -2318,6 +2318,13 @@ source_set("browser") { ] } @@ -12,5 +12,5 @@ + } + if (is_chromeos) { + deps += [ "//components/value_store:value_store" ] sources += [ - "handwriting/handwriting_recognition_service_impl_cros.cc", diff --git a/www/chromium/files/patch-content_browser_browser__child__process__host__impl.cc b/www/chromium/files/patch-content_browser_browser__child__process__host__impl.cc index da0ed0e31edc..3296411f0ee5 100644 --- a/www/chromium/files/patch-content_browser_browser__child__process__host__impl.cc +++ b/www/chromium/files/patch-content_browser_browser__child__process__host__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/browser_child_process_host_impl.cc.orig 2022-02-07 13:39:41 UTC +--- content/browser/browser_child_process_host_impl.cc.orig 2022-02-28 16:54:41 UTC +++ content/browser/browser_child_process_host_impl.cc -@@ -305,6 +305,7 @@ void BrowserChildProcessHostImpl::LaunchWithoutExtraCo +@@ -293,6 +293,7 @@ void BrowserChildProcessHostImpl::LaunchWithoutExtraCo switches::kDisableBestEffortTasks, switches::kDisableLogging, switches::kEnableLogging, diff --git a/www/chromium/files/patch-content_browser_browser__main__loop.cc b/www/chromium/files/patch-content_browser_browser__main__loop.cc index f5894fcc95f3..416938efc96e 100644 --- a/www/chromium/files/patch-content_browser_browser__main__loop.cc +++ b/www/chromium/files/patch-content_browser_browser__main__loop.cc @@ -1,10 +1,10 @@ ---- content/browser/browser_main_loop.cc.orig 2022-02-07 13:39:41 UTC +--- content/browser/browser_main_loop.cc.orig 2022-02-28 16:54:41 UTC +++ content/browser/browser_main_loop.cc -@@ -238,6 +238,12 @@ +@@ -239,6 +239,12 @@ #include "mojo/public/cpp/bindings/lib/test_random_mojo_delays.h" #endif -+#if defined(OS_BSD) ++#if BUILDFLAG(IS_BSD) +#include "content/browser/sandbox_host_linux.h" +#include "content/public/common/zygote/sandbox_support_linux.h" +#include "sandbox/policy/sandbox.h" @@ -13,11 +13,11 @@ // One of the linux specific headers defines this as a macro. #ifdef DestroyAll #undef DestroyAll -@@ -545,6 +551,12 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -546,6 +552,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()); -+#elif defined(OS_BSD) ++#elif BUILDFLAG(IS_BSD) + base::FileHandleMappingVector additional_remapped_fds; + base::LaunchOptions options; + SandboxHostLinux::GetInstance()->Init(); @@ -26,21 +26,21 @@ #endif // GLib's spawning of new processes is buggy, so it's important that at this -@@ -572,7 +584,7 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -573,7 +585,7 @@ int BrowserMainLoop::EarlyInitialization() { // Up the priority of the UI thread unless it was already high (since Mac // and recent versions of Android (O+) do this automatically). --#if !defined(OS_MAC) -+#if !defined(OS_MAC) && !defined(OS_BSD) +-#if !BUILDFLAG(IS_MAC) ++#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD) if (base::FeatureList::IsEnabled( features::kBrowserUseDisplayThreadPriority) && base::PlatformThread::GetCurrentThreadPriority() < -@@ -583,7 +595,7 @@ int BrowserMainLoop::EarlyInitialization() { - #endif // !defined(OS_MAC) +@@ -584,7 +596,7 @@ int BrowserMainLoop::EarlyInitialization() { + #endif // !BUILDFLAG(IS_MAC) - #if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -- defined(OS_ANDROID) -+ defined(OS_ANDROID) || defined(OS_BSD) + #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_ANDROID) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) // We use quite a few file descriptors for our IPC as well as disk the disk // cache,and the default limit on the Mac is low (256), so bump it up. diff --git a/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc b/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc index 1fff9574f603..2a89d2d51ac1 100644 --- a/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc +++ b/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc @@ -1,10 +1,10 @@ ---- content/browser/child_process_launcher_helper_linux.cc.orig 2022-02-07 13:39:41 UTC +--- content/browser/child_process_launcher_helper_linux.cc.orig 2022-02-28 16:54:41 UTC +++ content/browser/child_process_launcher_helper_linux.cc @@ -19,7 +19,9 @@ #include "content/public/common/result_codes.h" #include "content/public/common/sandboxed_process_launcher_delegate.h" #include "content/public/common/zygote/sandbox_support_linux.h" -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) #include "content/public/common/zygote/zygote_handle.h" +#endif #include "sandbox/policy/linux/sandbox_linux.h" @@ -14,7 +14,7 @@ int* launch_result) { *is_synchronous_launch = true; -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) ZygoteHandle zygote_handle = base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoZygote) ? nullptr @@ -22,7 +22,7 @@ GetProcessType()); *launch_result = LAUNCH_RESULT_SUCCESS; --#if !defined(OS_OPENBSD) +-#if !BUILDFLAG(IS_OPENBSD) if (handle) { // It could be a renderer process or an utility process. int oom_score = content::kMiscOomScore; @@ -45,7 +45,7 @@ const ChildProcessLauncherHelper::Process& process, bool known_dead) { ChildProcessTerminationInfo info; -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) if (process.zygote) { info.status = process.zygote->GetTerminationStatus( process.process.Handle(), known_dead, &info.exit_code); @@ -60,7 +60,7 @@ DCHECK(CurrentlyOnProcessLauncherTaskRunner()); process.process.Terminate(RESULT_CODE_NORMAL_EXIT, false); // On POSIX, we must additionally reap the child. -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) if (process.zygote) { // If the renderer was created via a zygote, we have to proxy the reaping // through the zygote process. @@ -68,7 +68,7 @@ } else { +#endif base::EnsureProcessTerminated(std::move(process.process)); -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) } +#endif } diff --git a/www/chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc b/www/chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc index fa5704d5b5d4..60f6e8b3bb34 100644 --- a/www/chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc +++ b/www/chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc @@ -1,11 +1,11 @@ ---- content/browser/compositor/viz_process_transport_factory.cc.orig 2022-02-07 13:39:41 UTC +--- content/browser/compositor/viz_process_transport_factory.cc.orig 2022-02-28 16:54:41 UTC +++ content/browser/compositor/viz_process_transport_factory.cc -@@ -113,7 +113,7 @@ class HostDisplayClient : public viz::HostDisplayClien +@@ -112,7 +112,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. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) void DidCompleteSwapWithNewSize(const gfx::Size& size) override { compositor_->OnCompleteSwapWithNewSize(size); } diff --git a/www/chromium/files/patch-content_browser_compute__pressure_cpu__probe.cc b/www/chromium/files/patch-content_browser_compute__pressure_cpu__probe.cc index a2d52d6eb0bb..e19941607612 100644 --- a/www/chromium/files/patch-content_browser_compute__pressure_cpu__probe.cc +++ b/www/chromium/files/patch-content_browser_compute__pressure_cpu__probe.cc @@ -1,10 +1,10 @@ ---- content/browser/compute_pressure/cpu_probe.cc.orig 2022-02-07 13:39:41 UTC +--- content/browser/compute_pressure/cpu_probe.cc.orig 2022-02-28 16:54:41 UTC +++ content/browser/compute_pressure/cpu_probe.cc @@ -52,6 +52,7 @@ std::unique_ptr<CpuProbe> CpuProbe::Create() { - #elif defined(OS_LINUX) || defined(OS_CHROMEOS) + #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) return CpuProbeLinux::Create(); #else + NOTIMPLEMENTED(); return std::make_unique<NullCpuProbe>(); - #endif // defined(OS_ANDROID) + #endif // BUILDFLAG(IS_ANDROID) } diff --git a/www/chromium/files/patch-content_browser_devtools_protocol_system__info__handler.cc b/www/chromium/files/patch-content_browser_devtools_protocol_system__info__handler.cc index ddd0b5c20a2c..11964c73089d 100644 --- a/www/chromium/files/patch-content_browser_devtools_protocol_system__info__handler.cc +++ b/www/chromium/files/patch-content_browser_devtools_protocol_system__info__handler.cc @@ -1,11 +1,11 @@ ---- content/browser/devtools/protocol/system_info_handler.cc.orig 2022-02-07 13:39:41 UTC +--- content/browser/devtools/protocol/system_info_handler.cc.orig 2022-02-28 16:54:41 UTC +++ content/browser/devtools/protocol/system_info_handler.cc @@ -50,7 +50,7 @@ std::unique_ptr<SystemInfo::Size> GfxSizeToSystemInfoS // Windows builds need more time -- see Issue 873112 and 1004472. // Mac builds need more time - see Issue angleproject:6182. - #if ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(NDEBUG)) || \ -- defined(OS_WIN) || defined(OS_MAC) || defined(USE_OZONE) -+ defined(OS_WIN) || defined(OS_MAC) || defined(USE_OZONE) || defined(OS_BSD) + #if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !defined(NDEBUG)) || \ +- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || defined(USE_OZONE) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || defined(USE_OZONE) || BUILDFLAG(IS_BSD) static constexpr int kGPUInfoWatchdogTimeoutMultiplierOS = 3; #else static constexpr int kGPUInfoWatchdogTimeoutMultiplierOS = 1; diff --git a/www/chromium/files/patch-content_browser_download_download__manager__impl.cc b/www/chromium/files/patch-content_browser_download_download__manager__impl.cc index 888798e6d46c..6c0935abc37e 100644 --- a/www/chromium/files/patch-content_browser_download_download__manager__impl.cc +++ b/www/chromium/files/patch-content_browser_download_download__manager__impl.cc @@ -1,29 +1,29 @@ ---- content/browser/download/download_manager_impl.cc.orig 2022-02-07 13:39:41 UTC +--- content/browser/download/download_manager_impl.cc.orig 2022-02-28 16:54:41 UTC +++ content/browser/download/download_manager_impl.cc -@@ -89,7 +89,7 @@ +@@ -88,7 +88,7 @@ #include "third_party/blink/public/common/storage_key/storage_key.h" #include "url/origin.h" --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "base/nix/xdg_util.h" #endif -@@ -236,7 +236,7 @@ class DownloadItemFactoryImpl : public download::Downl +@@ -235,7 +235,7 @@ class DownloadItemFactoryImpl : public download::Downl } }; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) base::FilePath GetTemporaryDownloadDirectory() { std::unique_ptr<base::Environment> env(base::Environment::Create()); return base::nix::GetXDGDirectory(env.get(), "XDG_DATA_HOME", ".local/share"); -@@ -592,7 +592,7 @@ bool DownloadManagerImpl::InterceptDownload( +@@ -591,7 +591,7 @@ bool DownloadManagerImpl::InterceptDownload( base::FilePath DownloadManagerImpl::GetDefaultDownloadDirectory() { base::FilePath default_download_directory; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // TODO(thomasanderson,crbug.com/784010): Remove this when all Linux // distros with versions of GTK lower than 3.14.7 are no longer // supported. This should happen when support for Ubuntu Trusty and diff --git a/www/chromium/files/patch-content_browser_font__access_font__enumeration__cache.h b/www/chromium/files/patch-content_browser_font__access_font__enumeration__cache.h index de2ca573f898..49353a16e924 100644 --- a/www/chromium/files/patch-content_browser_font__access_font__enumeration__cache.h +++ b/www/chromium/files/patch-content_browser_font__access_font__enumeration__cache.h @@ -1,11 +1,11 @@ ---- content/browser/font_access/font_enumeration_cache.h.orig 2022-02-07 13:39:41 UTC +--- content/browser/font_access/font_enumeration_cache.h.orig 2022-02-28 16:54:41 UTC +++ content/browser/font_access/font_enumeration_cache.h @@ -24,7 +24,7 @@ #include "third_party/blink/public/mojom/font_access/font_access.mojom.h" - #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -- defined(OS_MAC) || defined(OS_FUCHSIA) -+ defined(OS_MAC) || defined(OS_FUCHSIA) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) #define PLATFORM_HAS_LOCAL_FONT_ENUMERATION_IMPL 1 #endif diff --git a/www/chromium/files/patch-content_browser_gpu_compositor__util.cc b/www/chromium/files/patch-content_browser_gpu_compositor__util.cc index 5db3284b8fb3..e534bb329be9 100644 --- a/www/chromium/files/patch-content_browser_gpu_compositor__util.cc +++ b/www/chromium/files/patch-content_browser_gpu_compositor__util.cc @@ -1,11 +1,11 @@ ---- content/browser/gpu/compositor_util.cc.orig 2022-02-07 13:39:41 UTC +--- content/browser/gpu/compositor_util.cc.orig 2022-02-28 16:54:41 UTC +++ content/browser/gpu/compositor_util.cc @@ -145,7 +145,7 @@ const GpuFeatureData GetGpuFeatureData( {"video_decode", SafeGetFeatureStatus(gpu_feature_info, gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE), --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) !base::FeatureList::IsEnabled(media::kVaapiVideoDecodeLinux), #else command_line.HasSwitch(switches::kDisableAcceleratedVideoDecode), @@ -13,8 +13,8 @@ {"video_encode", SafeGetFeatureStatus(gpu_feature_info, gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_ENCODE), --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) !base::FeatureList::IsEnabled(media::kVaapiVideoEncodeLinux), #else command_line.HasSwitch(switches::kDisableAcceleratedVideoEncode), diff --git a/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc index 47791f133ec7..0315e9024c30 100644 --- a/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc +++ b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc @@ -1,11 +1,11 @@ ---- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2022-02-07 13:39:41 UTC +--- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2022-02-28 16:54:41 UTC +++ content/browser/gpu/gpu_data_manager_impl_private.cc -@@ -1341,7 +1341,7 @@ void GpuDataManagerImplPrivate::AppendGpuCommandLine( +@@ -1340,7 +1340,7 @@ void GpuDataManagerImplPrivate::AppendGpuCommandLine( break; case gpu::GpuMode::SWIFTSHADER: { bool legacy_software_gl = true; --#if defined(OS_LINUX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) // This setting makes WebGL run on SwANGLE instead of SwiftShader GL. legacy_software_gl = false; #endif diff --git a/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc b/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc index 45e81541e64d..cc749785d7e2 100644 --- a/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc +++ b/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc @@ -1,15 +1,15 @@ ---- content/browser/gpu/gpu_process_host.cc.orig 2022-02-07 13:39:41 UTC +--- content/browser/gpu/gpu_process_host.cc.orig 2022-02-28 16:54:41 UTC +++ content/browser/gpu/gpu_process_host.cc -@@ -101,7 +101,7 @@ +@@ -100,7 +100,7 @@ #include "ui/ozone/public/ozone_switches.h" #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "ui/gfx/switches.h" #endif -@@ -254,6 +254,7 @@ static const char* const kSwitchNames[] = { +@@ -252,6 +252,7 @@ static const char* const kSwitchNames[] = { switches::kEnableBackgroundThreadPool, switches::kEnableGpuRasterization, switches::kEnableLogging, @@ -17,12 +17,12 @@ switches::kEnableDeJelly, switches::kDeJellyScreenWidth, switches::kDocumentTransitionSlowdownFactor, -@@ -295,7 +296,7 @@ static const char* const kSwitchNames[] = { +@@ -289,7 +290,7 @@ static const char* const kSwitchNames[] = { switches::kOzoneDumpFile, switches::kDisableBufferBWCompression, #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) switches::kX11Display, switches::kNoXshm, #endif diff --git a/www/chromium/files/patch-content_browser_media_media__keys__listener__manager__impl.cc b/www/chromium/files/patch-content_browser_media_media__keys__listener__manager__impl.cc index e350d938e941..243da28c2a93 100644 --- a/www/chromium/files/patch-content_browser_media_media__keys__listener__manager__impl.cc +++ b/www/chromium/files/patch-content_browser_media_media__keys__listener__manager__impl.cc @@ -1,11 +1,11 @@ ---- content/browser/media/media_keys_listener_manager_impl.cc.orig 2022-02-07 13:39:41 UTC +--- content/browser/media/media_keys_listener_manager_impl.cc.orig 2022-02-28 16:54:41 UTC +++ content/browser/media/media_keys_listener_manager_impl.cc @@ -226,7 +226,7 @@ void MediaKeysListenerManagerImpl::StartListeningForMe // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. - #if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_WIN) || \ -- defined(OS_MAC) -+ defined(OS_MAC) || defined(OS_BSD) + #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ +- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) system_media_controls_ = system_media_controls::SystemMediaControls::Create( media::AudioManager::GetGlobalAppName()); #endif diff --git a/www/chromium/files/patch-content_browser_ppapi__plugin__process__host__receiver__bindings.cc b/www/chromium/files/patch-content_browser_ppapi__plugin__process__host__receiver__bindings.cc index ea116cea3af0..db671fc88b41 100644 --- a/www/chromium/files/patch-content_browser_ppapi__plugin__process__host__receiver__bindings.cc +++ b/www/chromium/files/patch-content_browser_ppapi__plugin__process__host__receiver__bindings.cc @@ -1,11 +1,11 @@ ---- content/browser/ppapi_plugin_process_host_receiver_bindings.cc.orig 2021-04-14 18:41:02 UTC +--- content/browser/ppapi_plugin_process_host_receiver_bindings.cc.orig 2022-02-28 16:54:41 UTC +++ content/browser/ppapi_plugin_process_host_receiver_bindings.cc @@ -8,7 +8,7 @@ #include "build/build_config.h" --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck #include "content/browser/font_service.h" // nogncheck #endif @@ -13,8 +13,8 @@ void PpapiPluginProcessHost::BindHostReceiver( mojo::GenericPendingReceiver receiver) { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) ConnectToFontService(std::move(font_receiver)); #endif diff --git a/www/chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc b/www/chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc index 67c7d3773e7a..580bb950cdff 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc @@ -1,11 +1,11 @@ ---- content/browser/renderer_host/delegated_frame_host.cc.orig 2022-02-07 13:39:41 UTC +--- content/browser/renderer_host/delegated_frame_host.cc.orig 2022-02-28 16:54:41 UTC +++ content/browser/renderer_host/delegated_frame_host.cc @@ -288,7 +288,7 @@ void DelegatedFrameHost::EmbedSurface( if (!primary_surface_id || primary_surface_id->local_surface_id() != local_surface_id_) { --#if defined(OS_WIN) || defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_WIN) || defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) // On Windows and Linux, we would like to produce new content as soon as // possible or the OS will create an additional black gutter. Until we can // block resize on surface synchronization on these platforms, we will not diff --git a/www/chromium/files/patch-content_browser_renderer__host_input_input__device__change__observer.cc b/www/chromium/files/patch-content_browser_renderer__host_input_input__device__change__observer.cc index 4b1c95a6c27a..00e9275d7d0d 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_input_input__device__change__observer.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_input_input__device__change__observer.cc @@ -1,29 +1,29 @@ ---- content/browser/renderer_host/input/input_device_change_observer.cc.orig 2021-04-14 18:41:02 UTC +--- content/browser/renderer_host/input/input_device_change_observer.cc.orig 2022-02-28 16:54:41 UTC +++ content/browser/renderer_host/input/input_device_change_observer.cc @@ -9,7 +9,7 @@ - #if defined(OS_WIN) + #if BUILDFLAG(IS_WIN) #include "ui/events/devices/input_device_observer_win.h" --#elif defined(OS_LINUX) || defined(OS_CHROMEOS) -+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "ui/events/devices/device_data_manager.h" - #elif defined(OS_ANDROID) + #elif BUILDFLAG(IS_ANDROID) #include "ui/events/devices/input_device_observer_android.h" @@ -21,7 +21,7 @@ InputDeviceChangeObserver::InputDeviceChangeObserver(R render_view_host_impl_ = rvhi; - #if defined(OS_WIN) + #if BUILDFLAG(IS_WIN) ui::InputDeviceObserverWin::GetInstance()->AddObserver(this); --#elif defined(OS_LINUX) || defined(OS_CHROMEOS) -+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) ui::DeviceDataManager::GetInstance()->AddObserver(this); - #elif defined(OS_ANDROID) + #elif BUILDFLAG(IS_ANDROID) ui::InputDeviceObserverAndroid::GetInstance()->AddObserver(this); @@ -31,7 +31,7 @@ InputDeviceChangeObserver::InputDeviceChangeObserver(R InputDeviceChangeObserver::~InputDeviceChangeObserver() { - #if defined(OS_WIN) + #if BUILDFLAG(IS_WIN) ui::InputDeviceObserverWin::GetInstance()->RemoveObserver(this); --#elif defined(OS_LINUX) || defined(OS_CHROMEOS) -+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) ui::DeviceDataManager::GetInstance()->RemoveObserver(this); - #elif defined(OS_ANDROID) + #elif BUILDFLAG(IS_ANDROID) ui::InputDeviceObserverAndroid::GetInstance()->RemoveObserver(this); diff --git a/www/chromium/files/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc b/www/chromium/files/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc index 8029abd39d54..0d876b0fef73 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc @@ -1,11 +1,11 @@ ---- content/browser/renderer_host/pepper/pepper_file_io_host.cc.orig 2021-12-14 11:45:05 UTC +--- content/browser/renderer_host/pepper/pepper_file_io_host.cc.orig 2022-02-28 16:54:41 UTC +++ content/browser/renderer_host/pepper/pepper_file_io_host.cc @@ -456,7 +456,7 @@ void PepperFileIOHost::OnLocalFileOpened( ppapi::host::ReplyMessageContext reply_context, const base::FilePath& path, base::File::Error error_code) { --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Quarantining a file before its contents are available is only supported on // Windows and Linux. if (!FileOpenForWrite(open_flags_) || error_code != base::File::FILE_OK) { @@ -13,8 +13,8 @@ #endif } --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) void PepperFileIOHost::OnLocalFileQuarantined( ppapi::host::ReplyMessageContext reply_context, const base::FilePath& path, diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc b/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc index 8ab1be5d2529..b093f609301c 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc @@ -1,11 +1,11 @@ ---- content/browser/renderer_host/render_message_filter.cc.orig 2021-09-14 01:51:56 UTC +--- content/browser/renderer_host/render_message_filter.cc.orig 2022-02-28 16:54:41 UTC +++ content/browser/renderer_host/render_message_filter.cc @@ -67,7 +67,7 @@ - #if defined(OS_MAC) + #if BUILDFLAG(IS_MAC) #include "ui/accelerated_widget_mac/window_resize_helper_mac.h" #endif --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "base/linux_util.h" #include "base/threading/platform_thread.h" #endif @@ -13,8 +13,8 @@ std::move(callback).Run(routing_id, frame_token, devtools_frame_token); } --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) void RenderMessageFilter::SetThreadPriorityOnFileThread( base::PlatformThreadId ns_tid, base::ThreadPriority priority) { @@ -22,8 +22,8 @@ } #endif --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) void RenderMessageFilter::SetThreadPriority(int32_t ns_tid, base::ThreadPriority priority) { constexpr base::TaskTraits kTraits = { diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h b/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h index 706eedb080ef..e64358b3d03c 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h +++ b/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h @@ -1,19 +1,19 @@ ---- content/browser/renderer_host/render_message_filter.h.orig 2022-02-07 13:39:41 UTC +--- content/browser/renderer_host/render_message_filter.h.orig 2022-02-28 16:54:41 UTC +++ content/browser/renderer_host/render_message_filter.h @@ -78,14 +78,14 @@ class RenderMessageFilter void GenerateRoutingID(GenerateRoutingIDCallback routing_id) override; void GenerateFrameRoutingID(GenerateFrameRoutingIDCallback callback) override; void HasGpuProcess(HasGpuProcessCallback callback) override; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) void SetThreadPriority(int32_t ns_tid, base::ThreadPriority priority) override; #endif void OnResolveProxy(const GURL& url, IPC::Message* reply_msg); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) void SetThreadPriorityOnFileThread(base::PlatformThreadId ns_tid, base::ThreadPriority priority); #endif diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc index 7ff643489df9..1fd360656992 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc @@ -1,33 +1,33 @@ ---- content/browser/renderer_host/render_process_host_impl.cc.orig 2022-02-07 13:39:41 UTC +--- content/browser/renderer_host/render_process_host_impl.cc.orig 2022-02-28 16:54:41 UTC +++ content/browser/renderer_host/render_process_host_impl.cc -@@ -197,7 +197,7 @@ +@@ -206,7 +206,7 @@ #include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h" #endif --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include <sys/resource.h> #include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck -@@ -1217,7 +1217,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = +@@ -1226,7 +1226,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = // to indicate failure and std::numeric_limits<size_t>::max() to indicate // unlimited. size_t GetPlatformProcessLimit() { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) struct rlimit limit; if (getrlimit(RLIMIT_NPROC, &limit) != 0) return kUnknownPlatformProcessLimit; -@@ -1304,7 +1304,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public +@@ -1313,7 +1313,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public return; } --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) { ConnectToFontService(std::move(font_receiver)); return; -@@ -3306,6 +3306,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin +@@ -3321,6 +3321,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin switches::kDisableSpeechAPI, switches::kDisableThreadedCompositing, switches::kDisableTouchDragDrop, diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h index 19c66094a27b..cb3119b35d04 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h +++ b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h @@ -1,11 +1,11 @@ ---- content/browser/renderer_host/render_process_host_impl.h.orig 2022-02-07 13:39:41 UTC +--- content/browser/renderer_host/render_process_host_impl.h.orig 2022-02-28 16:54:41 UTC +++ content/browser/renderer_host/render_process_host_impl.h -@@ -461,7 +461,7 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -464,7 +464,7 @@ class CONTENT_EXPORT RenderProcessHostImpl // Sets this RenderProcessHost to be guest only. For Testing only. void SetForGuestsOnlyForTesting(); --#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MAC) -+#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MAC) && !defined(OS_BSD) +-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD) // Launch the zygote early in the browser startup. static void EarlyZygoteLaunch(); - #endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MAC) + #endif // BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_MAC) diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc b/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc index 26a17ee5fb52..f6a3c684551b 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc @@ -1,11 +1,11 @@ ---- content/browser/renderer_host/render_view_host_impl.cc.orig 2021-12-14 11:45:05 UTC +--- content/browser/renderer_host/render_view_host_impl.cc.orig 2022-02-28 16:54:41 UTC +++ content/browser/renderer_host/render_view_host_impl.cc @@ -259,7 +259,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); --#elif defined(OS_LINUX) || defined(OS_CHROMEOS) -+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) prefs->system_font_family_name = gfx::Font().GetFontName(); - #elif defined(OS_FUCHSIA) + #elif BUILDFLAG(IS_FUCHSIA) // Make Blink's "focus ring" invisible. The focus ring is a hairline border diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc index af0c6d752162..9158f197433d 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc @@ -1,47 +1,47 @@ ---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2022-02-07 13:39:41 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2022-02-28 16:54:41 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.cc -@@ -114,7 +114,7 @@ +@@ -115,7 +115,7 @@ #include "ui/gfx/gdi_util.h" #endif --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) #include "content/browser/accessibility/browser_accessibility_auralinux.h" #include "ui/base/ime/linux/text_edit_command_auralinux.h" #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" -@@ -479,7 +479,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge +@@ -429,7 +429,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge if (manager) return ToBrowserAccessibilityWin(manager->GetRoot())->GetCOM(); --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#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() { +@@ -1552,7 +1552,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { return GetTextInputManager() && GetTextInputManager()->should_do_learning(); } --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) bool RenderWidgetHostViewAura::SetCompositionFromExistingText( const gfx::Range& range, const std::vector<ui::ImeTextSpan>& ui_ime_text_spans) { -@@ -2396,7 +2396,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { +@@ -2369,7 +2369,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { } bool RenderWidgetHostViewAura::NeedsMouseCapture() { --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) return NeedsInputGrab(); #else return false; -@@ -2573,7 +2573,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit +@@ -2546,7 +2546,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit if (!target_host) return; --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) ui::TextEditKeyBindingsDelegateAuraLinux* keybinding_delegate = ui::GetTextEditKeyBindingsDelegate(); std::vector<ui::TextEditCommandAuraLinux> commands; diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h index 9ac4ded78fec..2402532468e0 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h +++ b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h @@ -1,11 +1,11 @@ ---- content/browser/renderer_host/render_widget_host_view_aura.h.orig 2022-02-07 13:39:41 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.h.orig 2022-02-28 16:54:41 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.h -@@ -235,7 +235,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura +@@ -240,7 +240,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura ukm::SourceId GetClientSourceForMetrics() const override; bool ShouldDoLearning() override; --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) bool SetCompositionFromExistingText( const gfx::Range& range, const std::vector<ui::ImeTextSpan>& ui_ime_text_spans) override; diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc index 9c833031ba3a..ed61b8b2d69a 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc @@ -1,11 +1,11 @@ ---- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig 2021-12-14 11:45:05 UTC +--- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig 2022-02-28 16:54:41 UTC +++ content/browser/renderer_host/render_widget_host_view_event_handler.cc -@@ -600,7 +600,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand +@@ -596,7 +596,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand if (event->type() == ui::ET_MOUSE_EXITED) { if (mouse_locked || selection_popup) return false; --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Don't forward the mouse leave message which is received when the context // menu is displayed by the page. This confuses the page and causes state // changes. diff --git a/www/chromium/files/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc b/www/chromium/files/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc index e5b853173d0c..f4d50a32ee42 100644 --- a/www/chromium/files/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc +++ b/www/chromium/files/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc @@ -1,11 +1,11 @@ ---- content/browser/scheduler/responsiveness/jank_monitor_impl.cc.orig 2021-12-14 11:45:05 UTC +--- content/browser/scheduler/responsiveness/jank_monitor_impl.cc.orig 2022-02-28 16:54:41 UTC +++ content/browser/scheduler/responsiveness/jank_monitor_impl.cc @@ -333,7 +333,7 @@ void JankMonitorImpl::ThreadExecutionState::DidRunTask // in context menus, among others). Simply ignore the mismatches for now. // See https://crbug.com/929813 for the details of why the mismatch // happens. --#if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && defined(USE_OZONE) -+#if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) && defined(USE_OZONE) +-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && defined(USE_OZONE) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) && defined(USE_OZONE) task_execution_metadata_.clear(); #endif return; diff --git a/www/chromium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.cc b/www/chromium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.cc index e5049e7d975e..07a8c97d46c8 100644 --- a/www/chromium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.cc +++ b/www/chromium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.cc @@ -1,11 +1,11 @@ ---- content/browser/scheduler/responsiveness/native_event_observer.cc.orig 2022-02-07 13:39:41 UTC +--- content/browser/scheduler/responsiveness/native_event_observer.cc.orig 2022-02-28 16:54:41 UTC +++ content/browser/scheduler/responsiveness/native_event_observer.cc @@ -15,7 +15,7 @@ #include "ui/events/platform/platform_event_source.h" --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "ui/aura/env.h" #include "ui/events/event.h" #endif @@ -13,8 +13,8 @@ DeregisterObserver(); } --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) void NativeEventObserver::RegisterObserver() { aura::Env::GetInstance()->AddWindowEventDispatcherObserver(this); } diff --git a/www/chromium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.h b/www/chromium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.h index c03dd587921c..0d5970ba399b 100644 --- a/www/chromium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.h +++ b/www/chromium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.h @@ -1,29 +1,29 @@ ---- content/browser/scheduler/responsiveness/native_event_observer.h.orig 2022-02-07 13:39:41 UTC +--- content/browser/scheduler/responsiveness/native_event_observer.h.orig 2022-02-28 16:54:41 UTC +++ content/browser/scheduler/responsiveness/native_event_observer.h @@ -15,7 +15,7 @@ #include "content/public/browser/native_event_processor_observer_mac.h" #endif --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "ui/aura/window_event_dispatcher_observer.h" #endif @@ -40,7 +40,7 @@ namespace responsiveness { class CONTENT_EXPORT NativeEventObserver - #if defined(OS_MAC) + #if BUILDFLAG(IS_MAC) : public NativeEventProcessorObserver --#elif defined(OS_LINUX) || defined(OS_CHROMEOS) -+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) : public aura::WindowEventDispatcherObserver - #elif defined(OS_WIN) + #elif BUILDFLAG(IS_WIN) : public base::MessagePumpForUI::Observer @@ -57,7 +57,7 @@ class CONTENT_EXPORT NativeEventObserver NativeEventObserver(WillRunEventCallback will_run_event_callback, DidRunEventCallback did_run_event_callback); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) NativeEventObserver(const NativeEventObserver&) = delete; NativeEventObserver& operator=(const NativeEventObserver&) = delete; @@ -31,8 +31,8 @@ // Exposed for tests. void WillRunNativeEvent(const void* opaque_identifier) override; void DidRunNativeEvent(const void* opaque_identifier) override; --#elif defined(OS_LINUX) || defined(OS_CHROMEOS) -+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // aura::WindowEventDispatcherObserver overrides: void OnWindowEventDispatcherStartedProcessing( aura::WindowEventDispatcher* dispatcher, @@ -40,8 +40,8 @@ void RegisterObserver(); void DeregisterObserver(); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) struct EventInfo { const void* unique_id; }; diff --git a/www/chromium/files/patch-content_browser_utility__process__host__receiver__bindings.cc b/www/chromium/files/patch-content_browser_utility__process__host__receiver__bindings.cc index 4fa0c94ee43b..14284e8b53b0 100644 --- a/www/chromium/files/patch-content_browser_utility__process__host__receiver__bindings.cc +++ b/www/chromium/files/patch-content_browser_utility__process__host__receiver__bindings.cc @@ -1,11 +1,11 @@ ---- content/browser/utility_process_host_receiver_bindings.cc.orig 2021-04-14 18:41:02 UTC +--- content/browser/utility_process_host_receiver_bindings.cc.orig 2022-02-28 16:54:41 UTC +++ content/browser/utility_process_host_receiver_bindings.cc @@ -10,7 +10,7 @@ #include "content/public/browser/content_browser_client.h" #include "content/public/common/content_client.h" --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck #include "content/browser/font_service.h" // nogncheck #endif @@ -13,8 +13,8 @@ void UtilityProcessHost::BindHostReceiver( mojo::GenericPendingReceiver receiver) { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) { ConnectToFontService(std::move(font_receiver)); return; diff --git a/www/chromium/files/patch-content_browser_utility__sandbox__delegate.cc b/www/chromium/files/patch-content_browser_utility__sandbox__delegate.cc index 97e9de6ca546..41aa35e3c883 100644 --- a/www/chromium/files/patch-content_browser_utility__sandbox__delegate.cc +++ b/www/chromium/files/patch-content_browser_utility__sandbox__delegate.cc @@ -1,11 +1,11 @@ ---- content/browser/utility_sandbox_delegate.cc.orig 2022-02-07 13:39:41 UTC +--- content/browser/utility_sandbox_delegate.cc.orig 2022-02-28 16:54:41 UTC +++ content/browser/utility_sandbox_delegate.cc -@@ -61,7 +61,7 @@ UtilitySandboxedProcessLauncherDelegate:: +@@ -62,7 +62,7 @@ UtilitySandboxedProcessLauncherDelegate:: #if BUILDFLAG(ENABLE_PLUGINS) sandbox_type_ == sandbox::mojom::Sandbox::kPpapi || #endif --#if defined(OS_FUCHSIA) -+#if defined(OS_FUCHSIA) || defined(OS_BSD) +-#if BUILDFLAG(IS_FUCHSIA) ++#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) sandbox_type_ == sandbox::mojom::Sandbox::kVideoCapture || #endif #if BUILDFLAG(IS_CHROMEOS_ASH) diff --git a/www/chromium/files/patch-content_browser_v8__snapshot__files.cc b/www/chromium/files/patch-content_browser_v8__snapshot__files.cc index bf6171165df9..187b0f5d2e76 100644 --- a/www/chromium/files/patch-content_browser_v8__snapshot__files.cc +++ b/www/chromium/files/patch-content_browser_v8__snapshot__files.cc @@ -1,11 +1,11 @@ ---- content/browser/v8_snapshot_files.cc.orig 2021-12-31 00:57:32 UTC +--- content/browser/v8_snapshot_files.cc.orig 2022-02-28 16:54:41 UTC +++ content/browser/v8_snapshot_files.cc -@@ -15,7 +15,7 @@ namespace content { +@@ -10,7 +10,7 @@ + namespace content { - std::map<std::string, base::FilePath> GetV8SnapshotFilesToPreload( - base::CommandLine& process_command_line) { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + std::map<std::string, base::FilePath> GetV8SnapshotFilesToPreload() { +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #if defined(USE_V8_CONTEXT_SNAPSHOT) return {{kV8ContextSnapshotDataDescriptor, base::FilePath(FILE_PATH_LITERAL(V8_CONTEXT_SNAPSHOT_FILENAME))}}; diff --git a/www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc b/www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc index a7b50122b941..18a0445bf99f 100644 --- a/www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc +++ b/www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc @@ -1,11 +1,11 @@ ---- content/browser/web_contents/web_contents_view_aura.cc.orig 2022-02-07 13:39:41 UTC +--- content/browser/web_contents/web_contents_view_aura.cc.orig 2022-02-28 16:54:41 UTC +++ content/browser/web_contents/web_contents_view_aura.cc @@ -159,7 +159,7 @@ class WebDragSourceAura : public content::WebContentsO raw_ptr<aura::Window> window_; }; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) // Fill out the OSExchangeData with a file contents, synthesizing a name if // necessary. void PrepareDragForFileContents(const DropData& drop_data, @@ -13,17 +13,17 @@ if (!drop_data.download_metadata.empty()) PrepareDragForDownload(drop_data, provider, web_contents); #endif --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) // 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. -@@ -1304,7 +1304,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent* +@@ -1312,7 +1312,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. --#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_BSD) +-#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) ++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD) // It is possible for the web-contents to be destroyed while it is being // activated. Use a weak-ptr to track whether that happened or not. // More in https://crbug.com/1040725 diff --git a/www/chromium/files/patch-content_browser_webui_web__ui__main__frame__observer.cc b/www/chromium/files/patch-content_browser_webui_web__ui__main__frame__observer.cc index 73fcc7dd72ae..f55da6f7203a 100644 --- a/www/chromium/files/patch-content_browser_webui_web__ui__main__frame__observer.cc +++ b/www/chromium/files/patch-content_browser_webui_web__ui__main__frame__observer.cc @@ -1,38 +1,38 @@ ---- content/browser/webui/web_ui_main_frame_observer.cc.orig 2022-02-07 13:39:41 UTC +--- content/browser/webui/web_ui_main_frame_observer.cc.orig 2022-02-28 16:54:41 UTC +++ content/browser/webui/web_ui_main_frame_observer.cc -@@ -11,7 +11,7 @@ +@@ -12,7 +12,7 @@ #include "content/browser/webui/web_ui_impl.h" #include "content/public/browser/navigation_handle.h" --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "base/callback_helpers.h" #include "base/feature_list.h" #include "base/logging.h" -@@ -30,7 +30,7 @@ namespace content { +@@ -31,7 +31,7 @@ namespace content { namespace { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Remove the pieces of the URL we don't want to send back with the error // reports. In particular, do not send query or fragments as those can have // privacy-sensitive information in them. -@@ -66,7 +66,7 @@ void WebUIMainFrameObserver::DidFinishNavigation( +@@ -67,7 +67,7 @@ void WebUIMainFrameObserver::DidFinishNavigation( web_ui_->DisallowJavascriptOnAllHandlers(); } --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) void WebUIMainFrameObserver::OnDidAddMessageToConsole( RenderFrameHost* source_frame, blink::mojom::ConsoleMessageLevel log_level, -@@ -183,7 +183,7 @@ void WebUIMainFrameObserver::ReadyToCommitNavigation( +@@ -175,7 +175,7 @@ void WebUIMainFrameObserver::ReadyToCommitNavigation( // TODO(crbug.com/1129544) This is currently disabled due to Windows DLL // thunking issues. Fix & re-enable. --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) MaybeEnableWebUIJavaScriptErrorReporting(navigation_handle); - #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) } diff --git a/www/chromium/files/patch-content_browser_webui_web__ui__main__frame__observer.h b/www/chromium/files/patch-content_browser_webui_web__ui__main__frame__observer.h index a470b9d4ad8a..e9c4572d0519 100644 --- a/www/chromium/files/patch-content_browser_webui_web__ui__main__frame__observer.h +++ b/www/chromium/files/patch-content_browser_webui_web__ui__main__frame__observer.h @@ -1,11 +1,11 @@ ---- content/browser/webui/web_ui_main_frame_observer.h.orig 2022-02-07 13:39:41 UTC +--- content/browser/webui/web_ui_main_frame_observer.h.orig 2022-02-28 16:54:41 UTC +++ content/browser/webui/web_ui_main_frame_observer.h @@ -45,7 +45,7 @@ class CONTENT_EXPORT WebUIMainFrameObserver : public W // TODO(crbug.com/1129544) This is currently disabled due to Windows DLL // thunking issues. Fix & re-enable. --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // On official Google builds, capture and report JavaScript error messages on // WebUI surfaces back to Google. This allows us to fix JavaScript errors and // exceptions. @@ -13,8 +13,8 @@ void ReadyToCommitNavigation(NavigationHandle* navigation_handle) override; private: --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) void MaybeEnableWebUIJavaScriptErrorReporting( NavigationHandle* navigation_handle); diff --git a/www/chromium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.cc b/www/chromium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.cc index b0ef8401edc6..a722a9716c7e 100644 --- a/www/chromium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.cc +++ b/www/chromium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.cc @@ -1,10 +1,10 @@ ---- content/browser/zygote_host/zygote_host_impl_linux.cc.orig 2022-02-07 13:39:41 UTC +--- content/browser/zygote_host/zygote_host_impl_linux.cc.orig 2022-02-28 16:54:41 UTC +++ content/browser/zygote_host/zygote_host_impl_linux.cc @@ -28,6 +28,7 @@ namespace content { namespace { -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) // Receive a fixed message on fd and return the sender's PID. // Returns true if the message received matches the expected message. bool ReceiveFixedMessage(int fd, @@ -20,7 +20,7 @@ } ZygoteHostImpl::ZygoteHostImpl() -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) : use_namespace_sandbox_(false), use_suid_sandbox_(false), use_suid_sandbox_for_adj_oom_score_(false), @@ -34,7 +34,7 @@ } void ZygoteHostImpl::Init(const base::CommandLine& command_line) { -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) if (command_line.HasSwitch(sandbox::policy::switches::kNoSandbox)) { return; } @@ -50,7 +50,7 @@ base::CommandLine* cmd_line, base::ScopedFD* control_fd, base::FileHandleMappingVector additional_remapped_fds) { -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) int fds[2]; CHECK_EQ(0, socketpair(AF_UNIX, SOCK_SEQPACKET, 0, fds)); CHECK(base::UnixDomainSocket::EnableReceiveProcessId(fds[0])); @@ -63,8 +63,8 @@ +#endif } --#if !defined(OS_OPENBSD) -+#if !defined(OS_BSD) +-#if !BUILDFLAG(IS_OPENBSD) ++#if !BUILDFLAG(IS_BSD) void ZygoteHostImpl::AdjustRendererOOMScore(base::ProcessHandle pid, int score) { // 1) You can't change the oom_score_adj of a non-dumpable process diff --git a/www/chromium/files/patch-content_child_child__process.cc b/www/chromium/files/patch-content_child_child__process.cc index a6602d40be25..90c3fb35a396 100644 --- a/www/chromium/files/patch-content_child_child__process.cc +++ b/www/chromium/files/patch-content_child_child__process.cc @@ -1,11 +1,11 @@ ---- content/child/child_process.cc.orig 2021-04-14 18:41:02 UTC +--- content/child/child_process.cc.orig 2022-02-28 16:54:41 UTC +++ content/child/child_process.cc @@ -52,7 +52,7 @@ ChildProcess::ChildProcess(base::ThreadPriority io_thr DCHECK(!g_lazy_child_process_tls.Pointer()->Get()); g_lazy_child_process_tls.Pointer()->Set(this); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) const base::CommandLine& command_line = *base::CommandLine::ForCurrentProcess(); const bool is_embedded_in_browser_process = diff --git a/www/chromium/files/patch-content_common_BUILD.gn b/www/chromium/files/patch-content_common_BUILD.gn index f15d3ea1da02..ad648e249b18 100644 --- a/www/chromium/files/patch-content_common_BUILD.gn +++ b/www/chromium/files/patch-content_common_BUILD.gn @@ -1,6 +1,6 @@ ---- content/common/BUILD.gn.orig 2022-02-07 13:39:41 UTC +--- content/common/BUILD.gn.orig 2022-02-28 16:54:41 UTC +++ content/common/BUILD.gn -@@ -407,6 +407,9 @@ if (is_linux || is_chromeos) { +@@ -406,6 +406,9 @@ if (is_linux || is_chromeos) { public = [ "set_process_title_linux.h" ] sources = [ "set_process_title_linux.cc" ] deps = [ "//base" ] diff --git a/www/chromium/files/patch-content_common_font__list__unittest.cc b/www/chromium/files/patch-content_common_font__list__unittest.cc new file mode 100644 index 000000000000..8f36cb7c123b --- /dev/null +++ b/www/chromium/files/patch-content_common_font__list__unittest.cc @@ -0,0 +1,11 @@ +--- content/common/font_list_unittest.cc.orig 2022-02-28 16:54:41 UTC ++++ content/common/font_list_unittest.cc +@@ -51,7 +51,7 @@ TEST(FontList, GetFontList) { + EXPECT_TRUE(HasFontWithName(*fonts, "MS Gothic", "MS Gothic")); + EXPECT_TRUE(HasFontWithName(*fonts, "Segoe UI", "Segoe UI")); + EXPECT_TRUE(HasFontWithName(*fonts, "Verdana", "Verdana")); +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + EXPECT_TRUE(HasFontWithName(*fonts, "Arimo", "Arimo")); + #else + EXPECT_TRUE(HasFontWithName(*fonts, "Arial", "Arial")); diff --git a/www/chromium/files/patch-content_common_mojo__core__library__support.cc b/www/chromium/files/patch-content_common_mojo__core__library__support.cc index 1663d3aeb5b1..06c2981025ca 100644 --- a/www/chromium/files/patch-content_common_mojo__core__library__support.cc +++ b/www/chromium/files/patch-content_common_mojo__core__library__support.cc @@ -1,11 +1,11 @@ ---- content/common/mojo_core_library_support.cc.orig 2021-07-19 18:45:15 UTC +--- content/common/mojo_core_library_support.cc.orig 2022-02-28 16:54:41 UTC +++ content/common/mojo_core_library_support.cc @@ -15,7 +15,7 @@ bool IsMojoCoreSharedLibraryEnabled() { } absl::optional<base::FilePath> GetMojoCoreSharedLibraryPath() { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) const base::CommandLine& command_line = *base::CommandLine::ForCurrentProcess(); if (!command_line.HasSwitch(switches::kMojoCoreLibraryPath)) diff --git a/www/chromium/files/patch-content_common_sandbox__init__linux.cc b/www/chromium/files/patch-content_common_sandbox__init__linux.cc deleted file mode 100644 index c0b7b47a210f..000000000000 --- a/www/chromium/files/patch-content_common_sandbox__init__linux.cc +++ /dev/null @@ -1,19 +0,0 @@ ---- content/common/sandbox_init_linux.cc.orig 2022-02-07 13:39:41 UTC -+++ content/common/sandbox_init_linux.cc -@@ -16,11 +16,15 @@ namespace content { - - bool InitializeSandbox(std::unique_ptr<sandbox::bpf_dsl::Policy> policy, - base::ScopedFD proc_fd) { -+#if !defined(OS_BSD) - return sandbox::policy::SandboxSeccompBPF::StartSandboxWithExternalPolicy( - std::move(policy), std::move(proc_fd)); -+#else -+ return false; -+#endif - } - --#if !defined(OS_NACL_NONSFI) -+#if !defined(OS_NACL_NONSFI) && !defined(OS_BSD) - std::unique_ptr<sandbox::bpf_dsl::Policy> GetBPFSandboxBaselinePolicy() { - return sandbox::policy::SandboxSeccompBPF::GetBaselinePolicy(); - } diff --git a/www/chromium/files/patch-content_common_user__agent.cc b/www/chromium/files/patch-content_common_user__agent.cc index 8aa7aa116e87..4935bfa93679 100644 --- a/www/chromium/files/patch-content_common_user__agent.cc +++ b/www/chromium/files/patch-content_common_user__agent.cc @@ -1,19 +1,19 @@ ---- content/common/user_agent.cc.orig 2022-02-07 13:39:41 UTC +--- content/common/user_agent.cc.orig 2022-02-28 16:54:41 UTC +++ content/common/user_agent.cc -@@ -252,6 +252,16 @@ std::string BuildOSCpuInfoFromOSVersionAndCpuType(cons - ); - #endif - -+#if defined(OS_BSD) +@@ -244,6 +244,16 @@ std::string BuildOSCpuInfoFromOSVersionAndCpuType(cons + "Android %s", os_version.c_str() + #elif BUILDFLAG(IS_FUCHSIA) + "Fuchsia" ++#elif BUILDFLAG(IS_BSD) +#if defined(__x86_64__) -+ base::StringAppendF(&os_cpu, "; Linux x86_64"); ++ "Linux x86_64; %s %s", +#elif defined(__aarch64__) -+ base::StringAppendF(&os_cpu, "; Linux aarch64"); ++ "Linux aarch64; %s %s", +#else -+ base::StringAppendF(&os_cpu, "; Linux i686"); ++ "Linux i686; %s %s", +#endif -+#endif -+ - return os_cpu; - } - ++ unixinfo.sysname, // e.g. Linux ++ cpu_type.c_str() // e.g. i686 + #elif BUILDFLAG(IS_POSIX) + "%s %s", + unixinfo.sysname, // e.g. Linux diff --git a/www/chromium/files/patch-content_gpu_gpu__main.cc b/www/chromium/files/patch-content_gpu_gpu__main.cc index 9e7739c92e9c..95666e2f0bee 100644 --- a/www/chromium/files/patch-content_gpu_gpu__main.cc +++ b/www/chromium/files/patch-content_gpu_gpu__main.cc @@ -1,53 +1,53 @@ ---- content/gpu/gpu_main.cc.orig 2022-02-07 13:39:41 UTC +--- content/gpu/gpu_main.cc.orig 2022-02-28 16:54:41 UTC +++ content/gpu/gpu_main.cc @@ -83,7 +83,7 @@ #include "sandbox/win/src/sandbox.h" #endif --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "content/gpu/gpu_sandbox_hook_linux.h" - #include "content/public/common/sandbox_init.h" #include "sandbox/policy/linux/sandbox_linux.h" -@@ -106,7 +106,7 @@ namespace content { + #include "sandbox/policy/sandbox_type.h" +@@ -105,7 +105,7 @@ namespace content { namespace { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) bool StartSandboxLinux(gpu::GpuWatchdogThread*, const gpu::GPUInfo*, const gpu::GpuPreferences&); -@@ -168,7 +168,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel +@@ -167,7 +167,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel bool EnsureSandboxInitialized(gpu::GpuWatchdogThread* watchdog_thread, const gpu::GPUInfo* gpu_info, const gpu::GpuPreferences& gpu_prefs) override { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs); - #elif defined(OS_WIN) + #elif BUILDFLAG(IS_WIN) return StartSandboxWindows(sandbox_info_); -@@ -264,7 +264,7 @@ int GpuMain(MainFunctionParams parameters) { +@@ -263,7 +263,7 @@ int GpuMain(MainFunctionParams parameters) { std::make_unique<base::SingleThreadTaskExecutor>( gpu_preferences.message_pump_type); } --#elif defined(OS_LINUX) || defined(OS_CHROMEOS) -+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #error "Unsupported Linux platform." - #elif defined(OS_MAC) + #elif BUILDFLAG(IS_MAC) // Cross-process CoreAnimation requires a CFRunLoop to function at all, and -@@ -407,17 +407,19 @@ int GpuMain(MainFunctionParams parameters) { +@@ -406,17 +406,19 @@ int GpuMain(MainFunctionParams parameters) { namespace { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread, const gpu::GPUInfo* gpu_info, const gpu::GpuPreferences& gpu_prefs) { TRACE_EVENT0("gpu,startup", "Initialize sandbox"); -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) if (watchdog_thread) { // SandboxLinux needs to be able to ensure that the thread // has really been stopped. @@ -57,11 +57,11 @@ // SandboxLinux::InitializeSandbox() must always be called // with only one thread. -@@ -438,11 +440,13 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo +@@ -437,11 +439,13 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo *base::CommandLine::ForCurrentProcess()), base::BindOnce(GpuProcessPreSandboxHook), sandbox_options); -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) if (watchdog_thread) { base::Thread::Options thread_options; thread_options.timer_slack = base::TIMER_SLACK_MAXIMUM; diff --git a/www/chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc b/www/chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc index b6184245fe81..3a9a8f76b38a 100644 --- a/www/chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc +++ b/www/chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc @@ -1,4 +1,4 @@ ---- content/gpu/gpu_sandbox_hook_linux.cc.orig 2022-02-07 13:39:41 UTC +--- content/gpu/gpu_sandbox_hook_linux.cc.orig 2022-02-28 16:54:41 UTC +++ content/gpu/gpu_sandbox_hook_linux.cc @@ -101,6 +101,7 @@ static const char kLibV4lEncPluginPath[] = @@ -8,7 +8,7 @@ void AddV4L2GpuPermissions( std::vector<BrokerFilePermission>* permissions, const sandbox::policy::SandboxSeccompBPF::Options& options) { -@@ -395,8 +396,10 @@ std::vector<BrokerFilePermission> FilePermissionsForGp +@@ -407,8 +408,10 @@ std::vector<BrokerFilePermission> FilePermissionsForGp AddStandardGpuPermissions(&permissions); return permissions; } @@ -19,7 +19,7 @@ // Preload the Mali library. if (UseChromecastSandboxAllowlist()) { for (const char* path : kAllowedChromecastPaths) { -@@ -438,6 +441,7 @@ void LoadArmGpuLibraries() { +@@ -450,6 +453,7 @@ void LoadArmGpuLibraries() { dlopen(driver_paths[i], dlopen_flag); } } @@ -27,7 +27,7 @@ } bool LoadAmdGpuLibraries() { -@@ -501,12 +505,14 @@ void LoadV4L2Libraries( +@@ -513,12 +517,14 @@ void LoadV4L2Libraries( } void LoadChromecastV4L2Libraries() { @@ -42,7 +42,7 @@ } bool LoadLibrariesForGpu( -@@ -533,6 +539,7 @@ bool LoadLibrariesForGpu( +@@ -545,6 +551,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; -@@ -555,13 +562,17 @@ bool BrokerProcessPreSandboxHook( +@@ -567,13 +574,17 @@ bool BrokerProcessPreSandboxHook( SetProcessTitleFromCommandLine(nullptr); return true; } diff --git a/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc b/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc index cf13df3412ea..d84426e97588 100644 --- a/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc +++ b/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc @@ -1,11 +1,11 @@ ---- content/ppapi_plugin/ppapi_blink_platform_impl.cc.orig 2021-07-19 18:45:15 UTC +--- content/ppapi_plugin/ppapi_blink_platform_impl.cc.orig 2022-02-28 16:54:41 UTC +++ content/ppapi_plugin/ppapi_blink_platform_impl.cc @@ -20,7 +20,7 @@ - #if defined(OS_MAC) + #if BUILDFLAG(IS_MAC) #include "content/child/child_process_sandbox_support_impl_mac.h" --#elif defined(OS_LINUX) || defined(OS_CHROMEOS) -+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "content/child/child_process_sandbox_support_impl_linux.h" #include "mojo/public/cpp/bindings/pending_remote.h" #endif @@ -13,8 +13,8 @@ namespace content { PpapiBlinkPlatformImpl::PpapiBlinkPlatformImpl() { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) mojo::PendingRemote<font_service::mojom::FontService> font_service; ChildThread::Get()->BindHostReceiver( font_service.InitWithNewPipeAndPassReceiver()); @@ -22,8 +22,8 @@ void PpapiBlinkPlatformImpl::Shutdown() {} blink::WebSandboxSupport* PpapiBlinkPlatformImpl::GetSandboxSupport() { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) return sandbox_support_.get(); #else return nullptr; diff --git a/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h b/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h index a42d82a79a8e..955acc89d457 100644 --- a/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h +++ b/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h @@ -1,11 +1,11 @@ ---- content/ppapi_plugin/ppapi_blink_platform_impl.h.orig 2022-02-07 13:39:41 UTC +--- content/ppapi_plugin/ppapi_blink_platform_impl.h.orig 2022-02-28 16:54:41 UTC +++ content/ppapi_plugin/ppapi_blink_platform_impl.h @@ -12,7 +12,7 @@ #include "build/build_config.h" #include "content/child/blink_platform_impl.h" --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "components/services/font/public/cpp/font_loader.h" #include "third_party/skia/include/core/SkRefCnt.h" #endif @@ -13,13 +13,13 @@ blink::WebThemeEngine* ThemeEngine() override; private: --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) std::unique_ptr<blink::WebSandboxSupport> sandbox_support_; #endif --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) sk_sp<font_service::FontLoader> font_loader_; #endif }; diff --git a/www/chromium/files/patch-content_ppapi__plugin_ppapi__plugin__main.cc b/www/chromium/files/patch-content_ppapi__plugin_ppapi__plugin__main.cc index beed530dae9a..05a4bce588bb 100644 --- a/www/chromium/files/patch-content_ppapi__plugin_ppapi__plugin__main.cc +++ b/www/chromium/files/patch-content_ppapi__plugin_ppapi__plugin__main.cc @@ -1,24 +1,23 @@ ---- content/ppapi_plugin/ppapi_plugin_main.cc.orig 2022-02-07 13:39:41 UTC +--- content/ppapi_plugin/ppapi_plugin_main.cc.orig 2022-02-28 16:54:41 UTC +++ content/ppapi_plugin/ppapi_plugin_main.cc -@@ -54,6 +54,12 @@ +@@ -53,6 +53,11 @@ #include "gin/v8_initializer.h" #endif -+#if defined(OS_OPENBSD) -+#include "content/public/common/sandbox_init.h" ++#if BUILDFLAG(IS_OPENBSD) +#include "sandbox/policy/openbsd/sandbox_openbsd.h" +#include "sandbox/policy/sandbox_type.h" +#endif + - #if defined(OS_POSIX) && !defined(OS_ANDROID) + #if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID) #include <stdlib.h> #endif -@@ -135,7 +141,7 @@ int PpapiPluginMain(MainFunctionParams parameters) { +@@ -136,7 +141,7 @@ int PpapiPluginMain(MainFunctionParams parameters) { gin::V8Initializer::LoadV8Snapshot(); #endif --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_OPENBSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OPENBSD) sandbox::policy::SandboxLinux::GetInstance()->InitializeSandbox( sandbox::policy::SandboxTypeFromCommandLine(command_line), sandbox::policy::SandboxLinux::PreSandboxHook(), diff --git a/www/chromium/files/patch-content_public_browser_font__access__context.h b/www/chromium/files/patch-content_public_browser_font__access__context.h deleted file mode 100644 index 994a0092a2d0..000000000000 --- a/www/chromium/files/patch-content_public_browser_font__access__context.h +++ /dev/null @@ -1,11 +0,0 @@ ---- content/public/browser/font_access_context.h.orig 2022-02-07 13:39:41 UTC -+++ content/public/browser/font_access_context.h -@@ -11,7 +11,7 @@ - #include "third_party/blink/public/mojom/font_access/font_access.mojom.h" - - #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -- defined(OS_MAC) || defined(OS_FUCHSIA) -+ defined(OS_MAC) || defined(OS_FUCHSIA) || defined(OS_BSD) - #define PLATFORM_HAS_LOCAL_FONT_ENUMERATION_IMPL 1 - #endif - diff --git a/www/chromium/files/patch-content_public_common_common__param__traits__macros.h b/www/chromium/files/patch-content_public_common_common__param__traits__macros.h index 4a3b12361bdc..520813b67267 100644 --- a/www/chromium/files/patch-content_public_common_common__param__traits__macros.h +++ b/www/chromium/files/patch-content_public_common_common__param__traits__macros.h @@ -1,11 +1,11 @@ ---- content/public/common/common_param_traits_macros.h.orig 2022-02-07 13:39:41 UTC +--- content/public/common/common_param_traits_macros.h.orig 2022-02-28 16:54:41 UTC +++ content/public/common/common_param_traits_macros.h @@ -127,7 +127,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) --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) IPC_STRUCT_TRAITS_MEMBER(system_font_family_name) #endif - #if defined(OS_WIN) + #if BUILDFLAG(IS_WIN) diff --git a/www/chromium/files/patch-content_public_common_content__features.cc b/www/chromium/files/patch-content_public_common_content__features.cc index b79ae14e5a3a..9e34ea4a102a 100644 --- a/www/chromium/files/patch-content_public_common_content__features.cc +++ b/www/chromium/files/patch-content_public_common_content__features.cc @@ -1,55 +1,55 @@ ---- content/public/common/content_features.cc.orig 2022-02-07 13:39:41 UTC +--- content/public/common/content_features.cc.orig 2022-02-28 16:54:41 UTC +++ content/public/common/content_features.cc @@ -50,7 +50,7 @@ const base::Feature kAudioServiceOutOfProcess { "AudioServiceOutOfProcess", // TODO(crbug.com/1052397): Remove !IS_CHROMEOS_LACROS once lacros starts being // built with OS_CHROMEOS instead of OS_LINUX. --#if defined(OS_WIN) || defined(OS_MAC) || \ -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) || \ - (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ + (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) base::FEATURE_ENABLED_BY_DEFAULT #else @@ -62,7 +62,7 @@ const base::Feature kAudioServiceOutOfProcess { // kAudioServiceOutOfProcess feature is enabled. const base::Feature kAudioServiceSandbox { "AudioServiceSandbox", --#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_FUCHSIA) -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -973,7 +973,7 @@ const base::Feature kWebAssemblyBaseline{"WebAssemblyB +@@ -987,7 +987,7 @@ const base::Feature kWebAssemblyBaseline{"WebAssemblyB const base::Feature kWebAssemblyCodeProtection{ "WebAssemblyCodeProtection", base::FEATURE_DISABLED_BY_DEFAULT}; --#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(ARCH_CPU_X86_64) -+#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(ARCH_CPU_X86_64) +-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(ARCH_CPU_X86_64) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_X86_64) // Use memory protection keys in userspace (PKU) (if available) to protect code // JITed for WebAssembly. Fall back to traditional memory protection if // WebAssemblyCodeProtection is also enabled. -@@ -1003,7 +1003,7 @@ const base::Feature kWebAssemblyTiering{"WebAssemblyTi +@@ -1017,7 +1017,7 @@ const base::Feature kWebAssemblyTiering{"WebAssemblyTi const base::Feature kWebAssemblyTrapHandler { "WebAssemblyTrapHandler", - #if ((defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || \ -- defined(OS_MAC)) && \ -+ defined(OS_MAC) || defined(OS_BSD)) && \ - defined(ARCH_CPU_X86_64)) || \ - (defined(OS_MAC) && defined(ARCH_CPU_ARM64)) + #if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ +- BUILDFLAG(IS_MAC)) && \ ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)) && \ + defined(ARCH_CPU_X86_64)) || \ + (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) base::FEATURE_ENABLED_BY_DEFAULT -@@ -1025,7 +1025,7 @@ const base::Feature kWebAuthCable { +@@ -1039,7 +1039,7 @@ const base::Feature kWebAuthCable { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. // If updating this, also update kWebAuthCableServerLink. --#if BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) base::FEATURE_DISABLED_BY_DEFAULT #else base::FEATURE_ENABLED_BY_DEFAULT -@@ -1093,7 +1093,11 @@ const base::Feature kWebUIReportOnlyTrustedTypes{ +@@ -1107,7 +1107,11 @@ const base::Feature kWebUIReportOnlyTrustedTypes{ // Controls whether the WebUSB API is enabled: // https://wicg.github.io/webusb -+#if defined(OS_BSD) ++#if BUILDFLAG(IS_BSD) +const base::Feature kWebUsb{"WebUSB", base::FEATURE_DISABLED_BY_DEFAULT}; +#else const base::Feature kWebUsb{"WebUSB", base::FEATURE_ENABLED_BY_DEFAULT}; @@ -57,12 +57,3 @@ // Controls whether the WebXR Device API is enabled. const base::Feature kWebXr{"WebXR", base::FEATURE_ENABLED_BY_DEFAULT}; -@@ -1193,7 +1197,7 @@ const base::Feature kRetryGetVideoCaptureDeviceInfos{ - - #endif // defined(OS_MAC) - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - // If the JavaScript on a WebUI page has an error (such as an unhandled - // exception), report that error back the crash reporting infrastructure, same - // as we do for program crashes. diff --git a/www/chromium/files/patch-content_public_common_content__features.h b/www/chromium/files/patch-content_public_common_content__features.h index cd1ccfb881c4..c21d582cb4ef 100644 --- a/www/chromium/files/patch-content_public_common_content__features.h +++ b/www/chromium/files/patch-content_public_common_content__features.h @@ -1,20 +1,11 @@ ---- content/public/common/content_features.h.orig 2022-02-07 13:39:41 UTC +--- content/public/common/content_features.h.orig 2022-02-28 16:54:41 UTC +++ content/public/common/content_features.h -@@ -248,7 +248,7 @@ CONTENT_EXPORT extern const base::Feature +@@ -249,7 +249,7 @@ CONTENT_EXPORT extern const base::Feature CONTENT_EXPORT extern const base::Feature kWebAppWindowControlsOverlay; CONTENT_EXPORT extern const base::Feature kWebAssemblyBaseline; CONTENT_EXPORT extern const base::Feature kWebAssemblyCodeProtection; --#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(ARCH_CPU_X86_64) -+#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(ARCH_CPU_X86_64) +-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(ARCH_CPU_X86_64) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_X86_64) CONTENT_EXPORT extern const base::Feature kWebAssemblyCodeProtectionPku; - #endif // (defined(OS_LINUX) || defined(OS_CHROMEOS)) && + #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && // defined(ARCH_CPU_X86_64) -@@ -306,7 +306,7 @@ CONTENT_EXPORT extern const base::Feature kMacSyscallS - CONTENT_EXPORT extern const base::Feature kRetryGetVideoCaptureDeviceInfos; - #endif // defined(OS_MAC) - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - CONTENT_EXPORT extern const base::Feature kSendWebUIJavaScriptErrorReports; - CONTENT_EXPORT extern const char - kSendWebUIJavaScriptErrorReportsSendToProductionVariation[]; diff --git a/www/chromium/files/patch-content_public_common_content__switches.cc b/www/chromium/files/patch-content_public_common_content__switches.cc index 16b231ce8840..aac07c5a0777 100644 --- a/www/chromium/files/patch-content_public_common_content__switches.cc +++ b/www/chromium/files/patch-content_public_common_content__switches.cc @@ -1,6 +1,6 @@ ---- content/public/common/content_switches.cc.orig 2022-02-07 13:39:41 UTC +--- content/public/common/content_switches.cc.orig 2022-02-28 16:54:41 UTC +++ content/public/common/content_switches.cc -@@ -386,6 +386,8 @@ const char kEnableGpuMemoryBufferVideoFrames[] = +@@ -383,6 +383,8 @@ const char kEnableGpuMemoryBufferVideoFrames[] = // builds. const char kEnableLogging[] = "enable-logging"; @@ -9,12 +9,12 @@ // 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. -@@ -1006,7 +1008,7 @@ const char kEnableAutomation[] = "enable-automation"; +@@ -991,7 +993,7 @@ const char kEnableAutomation[] = "enable-automation"; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) // Allows sending text-to-speech requests to speech-dispatcher, a common // Linux speech service. Because it's buggy, the user must explicitly // enable it so that visiting a random webpage can't cause instability. diff --git a/www/chromium/files/patch-content_public_common_content__switches.h b/www/chromium/files/patch-content_public_common_content__switches.h index cd68ba47f34b..6ce03c2ade27 100644 --- a/www/chromium/files/patch-content_public_common_content__switches.h +++ b/www/chromium/files/patch-content_public_common_content__switches.h @@ -1,4 +1,4 @@ ---- content/public/common/content_switches.h.orig 2022-02-07 13:39:41 UTC +--- content/public/common/content_switches.h.orig 2022-02-28 16:54:41 UTC +++ content/public/common/content_switches.h @@ -114,6 +114,7 @@ CONTENT_EXPORT extern const char kEnableBlinkTestFeatu CONTENT_EXPORT extern const char kEnableGpuMemoryBufferVideoFrames[]; @@ -8,12 +8,12 @@ CONTENT_EXPORT extern const char kEnableNetworkInformationDownlinkMax[]; CONTENT_EXPORT extern const char kEnableCanvas2DLayers[]; CONTENT_EXPORT extern const char kEnableCanvasContextLostInBackground[]; -@@ -276,7 +277,7 @@ CONTENT_EXPORT extern const char kRendererWaitForJavaD +@@ -272,7 +273,7 @@ CONTENT_EXPORT extern const char kRendererWaitForJavaD // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) CONTENT_EXPORT extern const char kEnableSpeechDispatcher[]; #endif diff --git a/www/chromium/files/patch-content_public_common_use__zoom__for__dsf__policy.cc b/www/chromium/files/patch-content_public_common_use__zoom__for__dsf__policy.cc index c034ab5b60c9..ba73820d0fac 100644 --- a/www/chromium/files/patch-content_public_common_use__zoom__for__dsf__policy.cc +++ b/www/chromium/files/patch-content_public_common_use__zoom__for__dsf__policy.cc @@ -1,11 +1,11 @@ ---- content/public/common/use_zoom_for_dsf_policy.cc.orig 2022-02-07 13:39:41 UTC +--- content/public/common/use_zoom_for_dsf_policy.cc.orig 2022-02-28 16:54:41 UTC +++ content/public/common/use_zoom_for_dsf_policy.cc @@ -26,7 +26,7 @@ const base::Feature kUseZoomForDsfEnabledByDefault{ bool IsUseZoomForDSFEnabledByDefault() { - #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || \ -- defined(OS_MAC) -+ defined(OS_MAC) || defined(OS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) return true; - #elif defined(OS_WIN) || defined(OS_ANDROID) + #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) return base::FeatureList::IsEnabled(kUseZoomForDsfEnabledByDefault); diff --git a/www/chromium/files/patch-content_public_test_mock__render__thread.cc b/www/chromium/files/patch-content_public_test_mock__render__thread.cc new file mode 100644 index 000000000000..443a588c56e2 --- /dev/null +++ b/www/chromium/files/patch-content_public_test_mock__render__thread.cc @@ -0,0 +1,11 @@ +--- content/public/test/mock_render_thread.cc.orig 2022-02-28 16:54:41 UTC ++++ content/public/test/mock_render_thread.cc +@@ -64,7 +64,7 @@ class MockRenderMessageFilterImpl : public mojom::Rend + std::move(callback).Run(false); + } + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + void SetThreadPriority(int32_t platform_thread_id, + base::ThreadPriority thread_priority) override {} + #endif diff --git a/www/chromium/files/patch-content_renderer_render__process__impl.cc b/www/chromium/files/patch-content_renderer_render__process__impl.cc index 37cc726442ff..da23f9def37b 100644 --- a/www/chromium/files/patch-content_renderer_render__process__impl.cc +++ b/www/chromium/files/patch-content_renderer_render__process__impl.cc @@ -1,11 +1,11 @@ ---- content/renderer/render_process_impl.cc.orig 2022-02-07 13:39:41 UTC +--- content/renderer/render_process_impl.cc.orig 2022-02-28 16:54:41 UTC +++ content/renderer/render_process_impl.cc @@ -47,7 +47,7 @@ - #if defined(OS_WIN) + #if BUILDFLAG(IS_WIN) #include "base/win/win_util.h" #endif --#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(ARCH_CPU_X86_64) -+#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(ARCH_CPU_X86_64) +-#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) #include "v8/include/v8-wasm-trap-handler-posix.h" #endif @@ -13,17 +13,17 @@ SetV8FlagIfNotFeature(features::kWebAssemblyCodeProtection, "--no-wasm-write-protect-code-memory"); --#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(ARCH_CPU_X86_64) -+#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(ARCH_CPU_X86_64) +-#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) SetV8FlagIfFeature(features::kWebAssemblyCodeProtectionPku, "--wasm-memory-protection-keys"); SetV8FlagIfNotFeature(features::kWebAssemblyCodeProtectionPku, -@@ -240,7 +240,7 @@ RenderProcessImpl::RenderProcessImpl() +@@ -227,7 +227,7 @@ RenderProcessImpl::RenderProcessImpl() SetV8FlagIfFeature(features::kWebAssemblyDynamicTiering, "--wasm-dynamic-tiering"); --#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(ARCH_CPU_X86_64) -+#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(ARCH_CPU_X86_64) +-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(ARCH_CPU_X86_64) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_X86_64) if (base::FeatureList::IsEnabled(features::kWebAssemblyTrapHandler)) { if (command_line->HasSwitch(switches::kEnableCrashpad) || command_line->HasSwitch(switches::kEnableCrashReporter) || diff --git a/www/chromium/files/patch-content_renderer_render__thread__impl.cc b/www/chromium/files/patch-content_renderer_render__thread__impl.cc index 6f28be87f7a0..6f325abf06dd 100644 --- a/www/chromium/files/patch-content_renderer_render__thread__impl.cc +++ b/www/chromium/files/patch-content_renderer_render__thread__impl.cc @@ -1,47 +1,47 @@ ---- content/renderer/render_thread_impl.cc.orig 2022-02-07 13:39:41 UTC +--- content/renderer/render_thread_impl.cc.orig 2022-02-28 16:54:41 UTC +++ content/renderer/render_thread_impl.cc -@@ -188,7 +188,7 @@ +@@ -189,7 +189,7 @@ - #if defined(OS_MAC) + #if BUILDFLAG(IS_MAC) #include <malloc/malloc.h> -#else -+#elif !defined(OS_OPENBSD) ++#elif !BUILDFLAG(IS_OPENBSD) #include <malloc.h> #endif -@@ -701,7 +701,7 @@ void RenderThreadImpl::Init() { +@@ -718,7 +718,7 @@ void RenderThreadImpl::Init() { DCHECK(parsed_num_raster_threads) << string_value; DCHECK_GT(num_raster_threads, 0); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) categorized_worker_pool_->SetBackgroundingCallback( main_thread_scheduler_->DefaultTaskRunner(), base::BindOnce( -@@ -724,7 +724,7 @@ void RenderThreadImpl::Init() { +@@ -741,7 +741,7 @@ void RenderThreadImpl::Init() { base::DiscardableMemoryAllocator::SetInstance( discardable_memory_allocator_.get()); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (base::FeatureList::IsEnabled( blink::features::kBlinkCompositorUseDisplayThreadPriority)) { render_message_filter()->SetThreadPriority( -@@ -1057,7 +1057,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1075,7 +1075,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: const bool enable_video_decode_accelerator = --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) base::FeatureList::IsEnabled(media::kVaapiVideoDecodeLinux) && #else !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode) && -@@ -1068,7 +1068,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1086,7 +1086,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: const bool enable_video_encode_accelerator = --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) base::FeatureList::IsEnabled(media::kVaapiVideoEncodeLinux) && #else !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoEncode) && diff --git a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc index 33c8fc748011..40ba7f66c1fb 100644 --- a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc +++ b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc @@ -1,11 +1,11 @@ ---- content/renderer/renderer_blink_platform_impl.cc.orig 2022-02-07 13:39:41 UTC +--- content/renderer/renderer_blink_platform_impl.cc.orig 2022-02-28 16:54:41 UTC +++ content/renderer/renderer_blink_platform_impl.cc @@ -108,7 +108,7 @@ - #if defined(OS_MAC) + #if BUILDFLAG(IS_MAC) #include "content/child/child_process_sandbox_support_impl_mac.h" --#elif defined(OS_LINUX) || defined(OS_CHROMEOS) -+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "content/child/child_process_sandbox_support_impl_linux.h" #endif @@ -13,8 +13,8 @@ main_thread_scheduler_(main_thread_scheduler) { // RenderThread may not exist in some tests. if (RenderThreadImpl::current()) { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) mojo::PendingRemote<font_service::mojom::FontService> font_service; RenderThreadImpl::current()->BindHostReceiver( font_service.InitWithNewPipeAndPassReceiver()); @@ -22,18 +22,18 @@ #endif } --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) if (sandboxEnabled()) { - #if defined(OS_MAC) + #if BUILDFLAG(IS_MAC) sandbox_support_ = std::make_unique<WebSandboxSupportMac>(); @@ -261,7 +261,8 @@ RendererBlinkPlatformImpl::WrapSharedURLLoaderFactory( /*terminate_sync_load_event=*/nullptr); } --#if defined(OS_LINUX) || defined(OS_CHROMEOS) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +// pledge -+#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(OS_BSD) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_BSD) void RendererBlinkPlatformImpl::SetDisplayThreadPriority( base::PlatformThreadId thread_id) { if (RenderThreadImpl* render_thread = RenderThreadImpl::current()) { @@ -41,8 +41,8 @@ } blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) return sandbox_support_.get(); #else // These platforms do not require sandbox support. diff --git a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h index ad10482ead1d..aee599a1807f 100644 --- a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h +++ b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h @@ -1,11 +1,11 @@ ---- content/renderer/renderer_blink_platform_impl.h.orig 2022-02-07 13:39:41 UTC +--- content/renderer/renderer_blink_platform_impl.h.orig 2022-02-28 16:54:41 UTC +++ content/renderer/renderer_blink_platform_impl.h @@ -29,7 +29,7 @@ #include "third_party/blink/public/mojom/cache_storage/cache_storage.mojom.h" #include "third_party/blink/public/mojom/loader/code_cache.mojom.h" --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "components/services/font/public/cpp/font_loader.h" // nogncheck #include "third_party/skia/include/core/SkRefCnt.h" // nogncheck #endif @@ -13,8 +13,8 @@ void Collect3DContextInformation(blink::Platform::GraphicsInfo* gl_info, const gpu::GPUInfo& gpu_info) const; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) std::unique_ptr<blink::WebSandboxSupport> sandbox_support_; #endif @@ -22,8 +22,8 @@ mojo::SharedRemote<blink::mojom::CodeCacheHost> code_cache_host_ GUARDED_BY(code_cache_host_lock_); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) sk_sp<font_service::FontLoader> font_loader_; #endif diff --git a/www/chromium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc b/www/chromium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc index 67135dd09692..5d669f32c57e 100644 --- a/www/chromium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc +++ b/www/chromium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc @@ -1,6 +1,6 @@ ---- content/renderer/renderer_main_platform_delegate_linux.cc.orig 2022-02-07 13:39:41 UTC +--- content/renderer/renderer_main_platform_delegate_linux.cc.orig 2022-02-28 16:54:41 UTC +++ content/renderer/renderer_main_platform_delegate_linux.cc -@@ -45,6 +45,7 @@ bool RendererMainPlatformDelegate::EnableSandbox() { +@@ -44,6 +44,7 @@ bool RendererMainPlatformDelegate::EnableSandbox() { // any renderer has been started. // Here, we test that the status of SeccompBpf in the renderer is consistent // with what SandboxLinux::GetStatus() said we would do. @@ -8,7 +8,7 @@ auto* linux_sandbox = sandbox::policy::SandboxLinux::GetInstance(); if (linux_sandbox->GetStatus() & sandbox::policy::SandboxLinux::kSeccompBPF) { CHECK(linux_sandbox->seccomp_bpf_started()); -@@ -66,6 +67,7 @@ bool RendererMainPlatformDelegate::EnableSandbox() { +@@ -65,6 +66,7 @@ bool RendererMainPlatformDelegate::EnableSandbox() { CHECK_EQ(errno, EPERM); } #endif // __x86_64__ diff --git a/www/chromium/files/patch-content_shell_BUILD.gn b/www/chromium/files/patch-content_shell_BUILD.gn index fc8ffc6a2b73..f261c872642e 100644 --- a/www/chromium/files/patch-content_shell_BUILD.gn +++ b/www/chromium/files/patch-content_shell_BUILD.gn @@ -1,6 +1,6 @@ ---- content/shell/BUILD.gn.orig 2022-02-07 13:39:41 UTC +--- content/shell/BUILD.gn.orig 2022-02-28 16:54:41 UTC +++ content/shell/BUILD.gn -@@ -869,7 +869,7 @@ group("content_shell_crash_test") { +@@ -872,7 +872,7 @@ group("content_shell_crash_test") { if (is_win) { data_deps += [ "//build/win:copy_cdb_to_output" ] } diff --git a/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc b/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc index 3081382eea42..936eb5d2e183 100644 --- a/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc +++ b/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc @@ -1,11 +1,11 @@ ---- content/shell/app/shell_main_delegate.cc.orig 2022-02-07 13:39:41 UTC +--- content/shell/app/shell_main_delegate.cc.orig 2022-02-28 16:54:41 UTC +++ content/shell/app/shell_main_delegate.cc @@ -211,7 +211,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); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) crash_reporter::SetFirstChanceExceptionHandler( v8::TryHandleWebAssemblyTrapPosix); #endif diff --git a/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc b/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc index 7b1010e06148..cf39697c5157 100644 --- a/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc +++ b/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc @@ -1,11 +1,11 @@ ---- content/shell/browser/shell_browser_main_parts.cc.orig 2022-02-07 13:39:41 UTC +--- content/shell/browser/shell_browser_main_parts.cc.orig 2022-02-28 16:54:41 UTC +++ content/shell/browser/shell_browser_main_parts.cc @@ -49,7 +49,7 @@ #include "net/base/network_change_notifier.h" #endif --#if defined(USE_AURA) && (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+#if defined(USE_AURA) && (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) +-#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) #include "ui/base/ime/init/input_method_initializer.h" #endif @@ -13,8 +13,8 @@ } int ShellBrowserMainParts::PreEarlyInitialization() { --#if defined(USE_AURA) && (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+#if defined(USE_AURA) && (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) +-#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) ui::InitializeInputMethodForTesting(); #endif - #if defined(OS_ANDROID) + #if BUILDFLAG(IS_ANDROID) diff --git a/www/chromium/files/patch-content_shell_browser_shell__paths.cc b/www/chromium/files/patch-content_shell_browser_shell__paths.cc index e5313259cb28..c00a1c66a5a2 100644 --- a/www/chromium/files/patch-content_shell_browser_shell__paths.cc +++ b/www/chromium/files/patch-content_shell_browser_shell__paths.cc @@ -1,20 +1,20 @@ ---- content/shell/browser/shell_paths.cc.orig 2022-02-07 13:39:41 UTC +--- content/shell/browser/shell_paths.cc.orig 2022-02-28 16:54:41 UTC +++ content/shell/browser/shell_paths.cc @@ -13,7 +13,7 @@ - #if defined(OS_FUCHSIA) + #if BUILDFLAG(IS_FUCHSIA) #include "base/fuchsia/file_utils.h" --#elif defined(OS_LINUX) || defined(OS_CHROMEOS) -+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "base/nix/xdg_util.h" #endif @@ -25,7 +25,7 @@ bool GetDefaultUserDataDirectory(base::FilePath* resul - #if defined(OS_WIN) + #if BUILDFLAG(IS_WIN) CHECK(base::PathService::Get(base::DIR_LOCAL_APP_DATA, result)); *result = result->Append(std::wstring(L"content_shell")); --#elif defined(OS_LINUX) || defined(OS_CHROMEOS) -+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) std::unique_ptr<base::Environment> env(base::Environment::Create()); base::FilePath config_dir(base::nix::GetXDGDirectory( env.get(), base::nix::kXdgConfigHomeEnvVar, base::nix::kDotConfigDir)); diff --git a/www/chromium/files/patch-content_shell_utility_shell__content__utility__client.cc b/www/chromium/files/patch-content_shell_utility_shell__content__utility__client.cc index d177df0a8a2a..1889f5641698 100644 --- a/www/chromium/files/patch-content_shell_utility_shell__content__utility__client.cc +++ b/www/chromium/files/patch-content_shell_utility_shell__content__utility__client.cc @@ -1,20 +1,20 @@ ---- content/shell/utility/shell_content_utility_client.cc.orig 2021-12-31 00:57:33 UTC +--- content/shell/utility/shell_content_utility_client.cc.orig 2022-02-28 16:54:41 UTC +++ content/shell/utility/shell_content_utility_client.cc -@@ -33,7 +33,7 @@ +@@ -32,7 +32,7 @@ #include "sandbox/policy/sandbox.h" #include "services/test/echo/echo_service.h" --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "content/test/sandbox_status_service.h" #endif -@@ -143,7 +143,7 @@ void ShellContentUtilityClient::ExposeInterfacesToBrow +@@ -142,7 +142,7 @@ void ShellContentUtilityClient::ExposeInterfacesToBrow binders->Add<mojom::PowerMonitorTest>( base::BindRepeating(&PowerMonitorTestImpl::MakeSelfOwnedReceiver), base::ThreadTaskRunnerHandle::Get()); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (register_sandbox_status_helper_) { binders->Add<content::mojom::SandboxStatusService>( base::BindRepeating( diff --git a/www/chromium/files/patch-content_test_BUILD.gn b/www/chromium/files/patch-content_test_BUILD.gn index 38dc56055adc..e65dae313f21 100644 --- a/www/chromium/files/patch-content_test_BUILD.gn +++ b/www/chromium/files/patch-content_test_BUILD.gn @@ -1,6 +1,6 @@ ---- content/test/BUILD.gn.orig 2022-02-07 13:39:41 UTC +--- content/test/BUILD.gn.orig 2022-02-28 16:54:41 UTC +++ content/test/BUILD.gn -@@ -1878,7 +1878,7 @@ static_library("run_all_unittests") { +@@ -1900,7 +1900,7 @@ static_library("run_all_unittests") { ":test_support", "//base/test:test_support", ] @@ -9,7 +9,7 @@ deps += [ "//content/common:set_process_title_linux" ] } } -@@ -2806,7 +2806,7 @@ test("content_unittests") { +@@ -2828,7 +2828,7 @@ test("content_unittests") { deps += [ "//third_party/boringssl" ] } diff --git a/www/chromium/files/patch-content_utility_services.cc b/www/chromium/files/patch-content_utility_services.cc index 5e46ea9659c4..421ce9c78c37 100644 --- a/www/chromium/files/patch-content_utility_services.cc +++ b/www/chromium/files/patch-content_utility_services.cc @@ -1,20 +1,20 @@ ---- content/utility/services.cc.orig 2022-02-07 13:39:41 UTC +--- content/utility/services.cc.orig 2022-02-28 16:54:41 UTC +++ content/utility/services.cc -@@ -68,7 +68,7 @@ +@@ -67,7 +67,7 @@ extern sandbox::TargetServices* g_utility_target_services; - #endif // defined(OS_WIN) + #endif // BUILDFLAG(IS_WIN) --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "sandbox/linux/services/libc_interceptor.h" #include "sandbox/policy/mojom/sandbox.mojom.h" #include "sandbox/policy/sandbox_type.h" -@@ -206,7 +206,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::Audi +@@ -205,7 +205,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::Audi << "task_policy_set TASK_QOS_POLICY"; #endif --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) auto* command_line = base::CommandLine::ForCurrentProcess(); if (sandbox::policy::SandboxTypeFromCommandLine(*command_line) == sandbox::mojom::Sandbox::kNoSandbox) { diff --git a/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc b/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc index 32adca518441..1f2efe71edd0 100644 --- a/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc +++ b/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc @@ -1,11 +1,11 @@ ---- content/utility/utility_blink_platform_with_sandbox_support_impl.cc.orig 2021-04-14 18:41:03 UTC +--- content/utility/utility_blink_platform_with_sandbox_support_impl.cc.orig 2022-02-28 16:54:41 UTC +++ content/utility/utility_blink_platform_with_sandbox_support_impl.cc @@ -9,7 +9,7 @@ - #if defined(OS_MAC) + #if BUILDFLAG(IS_MAC) #include "content/child/child_process_sandbox_support_impl_mac.h" --#elif defined(OS_LINUX) || defined(OS_CHROMEOS) -+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "content/child/child_process_sandbox_support_impl_linux.h" #endif @@ -13,8 +13,8 @@ UtilityBlinkPlatformWithSandboxSupportImpl:: UtilityBlinkPlatformWithSandboxSupportImpl() { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) mojo::PendingRemote<font_service::mojom::FontService> font_service; UtilityThread::Get()->BindHostReceiver( font_service.InitWithNewPipeAndPassReceiver()); @@ -22,8 +22,8 @@ blink::WebSandboxSupport* UtilityBlinkPlatformWithSandboxSupportImpl::GetSandboxSupport() { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) return sandbox_support_.get(); #else return nullptr; diff --git a/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h b/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h index bea16be55d63..a9f9964ff3a1 100644 --- a/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h +++ b/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h @@ -1,11 +1,11 @@ ---- content/utility/utility_blink_platform_with_sandbox_support_impl.h.orig 2022-02-07 13:39:41 UTC +--- content/utility/utility_blink_platform_with_sandbox_support_impl.h.orig 2022-02-28 16:54:41 UTC +++ content/utility/utility_blink_platform_with_sandbox_support_impl.h @@ -10,7 +10,7 @@ #include "build/build_config.h" #include "third_party/blink/public/platform/platform.h" --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "components/services/font/public/cpp/font_loader.h" // nogncheck #include "third_party/skia/include/core/SkRefCnt.h" // nogncheck #endif @@ -13,12 +13,12 @@ blink::WebSandboxSupport* GetSandboxSupport() override; private: --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) std::unique_ptr<blink::WebSandboxSupport> sandbox_support_; #endif --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) sk_sp<font_service::FontLoader> font_loader_; #endif }; diff --git a/www/chromium/files/patch-content_utility_utility__main.cc b/www/chromium/files/patch-content_utility_utility__main.cc index cf4428749ae7..52a7fc2d81c4 100644 --- a/www/chromium/files/patch-content_utility_utility__main.cc +++ b/www/chromium/files/patch-content_utility_utility__main.cc @@ -1,47 +1,47 @@ ---- content/utility/utility_main.cc.orig 2022-02-07 13:39:41 UTC +--- content/utility/utility_main.cc.orig 2022-02-28 16:54:41 UTC +++ content/utility/utility_main.cc -@@ -31,16 +31,22 @@ +@@ -32,16 +32,22 @@ #include "third_party/icu/source/common/unicode/unistr.h" #include "third_party/icu/source/i18n/unicode/timezone.h" --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "content/utility/speech/speech_recognition_sandbox_hook_linux.h" #if BUILDFLAG(ENABLE_PRINTING) #include "printing/sandbox/print_backend_sandbox_hook_linux.h" #endif -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) #include "sandbox/policy/linux/sandbox_linux.h" +#endif #include "services/audio/audio_sandbox_hook_linux.h" #include "services/network/network_sandbox_hook_linux.h" #endif -+#if defined(OS_BSD) ++#if BUILDFLAG(IS_BSD) +#include "sandbox/policy/openbsd/sandbox_openbsd.h" +#endif + #if BUILDFLAG(IS_CHROMEOS_ASH) #include "ash/services/ime/ime_sandbox_hook.h" #include "chromeos/assistant/buildflags.h" -@@ -121,7 +127,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -135,7 +141,7 @@ int UtilityMain(MainFunctionParams parameters) { } } --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Initializes the sandbox before any threads are created. // TODO(jorgelo): move this after GTK initialization when we enable a strict // Seccomp-BPF policy. -@@ -165,6 +171,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -179,6 +185,7 @@ int UtilityMain(MainFunctionParams parameters) { default: break; } -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) if (parameters.zygote_child || !pre_sandbox_hook.is_null()) { sandbox::policy::SandboxLinux::Options sandbox_options; #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -180,6 +187,11 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -194,6 +201,11 @@ int UtilityMain(MainFunctionParams parameters) { sandbox::policy::Sandbox::Initialize( sandbox_type, std::move(pre_sandbox_hook), sandbox_options); } @@ -50,6 +50,6 @@ + sandbox_type, std::move(pre_sandbox_hook), + sandbox::policy::SandboxLinux::Options()); +#endif - #elif defined(OS_WIN) + #elif BUILDFLAG(IS_WIN) g_utility_target_services = parameters.sandbox_info->target_services; #endif diff --git a/www/chromium/files/patch-device_fido_features.cc b/www/chromium/files/patch-device_fido_features.cc index 50905aaf6d65..028d19e45e69 100644 --- a/www/chromium/files/patch-device_fido_features.cc +++ b/www/chromium/files/patch-device_fido_features.cc @@ -1,20 +1,11 @@ ---- device/fido/features.cc.orig 2021-12-31 00:57:33 UTC +--- device/fido/features.cc.orig 2022-02-28 16:54:41 UTC +++ device/fido/features.cc -@@ -26,7 +26,7 @@ extern const base::Feature kWebAuthCableServerLink { - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. - // If updating this, also update kWebAuthCable. --#if BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_LINUX) || defined(OS_BSD) - base::FEATURE_DISABLED_BY_DEFAULT - #else - base::FEATURE_ENABLED_BY_DEFAULT -@@ -38,7 +38,7 @@ extern const base::Feature kWebAuthCableSecondFactor { +@@ -24,7 +24,7 @@ extern const base::Feature kWebAuthCableSecondFactor { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. // If updating this, also update kWebAuthCableServerLink. --#if BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) base::FEATURE_DISABLED_BY_DEFAULT #else base::FEATURE_ENABLED_BY_DEFAULT diff --git a/www/chromium/files/patch-device_gamepad_gamepad__provider.cc b/www/chromium/files/patch-device_gamepad_gamepad__provider.cc index cd983e2a7a7c..a1a2e8e3d470 100644 --- a/www/chromium/files/patch-device_gamepad_gamepad__provider.cc +++ b/www/chromium/files/patch-device_gamepad_gamepad__provider.cc @@ -1,11 +1,11 @@ ---- device/gamepad/gamepad_provider.cc.orig 2021-12-14 11:45:06 UTC +--- device/gamepad/gamepad_provider.cc.orig 2022-02-28 16:54:41 UTC +++ device/gamepad/gamepad_provider.cc @@ -216,7 +216,7 @@ void GamepadProvider::Initialize(std::unique_ptr<Gamep if (!polling_thread_) polling_thread_ = std::make_unique<base::Thread>("Gamepad polling thread"); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // On Linux, the data fetcher needs to watch file descriptors, so the message // loop needs to be a libevent loop. const base::MessagePumpType kMessageLoopType = base::MessagePumpType::IO; diff --git a/www/chromium/files/patch-device_gamepad_hid__writer__linux.cc b/www/chromium/files/patch-device_gamepad_hid__writer__linux.cc index 5208c5251dbc..439446240bac 100644 --- a/www/chromium/files/patch-device_gamepad_hid__writer__linux.cc +++ b/www/chromium/files/patch-device_gamepad_hid__writer__linux.cc @@ -1,4 +1,4 @@ ---- device/gamepad/hid_writer_linux.cc.orig 2022-02-07 13:39:41 UTC +--- device/gamepad/hid_writer_linux.cc.orig 2022-02-28 16:54:41 UTC +++ device/gamepad/hid_writer_linux.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be @@ -8,4 +8,4 @@ + #include "device/gamepad/hid_writer_linux.h" - #include "base/posix/eintr_wrapper.h" + #include <unistd.h> diff --git a/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc b/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc index 0440d715fc59..6c557c1bb4f8 100644 --- a/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc +++ b/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc @@ -1,20 +1,20 @@ ---- extensions/browser/api/messaging/message_service.cc.orig 2022-02-07 13:39:41 UTC +--- extensions/browser/api/messaging/message_service.cc.orig 2022-02-28 16:54:41 UTC +++ extensions/browser/api/messaging/message_service.cc @@ -74,7 +74,7 @@ namespace { const char kReceivingEndDoesntExistError[] = "Could not establish connection. Receiving end does not exist."; - #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ -- defined(OS_CHROMEOS) -+ defined(OS_CHROMEOS) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) const char kMissingPermissionError[] = "Access to native messaging requires nativeMessaging permission."; const char kProhibitedByPoliciesError[] = @@ -439,7 +439,7 @@ void MessageService::OpenChannelToNativeApp( return; - #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ -- defined(OS_CHROMEOS) -+ defined(OS_CHROMEOS) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) bool has_permission = extension->permissions_data()->HasAPIPermission( mojom::APIPermissionID::kNativeMessaging); if (!has_permission) { diff --git a/www/chromium/files/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc b/www/chromium/files/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc index 609a1b1dd669..14a81f209f24 100644 --- a/www/chromium/files/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc +++ b/www/chromium/files/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc @@ -1,20 +1,20 @@ ---- extensions/browser/api/networking_private/networking_private_delegate_factory.cc.orig 2021-04-14 18:41:03 UTC +--- extensions/browser/api/networking_private/networking_private_delegate_factory.cc.orig 2022-02-28 16:54:41 UTC +++ extensions/browser/api/networking_private/networking_private_delegate_factory.cc @@ -12,7 +12,7 @@ #if BUILDFLAG(IS_CHROMEOS_ASH) #include "extensions/browser/api/networking_private/networking_private_chromeos.h" --#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) #include "extensions/browser/api/networking_private/networking_private_linux.h" - #elif defined(OS_WIN) || defined(OS_MAC) + #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) #include "components/wifi/wifi_service.h" @@ -62,7 +62,7 @@ KeyedService* NetworkingPrivateDelegateFactory::BuildS NetworkingPrivateDelegate* delegate; #if BUILDFLAG(IS_CHROMEOS_ASH) delegate = new NetworkingPrivateChromeOS(browser_context); --#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) delegate = new NetworkingPrivateLinux(); - #elif defined(OS_WIN) || defined(OS_MAC) + #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) std::unique_ptr<wifi::WiFiService> wifi_service(wifi::WiFiService::Create()); diff --git a/www/chromium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc b/www/chromium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc index 6dba1684b015..aa4d6c376ebd 100644 --- a/www/chromium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc +++ b/www/chromium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc @@ -1,11 +1,11 @@ ---- extensions/browser/browser_context_keyed_service_factories.cc.orig 2022-02-07 13:39:41 UTC +--- extensions/browser/browser_context_keyed_service_factories.cc.orig 2022-02-28 16:54:41 UTC +++ extensions/browser/browser_context_keyed_service_factories.cc -@@ -89,7 +89,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() +@@ -91,7 +91,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() IdleManagerFactory::GetInstance(); ManagementAPI::GetFactoryInstance(); - #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || \ -- defined(OS_MAC) -+ defined(OS_MAC) || defined(OS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ +- BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) NetworkingPrivateEventRouterFactory::GetInstance(); #endif PowerAPI::GetFactoryInstance(); diff --git a/www/chromium/files/patch-extensions_browser_extension__prefs.cc b/www/chromium/files/patch-extensions_browser_extension__prefs.cc index 290ffac3509a..a8d0b2849b64 100644 --- a/www/chromium/files/patch-extensions_browser_extension__prefs.cc +++ b/www/chromium/files/patch-extensions_browser_extension__prefs.cc @@ -1,11 +1,11 @@ ---- extensions/browser/extension_prefs.cc.orig 2022-02-07 13:39:41 UTC +--- extensions/browser/extension_prefs.cc.orig 2022-02-28 16:54:41 UTC +++ extensions/browser/extension_prefs.cc -@@ -2252,7 +2252,7 @@ void ExtensionPrefs::RegisterProfilePrefs( +@@ -2265,7 +2265,7 @@ void ExtensionPrefs::RegisterProfilePrefs( registry->RegisterStringPref(pref_names::kLastChromeVersion, std::string()); registry->RegisterDictionaryPref(kInstallSignature); registry->RegisterListPref(kExternalUninstalls); --#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) registry->RegisterBooleanPref(pref_names::kChromeAppsEnabled, false); #endif registry->RegisterBooleanPref(pref_names::kU2fSecurityKeyApiEnabled, false); diff --git a/www/chromium/files/patch-extensions_browser_pref__names.cc b/www/chromium/files/patch-extensions_browser_pref__names.cc index d6277b142242..5797de43685b 100644 --- a/www/chromium/files/patch-extensions_browser_pref__names.cc +++ b/www/chromium/files/patch-extensions_browser_pref__names.cc @@ -1,11 +1,11 @@ ---- extensions/browser/pref_names.cc.orig 2021-12-16 15:11:20 UTC +--- extensions/browser/pref_names.cc.orig 2022-02-28 16:54:41 UTC +++ extensions/browser/pref_names.cc -@@ -47,7 +47,7 @@ const char kStorageGarbageCollect[] = "extensions.stor +@@ -48,7 +48,7 @@ const char kStorageGarbageCollect[] = "extensions.stor const char kToolbar[] = "extensions.toolbar"; const char kDeletedComponentExtensions[] = "extensions.deleted_component_extensions"; --#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) extern const char kChromeAppsEnabled[] = "extensions.chrome_apps_enabled"; #endif const char kU2fSecurityKeyApiEnabled[] = diff --git a/www/chromium/files/patch-extensions_browser_pref__names.h b/www/chromium/files/patch-extensions_browser_pref__names.h index ebcacaa86a38..b4a0fd439d1b 100644 --- a/www/chromium/files/patch-extensions_browser_pref__names.h +++ b/www/chromium/files/patch-extensions_browser_pref__names.h @@ -1,11 +1,11 @@ ---- extensions/browser/pref_names.h.orig 2021-12-16 15:11:30 UTC +--- extensions/browser/pref_names.h.orig 2022-02-28 16:54:41 UTC +++ extensions/browser/pref_names.h @@ -101,7 +101,7 @@ extern const char kToolbar[]; // uninstalled/removed and should not be reloaded. extern const char kDeletedComponentExtensions[]; --#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // A preference for whether Chrome Apps should be allowed. The default depends // on the ChromeAppsDeprecation feature flag, and this pref can extend support // for Chrome Apps by enterprise policy. diff --git a/www/chromium/files/patch-extensions_common_api___permission__features.json b/www/chromium/files/patch-extensions_common_api___permission__features.json index 037478cd165d..81c60495b3c4 100644 --- a/www/chromium/files/patch-extensions_common_api___permission__features.json +++ b/www/chromium/files/patch-extensions_common_api___permission__features.json @@ -1,4 +1,4 @@ ---- extensions/common/api/_permission_features.json.orig 2022-02-07 13:39:41 UTC +--- extensions/common/api/_permission_features.json.orig 2022-02-28 16:54:41 UTC +++ extensions/common/api/_permission_features.json @@ -134,7 +134,7 @@ { @@ -9,7 +9,7 @@ "allowlist": [ "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80", // http://crbug.com/387169 "A3BC37E2148AC4E99BE4B16AF9D42DD1E592BBBE", // http://crbug.com/387169 -@@ -445,7 +445,7 @@ +@@ -447,7 +447,7 @@ }, { "channel": "stable", "extension_types": ["extension", "legacy_packaged_app", "platform_app"], @@ -18,7 +18,7 @@ "allowlist": [ "0DE0F05680A4A056BCEC864ED8DDA84296F82B40", // http://crbug.com/434651 "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80", // http://crbug.com/293683 -@@ -481,7 +481,7 @@ +@@ -485,7 +485,7 @@ "networkingPrivate": { "channel": "stable", "extension_types": ["extension", "legacy_packaged_app", "platform_app"], diff --git a/www/chromium/files/patch-extensions_common_features_feature.cc b/www/chromium/files/patch-extensions_common_features_feature.cc index 58152ea08295..53441c02779e 100644 --- a/www/chromium/files/patch-extensions_common_features_feature.cc +++ b/www/chromium/files/patch-extensions_common_features_feature.cc @@ -1,8 +1,8 @@ ---- extensions/common/features/feature.cc.orig 2022-02-07 13:39:41 UTC +--- extensions/common/features/feature.cc.orig 2022-02-28 16:54:41 UTC +++ extensions/common/features/feature.cc @@ -34,6 +34,8 @@ Feature::Platform Feature::GetCurrentPlatform() { return WIN_PLATFORM; - #elif defined(OS_FUCHSIA) + #elif BUILDFLAG(IS_FUCHSIA) return FUCHSIA_PLATFORM; +#elif defined(OS_BSD) + return LINUX_PLATFORM; diff --git a/www/chromium/files/patch-extensions_renderer_bindings_api__binding__util.cc b/www/chromium/files/patch-extensions_renderer_bindings_api__binding__util.cc index dbe57dcbb69a..80e3d05fea23 100644 --- a/www/chromium/files/patch-extensions_renderer_bindings_api__binding__util.cc +++ b/www/chromium/files/patch-extensions_renderer_bindings_api__binding__util.cc @@ -1,11 +1,11 @@ ---- extensions/renderer/bindings/api_binding_util.cc.orig 2022-02-07 13:39:41 UTC +--- extensions/renderer/bindings/api_binding_util.cc.orig 2022-02-28 16:54:41 UTC +++ extensions/renderer/bindings/api_binding_util.cc @@ -132,7 +132,7 @@ std::string GetPlatformString() { return "lacros"; #elif BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_CHROMEOS_LACROS) return "chromeos"; --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return "linux"; - #elif defined(OS_MAC) + #elif BUILDFLAG(IS_MAC) return "mac"; diff --git a/www/chromium/files/patch-extensions_shell_app_shell__main__delegate.cc b/www/chromium/files/patch-extensions_shell_app_shell__main__delegate.cc index b20ddae3a8c0..bc9c4bf1b540 100644 --- a/www/chromium/files/patch-extensions_shell_app_shell__main__delegate.cc +++ b/www/chromium/files/patch-extensions_shell_app_shell__main__delegate.cc @@ -1,20 +1,20 @@ ---- extensions/shell/app/shell_main_delegate.cc.orig 2021-09-14 01:51:57 UTC +--- extensions/shell/app/shell_main_delegate.cc.orig 2022-02-28 16:54:41 UTC +++ extensions/shell/app/shell_main_delegate.cc @@ -42,7 +42,7 @@ - #if defined(OS_WIN) + #if BUILDFLAG(IS_WIN) #include "base/base_paths_win.h" --#elif defined(OS_LINUX) || defined(OS_CHROMEOS) -+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "base/nix/xdg_util.h" - #elif defined(OS_MAC) + #elif BUILDFLAG(IS_MAC) #include "base/base_paths_mac.h" -@@ -78,7 +78,7 @@ base::FilePath GetDataPath() { +@@ -61,7 +61,7 @@ base::FilePath GetDataPath() { return cmd_line->GetSwitchValuePath(switches::kContentShellDataPath); base::FilePath data_dir; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) std::unique_ptr<base::Environment> env(base::Environment::Create()); data_dir = base::nix::GetXDGDirectory( env.get(), base::nix::kXdgConfigHomeEnvVar, base::nix::kDotConfigDir); diff --git a/www/chromium/files/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc b/www/chromium/files/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc index 0acebaed70a7..74bc8ff8874b 100644 --- a/www/chromium/files/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc +++ b/www/chromium/files/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc @@ -1,11 +1,11 @@ ---- extensions/shell/browser/api/runtime/shell_runtime_api_delegate.cc.orig 2021-04-14 18:41:04 UTC +--- extensions/shell/browser/api/runtime/shell_runtime_api_delegate.cc.orig 2022-02-28 16:54:41 UTC +++ extensions/shell/browser/api/runtime/shell_runtime_api_delegate.cc @@ -45,7 +45,7 @@ void ShellRuntimeAPIDelegate::OpenURL(const GURL& unin bool ShellRuntimeAPIDelegate::GetPlatformInfo(PlatformInfo* info) { #if BUILDFLAG(IS_CHROMEOS_ASH) info->os = api::runtime::PLATFORM_OS_CROS; --#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) info->os = api::runtime::PLATFORM_OS_LINUX; #endif return true; diff --git a/www/chromium/files/patch-extensions_shell_browser_shell__browser__main__parts.cc b/www/chromium/files/patch-extensions_shell_browser_shell__browser__main__parts.cc index 6fcf0af77142..09ac8cc34952 100644 --- a/www/chromium/files/patch-extensions_shell_browser_shell__browser__main__parts.cc +++ b/www/chromium/files/patch-extensions_shell_browser_shell__browser__main__parts.cc @@ -1,11 +1,11 @@ ---- extensions/shell/browser/shell_browser_main_parts.cc.orig 2022-02-07 13:39:41 UTC +--- extensions/shell/browser/shell_browser_main_parts.cc.orig 2022-02-28 16:54:41 UTC +++ extensions/shell/browser/shell_browser_main_parts.cc -@@ -152,7 +152,7 @@ void ShellBrowserMainParts::PostCreateMainMessageLoop( +@@ -142,7 +142,7 @@ void ShellBrowserMainParts::PostCreateMainMessageLoop( switches::kAppShellAllowRoaming)) { network_controller_->SetCellularAllowRoaming(true); } --#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) // app_shell doesn't need GTK, so the fake input method context can work. // See crbug.com/381852 and revision fb69f142. // TODO(michaelpg): Verify this works for target environments. diff --git a/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.cc b/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.cc index 308e89d6aab9..6d35272bfa2a 100644 --- a/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.cc +++ b/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.cc @@ -1,11 +1,11 @@ ---- extensions/shell/browser/shell_extensions_api_client.cc.orig 2022-02-07 13:39:41 UTC +--- extensions/shell/browser/shell_extensions_api_client.cc.orig 2022-02-28 16:54:41 UTC +++ extensions/shell/browser/shell_extensions_api_client.cc -@@ -57,7 +57,7 @@ ShellExtensionsAPIClient::CreateDisplayInfoProvider() +@@ -58,7 +58,7 @@ ShellExtensionsAPIClient::CreateDisplayInfoProvider() // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) FileSystemDelegate* ShellExtensionsAPIClient::GetFileSystemDelegate() { if (!file_system_delegate_) file_system_delegate_ = std::make_unique<ShellFileSystemDelegate>(); diff --git a/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.h b/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.h index 3d8d9db905ee..5c420402f722 100644 --- a/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.h +++ b/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.h @@ -1,11 +1,11 @@ ---- extensions/shell/browser/shell_extensions_api_client.h.orig 2021-04-14 18:41:04 UTC +--- extensions/shell/browser/shell_extensions_api_client.h.orig 2022-02-28 16:54:41 UTC +++ extensions/shell/browser/shell_extensions_api_client.h @@ -36,7 +36,7 @@ class ShellExtensionsAPIClient : public ExtensionsAPIC const override; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) FileSystemDelegate* GetFileSystemDelegate() override; #endif MessagingDelegate* GetMessagingDelegate() override; @@ -13,8 +13,8 @@ private: // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) std::unique_ptr<FileSystemDelegate> file_system_delegate_; #endif std::unique_ptr<MessagingDelegate> messaging_delegate_; diff --git a/www/chromium/files/patch-extensions_shell_common_switches.cc b/www/chromium/files/patch-extensions_shell_common_switches.cc deleted file mode 100644 index dda8a183d3ee..000000000000 --- a/www/chromium/files/patch-extensions_shell_common_switches.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- extensions/shell/common/switches.cc.orig 2022-02-07 13:39:41 UTC -+++ extensions/shell/common/switches.cc -@@ -22,7 +22,7 @@ const char kAppShellPreferredNetwork[] = "app-shell-pr - - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) - // The directory breakpad should store minidumps in. - const char kCrashDumpsDir[] = "crash-dumps-dir"; - diff --git a/www/chromium/files/patch-extensions_shell_common_switches.h b/www/chromium/files/patch-extensions_shell_common_switches.h deleted file mode 100644 index 9e75e9414503..000000000000 --- a/www/chromium/files/patch-extensions_shell_common_switches.h +++ /dev/null @@ -1,11 +0,0 @@ ---- extensions/shell/common/switches.h.orig 2022-02-07 13:39:41 UTC -+++ extensions/shell/common/switches.h -@@ -20,7 +20,7 @@ extern const char kAppShellPreferredNetwork[]; - #endif - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) - extern const char kCrashDumpsDir[]; - extern const char kEnableReporting[]; - #endif diff --git a/www/chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc b/www/chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc index 8f62d22ca390..01ee880ddb40 100644 --- a/www/chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc +++ b/www/chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc @@ -1,20 +1,20 @@ ---- gpu/command_buffer/common/gpu_memory_buffer_support.cc.orig 2022-02-07 13:39:41 UTC +--- gpu/command_buffer/common/gpu_memory_buffer_support.cc.orig 2022-02-28 16:54:41 UTC +++ gpu/command_buffer/common/gpu_memory_buffer_support.cc @@ -134,7 +134,7 @@ uint32_t GetPlatformSpecificTextureTarget() { - #if defined(OS_MAC) + #if BUILDFLAG(IS_MAC) return macos_specific_texture_target; - #elif defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -- defined(OS_WIN) -+ defined(OS_WIN) || defined(OS_BSD) + #elif BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) return GL_TEXTURE_EXTERNAL_OES; - #elif defined(OS_FUCHSIA) + #elif BUILDFLAG(IS_FUCHSIA) return GL_TEXTURE_2D; @@ -166,7 +166,7 @@ GPU_EXPORT bool NativeBufferNeedsPlatformSpecificTextu gfx::BufferFormat format, gfx::BufferPlane plane) { - #if defined(USE_OZONE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -- defined(OS_WIN) -+ defined(OS_WIN) || defined(OS_BSD) + #if defined(USE_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) // Always use GL_TEXTURE_2D as the target for RGB textures. // https://crbug.com/916728 if (format == gfx::BufferFormat::R_8 || format == gfx::BufferFormat::RG_88 || diff --git a/www/chromium/files/patch-gpu_command__buffer_service_external__semaphore.cc b/www/chromium/files/patch-gpu_command__buffer_service_external__semaphore.cc index 5069ebc251de..3e8ba0b81e4b 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_external__semaphore.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_external__semaphore.cc @@ -1,11 +1,11 @@ ---- gpu/command_buffer/service/external_semaphore.cc.orig 2021-07-19 18:45:17 UTC +--- gpu/command_buffer/service/external_semaphore.cc.orig 2022-02-28 16:54:41 UTC +++ gpu/command_buffer/service/external_semaphore.cc @@ -27,7 +27,7 @@ GLuint ImportSemaphoreHandleToGLSemaphore(SemaphoreHan if (!handle.is_valid()) return 0; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) if (handle.vk_handle_type() != VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT) { DLOG(ERROR) << "Importing semaphore handle of unexpected type:" diff --git a/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc b/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc index 84058edc6972..da1721a96294 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc @@ -1,29 +1,29 @@ ---- gpu/command_buffer/service/external_vk_image_backing.cc.orig 2022-02-07 13:39:41 UTC +--- gpu/command_buffer/service/external_vk_image_backing.cc.orig 2022-02-28 16:54:41 UTC +++ gpu/command_buffer/service/external_vk_image_backing.cc @@ -31,7 +31,7 @@ #include "ui/gl/gl_version_info.h" #include "ui/gl/scoped_binders.h" --#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && BUILDFLAG(USE_DAWN) -+#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && BUILDFLAG(USE_DAWN) +-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && BUILDFLAG(USE_DAWN) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_DAWN) #include "gpu/command_buffer/service/external_vk_image_dawn_representation.h" #endif -@@ -564,7 +564,7 @@ ExternalVkImageBacking::ProduceDawn(SharedImageManager +@@ -559,7 +559,7 @@ ExternalVkImageBacking::ProduceDawn(SharedImageManager MemoryTypeTracker* tracker, WGPUDevice wgpuDevice, WGPUBackendType backend_type) { --#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && BUILDFLAG(USE_DAWN) -+#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && BUILDFLAG(USE_DAWN) +-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && BUILDFLAG(USE_DAWN) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_DAWN) auto wgpu_format = viz::ToWGPUFormat(format()); if (wgpu_format == WGPUTextureFormat_Undefined) { -@@ -596,7 +596,7 @@ GLuint ExternalVkImageBacking::ProduceGLTextureInterna +@@ -592,7 +592,7 @@ GLuint ExternalVkImageBacking::ProduceGLTextureInterna gl::GLApi* api = gl::g_current_gl_context; absl::optional<ScopedDedicatedMemoryObject> memory_object; if (!use_separate_gl_texture()) { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) auto memory_fd = image_->GetMemoryFd(); if (!memory_fd.is_valid()) return 0; diff --git a/www/chromium/files/patch-gpu_command__buffer_service_shared__image__backing__factory__angle__vulkan.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__image__backing__factory__angle__vulkan.cc new file mode 100644 index 000000000000..3b49ed72e30f --- /dev/null +++ b/www/chromium/files/patch-gpu_command__buffer_service_shared__image__backing__factory__angle__vulkan.cc @@ -0,0 +1,11 @@ +--- gpu/command_buffer/service/shared_image_backing_factory_angle_vulkan.cc.orig 2022-02-28 16:54:41 UTC ++++ gpu/command_buffer/service/shared_image_backing_factory_angle_vulkan.cc +@@ -573,7 +573,7 @@ bool SharedImageBackingFactoryAngleVulkan::CanUseAngle + // TODO(penghuang): verify the scanout is the right usage for video playback. + // crbug.com/1280798 + constexpr auto kSupportedUsages = +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + SHARED_IMAGE_USAGE_SCANOUT | + #endif + SHARED_IMAGE_USAGE_GLES2 | SHARED_IMAGE_USAGE_GLES2_FRAMEBUFFER_HINT | diff --git a/www/chromium/files/patch-gpu_command__buffer_service_shared__image__factory.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__image__factory.cc index 5033739dc49f..ac36bf032db2 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_shared__image__factory.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_shared__image__factory.cc @@ -1,16 +1,16 @@ ---- gpu/command_buffer/service/shared_image_factory.cc.orig 2022-02-07 13:39:41 UTC +--- gpu/command_buffer/service/shared_image_factory.cc.orig 2022-02-28 16:54:41 UTC +++ gpu/command_buffer/service/shared_image_factory.cc @@ -34,11 +34,11 @@ #include "ui/gl/gl_switches.h" #include "ui/gl/trace_util.h" --#if defined(OS_LINUX) && defined(USE_OZONE) && BUILDFLAG(ENABLE_VULKAN) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_OZONE) && BUILDFLAG(ENABLE_VULKAN) +-#if BUILDFLAG(IS_LINUX) && defined(USE_OZONE) && BUILDFLAG(ENABLE_VULKAN) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(USE_OZONE) && BUILDFLAG(ENABLE_VULKAN) #include "ui/ozone/public/ozone_platform.h" #endif --#if (defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_WIN)) && \ -+#if (defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_WIN) || defined(OS_BSD)) && \ +-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN)) && \ ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)) && \ BUILDFLAG(ENABLE_VULKAN) #include "gpu/command_buffer/service/external_vk_image_factory.h" #include "gpu/command_buffer/service/shared_image_backing_factory_angle_vulkan.h" @@ -18,17 +18,17 @@ namespace gpu { --#if defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ +-#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ !BUILDFLAG(IS_CHROMEOS_LACROS) && !BUILDFLAG(IS_CHROMECAST) && \ BUILDFLAG(ENABLE_VULKAN) -@@ -173,7 +173,7 @@ SharedImageFactory::SharedImageFactory( +@@ -200,7 +200,7 @@ SharedImageFactory::SharedImageFactory( // |gr_context_type|. if (gr_context_type_ == GrContextType::kVulkan) { #if BUILDFLAG(ENABLE_VULKAN) --#if defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ +-#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ !BUILDFLAG(IS_CHROMEOS_LACROS) && !BUILDFLAG(IS_CHROMECAST) // Desktop Linux, not ChromeOS. if (base::FeatureList::IsEnabled(features::kVulkanFromANGLE)) { diff --git a/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc b/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc index 2a5e8eab866b..0c10f6fd150b 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc @@ -1,11 +1,11 @@ ---- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2022-02-07 13:39:41 UTC +--- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2022-02-28 16:54:41 UTC +++ gpu/command_buffer/service/webgpu_decoder_impl.cc -@@ -1021,7 +1021,7 @@ error::Error WebGPUDecoderImpl::HandleRequestAdapter( +@@ -1010,7 +1010,7 @@ error::Error WebGPUDecoderImpl::HandleRequestAdapter( } if (gr_context_type_ != GrContextType::kVulkan) { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) SendAdapterProperties(request_adapter_serial, -1, nullptr, "WebGPU on Linux requires command-line flag " "--enable-features=Vulkan,UseSkiaRenderer"); diff --git a/www/chromium/files/patch-gpu_config_gpu__control__list.cc b/www/chromium/files/patch-gpu_config_gpu__control__list.cc index e75c2244ff3c..2ad7e68a262e 100644 --- a/www/chromium/files/patch-gpu_config_gpu__control__list.cc +++ b/www/chromium/files/patch-gpu_config_gpu__control__list.cc @@ -1,20 +1,20 @@ ---- gpu/config/gpu_control_list.cc.orig 2022-02-07 13:39:41 UTC +--- gpu/config/gpu_control_list.cc.orig 2022-02-28 16:54:41 UTC +++ gpu/config/gpu_control_list.cc @@ -276,7 +276,7 @@ bool GpuControlList::More::GLVersionInfoMismatch( GpuControlList::GLType GpuControlList::More::GetDefaultGLType() { - #if defined(OS_CHROMEOS) + #if BUILDFLAG(IS_CHROMEOS) return kGLTypeGL; --#elif defined(OS_LINUX) || defined(OS_OPENBSD) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_OPENBSD) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return kGLTypeGL; - #elif defined(OS_MAC) + #elif BUILDFLAG(IS_MAC) return kGLTypeGL; @@ -781,7 +781,7 @@ GpuControlList::OsType GpuControlList::GetOsType() { return kOsAndroid; - #elif defined(OS_FUCHSIA) + #elif BUILDFLAG(IS_FUCHSIA) return kOsFuchsia; --#elif defined(OS_LINUX) || defined(OS_OPENBSD) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_OPENBSD) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return kOsLinux; - #elif defined(OS_MAC) + #elif BUILDFLAG(IS_MAC) return kOsMacosx; diff --git a/www/chromium/files/patch-gpu_config_gpu__test__config.cc b/www/chromium/files/patch-gpu_config_gpu__test__config.cc index 56b64af4a0af..86cc37845dcf 100644 --- a/www/chromium/files/patch-gpu_config_gpu__test__config.cc +++ b/www/chromium/files/patch-gpu_config_gpu__test__config.cc @@ -1,11 +1,11 @@ ---- gpu/config/gpu_test_config.cc.orig 2022-02-07 13:39:41 UTC +--- gpu/config/gpu_test_config.cc.orig 2022-02-28 16:54:41 UTC +++ gpu/config/gpu_test_config.cc @@ -29,7 +29,7 @@ GPUTestConfig::OS GetCurrentOS() { #if BUILDFLAG(IS_CHROMEOS_ASH) return GPUTestConfig::kOsChromeOS; - #elif (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ -- defined(OS_OPENBSD) -+ defined(OS_BSD) + #elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ +- BUILDFLAG(IS_OPENBSD) ++ BUILDFLAG(IS_BSD) return GPUTestConfig::kOsLinux; - #elif defined(OS_WIN) + #elif BUILDFLAG(IS_WIN) int32_t major_version = 0; diff --git a/www/chromium/files/patch-gpu_config_gpu__util.cc b/www/chromium/files/patch-gpu_config_gpu__util.cc index 5fb70493af34..5e7ba288dd6a 100644 --- a/www/chromium/files/patch-gpu_config_gpu__util.cc +++ b/www/chromium/files/patch-gpu_config_gpu__util.cc @@ -1,11 +1,11 @@ ---- gpu/config/gpu_util.cc.orig 2021-12-31 00:57:34 UTC +--- gpu/config/gpu_util.cc.orig 2022-02-28 16:54:41 UTC +++ gpu/config/gpu_util.cc -@@ -795,7 +795,7 @@ bool EnableSwiftShaderIfNeeded(base::CommandLine* comm +@@ -754,7 +754,7 @@ bool EnableSwiftShaderIfNeeded(base::CommandLine* comm gpu_feature_info.status_values[GPU_FEATURE_TYPE_ACCELERATED_GL] != kGpuFeatureStatusEnabled) { bool legacy_software_gl = true; --#if defined(OS_LINUX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) // This setting makes WebGL run on SwANGLE instead of SwiftShader GL. legacy_software_gl = false; #endif diff --git a/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc b/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc index f5c0b2e2342a..319cd8b6908f 100644 --- a/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc +++ b/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc @@ -1,20 +1,20 @@ ---- gpu/ipc/common/gpu_memory_buffer_support.cc.orig 2022-02-07 13:39:41 UTC +--- gpu/ipc/common/gpu_memory_buffer_support.cc.orig 2022-02-28 16:54:41 UTC +++ gpu/ipc/common/gpu_memory_buffer_support.cc @@ -21,7 +21,7 @@ #include "ui/ozone/public/ozone_platform.h" #endif --#if defined(USE_OZONE) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(USE_OZONE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if defined(USE_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if defined(USE_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "gpu/ipc/common/gpu_memory_buffer_impl_native_pixmap.h" #endif @@ -50,7 +50,7 @@ GpuMemoryBufferSupport::GetNativeGpuMemoryBufferType() return gfx::IO_SURFACE_BUFFER; - #elif defined(OS_ANDROID) + #elif BUILDFLAG(IS_ANDROID) return gfx::ANDROID_HARDWARE_BUFFER; --#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(USE_OZONE) -+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(USE_OZONE) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) || BUILDFLAG(IS_BSD) return gfx::NATIVE_PIXMAP; - #elif defined(OS_WIN) + #elif BUILDFLAG(IS_WIN) return gfx::DXGI_SHARED_HANDLE; diff --git a/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.h b/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.h index 2e18faa9add8..61b45c7dc8e9 100644 --- a/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.h +++ b/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.h @@ -1,11 +1,11 @@ ---- gpu/ipc/common/gpu_memory_buffer_support.h.orig 2022-02-07 13:39:41 UTC +--- gpu/ipc/common/gpu_memory_buffer_support.h.orig 2022-02-28 16:54:41 UTC +++ gpu/ipc/common/gpu_memory_buffer_support.h @@ -17,7 +17,7 @@ #include "ui/gfx/geometry/size.h" #include "ui/gfx/gpu_memory_buffer.h" --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(USE_OZONE) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(USE_OZONE) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) || BUILDFLAG(IS_BSD) namespace gfx { class ClientNativePixmapFactory; } diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc index bd779592117a..6ea83eae1ce1 100644 --- a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc +++ b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc @@ -1,11 +1,11 @@ ---- gpu/ipc/service/gpu_init.cc.orig 2022-02-07 13:39:41 UTC +--- gpu/ipc/service/gpu_init.cc.orig 2022-02-28 16:54:41 UTC +++ gpu/ipc/service/gpu_init.cc @@ -122,7 +122,7 @@ void InitializePlatformOverlaySettings(GPUInfo* gpu_in } #if BUILDFLAG(IS_CHROMEOS_LACROS) || \ -- (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) -+ (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) && !defined(OS_BSD) +- (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) ++ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) && !BUILDFLAG(IS_BSD) bool CanAccessNvidiaDeviceFile() { bool res = true; base::ScopedBlockingCall scoped_blocking_call(FROM_HERE, @@ -13,8 +13,8 @@ device_perf_info_ = device_perf_info; } --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) && !defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) && !BUILDFLAG(IS_BSD) if (gpu_info_.gpu.vendor_id == 0x10de && // NVIDIA gpu_info_.gpu.driver_vendor == "NVIDIA" && !CanAccessNvidiaDeviceFile()) return false; @@ -22,8 +22,8 @@ delayed_watchdog_enable = true; #endif --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // PreSandbox is mainly for resource handling and not related to the GPU // driver, it doesn't need the GPU watchdog. The loadLibrary may take long // time that killing and restarting the GPU process will not help. @@ -31,8 +31,8 @@ } bool attempted_startsandbox = false; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // 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. @@ -40,8 +40,8 @@ } if (gl_initialized && gl_use_swiftshader_ && !gl::IsSoftwareGLImplementation(gl::GetGLImplementationParts())) { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " << "on Linux"; return false; @@ -49,35 +49,35 @@ } } --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // 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 -@@ -474,7 +474,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -460,7 +460,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL command_line, gpu_feature_info_, gpu_preferences_.disable_software_rasterizer, false); if (gl_use_swiftshader_) { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " << "on Linux"; return false; -@@ -575,7 +575,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -566,7 +566,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // 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. -@@ -813,7 +813,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -799,7 +799,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // 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. diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc b/www/chromium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc index 50cc0e6b7a1f..d624092a277c 100644 --- a/www/chromium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc +++ b/www/chromium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc @@ -1,20 +1,20 @@ ---- gpu/ipc/service/gpu_memory_buffer_factory.cc.orig 2021-04-14 18:41:04 UTC +--- gpu/ipc/service/gpu_memory_buffer_factory.cc.orig 2022-02-28 16:54:41 UTC +++ gpu/ipc/service/gpu_memory_buffer_factory.cc @@ -12,7 +12,7 @@ #include "gpu/ipc/service/gpu_memory_buffer_factory_io_surface.h" #endif --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) #include "gpu/ipc/service/gpu_memory_buffer_factory_native_pixmap.h" #endif @@ -34,7 +34,7 @@ GpuMemoryBufferFactory::CreateNativeType( return std::make_unique<GpuMemoryBufferFactoryIOSurface>(); - #elif defined(OS_ANDROID) + #elif BUILDFLAG(IS_ANDROID) return std::make_unique<GpuMemoryBufferFactoryAndroidHardwareBuffer>(); --#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) -+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) return std::make_unique<GpuMemoryBufferFactoryNativePixmap>( vulkan_context_provider); - #elif defined(OS_WIN) + #elif BUILDFLAG(IS_WIN) diff --git a/www/chromium/files/patch-gpu_ipc_service_x__util.h b/www/chromium/files/patch-gpu_ipc_service_x__util.h index e4b7ffb44ab7..610c08c17125 100644 --- a/www/chromium/files/patch-gpu_ipc_service_x__util.h +++ b/www/chromium/files/patch-gpu_ipc_service_x__util.h @@ -1,16 +1,16 @@ ---- gpu/ipc/service/x_util.h.orig 2022-02-07 13:39:41 UTC +--- gpu/ipc/service/x_util.h.orig 2022-02-28 16:54:41 UTC +++ gpu/ipc/service/x_util.h @@ -11,11 +11,11 @@ #include "build/build_config.h" #include "gpu/ipc/service/gpu_config.h" --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "ui/ozone/buildflags.h" #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #if BUILDFLAG(OZONE_PLATFORM_X11) namespace gpu { diff --git a/www/chromium/files/patch-gpu_vulkan_generate__bindings.py b/www/chromium/files/patch-gpu_vulkan_generate__bindings.py index 81c7d1672f24..302d5f1e0418 100644 --- a/www/chromium/files/patch-gpu_vulkan_generate__bindings.py +++ b/www/chromium/files/patch-gpu_vulkan_generate__bindings.py @@ -1,29 +1,29 @@ ---- gpu/vulkan/generate_bindings.py.orig 2021-09-14 01:51:58 UTC +--- gpu/vulkan/generate_bindings.py.orig 2022-02-28 16:54:41 UTC +++ gpu/vulkan/generate_bindings.py -@@ -184,7 +184,7 @@ VULKAN_DEVICE_FUNCTIONS = [ - ] +@@ -185,7 +185,7 @@ VULKAN_DEVICE_FUNCTIONS = [ }, { -- 'ifdef': 'defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)', -+ 'ifdef': 'defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD)', + 'ifdef': +- 'BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)', ++ 'BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)', 'extension': 'VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME', 'functions': [ 'vkGetSemaphoreFdKHR', -@@ -200,7 +200,7 @@ VULKAN_DEVICE_FUNCTIONS = [ - ] +@@ -202,7 +202,7 @@ VULKAN_DEVICE_FUNCTIONS = [ }, { -- 'ifdef': 'defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)', -+ 'ifdef': 'defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD)', + 'ifdef': +- 'BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)', ++ 'BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)', 'extension': 'VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME', 'functions': [ 'vkGetMemoryFdKHR', -@@ -251,7 +251,7 @@ VULKAN_DEVICE_FUNCTIONS = [ +@@ -253,7 +253,7 @@ VULKAN_DEVICE_FUNCTIONS = [ ] }, { -- 'ifdef': 'defined(OS_LINUX) || defined(OS_CHROMEOS)', -+ 'ifdef': 'defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)', +- 'ifdef': 'BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)', ++ 'ifdef': 'BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)', 'extension': 'VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_EXTENSION_NAME', 'functions': [ 'vkGetImageDrmFormatModifierPropertiesEXT', diff --git a/www/chromium/files/patch-gpu_vulkan_vulkan__device__queue.cc b/www/chromium/files/patch-gpu_vulkan_vulkan__device__queue.cc index 927bc47e895e..8ff12aaa1b82 100644 --- a/www/chromium/files/patch-gpu_vulkan_vulkan__device__queue.cc +++ b/www/chromium/files/patch-gpu_vulkan_vulkan__device__queue.cc @@ -1,11 +1,11 @@ ---- gpu/vulkan/vulkan_device_queue.cc.orig 2022-02-07 13:39:41 UTC +--- gpu/vulkan/vulkan_device_queue.cc.orig 2022-02-28 16:54:41 UTC +++ gpu/vulkan/vulkan_device_queue.cc @@ -85,7 +85,7 @@ bool VulkanDeviceQueue::Initialize( // In dual-CPU cases, we cannot detect the active GPU correctly on Linux, // so don't select GPU device based on the |gpu_info|. --#if !defined(OS_LINUX) -+#if !defined(OS_LINUX) && !defined(OS_BSD) +-#if !BUILDFLAG(IS_LINUX) ++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) // If gpu_info is provided, the device should match it. if (gpu_info && (device_properties.vendorID != gpu_info->gpu.vendor_id || device_properties.deviceID != gpu_info->gpu.device_id)) { @@ -13,8 +13,8 @@ enabled_device_features_2_ = {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2}; // Android, Fuchsia, and Linux(VaapiVideoDecoder) need YCbCr sampler support. --#if defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_LINUX) -+#if defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (!physical_device_info.feature_sampler_ycbcr_conversion) { LOG(ERROR) << "samplerYcbcrConversion is not supported."; return false; diff --git a/www/chromium/files/patch-gpu_vulkan_vulkan__device__queue.h b/www/chromium/files/patch-gpu_vulkan_vulkan__device__queue.h index 1b866b529c0f..1f7518b9e478 100644 --- a/www/chromium/files/patch-gpu_vulkan_vulkan__device__queue.h +++ b/www/chromium/files/patch-gpu_vulkan_vulkan__device__queue.h @@ -1,11 +1,11 @@ ---- gpu/vulkan/vulkan_device_queue.h.orig 2022-02-07 13:39:41 UTC +--- gpu/vulkan/vulkan_device_queue.h.orig 2022-02-28 16:54:41 UTC +++ gpu/vulkan/vulkan_device_queue.h -@@ -153,7 +153,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanDeviceQueue { +@@ -155,7 +155,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanDeviceQueue { bool allow_protected_memory_ = false; --#if defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_LINUX) -+#if defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) VkPhysicalDeviceSamplerYcbcrConversionFeatures sampler_ycbcr_conversion_features_{ VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_YCBCR_CONVERSION_FEATURES}; diff --git a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc index e605e0ce5a0d..af378f5b9e53 100644 --- a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc +++ b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc @@ -1,29 +1,29 @@ ---- gpu/vulkan/vulkan_function_pointers.cc.orig 2022-02-07 13:39:41 UTC +--- gpu/vulkan/vulkan_function_pointers.cc.orig 2022-02-28 16:54:41 UTC +++ gpu/vulkan/vulkan_function_pointers.cc -@@ -912,7 +912,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer +@@ -916,7 +916,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer } - #endif // defined(OS_ANDROID) + #endif // BUILDFLAG(IS_ANDROID) --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) if (gfx::HasExtension(enabled_extensions, VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME)) { vkGetSemaphoreFdKHR = reinterpret_cast<PFN_vkGetSemaphoreFdKHR>( -@@ -956,7 +956,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer +@@ -961,7 +961,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer } - #endif // defined(OS_WIN) + #endif // BUILDFLAG(IS_WIN) --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) if (gfx::HasExtension(enabled_extensions, VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME)) { vkGetMemoryFdKHR = reinterpret_cast<PFN_vkGetMemoryFdKHR>( -@@ -1126,7 +1126,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer +@@ -1131,7 +1131,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer } } --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (gfx::HasExtension(enabled_extensions, VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_EXTENSION_NAME)) { vkGetImageDrmFormatModifierPropertiesEXT = diff --git a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h index 598a8d7e5f70..35d6ff42d006 100644 --- a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h +++ b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h @@ -1,62 +1,62 @@ ---- gpu/vulkan/vulkan_function_pointers.h.orig 2022-02-07 13:39:41 UTC +--- gpu/vulkan/vulkan_function_pointers.h.orig 2022-02-28 16:54:41 UTC +++ gpu/vulkan/vulkan_function_pointers.h -@@ -243,7 +243,7 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers +@@ -256,7 +256,7 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers vkGetAndroidHardwareBufferPropertiesANDROID; - #endif // defined(OS_ANDROID) + #endif // BUILDFLAG(IS_ANDROID) --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) VulkanFunction<PFN_vkGetSemaphoreFdKHR> vkGetSemaphoreFdKHR; VulkanFunction<PFN_vkImportSemaphoreFdKHR> vkImportSemaphoreFdKHR; - #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) -@@ -254,7 +254,7 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || +@@ -268,7 +268,7 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers vkImportSemaphoreWin32HandleKHR; - #endif // defined(OS_WIN) + #endif // BUILDFLAG(IS_WIN) --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) VulkanFunction<PFN_vkGetMemoryFdKHR> vkGetMemoryFdKHR; VulkanFunction<PFN_vkGetMemoryFdPropertiesKHR> vkGetMemoryFdPropertiesKHR; - #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) -@@ -294,7 +294,7 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || +@@ -309,7 +309,7 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers VulkanFunction<PFN_vkGetSwapchainImagesKHR> vkGetSwapchainImagesKHR; VulkanFunction<PFN_vkQueuePresentKHR> vkQueuePresentKHR; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) VulkanFunction<PFN_vkGetImageDrmFormatModifierPropertiesEXT> vkGetImageDrmFormatModifierPropertiesEXT; - #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) -@@ -1009,7 +1009,7 @@ ALWAYS_INLINE VkResult vkGetAndroidHardwareBufferPrope + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +@@ -1030,7 +1030,7 @@ ALWAYS_INLINE VkResult vkGetAndroidHardwareBufferPrope } - #endif // defined(OS_ANDROID) + #endif // BUILDFLAG(IS_ANDROID) --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) ALWAYS_INLINE VkResult vkGetSemaphoreFdKHR(VkDevice device, const VkSemaphoreGetFdInfoKHR* pGetFdInfo, -@@ -1042,7 +1042,7 @@ vkImportSemaphoreWin32HandleKHR(VkDevice device, +@@ -1064,7 +1064,7 @@ vkImportSemaphoreWin32HandleKHR(VkDevice device, } - #endif // defined(OS_WIN) + #endif // BUILDFLAG(IS_WIN) --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) ALWAYS_INLINE VkResult vkGetMemoryFdKHR(VkDevice device, const VkMemoryGetFdInfoKHR* pGetFdInfo, int* pFd) { -@@ -1152,7 +1152,7 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue +@@ -1200,7 +1200,7 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue pPresentInfo); } --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierPropertiesEXT( VkDevice device, VkImage image, -@@ -1162,4 +1162,4 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierProp +@@ -1210,4 +1210,4 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierProp } - #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -#endif // GPU_VULKAN_VULKAN_FUNCTION_POINTERS_H_ \ No newline at end of file diff --git a/www/chromium/files/patch-gpu_vulkan_vulkan__image.cc b/www/chromium/files/patch-gpu_vulkan_vulkan__image.cc index b63c4b9ea1b0..6e56f5b75688 100644 --- a/www/chromium/files/patch-gpu_vulkan_vulkan__image.cc +++ b/www/chromium/files/patch-gpu_vulkan_vulkan__image.cc @@ -1,11 +1,11 @@ ---- gpu/vulkan/vulkan_image.cc.orig 2022-02-07 13:39:41 UTC +--- gpu/vulkan/vulkan_image.cc.orig 2022-02-28 16:54:41 UTC +++ gpu/vulkan/vulkan_image.cc -@@ -325,7 +325,7 @@ bool VulkanImage::InitializeWithExternalMemory( +@@ -322,7 +322,7 @@ bool VulkanImage::InitializeWithExternalMemory( // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) VkPhysicalDeviceImageDrmFormatModifierInfoEXT modifier_info = { .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_DRM_FORMAT_MODIFIER_INFO_EXT, diff --git a/www/chromium/files/patch-gpu_vulkan_vulkan__image.h b/www/chromium/files/patch-gpu_vulkan_vulkan__image.h index f3517366d38e..e6caa33c4def 100644 --- a/www/chromium/files/patch-gpu_vulkan_vulkan__image.h +++ b/www/chromium/files/patch-gpu_vulkan_vulkan__image.h @@ -1,20 +1,20 @@ ---- gpu/vulkan/vulkan_image.h.orig 2022-02-07 13:39:41 UTC +--- gpu/vulkan/vulkan_image.h.orig 2022-02-28 16:54:41 UTC +++ gpu/vulkan/vulkan_image.h @@ -86,7 +86,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanImage { VkImageUsageFlags usage, VkImageCreateFlags flags); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) static std::unique_ptr<VulkanImage> CreateWithExternalMemoryAndModifiers( VulkanDeviceQueue* device_queue, const gfx::Size& size, -@@ -169,7 +169,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanImage { +@@ -170,7 +170,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanImage { VkImageTiling image_tiling, uint32_t queue_family_index); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) bool InitializeWithExternalMemoryAndModifiers(VulkanDeviceQueue* device_queue, const gfx::Size& size, VkFormat format, diff --git a/www/chromium/files/patch-headless_lib_browser_headless__browser__main__parts.h b/www/chromium/files/patch-headless_lib_browser_headless__browser__main__parts.h index c20fc4e8f1c3..e1e8158bd26a 100644 --- a/www/chromium/files/patch-headless_lib_browser_headless__browser__main__parts.h +++ b/www/chromium/files/patch-headless_lib_browser_headless__browser__main__parts.h @@ -1,11 +1,11 @@ ---- headless/lib/browser/headless_browser_main_parts.h.orig 2021-12-14 11:45:07 UTC +--- headless/lib/browser/headless_browser_main_parts.h.orig 2022-02-28 16:54:41 UTC +++ headless/lib/browser/headless_browser_main_parts.h @@ -50,7 +50,7 @@ class HEADLESS_EXPORT HeadlessBrowserMainParts - #if defined(OS_MAC) + #if BUILDFLAG(IS_MAC) void PreCreateMainMessageLoop() override; #endif --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) void PostCreateMainMessageLoop() override; #endif void QuitMainMessageLoop(); diff --git a/www/chromium/files/patch-headless_lib_browser_headless__browser__main__parts__linux.cc b/www/chromium/files/patch-headless_lib_browser_headless__browser__main__parts__linux.cc index 62e89bae0f7d..9179e4db559d 100644 --- a/www/chromium/files/patch-headless_lib_browser_headless__browser__main__parts__linux.cc +++ b/www/chromium/files/patch-headless_lib_browser_headless__browser__main__parts__linux.cc @@ -1,11 +1,11 @@ ---- headless/lib/browser/headless_browser_main_parts_linux.cc.orig 2021-07-19 18:45:17 UTC +--- headless/lib/browser/headless_browser_main_parts_linux.cc.orig 2022-02-28 16:54:41 UTC +++ headless/lib/browser/headless_browser_main_parts_linux.cc -@@ -11,7 +11,7 @@ - namespace headless { +@@ -24,7 +24,7 @@ constexpr char kProductName[] = "HeadlessChrome"; + #endif void HeadlessBrowserMainParts::PostCreateMainMessageLoop() { -#if defined(USE_DBUS) && !BUILDFLAG(IS_CHROMEOS_ASH) +#if defined(USE_DBUS) && !BUILDFLAG(IS_CHROMEOS_ASH) && !defined(OS_BSD) bluez::BluezDBusManager::Initialize(/*system_bus=*/nullptr); #endif - } + diff --git a/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc b/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc deleted file mode 100644 index 6b0fa743ac51..000000000000 --- a/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- headless/lib/browser/headless_content_browser_client.cc.orig 2022-02-07 13:39:41 UTC -+++ headless/lib/browser/headless_content_browser_client.cc -@@ -230,7 +230,7 @@ HeadlessContentBrowserClient::GetGeneratedCodeCacheSet - return content::GeneratedCodeCacheSettings(true, 0, context->GetPath()); - } - --#if defined(OS_POSIX) && !defined(OS_MAC) -+#if defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_BSD) - void HeadlessContentBrowserClient::GetAdditionalMappedFilesForChildProcess( - const base::CommandLine& command_line, - int child_process_id, diff --git a/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h b/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h index 8359b9a052d8..6feb91a51ba0 100644 --- a/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h +++ b/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h @@ -1,11 +1,11 @@ ---- headless/lib/browser/headless_content_browser_client.h.orig 2022-02-07 13:39:41 UTC +--- headless/lib/browser/headless_content_browser_client.h.orig 2022-02-28 16:54:41 UTC +++ headless/lib/browser/headless_content_browser_client.h -@@ -48,7 +48,7 @@ class HeadlessContentBrowserClient : public content::C +@@ -47,7 +47,7 @@ class HeadlessContentBrowserClient : public content::C override; content::GeneratedCodeCacheSettings GetGeneratedCodeCacheSettings( content::BrowserContext* context) override; --#if defined(OS_POSIX) && !defined(OS_MAC) -+#if defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_BSD) +-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD) void GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, diff --git a/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc b/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc index b0fcaf9e4bd6..e2a88a389107 100644 --- a/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc +++ b/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc @@ -1,20 +1,11 @@ ---- headless/lib/browser/headless_request_context_manager.cc.orig 2021-12-31 00:57:34 UTC +--- headless/lib/browser/headless_request_context_manager.cc.orig 2022-02-28 16:54:41 UTC +++ headless/lib/browser/headless_request_context_manager.cc -@@ -35,7 +35,7 @@ namespace { +@@ -65,7 +65,7 @@ void SetCryptKeyOnce(const base::FilePath& user_data_p + return; + done_once = true; - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) - constexpr char kProductName[] = "HeadlessChrome"; - #endif - -@@ -73,7 +73,7 @@ void SetCryptConfigOnce(const base::FilePath& user_dat - - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) - ::network::mojom::CryptConfigPtr config = - ::network::mojom::CryptConfig::New(); - config->store = base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII( +-#if (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)) && defined(HEADLESS_USE_PREFS) ++#if (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(HEADLESS_USE_PREFS) + // The OSCrypt keys are process bound, so if network service is out of + // process, send it the required key if it is available. + if (content::IsOutOfProcessNetworkService() diff --git a/www/chromium/files/patch-headless_lib_browser_headless__web__contents__impl.cc b/www/chromium/files/patch-headless_lib_browser_headless__web__contents__impl.cc index a9ed6d98377f..13249594cb90 100644 --- a/www/chromium/files/patch-headless_lib_browser_headless__web__contents__impl.cc +++ b/www/chromium/files/patch-headless_lib_browser_headless__web__contents__impl.cc @@ -1,11 +1,11 @@ ---- headless/lib/browser/headless_web_contents_impl.cc.orig 2022-02-07 13:39:41 UTC +--- headless/lib/browser/headless_web_contents_impl.cc.orig 2022-02-28 16:54:41 UTC +++ headless/lib/browser/headless_web_contents_impl.cc @@ -57,7 +57,7 @@ namespace headless { namespace { void UpdatePrefsFromSystemSettings(blink::RendererPreferences* prefs) { --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_WIN) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_WIN) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) content::UpdateFontRendererPreferencesFromSystemSettings(prefs); #endif diff --git a/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc b/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc new file mode 100644 index 000000000000..a0273cc9be72 --- /dev/null +++ b/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc @@ -0,0 +1,11 @@ +--- headless/lib/headless_content_main_delegate.cc.orig 2022-02-28 16:54:41 UTC ++++ headless/lib/headless_content_main_delegate.cc +@@ -331,7 +331,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( + if (process_type != switches::kZygoteProcess) { + g_headless_crash_client.Pointer()->set_crash_dumps_dir( + options()->crash_dumps_dir); +-#if !BUILDFLAG(IS_WIN) ++#if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_BSD) + crash_reporter::InitializeCrashpad(process_type.empty(), process_type); + #endif // !BUILDFLAG(IS_WIN) + crash_keys::SetSwitchesFromCommandLine(command_line, nullptr); diff --git a/www/chromium/files/patch-headless_lib_headless__macros.h b/www/chromium/files/patch-headless_lib_headless__macros.h deleted file mode 100644 index 01558c9ce926..000000000000 --- a/www/chromium/files/patch-headless_lib_headless__macros.h +++ /dev/null @@ -1,11 +0,0 @@ ---- headless/lib/headless_macros.h.orig 2022-02-07 13:39:41 UTC -+++ headless/lib/headless_macros.h -@@ -7,7 +7,7 @@ - - #include "build/build_config.h" - --#if defined(OS_POSIX) && !defined(OS_MAC) -+#if defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_BSD) - #define HEADLESS_USE_BREAKPAD - #endif // defined(OS_POSIX) && !defined(OS_MAC) - diff --git a/www/chromium/files/patch-headless_public_headless__browser.cc b/www/chromium/files/patch-headless_public_headless__browser.cc index 1555750b5a43..f770a11b6fe0 100644 --- a/www/chromium/files/patch-headless_public_headless__browser.cc +++ b/www/chromium/files/patch-headless_public_headless__browser.cc @@ -1,11 +1,11 @@ ---- headless/public/headless_browser.cc.orig 2021-12-14 11:45:07 UTC +--- headless/public/headless_browser.cc.orig 2022-02-28 16:54:41 UTC +++ headless/public/headless_browser.cc @@ -42,7 +42,7 @@ Options::Options(int argc, const char** argv) user_agent(content::BuildUserAgentFromProduct(product_name_and_version)), window_size(kDefaultWindowSize), font_render_hinting(kDefaultFontRenderHinting) { --#if defined(OS_LINUX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) gl_implementation = gl::kGLImplementationANGLEName; angle_implementation = gl::kANGLEImplementationSwiftShaderForWebGLName; #endif diff --git a/www/chromium/files/patch-ipc_ipc__channel.h b/www/chromium/files/patch-ipc_ipc__channel.h index ac2f0645c5d5..7fe7304f8b70 100644 --- a/www/chromium/files/patch-ipc_ipc__channel.h +++ b/www/chromium/files/patch-ipc_ipc__channel.h @@ -1,11 +1,11 @@ ---- ipc/ipc_channel.h.orig 2021-09-14 01:51:58 UTC +--- ipc/ipc_channel.h.orig 2022-02-28 16:54:41 UTC +++ ipc/ipc_channel.h -@@ -236,7 +236,7 @@ class COMPONENT_EXPORT(IPC) Channel : public Sender { +@@ -235,7 +235,7 @@ class COMPONENT_EXPORT(IPC) Channel : public Sender { static std::string GenerateUniqueRandomChannelID(); #endif --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Sandboxed processes live in a PID namespace, so when sending the IPC hello // message from client to server we need to send the PID from the global // PID namespace. diff --git a/www/chromium/files/patch-ipc_ipc__channel__common.cc b/www/chromium/files/patch-ipc_ipc__channel__common.cc index ff145e32967b..426ef109e668 100644 --- a/www/chromium/files/patch-ipc_ipc__channel__common.cc +++ b/www/chromium/files/patch-ipc_ipc__channel__common.cc @@ -1,11 +1,11 @@ ---- ipc/ipc_channel_common.cc.orig 2022-02-07 13:39:41 UTC +--- ipc/ipc_channel_common.cc.orig 2022-02-28 16:54:41 UTC +++ ipc/ipc_channel_common.cc @@ -10,7 +10,7 @@ namespace IPC { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) namespace { int g_global_pid = 0; diff --git a/www/chromium/files/patch-ipc_ipc__channel__mojo.cc b/www/chromium/files/patch-ipc_ipc__channel__mojo.cc index 73249fbea14a..d0259e09415b 100644 --- a/www/chromium/files/patch-ipc_ipc__channel__mojo.cc +++ b/www/chromium/files/patch-ipc_ipc__channel__mojo.cc @@ -1,11 +1,11 @@ ---- ipc/ipc_channel_mojo.cc.orig 2022-02-07 13:39:41 UTC +--- ipc/ipc_channel_mojo.cc.orig 2022-02-28 16:54:41 UTC +++ ipc/ipc_channel_mojo.cc @@ -112,7 +112,7 @@ class ThreadSafeChannelProxy : public mojo::ThreadSafe }; base::ProcessId GetSelfPID() { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (int global_pid = Channel::GetGlobalPid()) return global_pid; - #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-ipc_ipc__message__utils.cc b/www/chromium/files/patch-ipc_ipc__message__utils.cc index 6eba7fed6598..2ca87a761a4b 100644 --- a/www/chromium/files/patch-ipc_ipc__message__utils.cc +++ b/www/chromium/files/patch-ipc_ipc__message__utils.cc @@ -1,11 +1,11 @@ ---- ipc/ipc_message_utils.cc.orig 2021-09-14 01:51:58 UTC +--- ipc/ipc_message_utils.cc.orig 2022-02-28 16:54:41 UTC +++ ipc/ipc_message_utils.cc -@@ -351,7 +351,7 @@ void ParamTraits<unsigned int>::Log(const param_type& - l->append(base::NumberToString(p)); +@@ -349,7 +349,7 @@ void ParamTraits<unsigned int>::Log(const param_type& } --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ - defined(OS_FUCHSIA) || (defined(OS_ANDROID) && defined(ARCH_CPU_64_BITS)) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_FUCHSIA) || \ ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) || \ + (BUILDFLAG(IS_ANDROID) && defined(ARCH_CPU_64_BITS)) void ParamTraits<long>::Log(const param_type& p, std::string* l) { l->append(base::NumberToString(p)); diff --git a/www/chromium/files/patch-ipc_ipc__message__utils.h b/www/chromium/files/patch-ipc_ipc__message__utils.h index 49fbbcd29396..d00e3395df55 100644 --- a/www/chromium/files/patch-ipc_ipc__message__utils.h +++ b/www/chromium/files/patch-ipc_ipc__message__utils.h @@ -1,11 +1,11 @@ ---- ipc/ipc_message_utils.h.orig 2021-07-19 18:45:18 UTC +--- ipc/ipc_message_utils.h.orig 2022-02-28 16:54:41 UTC +++ ipc/ipc_message_utils.h -@@ -206,7 +206,7 @@ struct ParamTraits<unsigned int> { - // 3) Android 64 bit and Fuchsia also have int64_t typedef'd to long. +@@ -205,7 +205,7 @@ struct ParamTraits<unsigned int> { // Since we want to support Android 32<>64 bit IPC, as long as we don't have // these traits for 32 bit ARM then that'll catch any errors. --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ - defined(OS_FUCHSIA) || (defined(OS_ANDROID) && defined(ARCH_CPU_64_BITS)) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_FUCHSIA) || \ ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) || \ + (BUILDFLAG(IS_ANDROID) && defined(ARCH_CPU_64_BITS)) template <> struct ParamTraits<long> { diff --git a/www/chromium/files/patch-media_BUILD.gn b/www/chromium/files/patch-media_BUILD.gn index bbae2e9760e3..30db34ef80e2 100644 --- a/www/chromium/files/patch-media_BUILD.gn +++ b/www/chromium/files/patch-media_BUILD.gn @@ -1,6 +1,6 @@ ---- media/BUILD.gn.orig 2022-02-07 13:39:41 UTC +--- media/BUILD.gn.orig 2022-02-28 16:54:41 UTC +++ media/BUILD.gn -@@ -75,6 +75,9 @@ config("media_config") { +@@ -76,6 +76,9 @@ config("media_config") { defines += [ "DLOPEN_PULSEAUDIO" ] } } diff --git a/www/chromium/files/patch-media_audio_audio__features.cc b/www/chromium/files/patch-media_audio_audio__features.cc index 996b37a6b07c..cc57efce1236 100644 --- a/www/chromium/files/patch-media_audio_audio__features.cc +++ b/www/chromium/files/patch-media_audio_audio__features.cc @@ -1,11 +1,11 @@ ---- media/audio/audio_features.cc.orig 2022-02-07 13:39:41 UTC +--- media/audio/audio_features.cc.orig 2022-02-28 16:54:41 UTC +++ media/audio/audio_features.cc -@@ -13,7 +13,7 @@ namespace features { +@@ -19,7 +19,7 @@ const base::Feature kPlatformAudioEncoder{"PlatformAud const base::Feature kAudioServiceOutOfProcessKillAtHang{ "AudioServiceOutOfProcessKillAtHang", - #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ -- defined(OS_CHROMEOS) -+ defined(OS_CHROMEOS) || defined(OS_BSD) + #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/chromium/files/patch-media_audio_audio__input__device.cc b/www/chromium/files/patch-media_audio_audio__input__device.cc index dfc9bc78d53c..30a8b45d281e 100644 --- a/www/chromium/files/patch-media_audio_audio__input__device.cc +++ b/www/chromium/files/patch-media_audio_audio__input__device.cc @@ -1,11 +1,11 @@ ---- media/audio/audio_input_device.cc.orig 2022-02-07 13:39:41 UTC +--- media/audio/audio_input_device.cc.orig 2022-02-28 16:54:41 UTC +++ media/audio/audio_input_device.cc @@ -259,7 +259,7 @@ void AudioInputDevice::OnStreamCreated( // here. See comments in AliveChecker and PowerObserverHelper for details and // todos. if (detect_dead_stream_ == DeadStreamDetection::kEnabled) { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) const bool stop_at_first_alive_notification = true; const bool pause_check_during_suspend = false; #else diff --git a/www/chromium/files/patch-media_audio_audio__output__proxy__unittest.cc b/www/chromium/files/patch-media_audio_audio__output__proxy__unittest.cc new file mode 100644 index 000000000000..3110c8f24c5f --- /dev/null +++ b/www/chromium/files/patch-media_audio_audio__output__proxy__unittest.cc @@ -0,0 +1,14 @@ +--- media/audio/audio_output_proxy_unittest.cc.orig 2022-02-28 16:54:41 UTC ++++ media/audio/audio_output_proxy_unittest.cc +@@ -412,7 +412,11 @@ class AudioOutputProxyTest : public testing::Test { + // |stream| is closed at this point. Start() should reopen it again. + EXPECT_CALL(manager(), MakeAudioOutputStream(_, _, _)) + .Times(2) ++#if BUILDFLAG(IS_BSD) ++ .WillRepeatedly(Return(static_cast<AudioOutputStream*>(NULL))); ++#else + .WillRepeatedly(Return(reinterpret_cast<AudioOutputStream*>(NULL))); ++#endif + + EXPECT_CALL(callback_, OnError(_)).Times(2); + diff --git a/www/chromium/files/patch-media_audio_sndio_audio__manager__sndio.cc b/www/chromium/files/patch-media_audio_sndio_audio__manager__sndio.cc index 6714e1ab446d..c4cff1b5df2b 100644 --- a/www/chromium/files/patch-media_audio_sndio_audio__manager__sndio.cc +++ b/www/chromium/files/patch-media_audio_sndio_audio__manager__sndio.cc @@ -1,10 +1,11 @@ ---- media/audio/sndio/audio_manager_sndio.cc.orig 2022-02-07 13:39:41 UTC +--- media/audio/sndio/audio_manager_sndio.cc.orig 2022-02-28 16:54:41 UTC +++ media/audio/sndio/audio_manager_sndio.cc -@@ -0,0 +1,177 @@ +@@ -0,0 +1,181 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + ++#include "base/command_line.h" +#include "base/metrics/histogram_macros.h" +#include "base/memory/ptr_util.h" + @@ -15,9 +16,8 @@ +#if defined(USE_SNDIO) +#include "media/audio/sndio/sndio_input.h" +#include "media/audio/sndio/sndio_output.h" -+#else -+#include "media/audio/fake_audio_manager.h" +#endif ++#include "media/audio/fake_audio_manager.h" +#include "media/base/limits.h" +#include "media/base/media_switches.h" + @@ -31,7 +31,7 @@ + +#if defined(USE_SNDIO) +// Maximum number of output streams that can be open simultaneously. -+static const int kMaxOutputStreams = 4; ++static const int kMaxOutputStreams = 50; + +// Default sample rate for input and output streams. +static const int kDefaultSampleRate = 48000; @@ -87,9 +87,7 @@ + SetMaxOutputStreamsAllowed(kMaxOutputStreams); +} + -+AudioManagerSndio::~AudioManagerSndio() { -+ Shutdown(); -+} ++AudioManagerSndio::~AudioManagerSndio() = default; + +AudioOutputStream* AudioManagerSndio::MakeLinearOutputStream( + const AudioParameters& params, @@ -166,6 +164,12 @@ + std::unique_ptr<AudioThread> audio_thread, + AudioLogFactory* audio_log_factory) { + DLOG(WARNING) << "CreateAudioManager"; ++ // For testing allow audio output to be disabled. ++ if (base::CommandLine::ForCurrentProcess()->HasSwitch( ++ switches::kDisableAudioOutput)) { ++ return std::make_unique<FakeAudioManager>(std::move(audio_thread), ++ audio_log_factory); ++ } +#if defined(USE_SNDIO) + UMA_HISTOGRAM_ENUMERATION("Media.SndioAudioIO", kSndio, kAudioIOMax + 1); + return std::make_unique<AudioManagerSndio>(std::move(audio_thread), diff --git a/www/chromium/files/patch-media_audio_sndio_sndio__input.cc b/www/chromium/files/patch-media_audio_sndio_sndio__input.cc index a88f63e7f7cf..5baf33b03c3d 100644 --- a/www/chromium/files/patch-media_audio_sndio_sndio__input.cc +++ b/www/chromium/files/patch-media_audio_sndio_sndio__input.cc @@ -1,6 +1,6 @@ ---- media/audio/sndio/sndio_input.cc.orig 2022-02-07 13:39:41 UTC +--- media/audio/sndio/sndio_input.cc.orig 2022-02-28 16:54:41 UTC +++ media/audio/sndio/sndio_input.cc -@@ -0,0 +1,200 @@ +@@ -0,0 +1,201 @@ +// Copyright 2013 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -127,7 +127,7 @@ +void SndioAudioInputStream::Close() { + + if (state == kClosed) -+ return; ++ goto release; + + if (state == kRunning) + Stop(); @@ -136,6 +136,7 @@ + delete [] buffer; + sio_close(hdl); + ++release: + manager->ReleaseInputStream(this); +} + diff --git a/www/chromium/files/patch-media_audio_sndio_sndio__output.cc b/www/chromium/files/patch-media_audio_sndio_sndio__output.cc index 2f9a72be63ef..694b777465d7 100644 --- a/www/chromium/files/patch-media_audio_sndio_sndio__output.cc +++ b/www/chromium/files/patch-media_audio_sndio_sndio__output.cc @@ -1,6 +1,6 @@ ---- media/audio/sndio/sndio_output.cc.orig 2022-02-07 13:39:41 UTC +--- media/audio/sndio/sndio_output.cc.orig 2022-02-28 16:54:41 UTC +++ media/audio/sndio/sndio_output.cc -@@ -0,0 +1,183 @@ +@@ -0,0 +1,187 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -50,18 +50,37 @@ +} + +bool SndioAudioOutputStream::Open() { -+ struct sio_par par; -+ int sig; -+ + if (params.format() != AudioParameters::AUDIO_PCM_LINEAR && + params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) { + LOG(WARNING) << "Unsupported audio format."; + return false; + } ++ state = kStopped; ++ volpending = 0; ++ vol = SIO_MAXVOL; ++ buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)]; ++ return true; ++} ++ ++void SndioAudioOutputStream::Close() { ++ if (state == kClosed) ++ goto release; ++ if (state == kRunning) ++ Stop(); ++ state = kClosed; ++ delete [] buffer; ++release: ++ manager->ReleaseOutputStream(this); // Calls the destructor ++} ++ ++void SndioAudioOutputStream::Start(AudioSourceCallback* callback) { ++ struct sio_par par; ++ int sig; ++ + sio_initpar(&par); + par.rate = params.sample_rate(); + par.pchan = params.channels(); -+ par.bits = SampleFormatToBitsPerChannel(kSampleFormat); ++ par.bits = SampleFormatToBitsPerChannel(kSampleFormat); + par.bps = par.bits / 8; + par.sig = sig = par.bits != 8 ? 1 : 0; + par.le = SIO_LE_NATIVE; @@ -70,11 +89,12 @@ + hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0); + if (hdl == NULL) { + LOG(ERROR) << "Couldn't open audio device."; -+ return false; ++ return; + } + if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) { + LOG(ERROR) << "Couldn't set audio parameters."; -+ goto bad_close; ++ sio_close(hdl); ++ return; + } + if (par.rate != (unsigned int)params.sample_rate() || + par.pchan != (unsigned int)params.channels() || @@ -83,39 +103,22 @@ + (par.bps > 1 && par.le != SIO_LE_NATIVE) || + (par.bits != par.bps * 8)) { + LOG(ERROR) << "Unsupported audio parameters."; -+ goto bad_close; ++ sio_close(hdl); ++ return; + } -+ state = kStopped; -+ volpending = 0; -+ vol = 0; -+ buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)]; ++ + sio_onmove(hdl, &OnMoveCallback, this); + sio_onvol(hdl, &OnVolCallback, this); -+ return true; -+ bad_close: -+ sio_close(hdl); -+ return false; -+} + -+void SndioAudioOutputStream::Close() { -+ if (state == kClosed) -+ return; -+ if (state == kRunning) -+ Stop(); -+ state = kClosed; -+ delete [] buffer; -+ sio_close(hdl); -+ manager->ReleaseOutputStream(this); // Calls the destructor -+} -+ -+void SndioAudioOutputStream::Start(AudioSourceCallback* callback) { + state = kRunning; + hw_delay = 0; + source = callback; + sio_start(hdl); ++ + if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) { + LOG(ERROR) << "Failed to create real-time thread."; + sio_stop(hdl); ++ sio_close(hdl); + state = kStopped; + } +} @@ -126,6 +129,7 @@ + state = kStopWait; + pthread_join(thread, NULL); + sio_stop(hdl); ++ sio_close(hdl); + state = kStopped; +} + diff --git a/www/chromium/files/patch-media_base_audio__latency.cc b/www/chromium/files/patch-media_base_audio__latency.cc index 1ef4e3d460b1..a51069bbe202 100644 --- a/www/chromium/files/patch-media_base_audio__latency.cc +++ b/www/chromium/files/patch-media_base_audio__latency.cc @@ -1,11 +1,11 @@ ---- media/base/audio_latency.cc.orig 2022-02-07 13:39:41 UTC +--- media/base/audio_latency.cc.orig 2022-02-28 16:54:41 UTC +++ media/base/audio_latency.cc @@ -135,7 +135,7 @@ int AudioLatency::GetRtcBufferSize(int sample_rate, in } - #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ -- defined(OS_FUCHSIA) -+ defined(OS_FUCHSIA) || defined(OS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) // On Linux, MacOS and Fuchsia, the low level IO implementations on the // browser side supports all buffer size the clients want. We use the native // peer connection buffer size (10ms) to achieve best possible performance. diff --git a/www/chromium/files/patch-media_base_media__switches.cc b/www/chromium/files/patch-media_base_media__switches.cc index a95f80f66592..0bb0fb3f113c 100644 --- a/www/chromium/files/patch-media_base_media__switches.cc +++ b/www/chromium/files/patch-media_base_media__switches.cc @@ -1,29 +1,29 @@ ---- media/base/media_switches.cc.orig 2022-02-07 13:39:41 UTC +--- media/base/media_switches.cc.orig 2022-02-28 16:54:41 UTC +++ media/base/media_switches.cc @@ -9,7 +9,7 @@ #include "build/chromeos_buildflags.h" #include "components/system_media_controls/linux/buildflags/buildflags.h" --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "base/cpu.h" #endif @@ -397,7 +397,7 @@ const base::Feature kGav1VideoDecoder{"Gav1VideoDecode const base::Feature kGlobalMediaControls { "GlobalMediaControls", - #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS_LACROS) -+ BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) ++ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT @@ -429,7 +429,7 @@ constexpr base::FeatureParam<kCrosGlobalMediaControlsP const base::Feature kGlobalMediaControlsPictureInPicture { "GlobalMediaControlsPictureInPicture", - #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ -- defined(OS_CHROMEOS) || BUILDFLAG(IS_CHROMEOS_LACROS) -+ defined(OS_CHROMEOS) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_CHROMEOS_LACROS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT @@ -31,8 +31,8 @@ const base::Feature kUnifiedAutoplay{"UnifiedAutoplay", base::FEATURE_ENABLED_BY_DEFAULT}; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Enable vaapi video decoding on linux. This is already enabled by default on // chromeos, but needs an experiment on linux. const base::Feature kVaapiVideoDecodeLinux{"VaapiVideoDecoder", @@ -40,8 +40,8 @@ return false; #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - if (base::FeatureList::IsEnabled(media::kUseSodaForLiveCaption)) { - // Check if the CPU has the required instruction set to run the Speech - // On-Device API (SODA) library. +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Check if the CPU has the required instruction set to run the Speech + // On-Device API (SODA) library. + static bool has_sse41 = base::CPU().has_sse41(); diff --git a/www/chromium/files/patch-media_base_media__switches.h b/www/chromium/files/patch-media_base_media__switches.h index 694e01026713..98cf99b2eb59 100644 --- a/www/chromium/files/patch-media_base_media__switches.h +++ b/www/chromium/files/patch-media_base_media__switches.h @@ -1,20 +1,11 @@ ---- media/base/media_switches.h.orig 2022-02-07 13:39:41 UTC +--- media/base/media_switches.h.orig 2022-02-28 16:54:41 UTC +++ media/base/media_switches.h -@@ -38,7 +38,7 @@ MEDIA_EXPORT extern const char kDisableBackgroundMedia - MEDIA_EXPORT extern const char kReportVp9AsAnUnsupportedMimeType[]; - - #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FREEBSD) || \ -- defined(OS_SOLARIS) -+ defined(OS_SOLARIS) || defined(OS_BSD) - MEDIA_EXPORT extern const char kAlsaInputDevice[]; - MEDIA_EXPORT extern const char kAlsaOutputDevice[]; - #endif -@@ -187,7 +187,7 @@ MEDIA_EXPORT extern const base::Feature kUseFakeDevice +@@ -186,7 +186,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; - MEDIA_EXPORT extern const base::Feature kUseSodaForLiveCaption; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) MEDIA_EXPORT extern const base::Feature kVaapiVideoDecodeLinux; MEDIA_EXPORT extern const base::Feature kVaapiVideoEncodeLinux; - #endif // defined(OS_LINUX) + #endif // BUILDFLAG(IS_LINUX) diff --git a/www/chromium/files/patch-media_base_scopedfd__helper.h b/www/chromium/files/patch-media_base_scopedfd__helper.h index 85ed66db9dc9..8bf62e4233ce 100644 --- a/www/chromium/files/patch-media_base_scopedfd__helper.h +++ b/www/chromium/files/patch-media_base_scopedfd__helper.h @@ -1,11 +1,11 @@ ---- media/base/scopedfd_helper.h.orig 2022-02-07 13:39:41 UTC +--- media/base/scopedfd_helper.h.orig 2022-02-28 16:54:41 UTC +++ media/base/scopedfd_helper.h @@ -15,7 +15,7 @@ namespace media { - // since the only current user is V4L2 we are limiting the scope to OS_LINUX so - // the binary size does not inflate on non-using systems. Feel free to adapt + // but since the only current user is V4L2 we are limiting the scope to OS_LINUX + // so the binary size does not inflate on non-using systems. Feel free to adapt // this and BUILD.gn as our needs evolve. --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Return a new vector containing duplicates of |fds|, or PCHECKs in case of an // error. diff --git a/www/chromium/files/patch-media_base_user__input__monitor__unittest.cc b/www/chromium/files/patch-media_base_user__input__monitor__unittest.cc new file mode 100644 index 000000000000..08c5284ee7a6 --- /dev/null +++ b/www/chromium/files/patch-media_base_user__input__monitor__unittest.cc @@ -0,0 +1,29 @@ +--- media/base/user_input_monitor_unittest.cc.orig 2022-02-28 16:54:41 UTC ++++ media/base/user_input_monitor_unittest.cc +@@ -13,7 +13,7 @@ + #include "build/build_config.h" + #include "testing/gtest/include/gtest/gtest.h" + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "base/files/file_descriptor_watcher_posix.h" + #endif + +@@ -49,7 +49,7 @@ class UserInputMonitorTest : public testing::Test { + } // namespace + + TEST_F(UserInputMonitorTest, CreatePlatformSpecific) { +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + base::test::TaskEnvironment task_environment( + base::test::TaskEnvironment::MainThreadType::IO); + #else +@@ -71,7 +71,7 @@ TEST_F(UserInputMonitorTest, CreatePlatformSpecific) { + } + + TEST_F(UserInputMonitorTest, CreatePlatformSpecificWithMapping) { +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + base::test::TaskEnvironment task_environment( + base::test::TaskEnvironment::MainThreadType::IO); + #else diff --git a/www/chromium/files/patch-media_base_vector__math.cc b/www/chromium/files/patch-media_base_vector__math.cc index 345481396361..56bde6b71819 100644 --- a/www/chromium/files/patch-media_base_vector__math.cc +++ b/www/chromium/files/patch-media_base_vector__math.cc @@ -1,11 +1,11 @@ ---- media/base/vector_math.cc.orig 2021-04-14 18:41:05 UTC +--- media/base/vector_math.cc.orig 2022-02-28 16:54:41 UTC +++ media/base/vector_math.cc @@ -18,7 +18,7 @@ // better, which is anywhere clang is used. // TODO(pcc): Linux currently uses ThinLTO which has broken auto-vectorization // in clang, so use our intrinsic version for now. http://crbug.com/738085 --#if !defined(__clang__) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if !defined(__clang__) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if !defined(__clang__) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if !defined(__clang__) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #define FMAC_FUNC FMAC_SSE #define FMUL_FUNC FMUL_SSE #else diff --git a/www/chromium/files/patch-media_base_video__frame.cc b/www/chromium/files/patch-media_base_video__frame.cc index d1ccf88a17ef..12287f094bda 100644 --- a/www/chromium/files/patch-media_base_video__frame.cc +++ b/www/chromium/files/patch-media_base_video__frame.cc @@ -1,11 +1,11 @@ ---- media/base/video_frame.cc.orig 2022-02-07 13:39:41 UTC +--- media/base/video_frame.cc.orig 2022-02-28 16:54:41 UTC +++ media/base/video_frame.cc @@ -73,7 +73,7 @@ std::string VideoFrame::StorageTypeToString( return "OWNED_MEMORY"; case VideoFrame::STORAGE_SHMEM: return "SHMEM"; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) case VideoFrame::STORAGE_DMABUFS: return "DMABUFS"; #endif @@ -13,8 +13,8 @@ // static bool VideoFrame::IsStorageTypeMappable(VideoFrame::StorageType storage_type) { return --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // This is not strictly needed but makes explicit that, at VideoFrame // level, DmaBufs are not mappable from userspace. storage_type != VideoFrame::STORAGE_DMABUFS && @@ -22,8 +22,8 @@ return VideoFrameLayout::CreateWithPlanes(format, coded_size, planes); } --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // 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 @@ -31,8 +31,8 @@ for (size_t i = 0; i < num_planes; ++i) planes[i].stride = gpu_memory_buffer->stride(i); uint64_t modifier = gfx::NativePixmapHandle::kNoModifier; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (gpu_memory_buffer->GetType() == gfx::NATIVE_PIXMAP) { const auto gmb_handle = gpu_memory_buffer->CloneHandle(); if (gmb_handle.is_null() || @@ -40,8 +40,8 @@ return frame; } --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // static scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs( const VideoFrameLayout& layout, @@ -49,8 +49,8 @@ } } --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) DCHECK(frame->dmabuf_fds_); // If there are any |dmabuf_fds_| plugged in, we should refer them too. wrapping_frame->dmabuf_fds_ = frame->dmabuf_fds_; @@ -58,8 +58,8 @@ : mailbox_holders_[texture_index]; } --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) const std::vector<base::ScopedFD>& VideoFrame::DmabufFds() const { DCHECK_EQ(storage_type_, STORAGE_DMABUFS); @@ -67,8 +67,8 @@ storage_type_(storage_type), visible_rect_(Intersection(visible_rect, gfx::Rect(layout.coded_size()))), natural_size_(natural_size), --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) dmabuf_fds_(base::MakeRefCounted<DmabufHolder>()), #endif timestamp_(timestamp), diff --git a/www/chromium/files/patch-media_base_video__frame.h b/www/chromium/files/patch-media_base_video__frame.h index 717fec355b15..7fa2e02afc05 100644 --- a/www/chromium/files/patch-media_base_video__frame.h +++ b/www/chromium/files/patch-media_base_video__frame.h @@ -1,20 +1,20 @@ ---- media/base/video_frame.h.orig 2022-02-07 13:39:41 UTC +--- media/base/video_frame.h.orig 2022-02-28 16:54:41 UTC +++ media/base/video_frame.h @@ -40,7 +40,7 @@ #include "base/mac/scoped_cftyperef.h" - #endif // defined(OS_MAC) + #endif // BUILDFLAG(IS_MAC) --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "base/files/scoped_file.h" - #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -82,7 +82,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. --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#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 @@ -22,8 +22,8 @@ ReleaseMailboxAndGpuMemoryBufferCB mailbox_holder_and_gmb_release_cb, base::TimeDelta timestamp); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // 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 @@ -31,8 +31,8 @@ // mailbox, the caller must wait for the included sync point. const gpu::MailboxHolder& mailbox_holder(size_t texture_index) const; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // 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 @@ -40,8 +40,8 @@ // GPU memory buffer, if this frame is STORAGE_GPU_MEMORY_BUFFER. std::unique_ptr<gfx::GpuMemoryBuffer> gpu_memory_buffer_; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) class DmabufHolder; // Dmabufs for the frame, used when storage is STORAGE_DMABUFS. Size is either diff --git a/www/chromium/files/patch-media_capture_video_create__video__capture__device__factory.cc b/www/chromium/files/patch-media_capture_video_create__video__capture__device__factory.cc index dc26310907a5..3ae853366d1a 100644 --- a/www/chromium/files/patch-media_capture_video_create__video__capture__device__factory.cc +++ b/www/chromium/files/patch-media_capture_video_create__video__capture__device__factory.cc @@ -1,11 +1,11 @@ ---- media/capture/video/create_video_capture_device_factory.cc.orig 2022-02-07 13:39:41 UTC +--- media/capture/video/create_video_capture_device_factory.cc.orig 2022-02-28 16:54:41 UTC +++ media/capture/video/create_video_capture_device_factory.cc @@ -12,7 +12,7 @@ #include "media/capture/video/fake_video_capture_device_factory.h" #include "media/capture/video/file_video_capture_device_factory.h" --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) #include "media/capture/video/linux/video_capture_device_factory_linux.h" #elif BUILDFLAG(IS_CHROMEOS_ASH) #include "media/capture/video/chromeos/public/cros_features.h" @@ -13,8 +13,8 @@ std::unique_ptr<VideoCaptureDeviceFactory> CreatePlatformSpecificVideoCaptureDeviceFactory( scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) { --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) return std::make_unique<VideoCaptureDeviceFactoryLinux>(ui_task_runner); #elif BUILDFLAG(IS_CHROMEOS_ASH) if (base::SysInfo::IsRunningOnChromeOS()) diff --git a/www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc b/www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc index b030733a4af1..4dbe8e68e18e 100644 --- a/www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc +++ b/www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc @@ -1,11 +1,11 @@ ---- media/capture/video/fake_video_capture_device_factory.cc.orig 2022-02-07 13:39:41 UTC +--- media/capture/video/fake_video_capture_device_factory.cc.orig 2022-02-28 16:54:41 UTC +++ media/capture/video/fake_video_capture_device_factory.cc @@ -213,7 +213,7 @@ void FakeVideoCaptureDeviceFactory::GetDevicesInfo( int entry_index = 0; for (const auto& entry : devices_config_) { VideoCaptureApi api = --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) VideoCaptureApi::LINUX_V4L2_SINGLE_PLANE; - #elif defined(OS_MAC) + #elif BUILDFLAG(IS_MAC) VideoCaptureApi::MACOSX_AVFOUNDATION; diff --git a/www/chromium/files/patch-media_capture_video_file__video__capture__device__factory.cc b/www/chromium/files/patch-media_capture_video_file__video__capture__device__factory.cc index 73c6a118c486..91bf3d7255cc 100644 --- a/www/chromium/files/patch-media_capture_video_file__video__capture__device__factory.cc +++ b/www/chromium/files/patch-media_capture_video_file__video__capture__device__factory.cc @@ -1,11 +1,11 @@ ---- media/capture/video/file_video_capture_device_factory.cc.orig 2021-07-19 18:45:18 UTC +--- media/capture/video/file_video_capture_device_factory.cc.orig 2022-02-28 16:54:41 UTC +++ media/capture/video/file_video_capture_device_factory.cc @@ -52,7 +52,7 @@ void FileVideoCaptureDeviceFactory::GetDevicesInfo( VideoCaptureApi::WIN_DIRECT_SHOW; - #elif defined(OS_MAC) + #elif BUILDFLAG(IS_MAC) VideoCaptureApi::MACOSX_AVFOUNDATION; --#elif defined(OS_LINUX) || defined(OS_CHROMEOS) -+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) VideoCaptureApi::LINUX_V4L2_SINGLE_PLANE; #else VideoCaptureApi::UNKNOWN; diff --git a/www/chromium/files/patch-media_capture_video_linux_fake__v4l2__impl.cc b/www/chromium/files/patch-media_capture_video_linux_fake__v4l2__impl.cc new file mode 100644 index 000000000000..1381e614fb61 --- /dev/null +++ b/www/chromium/files/patch-media_capture_video_linux_fake__v4l2__impl.cc @@ -0,0 +1,11 @@ +--- media/capture/video/linux/fake_v4l2_impl.cc.orig 2022-02-28 16:54:41 UTC ++++ media/capture/video/linux/fake_v4l2_impl.cc +@@ -424,7 +424,7 @@ int FakeV4L2Impl::close(int fd) { + return kSuccessReturnValue; + } + +-int FakeV4L2Impl::ioctl(int fd, int request, void* argp) { ++int FakeV4L2Impl::ioctl(int fd, unsigned long request, void* argp) { + base::AutoLock lock(lock_); + auto device_iter = opened_devices_.find(fd); + if (device_iter == opened_devices_.end()) diff --git a/www/chromium/files/patch-media_capture_video_linux_fake__v4l2__impl.h b/www/chromium/files/patch-media_capture_video_linux_fake__v4l2__impl.h index d69a68cc9b49..cd0eaf3eb8f8 100644 --- a/www/chromium/files/patch-media_capture_video_linux_fake__v4l2__impl.h +++ b/www/chromium/files/patch-media_capture_video_linux_fake__v4l2__impl.h @@ -1,6 +1,20 @@ ---- media/capture/video/linux/fake_v4l2_impl.h.orig 2022-02-07 13:39:41 UTC +--- media/capture/video/linux/fake_v4l2_impl.h.orig 2022-03-01 11:59:41 UTC +++ media/capture/video/linux/fake_v4l2_impl.h -@@ -36,7 +36,7 @@ class CAPTURE_EXPORT FakeV4L2Impl : public V4L2Capture +@@ -8,7 +8,13 @@ + #include <map> + #include <string> + ++#include "build/build_config.h" ++#if BUILDFLAG(IS_OPENBSD) ++#include <sys/videoio.h> ++typedef __uint32_t __u32; ++#else + #include <linux/videodev2.h> ++#endif + + #include "base/synchronization/lock.h" + #include "media/capture/capture_export.h" +@@ -36,7 +42,7 @@ class CAPTURE_EXPORT FakeV4L2Impl : public V4L2Capture // Implementation of V4L2CaptureDevice interface: int open(const char* device_name, int flags) override; int close(int fd) override; diff --git a/www/chromium/files/patch-media_capture_video_video__capture__buffer__pool__impl.cc b/www/chromium/files/patch-media_capture_video_video__capture__buffer__pool__impl.cc index 718fd24f6dad..3373c245b336 100644 --- a/www/chromium/files/patch-media_capture_video_video__capture__buffer__pool__impl.cc +++ b/www/chromium/files/patch-media_capture_video_video__capture__buffer__pool__impl.cc @@ -1,11 +1,11 @@ ---- media/capture/video/video_capture_buffer_pool_impl.cc.orig 2021-09-14 01:51:58 UTC +--- media/capture/video/video_capture_buffer_pool_impl.cc.orig 2022-02-28 16:54:41 UTC +++ media/capture/video/video_capture_buffer_pool_impl.cc @@ -74,7 +74,7 @@ VideoCaptureBufferPoolImpl::CreateSharedMemoryViaRawFi int buffer_id) { // This requires platforms where base::SharedMemoryHandle is backed by a // file descriptor. --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) base::AutoLock lock(lock_); VideoCaptureBufferTracker* tracker = GetTracker(buffer_id); diff --git a/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc b/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc index 99ff745c5747..8ae8e6c1d5bd 100644 --- a/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc +++ b/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc @@ -1,11 +1,11 @@ ---- media/capture/video/video_capture_device_client.cc.orig 2021-07-19 18:45:18 UTC +--- media/capture/video/video_capture_device_client.cc.orig 2022-02-28 16:54:41 UTC +++ media/capture/video/video_capture_device_client.cc @@ -320,7 +320,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData( // see http://linuxtv.org/downloads/v4l-dvb-apis/packed-rgb.html. // Windows RGB24 defines blue at lowest byte, // see https://msdn.microsoft.com/en-us/library/windows/desktop/dd407253 --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) fourcc_format = libyuv::FOURCC_RAW; - #elif defined(OS_WIN) + #elif BUILDFLAG(IS_WIN) fourcc_format = libyuv::FOURCC_24BG; diff --git a/www/chromium/files/patch-media_cdm_cdm__paths__unittest.cc b/www/chromium/files/patch-media_cdm_cdm__paths__unittest.cc new file mode 100644 index 000000000000..6c8761f016c5 --- /dev/null +++ b/www/chromium/files/patch-media_cdm_cdm__paths__unittest.cc @@ -0,0 +1,20 @@ +--- media/cdm/cdm_paths_unittest.cc.orig 2022-02-28 16:54:41 UTC ++++ media/cdm/cdm_paths_unittest.cc +@@ -18,7 +18,7 @@ + // TODO(crbug.com/971433). Move the CDMs out of the install directory on + // ChromeOS. + #if (BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS_LACROS)) ++ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) + #define CDM_USE_PLATFORM_SPECIFIC_PATH + #endif + +@@ -39,7 +39,7 @@ const char kComponentPlatform[] = + "win"; + #elif BUILDFLAG(IS_CHROMEOS) + "cros"; +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + "linux"; + #else + "unsupported_platform"; diff --git a/www/chromium/files/patch-media_gpu_buffer__validation.cc b/www/chromium/files/patch-media_gpu_buffer__validation.cc index 8e76b441fbeb..13de2a41760f 100644 --- a/www/chromium/files/patch-media_gpu_buffer__validation.cc +++ b/www/chromium/files/patch-media_gpu_buffer__validation.cc @@ -1,20 +1,20 @@ ---- media/gpu/buffer_validation.cc.orig 2022-02-07 13:39:41 UTC +--- media/gpu/buffer_validation.cc.orig 2022-02-28 16:54:41 UTC +++ media/gpu/buffer_validation.cc @@ -12,7 +12,7 @@ #include "ui/gfx/geometry/size.h" #include "ui/gfx/gpu_memory_buffer.h" --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include <sys/types.h> #include <unistd.h> - #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -20,7 +20,7 @@ namespace media { bool GetFileSize(const int fd, size_t* size) { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (fd < 0) { VLOGF(1) << "Invalid file descriptor"; return false; @@ -22,8 +22,8 @@ VLOGF(1) << "Unexpected GpuMemoryBufferType: " << gmb_handle.type; return false; } --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) const size_t num_planes = media::VideoFrame::NumPlanes(pixel_format); if (num_planes != gmb_handle.native_pixmap_handle.planes.size() || num_planes == 0) { diff --git a/www/chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc b/www/chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc index 36a16df84531..331f5b859b38 100644 --- a/www/chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc +++ b/www/chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc @@ -1,20 +1,20 @@ ---- media/gpu/chromeos/video_decoder_pipeline.cc.orig 2022-02-07 13:39:41 UTC +--- media/gpu/chromeos/video_decoder_pipeline.cc.orig 2022-02-28 16:54:41 UTC +++ media/gpu/chromeos/video_decoder_pipeline.cc -@@ -644,7 +644,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -647,7 +647,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( } } --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Linux should always use a custom allocator (to allocate buffers using // libva) and a PlatformVideoFramePool. CHECK(allocator.has_value()); -@@ -665,7 +665,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -668,7 +668,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( #error "Unsupported platform" #endif --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) // viable_candidate should always be set unless using L1 protected content, // which isn't an option on linux or lacros. CHECK(viable_candidate); diff --git a/www/chromium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc b/www/chromium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc index 3d16468b037d..1172bf968237 100644 --- a/www/chromium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc +++ b/www/chromium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc @@ -1,11 +1,11 @@ ---- media/gpu/gpu_video_encode_accelerator_factory.cc.orig 2021-12-31 00:57:35 UTC +--- media/gpu/gpu_video_encode_accelerator_factory.cc.orig 2022-02-28 16:54:41 UTC +++ media/gpu/gpu_video_encode_accelerator_factory.cc @@ -92,7 +92,7 @@ std::vector<VEAFactoryFunction> GetVEAFactoryFunctions return vea_factory_functions; #if BUILDFLAG(USE_VAAPI) --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (base::FeatureList::IsEnabled(kVaapiVideoEncodeLinux)) vea_factory_functions.push_back(base::BindRepeating(&CreateVaapiVEA)); #else diff --git a/www/chromium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc b/www/chromium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc index 3bc43fbc9207..207e7787a3a2 100644 --- a/www/chromium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc +++ b/www/chromium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc @@ -1,11 +1,11 @@ ---- media/gpu/vaapi/vaapi_video_decoder.cc.orig 2022-02-07 13:39:41 UTC +--- media/gpu/vaapi/vaapi_video_decoder.cc.orig 2022-02-28 16:54:41 UTC +++ media/gpu/vaapi/vaapi_video_decoder.cc -@@ -771,7 +771,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScree +@@ -772,7 +772,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScree const gfx::Size decoder_natural_size = aspect_ratio_.GetNaturalSize(decoder_visible_rect); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) absl::optional<DmabufVideoFramePool::CreateFrameCB> allocator = base::BindRepeating(&AllocateCustomFrameProxy, weak_this_); std::vector<ImageProcessor::PixelLayoutCandidate> candidates = { diff --git a/www/chromium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc b/www/chromium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc index 0f391052a339..0953c967096f 100644 --- a/www/chromium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc +++ b/www/chromium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc @@ -1,11 +1,11 @@ ---- media/gpu/vaapi/vaapi_wrapper.cc.orig 2022-02-07 13:39:41 UTC +--- media/gpu/vaapi/vaapi_wrapper.cc.orig 2022-02-28 16:54:41 UTC +++ media/gpu/vaapi/vaapi_wrapper.cc -@@ -553,7 +553,7 @@ VADisplayState::VADisplayState() +@@ -567,7 +567,7 @@ VADisplayState::VADisplayState() bool VADisplayState::Initialize() { base::AutoLock auto_lock(va_lock_); --#if defined(USE_OZONE) && defined(OS_LINUX) -+#if defined(USE_OZONE) && (defined(OS_LINUX) || defined(OS_BSD)) +-#if defined(USE_OZONE) && BUILDFLAG(IS_LINUX) ++#if defined(USE_OZONE) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) // TODO(crbug.com/1116701): add vaapi support for other Ozone platforms on // Linux. See comment in OzonePlatform::PlatformProperties::supports_vaapi // for more details. This will also require revisiting everything that's diff --git a/www/chromium/files/patch-media_media__options.gni b/www/chromium/files/patch-media_media__options.gni index 328c50c9511b..915143278a5b 100644 --- a/www/chromium/files/patch-media_media__options.gni +++ b/www/chromium/files/patch-media_media__options.gni @@ -1,6 +1,6 @@ ---- media/media_options.gni.orig 2022-02-07 13:39:41 UTC +--- media/media_options.gni.orig 2022-02-28 16:54:41 UTC +++ media/media_options.gni -@@ -124,9 +124,12 @@ declare_args() { +@@ -125,9 +125,12 @@ declare_args() { # Enables runtime selection of ALSA library for audio. use_alsa = false @@ -14,7 +14,7 @@ (!is_chromecast || is_cast_desktop_build || is_cast_audio_only)) { use_alsa = true -@@ -141,6 +144,10 @@ declare_args() { +@@ -142,6 +145,10 @@ declare_args() { if (!use_cras && !is_chromecast && !is_asan && !is_tsan) { use_pulseaudio = true } diff --git a/www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc b/www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc index 5dd71edd4620..ebcb0be6ee69 100644 --- a/www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc +++ b/www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc @@ -1,11 +1,11 @@ ---- media/mojo/mojom/video_frame_mojom_traits.cc.orig 2022-02-07 13:39:41 UTC +--- media/mojo/mojom/video_frame_mojom_traits.cc.orig 2022-02-28 16:54:41 UTC +++ media/mojo/mojom/video_frame_mojom_traits.cc @@ -21,7 +21,7 @@ #include "ui/gfx/mojom/color_space_mojom_traits.h" #include "ui/gfx/mojom/hdr_metadata_mojom_traits.h" --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "base/posix/eintr_wrapper.h" - #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-media_video_fake__gpu__memory__buffer.cc b/www/chromium/files/patch-media_video_fake__gpu__memory__buffer.cc index 682ae16771c3..72654e9803f2 100644 --- a/www/chromium/files/patch-media_video_fake__gpu__memory__buffer.cc +++ b/www/chromium/files/patch-media_video_fake__gpu__memory__buffer.cc @@ -1,38 +1,38 @@ ---- media/video/fake_gpu_memory_buffer.cc.orig 2022-02-07 13:39:41 UTC +--- media/video/fake_gpu_memory_buffer.cc.orig 2022-02-28 16:54:41 UTC +++ media/video/fake_gpu_memory_buffer.cc -@@ -10,7 +10,7 @@ +@@ -9,7 +9,7 @@ #include "media/base/format_utils.h" #include "media/base/video_frame.h" --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include <fcntl.h> #include <sys/stat.h> #include <sys/types.h> -@@ -48,7 +48,7 @@ class FakeGpuMemoryBufferImpl : public gpu::GpuMemoryB +@@ -47,7 +47,7 @@ class FakeGpuMemoryBufferImpl : public gpu::GpuMemoryB } // namespace --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) base::ScopedFD GetDummyFD() { base::ScopedFD fd(open("/dev/zero", O_RDWR)); DCHECK(fd.is_valid()); -@@ -78,7 +78,7 @@ FakeGpuMemoryBuffer::FakeGpuMemoryBuffer(const gfx::Si +@@ -77,7 +77,7 @@ FakeGpuMemoryBuffer::FakeGpuMemoryBuffer(const gfx::Si static base::AtomicSequenceNumber buffer_id_generator; handle_.id = gfx::GpuMemoryBufferId(buffer_id_generator.GetNext()); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) for (size_t i = 0; i < VideoFrame::NumPlanes(video_pixel_format_); i++) { const gfx::Size plane_size_in_bytes = VideoFrame::PlaneSize(video_pixel_format_, i, size_); -@@ -135,7 +135,7 @@ gfx::GpuMemoryBufferHandle FakeGpuMemoryBuffer::CloneH +@@ -134,7 +134,7 @@ gfx::GpuMemoryBufferHandle FakeGpuMemoryBuffer::CloneH gfx::GpuMemoryBufferHandle handle; handle.type = gfx::NATIVE_PIXMAP; handle.id = handle_.id; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) handle.native_pixmap_handle = gfx::CloneHandleForIPC(handle_.native_pixmap_handle); #endif diff --git a/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc b/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc index 3be329c5ff5b..b8c80844e279 100644 --- a/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc +++ b/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc @@ -1,11 +1,11 @@ ---- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2021-12-31 00:57:36 UTC +--- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2022-02-28 16:54:41 UTC +++ media/video/gpu_memory_buffer_video_frame_pool.cc @@ -720,7 +720,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa } bool is_software_backed_video_frame = !video_frame->HasTextures(); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) is_software_backed_video_frame &= !video_frame->HasDmaBufs(); #endif diff --git a/www/chromium/files/patch-media_video_video__encode__accelerator__adapter.cc b/www/chromium/files/patch-media_video_video__encode__accelerator__adapter.cc index 0d2ecb98ba62..17c6287b96ab 100644 --- a/www/chromium/files/patch-media_video_video__encode__accelerator__adapter.cc +++ b/www/chromium/files/patch-media_video_video__encode__accelerator__adapter.cc @@ -1,20 +1,20 @@ ---- media/video/video_encode_accelerator_adapter.cc.orig 2021-12-14 11:45:08 UTC +--- media/video/video_encode_accelerator_adapter.cc.orig 2022-02-28 16:54:41 UTC +++ media/video/video_encode_accelerator_adapter.cc @@ -88,7 +88,7 @@ VideoEncodeAccelerator::Config SetUpVeaConfig( if (is_rgb) config.input_format = PIXEL_FORMAT_I420; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#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) -@@ -228,7 +228,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal +@@ -227,7 +227,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal auto vea_config = SetUpVeaConfig(profile_, options_, format, first_frame->storage_type()); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Linux/ChromeOS require a special configuration to use dmabuf storage. // We need to keep sending frames the same way the first frame was sent. // Other platforms will happily mix GpuMemoryBuffer storage with regular diff --git a/www/chromium/files/patch-media_video_video__encode__accelerator__adapter__test.cc b/www/chromium/files/patch-media_video_video__encode__accelerator__adapter__test.cc new file mode 100644 index 000000000000..d10c8d7ba0b9 --- /dev/null +++ b/www/chromium/files/patch-media_video_video__encode__accelerator__adapter__test.cc @@ -0,0 +1,11 @@ +--- media/video/video_encode_accelerator_adapter_test.cc.orig 2022-02-28 16:54:41 UTC ++++ media/video/video_encode_accelerator_adapter_test.cc +@@ -349,7 +349,7 @@ TEST_P(VideoEncodeAcceleratorAdapterTest, TwoFramesRes + + vea()->SetEncodingCallback(base::BindLambdaForTesting( + [&](BitstreamBuffer&, bool keyframe, scoped_refptr<VideoFrame> frame) { +-#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 diff --git a/www/chromium/files/patch-media_webrtc_audio__processor.cc b/www/chromium/files/patch-media_webrtc_audio__processor.cc index c9d3ba7f8543..046adadf70f2 100644 --- a/www/chromium/files/patch-media_webrtc_audio__processor.cc +++ b/www/chromium/files/patch-media_webrtc_audio__processor.cc @@ -1,11 +1,11 @@ ---- media/webrtc/audio_processor.cc.orig 2022-02-07 13:39:41 UTC +--- media/webrtc/audio_processor.cc.orig 2022-02-28 16:54:41 UTC +++ media/webrtc/audio_processor.cc -@@ -542,7 +542,7 @@ absl::optional<double> AudioProcessor::ProcessData( - // controller. - #if defined(OS_WIN) || defined(OS_MAC) +@@ -487,7 +487,7 @@ absl::optional<double> AudioProcessor::ProcessData( + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) DCHECK_LE(volume, 1.0); --#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_OPENBSD) -+#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) + #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ +- BUILDFLAG(IS_OPENBSD) ++ BUILDFLAG(IS_BSD) // We have a special situation on Linux where the microphone volume can be // "higher than maximum". The input volume slider in the sound preference // allows the user to set a scaling that is higher than 100%. It means that diff --git a/www/chromium/files/patch-media_webrtc_helpers__unittests.cc b/www/chromium/files/patch-media_webrtc_helpers__unittests.cc new file mode 100644 index 000000000000..afdf0f36248b --- /dev/null +++ b/www/chromium/files/patch-media_webrtc_helpers__unittests.cc @@ -0,0 +1,20 @@ +--- media/webrtc/helpers_unittests.cc.orig 2022-02-28 16:54:41 UTC ++++ media/webrtc/helpers_unittests.cc +@@ -36,7 +36,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, CheckDefau + EXPECT_FALSE(config.pre_amplifier.enabled); + EXPECT_TRUE(config.echo_canceller.enabled); + EXPECT_TRUE(config.gain_controller1.enabled); +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + EXPECT_TRUE(config.gain_controller2.enabled); + #else + EXPECT_FALSE(config.gain_controller2.enabled); +@@ -95,7 +95,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, CheckDefau + + // Check that either AGC1 digital or AGC2 digital is used based on the + // platforms where the Hybrid AGC is enabled by default. +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + EXPECT_FALSE(agc1_analog_config.enable_digital_adaptive); + EXPECT_TRUE(config.gain_controller2.enabled); + EXPECT_TRUE(config.gain_controller2.adaptive_digital.enabled); diff --git a/www/chromium/files/patch-media_webrtc_webrtc__features.cc b/www/chromium/files/patch-media_webrtc_webrtc__features.cc index df91fd7b28b4..c203655688cc 100644 --- a/www/chromium/files/patch-media_webrtc_webrtc__features.cc +++ b/www/chromium/files/patch-media_webrtc_webrtc__features.cc @@ -1,11 +1,11 @@ ---- media/webrtc/webrtc_features.cc.orig 2021-12-16 15:13:21 UTC +--- media/webrtc/webrtc_features.cc.orig 2022-02-28 16:54:41 UTC +++ media/webrtc/webrtc_features.cc @@ -9,7 +9,7 @@ namespace features { namespace { --#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) constexpr base::FeatureState kWebRtcHybridAgcState = base::FEATURE_ENABLED_BY_DEFAULT; #else diff --git a/www/chromium/files/patch-mojo_core_BUILD.gn b/www/chromium/files/patch-mojo_core_BUILD.gn index 0da9ce95a848..0b98bf57356d 100644 --- a/www/chromium/files/patch-mojo_core_BUILD.gn +++ b/www/chromium/files/patch-mojo_core_BUILD.gn @@ -1,6 +1,6 @@ ---- mojo/core/BUILD.gn.orig 2021-12-14 11:45:08 UTC +--- mojo/core/BUILD.gn.orig 2022-02-28 16:54:41 UTC +++ mojo/core/BUILD.gn -@@ -127,7 +127,7 @@ template("core_impl_source_set") { +@@ -128,7 +128,7 @@ template("core_impl_source_set") { ] } diff --git a/www/chromium/files/patch-mojo_core_embedder_features.h b/www/chromium/files/patch-mojo_core_embedder_features.h index 0ce643694ffd..27d9c465adc6 100644 --- a/www/chromium/files/patch-mojo_core_embedder_features.h +++ b/www/chromium/files/patch-mojo_core_embedder_features.h @@ -1,11 +1,11 @@ ---- mojo/core/embedder/features.h.orig 2022-02-07 13:39:41 UTC +--- mojo/core/embedder/features.h.orig 2022-02-28 16:54:41 UTC +++ mojo/core/embedder/features.h @@ -14,7 +14,7 @@ namespace mojo { namespace core { - #if defined(OS_POSIX) && !defined(OS_NACL) && !defined(OS_MAC) --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) + #if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_MAC) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) COMPONENT_EXPORT(MOJO_CORE_EMBEDDER_FEATURES) extern const base::Feature kMojoLinuxChannelSharedMem; diff --git a/www/chromium/files/patch-mojo_public_c_system_thunks.cc b/www/chromium/files/patch-mojo_public_c_system_thunks.cc index 799396b668ec..6ac3766ca400 100644 --- a/www/chromium/files/patch-mojo_public_c_system_thunks.cc +++ b/www/chromium/files/patch-mojo_public_c_system_thunks.cc @@ -1,11 +1,11 @@ ---- mojo/public/c/system/thunks.cc.orig 2022-02-07 13:39:41 UTC +--- mojo/public/c/system/thunks.cc.orig 2022-02-28 16:54:41 UTC +++ mojo/public/c/system/thunks.cc @@ -19,7 +19,7 @@ #include "mojo/public/c/system/core.h" #include "mojo/public/c/system/macros.h" --#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) -+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) #include "base/environment.h" #include "base/files/file_path.h" #include "base/scoped_native_library.h" @@ -13,8 +13,8 @@ ~CoreLibraryInitializer() = default; MojoResult LoadLibrary(base::FilePath library_path) { --#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) -+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) if (library_ && library_->is_valid()) return MOJO_RESULT_OK; @@ -22,17 +22,17 @@ if (library_path.empty()) { // Default to looking for the library in the current working directory. --#if defined(OS_CHROMEOS) || defined(OS_LINUX) -+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) const base::FilePath::CharType kDefaultLibraryPathValue[] = FILE_PATH_LITERAL("./libmojo_core.so"); - #elif defined(OS_WIN) + #elif BUILDFLAG(IS_WIN) @@ -131,7 +131,7 @@ class CoreLibraryInitializer { } private: --#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) -+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) absl::optional<base::ScopedNativeLibrary> library_; #endif }; diff --git a/www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd b/www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd index 04f67ce7734d..fbbcb5ae12d1 100644 --- a/www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd +++ b/www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd @@ -1,6 +1,6 @@ ---- mojo/public/js/mojo_bindings_resources.grd.orig 2021-09-14 01:51:59 UTC +--- mojo/public/js/mojo_bindings_resources.grd.orig 2022-02-28 16:54:41 UTC +++ mojo/public/js/mojo_bindings_resources.grd -@@ -105,7 +105,7 @@ +@@ -110,7 +110,7 @@ use_base_dir="false" resource_path="mojo/mojo/public/mojom/base/unguessable_token.mojom-webui.js" type="BINDATA" /> diff --git a/www/chromium/files/patch-mojo_public_tools_bindings_mojom.gni b/www/chromium/files/patch-mojo_public_tools_bindings_mojom.gni index c5f2c44ec0e0..11acb87ccc15 100644 --- a/www/chromium/files/patch-mojo_public_tools_bindings_mojom.gni +++ b/www/chromium/files/patch-mojo_public_tools_bindings_mojom.gni @@ -1,6 +1,6 @@ ---- mojo/public/tools/bindings/mojom.gni.orig 2022-02-07 13:39:41 UTC +--- mojo/public/tools/bindings/mojom.gni.orig 2022-02-28 16:54:41 UTC +++ mojo/public/tools/bindings/mojom.gni -@@ -688,6 +688,16 @@ template("mojom") { +@@ -690,6 +690,16 @@ template("mojom") { enabled_features += [ "is_win" ] } diff --git a/www/chromium/files/patch-net_BUILD.gn b/www/chromium/files/patch-net_BUILD.gn index e7a1fa60cfd2..900b952800d5 100644 --- a/www/chromium/files/patch-net_BUILD.gn +++ b/www/chromium/files/patch-net_BUILD.gn @@ -1,4 +1,4 @@ ---- net/BUILD.gn.orig 2022-02-07 13:39:41 UTC +--- net/BUILD.gn.orig 2022-03-01 11:59:41 UTC +++ net/BUILD.gn @@ -100,7 +100,7 @@ net_configs = [ "//build/config/compiler:wexit_time_destructors", @@ -9,7 +9,7 @@ net_configs += [ "//build/config/linux:libresolv" ] } -@@ -1213,6 +1213,15 @@ component("net") { +@@ -1215,6 +1215,15 @@ component("net") { ] } @@ -25,7 +25,7 @@ if (is_mac) { sources += [ "base/network_notification_thread_mac.cc", -@@ -1345,7 +1354,7 @@ component("net") { +@@ -1347,7 +1356,7 @@ component("net") { } } @@ -34,7 +34,7 @@ sources += [ "base/network_change_notifier_posix.cc", "base/network_change_notifier_posix.h", -@@ -1378,7 +1387,7 @@ component("net") { +@@ -1380,7 +1389,7 @@ component("net") { } # Use getifaddrs() on POSIX platforms, except Linux. @@ -43,7 +43,45 @@ sources += [ "base/network_interfaces_getifaddrs.cc", "base/network_interfaces_getifaddrs.h", -@@ -4713,7 +4722,7 @@ test("net_unittests") { +@@ -2445,7 +2454,7 @@ if (is_linux || is_chromeos || is_mac) { + } + } + +-if (is_linux || is_chromeos) { ++if ((is_linux || is_chromeos) && !is_bsd) { + static_library("epoll_server") { + sources = [ + "tools/epoll_server/platform/impl/epoll_bug_impl.h", +@@ -4439,7 +4448,7 @@ test("net_unittests") { + ] + } + +- if (is_linux || is_chromeos) { ++ if ((is_linux || is_chromeos) && !is_bsd) { + sources += [ + "base/address_tracker_linux_unittest.cc", + "base/network_interfaces_linux_unittest.cc", +@@ -4513,6 +4522,10 @@ test("net_unittests") { + "//url:buildflags", + ] + ++ if (is_bsd) { ++ deps += [ "//sandbox/policy" ] ++ } ++ + allow_circular_includes_from = [ "//net/third_party/quiche:quiche_tests" ] + + if (enable_websockets) { +@@ -4560,7 +4573,7 @@ test("net_unittests") { + ] + } + +- if (is_linux || is_chromeos) { ++ if ((is_linux || is_chromeos) && !is_bsd) { + sources += [ + "quic/platform/impl/quic_epoll_clock_test.cc", + "quic/platform/impl/quic_flags_test.cc", +@@ -4706,7 +4719,7 @@ test("net_unittests") { } # Use getifaddrs() on POSIX platforms, except Linux and Android. diff --git a/www/chromium/files/patch-net_base_address__tracker__linux.cc b/www/chromium/files/patch-net_base_address__tracker__linux.cc deleted file mode 100644 index 00af00cca4b7..000000000000 --- a/www/chromium/files/patch-net_base_address__tracker__linux.cc +++ /dev/null @@ -1,410 +0,0 @@ ---- net/base/address_tracker_linux.cc.orig 2022-02-07 13:39:41 UTC -+++ net/base/address_tracker_linux.cc -@@ -28,125 +28,10 @@ - namespace net { - namespace internal { - --namespace { -- --// Some kernel functions such as wireless_send_event and rtnetlink_ifinfo_prep --// may send spurious messages over rtnetlink. RTM_NEWLINK messages where --// ifi_change == 0 and rta_type == IFLA_WIRELESS should be ignored. --bool IgnoreWirelessChange(const struct ifinfomsg* msg, int length) { -- for (const struct rtattr* attr = IFLA_RTA(msg); RTA_OK(attr, length); -- attr = RTA_NEXT(attr, length)) { -- if (attr->rta_type == IFLA_WIRELESS && msg->ifi_change == 0) -- return true; -- } -- return false; --} -- --// Retrieves address from NETLINK address message. --// Sets |really_deprecated| for IPv6 addresses with preferred lifetimes of 0. --// Precondition: |header| must already be validated with NLMSG_OK. --bool GetAddress(const struct nlmsghdr* header, -- int header_length, -- IPAddress* out, -- bool* really_deprecated) { -- if (really_deprecated) -- *really_deprecated = false; -- -- // Extract the message and update |header_length| to be the number of -- // remaining bytes. -- const struct ifaddrmsg* msg = -- reinterpret_cast<const struct ifaddrmsg*>(NLMSG_DATA(header)); -- header_length -= NLMSG_HDRLEN; -- -- size_t address_length = 0; -- switch (msg->ifa_family) { -- case AF_INET: -- address_length = IPAddress::kIPv4AddressSize; -- break; -- case AF_INET6: -- address_length = IPAddress::kIPv6AddressSize; -- break; -- default: -- // Unknown family. -- return false; -- } -- // Use IFA_ADDRESS unless IFA_LOCAL is present. This behavior here is based on -- // getaddrinfo in glibc (check_pf.c). Judging from kernel implementation of -- // NETLINK, IPv4 addresses have only the IFA_ADDRESS attribute, while IPv6 -- // have the IFA_LOCAL attribute. -- uint8_t* address = NULL; -- uint8_t* local = NULL; -- int length = IFA_PAYLOAD(header); -- if (length > header_length) { -- LOG(ERROR) << "ifaddrmsg length exceeds bounds"; -- return false; -- } -- for (const struct rtattr* attr = -- reinterpret_cast<const struct rtattr*>(IFA_RTA(msg)); -- RTA_OK(attr, length); attr = RTA_NEXT(attr, length)) { -- switch (attr->rta_type) { -- case IFA_ADDRESS: -- if (RTA_PAYLOAD(attr) < address_length) { -- LOG(ERROR) << "attr does not have enough bytes to read an address"; -- return false; -- } -- address = reinterpret_cast<uint8_t*>(RTA_DATA(attr)); -- break; -- case IFA_LOCAL: -- if (RTA_PAYLOAD(attr) < address_length) { -- LOG(ERROR) << "attr does not have enough bytes to read an address"; -- return false; -- } -- local = reinterpret_cast<uint8_t*>(RTA_DATA(attr)); -- break; -- case IFA_CACHEINFO: { -- if (RTA_PAYLOAD(attr) < sizeof(struct ifa_cacheinfo)) { -- LOG(ERROR) -- << "attr does not have enough bytes to read an ifa_cacheinfo"; -- return false; -- } -- const struct ifa_cacheinfo* cache_info = -- reinterpret_cast<const struct ifa_cacheinfo*>(RTA_DATA(attr)); -- if (really_deprecated) -- *really_deprecated = (cache_info->ifa_prefered == 0); -- } break; -- default: -- break; -- } -- } -- if (local) -- address = local; -- if (!address) -- return false; -- *out = IPAddress(address, address_length); -- return true; --} -- --// SafelyCastNetlinkMsgData<T> performs a bounds check before casting |header|'s --// data to a |T*|. When the bounds check fails, returns nullptr. --template <typename T> --T* SafelyCastNetlinkMsgData(const struct nlmsghdr* header, int length) { -- DCHECK(NLMSG_OK(header, static_cast<__u32>(length))); -- if (length <= 0 || static_cast<size_t>(length) < NLMSG_HDRLEN + sizeof(T)) -- return nullptr; -- return reinterpret_cast<const T*>(NLMSG_DATA(header)); --} -- --} // namespace -- - // static - char* AddressTrackerLinux::GetInterfaceName(int interface_index, char* buf) { -- memset(buf, 0, IFNAMSIZ); -- base::ScopedFD ioctl_socket = GetSocketForIoctl(); -- if (!ioctl_socket.is_valid()) -- return buf; -- -- struct ifreq ifr = {}; -- ifr.ifr_ifindex = interface_index; -- -- if (ioctl(ioctl_socket.get(), SIOCGIFNAME, &ifr) == 0) -- strncpy(buf, ifr.ifr_name, IFNAMSIZ - 1); -- return buf; -+ NOTIMPLEMENTED(); -+ return NULL; - } - - AddressTrackerLinux::AddressTrackerLinux() -@@ -183,98 +68,8 @@ AddressTrackerLinux::AddressTrackerLinux( - AddressTrackerLinux::~AddressTrackerLinux() = default; - - void AddressTrackerLinux::Init() { --#if defined(OS_ANDROID) -- // RTM_GETLINK stopped working in Android 11 (see -- // https://developer.android.com/preview/privacy/mac-address), -- // so AddressTrackerLinux should not be used in later versions -- // of Android. Chromium code doesn't need it past Android P. -- DCHECK_LT(base::android::BuildInfo::GetInstance()->sdk_int(), -- base::android::SDK_VERSION_P); --#endif -- netlink_fd_.reset(socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE)); -- if (!netlink_fd_.is_valid()) { -- PLOG(ERROR) << "Could not create NETLINK socket"; -- AbortAndForceOnline(); -- return; -- } -- -- int rv; -- -- if (tracking_) { -- // Request notifications. -- struct sockaddr_nl addr = {}; -- addr.nl_family = AF_NETLINK; -- addr.nl_pid = 0; // Let the kernel select a unique value. -- // TODO(szym): Track RTMGRP_LINK as well for ifi_type, -- // http://crbug.com/113993 -- addr.nl_groups = -- RTMGRP_IPV4_IFADDR | RTMGRP_IPV6_IFADDR | RTMGRP_NOTIFY | RTMGRP_LINK; -- rv = bind(netlink_fd_.get(), reinterpret_cast<struct sockaddr*>(&addr), -- sizeof(addr)); -- if (rv < 0) { -- PLOG(ERROR) << "Could not bind NETLINK socket"; -- AbortAndForceOnline(); -- return; -- } -- } -- -- // Request dump of addresses. -- struct sockaddr_nl peer = {}; -- peer.nl_family = AF_NETLINK; -- -- struct { -- struct nlmsghdr header; -- struct rtgenmsg msg; -- } request = {}; -- -- request.header.nlmsg_len = NLMSG_LENGTH(sizeof(request.msg)); -- request.header.nlmsg_type = RTM_GETADDR; -- request.header.nlmsg_flags = NLM_F_REQUEST | NLM_F_DUMP; -- request.header.nlmsg_pid = 0; // This field is opaque to netlink. -- request.msg.rtgen_family = AF_UNSPEC; -- -- rv = HANDLE_EINTR( -- sendto(netlink_fd_.get(), &request, request.header.nlmsg_len, 0, -- reinterpret_cast<struct sockaddr*>(&peer), sizeof(peer))); -- if (rv < 0) { -- PLOG(ERROR) << "Could not send NETLINK request"; -- AbortAndForceOnline(); -- return; -- } -- -- // Consume pending message to populate the AddressMap, but don't notify. -- // Sending another request without first reading responses results in EBUSY. -- bool address_changed; -- bool link_changed; -- bool tunnel_changed; -- ReadMessages(&address_changed, &link_changed, &tunnel_changed); -- -- // Request dump of link state -- request.header.nlmsg_type = RTM_GETLINK; -- -- rv = HANDLE_EINTR( -- sendto(netlink_fd_.get(), &request, request.header.nlmsg_len, 0, -- reinterpret_cast<struct sockaddr*>(&peer), sizeof(peer))); -- if (rv < 0) { -- PLOG(ERROR) << "Could not send NETLINK request"; -- AbortAndForceOnline(); -- return; -- } -- -- // Consume pending message to populate links_online_, but don't notify. -- ReadMessages(&address_changed, &link_changed, &tunnel_changed); -- { -- AddressTrackerAutoLock lock(*this, connection_type_lock_); -- connection_type_initialized_ = true; -- connection_type_initialized_cv_.Broadcast(); -- } -- -- if (tracking_) { -- watcher_ = base::FileDescriptorWatcher::WatchReadable( -- netlink_fd_.get(), -- base::BindRepeating(&AddressTrackerLinux::OnFileCanReadWithoutBlocking, -- base::Unretained(this))); -- } -+ NOTIMPLEMENTED(); -+ AbortAndForceOnline(); - } - - bool AddressTrackerLinux::DidTrackingInitSucceedForTesting() const { -@@ -291,25 +86,6 @@ void AddressTrackerLinux::AbortAndForceOnline() { - connection_type_initialized_cv_.Broadcast(); - } - --AddressTrackerLinux::AddressMap AddressTrackerLinux::GetAddressMap() const { -- AddressTrackerAutoLock lock(*this, address_map_lock_); -- return address_map_; --} -- --std::unordered_set<int> AddressTrackerLinux::GetOnlineLinks() const { -- AddressTrackerAutoLock lock(*this, online_links_lock_); -- return online_links_; --} -- --bool AddressTrackerLinux::IsInterfaceIgnored(int interface_index) const { -- if (ignored_interfaces_.empty()) -- return false; -- -- char buf[IFNAMSIZ] = {0}; -- const char* interface_name = get_interface_name_(interface_index, buf); -- return ignored_interfaces_.find(interface_name) != ignored_interfaces_.end(); --} -- - NetworkChangeNotifier::ConnectionType - AddressTrackerLinux::GetCurrentConnectionType() { - // http://crbug.com/125097 -@@ -367,118 +143,7 @@ void AddressTrackerLinux::HandleMessage(const char* bu - bool* address_changed, - bool* link_changed, - bool* tunnel_changed) { -- DCHECK(buffer); -- // Note that NLMSG_NEXT decrements |length| to reflect the number of bytes -- // remaining in |buffer|. -- for (const struct nlmsghdr* header = -- reinterpret_cast<const struct nlmsghdr*>(buffer); -- length >= 0 && NLMSG_OK(header, static_cast<__u32>(length)); -- header = NLMSG_NEXT(header, length)) { -- // The |header| pointer should never precede |buffer|. -- DCHECK_LE(buffer, reinterpret_cast<const char*>(header)); -- switch (header->nlmsg_type) { -- case NLMSG_DONE: -- return; -- case NLMSG_ERROR: { -- const struct nlmsgerr* msg = -- SafelyCastNetlinkMsgData<const struct nlmsgerr>(header, length); -- if (msg == nullptr) -- return; -- LOG(ERROR) << "Unexpected netlink error " << msg->error << "."; -- } return; -- case RTM_NEWADDR: { -- IPAddress address; -- bool really_deprecated; -- const struct ifaddrmsg* msg = -- SafelyCastNetlinkMsgData<const struct ifaddrmsg>(header, length); -- if (msg == nullptr) -- return; -- if (IsInterfaceIgnored(msg->ifa_index)) -- break; -- if (GetAddress(header, length, &address, &really_deprecated)) { -- struct ifaddrmsg msg_copy = *msg; -- AddressTrackerAutoLock lock(*this, address_map_lock_); -- // Routers may frequently (every few seconds) output the IPv6 ULA -- // prefix which can cause the linux kernel to frequently output two -- // back-to-back messages, one without the deprecated flag and one with -- // the deprecated flag but both with preferred lifetimes of 0. Avoid -- // interpretting this as an actual change by canonicalizing the two -- // messages by setting the deprecated flag based on the preferred -- // lifetime also. http://crbug.com/268042 -- if (really_deprecated) -- msg_copy.ifa_flags |= IFA_F_DEPRECATED; -- // Only indicate change if the address is new or ifaddrmsg info has -- // changed. -- auto it = address_map_.find(address); -- if (it == address_map_.end()) { -- address_map_.insert(it, std::make_pair(address, msg_copy)); -- *address_changed = true; -- } else if (memcmp(&it->second, &msg_copy, sizeof(msg_copy))) { -- it->second = msg_copy; -- *address_changed = true; -- } -- } -- } break; -- case RTM_DELADDR: { -- IPAddress address; -- const struct ifaddrmsg* msg = -- SafelyCastNetlinkMsgData<const struct ifaddrmsg>(header, length); -- if (msg == nullptr) -- return; -- if (IsInterfaceIgnored(msg->ifa_index)) -- break; -- if (GetAddress(header, length, &address, nullptr)) { -- AddressTrackerAutoLock lock(*this, address_map_lock_); -- if (address_map_.erase(address)) -- *address_changed = true; -- } -- } break; -- case RTM_NEWLINK: { -- const struct ifinfomsg* msg = -- SafelyCastNetlinkMsgData<const struct ifinfomsg>(header, length); -- if (msg == nullptr) -- return; -- if (IsInterfaceIgnored(msg->ifi_index)) -- break; -- if (IgnoreWirelessChange(msg, IFLA_PAYLOAD(header))) { -- VLOG(2) << "Ignoring RTM_NEWLINK message"; -- break; -- } -- if (!(msg->ifi_flags & IFF_LOOPBACK) && (msg->ifi_flags & IFF_UP) && -- (msg->ifi_flags & IFF_LOWER_UP) && (msg->ifi_flags & IFF_RUNNING)) { -- AddressTrackerAutoLock lock(*this, online_links_lock_); -- if (online_links_.insert(msg->ifi_index).second) { -- *link_changed = true; -- if (IsTunnelInterface(msg->ifi_index)) -- *tunnel_changed = true; -- } -- } else { -- AddressTrackerAutoLock lock(*this, online_links_lock_); -- if (online_links_.erase(msg->ifi_index)) { -- *link_changed = true; -- if (IsTunnelInterface(msg->ifi_index)) -- *tunnel_changed = true; -- } -- } -- } break; -- case RTM_DELLINK: { -- const struct ifinfomsg* msg = -- SafelyCastNetlinkMsgData<const struct ifinfomsg>(header, length); -- if (msg == nullptr) -- return; -- if (IsInterfaceIgnored(msg->ifi_index)) -- break; -- AddressTrackerAutoLock lock(*this, online_links_lock_); -- if (online_links_.erase(msg->ifi_index)) { -- *link_changed = true; -- if (IsTunnelInterface(msg->ifi_index)) -- *tunnel_changed = true; -- } -- } break; -- default: -- break; -- } -- } -+ NOTIMPLEMENTED(); - } - - void AddressTrackerLinux::OnFileCanReadWithoutBlocking() { -@@ -506,31 +171,7 @@ bool AddressTrackerLinux::IsTunnelInterfaceName(const - } - - void AddressTrackerLinux::UpdateCurrentConnectionType() { -- AddressTrackerLinux::AddressMap address_map = GetAddressMap(); -- std::unordered_set<int> online_links = GetOnlineLinks(); -- -- // Strip out tunnel interfaces from online_links -- for (auto it = online_links.cbegin(); it != online_links.cend();) { -- if (IsTunnelInterface(*it)) { -- it = online_links.erase(it); -- } else { -- ++it; -- } -- } -- -- NetworkInterfaceList networks; -- NetworkChangeNotifier::ConnectionType type = -- NetworkChangeNotifier::CONNECTION_NONE; -- if (GetNetworkListImpl(&networks, 0, online_links, address_map, -- get_interface_name_)) { -- type = NetworkChangeNotifier::ConnectionTypeFromInterfaceList(networks); -- } else { -- type = online_links.empty() ? NetworkChangeNotifier::CONNECTION_NONE -- : NetworkChangeNotifier::CONNECTION_UNKNOWN; -- } -- -- AddressTrackerAutoLock lock(*this, connection_type_lock_); -- current_connection_type_ = type; -+ NOTIMPLEMENTED(); - } - - int AddressTrackerLinux::GetThreadsWaitingForConnectionTypeInitForTesting() { diff --git a/www/chromium/files/patch-net_base_address__tracker__linux.h b/www/chromium/files/patch-net_base_address__tracker__linux.h deleted file mode 100644 index 997f0230fc14..000000000000 --- a/www/chromium/files/patch-net_base_address__tracker__linux.h +++ /dev/null @@ -1,12 +0,0 @@ ---- net/base/address_tracker_linux.h.orig 2021-04-14 18:41:06 UTC -+++ net/base/address_tracker_linux.h -@@ -7,9 +7,6 @@ - - #include <sys/socket.h> // Needed to include netlink. - // Mask superfluous definition of |struct net|. This is fixed in Linux 2.6.38. --#define net net_kernel --#include <linux/rtnetlink.h> --#undef net - #include <stddef.h> - - #include <map> diff --git a/www/chromium/files/patch-net_base_network__change__notifier.cc b/www/chromium/files/patch-net_base_network__change__notifier.cc index 116322ec7085..8b9b8f465c37 100644 --- a/www/chromium/files/patch-net_base_network__change__notifier.cc +++ b/www/chromium/files/patch-net_base_network__change__notifier.cc @@ -1,26 +1,21 @@ ---- net/base/network_change_notifier.cc.orig 2022-02-07 13:39:41 UTC +--- net/base/network_change_notifier.cc.orig 2022-02-28 16:54:41 UTC +++ net/base/network_change_notifier.cc @@ -38,7 +38,7 @@ #include "net/base/network_change_notifier_linux.h" - #elif defined(OS_APPLE) + #elif BUILDFLAG(IS_APPLE) #include "net/base/network_change_notifier_mac.h" --#elif BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_ANDROID) -+#elif BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_ANDROID) || defined(OS_BSD) +-#elif BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_ANDROID) ++#elif BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) #include "net/base/network_change_notifier_posix.h" - #elif defined(OS_FUCHSIA) + #elif BUILDFLAG(IS_FUCHSIA) #include "net/base/network_change_notifier_fuchsia.h" -@@ -303,9 +303,13 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo - // service in a separate process. - return std::make_unique<NetworkChangeNotifierPosix>(initial_type, - initial_subtype); --#elif BUILDFLAG(IS_CHROMEOS_ASH) -+#elif BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_BSD) -+#if !defined(OS_BSD) - return std::make_unique<NetworkChangeNotifierPosix>(initial_type, - initial_subtype); -+#else -+ return NULL; -+#endif - #elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) - return std::make_unique<NetworkChangeNotifierLinux>( - std::unordered_set<std::string>()); +@@ -320,6 +320,9 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo + #elif BUILDFLAG(IS_FUCHSIA) + return std::make_unique<NetworkChangeNotifierFuchsia>( + /*require_wlan=*/false); ++#elif BUILDFLAG(IS_BSD) ++ return std::make_unique<MockNetworkChangeNotifier>( ++ /*dns_config_notifier*/nullptr); + #else + NOTIMPLEMENTED(); + return NULL; diff --git a/www/chromium/files/patch-net_cert_cert__verifier.cc b/www/chromium/files/patch-net_cert_cert__verifier.cc index 1d99d2e5abf8..bc7527e1a23b 100644 --- a/www/chromium/files/patch-net_cert_cert__verifier.cc +++ b/www/chromium/files/patch-net_cert_cert__verifier.cc @@ -1,11 +1,11 @@ ---- net/cert/cert_verifier.cc.orig 2021-07-19 18:45:19 UTC +--- net/cert/cert_verifier.cc.orig 2022-02-28 16:54:41 UTC +++ net/cert/cert_verifier.cc @@ -78,7 +78,7 @@ bool CertVerifier::RequestParams::operator<( std::unique_ptr<CertVerifier> CertVerifier::CreateDefaultWithoutCaching( scoped_refptr<CertNetFetcher> cert_net_fetcher) { scoped_refptr<CertVerifyProc> verify_proc; --#if defined(OS_FUCHSIA) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_FUCHSIA) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) verify_proc = CertVerifyProc::CreateBuiltinVerifyProc(std::move(cert_net_fetcher)); #elif BUILDFLAG(BUILTIN_CERT_VERIFIER_FEATURE_SUPPORTED) diff --git a/www/chromium/files/patch-net_cert_cert__verify__proc.cc b/www/chromium/files/patch-net_cert_cert__verify__proc.cc index d3cb19ae14e2..ec2e4a89ae7b 100644 --- a/www/chromium/files/patch-net_cert_cert__verify__proc.cc +++ b/www/chromium/files/patch-net_cert_cert__verify__proc.cc @@ -1,11 +1,11 @@ ---- net/cert/cert_verify_proc.cc.orig 2021-09-14 01:51:59 UTC +--- net/cert/cert_verify_proc.cc.orig 2022-02-28 16:54:41 UTC +++ net/cert/cert_verify_proc.cc -@@ -468,7 +468,7 @@ base::Value CertVerifyParams(X509Certificate* cert, +@@ -470,7 +470,7 @@ base::Value CertVerifyParams(X509Certificate* cert, } // namespace --#if !(defined(OS_FUCHSIA) || defined(OS_LINUX) || defined(OS_CHROMEOS)) -+#if !(defined(OS_FUCHSIA) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) +-#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) ++#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) // static scoped_refptr<CertVerifyProc> CertVerifyProc::CreateSystemVerifyProc( scoped_refptr<CertNetFetcher> cert_net_fetcher) { diff --git a/www/chromium/files/patch-net_cert_cert__verify__proc.h b/www/chromium/files/patch-net_cert_cert__verify__proc.h index 932fa0cf1327..a6fb7c8da9be 100644 --- a/www/chromium/files/patch-net_cert_cert__verify__proc.h +++ b/www/chromium/files/patch-net_cert_cert__verify__proc.h @@ -1,11 +1,11 @@ ---- net/cert/cert_verify_proc.h.orig 2022-02-07 13:39:41 UTC +--- net/cert/cert_verify_proc.h.orig 2022-02-28 16:54:41 UTC +++ net/cert/cert_verify_proc.h -@@ -65,7 +65,7 @@ class NET_EXPORT CertVerifyProc +@@ -66,7 +66,7 @@ class NET_EXPORT CertVerifyProc kMaxValue = kChainLengthOne }; --#if !(defined(OS_FUCHSIA) || defined(OS_LINUX) || defined(OS_CHROMEOS)) -+#if !(defined(OS_FUCHSIA) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) +-#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) ++#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) // Creates and returns a CertVerifyProc that uses the system verifier. // |cert_net_fetcher| may not be used, depending on the implementation. static scoped_refptr<CertVerifyProc> CreateSystemVerifyProc( diff --git a/www/chromium/files/patch-net_cert_cert__verify__proc__unittest.cc b/www/chromium/files/patch-net_cert_cert__verify__proc__unittest.cc new file mode 100644 index 000000000000..47824fcbe7e7 --- /dev/null +++ b/www/chromium/files/patch-net_cert_cert__verify__proc__unittest.cc @@ -0,0 +1,11 @@ +--- net/cert/cert_verify_proc_unittest.cc.orig 2022-02-28 16:54:41 UTC ++++ net/cert/cert_verify_proc_unittest.cc +@@ -223,7 +223,7 @@ const std::vector<CertVerifyProcType> kAllCertVerifier + CERT_VERIFY_PROC_MAC, CERT_VERIFY_PROC_BUILTIN + #elif BUILDFLAG(IS_WIN) + CERT_VERIFY_PROC_WIN +-#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + CERT_VERIFY_PROC_BUILTIN + #else + #error Unsupported platform diff --git a/www/chromium/files/patch-net_cert_test__root__certs__unittest.cc b/www/chromium/files/patch-net_cert_test__root__certs__unittest.cc new file mode 100644 index 000000000000..29236729febc --- /dev/null +++ b/www/chromium/files/patch-net_cert_test__root__certs__unittest.cc @@ -0,0 +1,11 @@ +--- net/cert/test_root_certs_unittest.cc.orig 2022-02-28 16:54:41 UTC ++++ net/cert/test_root_certs_unittest.cc +@@ -33,7 +33,7 @@ const char kRootCertificateFile[] = "root_ca_cert.pem" + const char kGoodCertificateFile[] = "ok_cert.pem"; + + scoped_refptr<CertVerifyProc> CreateCertVerifyProc() { +-#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + return CertVerifyProc::CreateBuiltinVerifyProc(/*cert_net_fetcher=*/nullptr); + #elif BUILDFLAG(BUILTIN_CERT_VERIFIER_FEATURE_SUPPORTED) + if (base::FeatureList::IsEnabled(features::kCertVerifierBuiltinFeature)) { diff --git a/www/chromium/files/patch-net_dns_BUILD.gn b/www/chromium/files/patch-net_dns_BUILD.gn index 05edcc259af7..b0a6c631049a 100644 --- a/www/chromium/files/patch-net_dns_BUILD.gn +++ b/www/chromium/files/patch-net_dns_BUILD.gn @@ -1,4 +1,4 @@ ---- net/dns/BUILD.gn.orig 2022-02-07 13:39:41 UTC +--- net/dns/BUILD.gn.orig 2022-02-28 16:54:41 UTC +++ net/dns/BUILD.gn @@ -112,7 +112,7 @@ source_set("dns") { "dns_config_service_android.cc", @@ -9,3 +9,15 @@ sources += [ "dns_config_service_linux.cc", "dns_config_service_linux.h", +@@ -415,9 +415,9 @@ source_set("tests") { + + if (is_android) { + sources += [ "dns_config_service_android_unittest.cc" ] +- } else if (is_linux) { ++ } else if (is_linux && !is_bsd) { + sources += [ "dns_config_service_linux_unittest.cc" ] +- } else if (is_posix) { ++ } else if (is_posix && !is_bsd) { + sources += [ "dns_config_service_posix_unittest.cc" ] + } + diff --git a/www/chromium/files/patch-net_dns_dns__config__service__posix.cc b/www/chromium/files/patch-net_dns_dns__config__service__posix.cc new file mode 100644 index 000000000000..65ef568454c5 --- /dev/null +++ b/www/chromium/files/patch-net_dns_dns__config__service__posix.cc @@ -0,0 +1,26 @@ +--- net/dns/dns_config_service_posix.cc.orig 2022-02-28 16:54:41 UTC ++++ net/dns/dns_config_service_posix.cc +@@ -33,6 +33,11 @@ + #include "net/dns/dns_config_watcher_mac.h" + #endif + ++#if BUILDFLAG(IS_BSD) ++#include "base/command_line.h" ++#include "sandbox/policy/switches.h" ++#endif ++ + namespace net { + + namespace internal { +@@ -129,6 +134,11 @@ class DnsConfigServicePosix::Watcher : public DnsConfi + + bool Watch() override { + CheckOnCorrectSequence(); ++ ++// pledge + unveil ++ base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); ++ if (!command_line->HasSwitch(sandbox::policy::switches::kNoSandbox)) ++ return false; + + bool success = true; + if (!config_watcher_.Watch(base::BindRepeating(&Watcher::OnConfigChanged, diff --git a/www/chromium/files/patch-net_dns_dns__reloader.cc b/www/chromium/files/patch-net_dns_dns__reloader.cc index be7806b364b5..bd85a3d566b6 100644 --- a/www/chromium/files/patch-net_dns_dns__reloader.cc +++ b/www/chromium/files/patch-net_dns_dns__reloader.cc @@ -1,18 +1,18 @@ ---- net/dns/dns_reloader.cc.orig 2022-02-07 13:39:41 UTC +--- net/dns/dns_reloader.cc.orig 2022-02-28 16:54:41 UTC +++ net/dns/dns_reloader.cc -@@ -4,7 +4,7 @@ +@@ -6,7 +6,7 @@ - #include "net/dns/dns_reloader.h" + #include "build/build_config.h" --#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \ -+#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_BSD) && \ - !defined(OS_ANDROID) && !defined(OS_FUCHSIA) +-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_OPENBSD) && \ ++#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD) && \ + !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_FUCHSIA) #include <resolv.h> -@@ -111,5 +111,5 @@ void DnsReloaderMaybeReload() { +@@ -113,5 +113,5 @@ void DnsReloaderMaybeReload() { } // namespace net --#endif // defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && -+#endif // defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_BSD) && - // !defined(OS_ANDROID) +-#endif // BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_OPENBSD) ++#endif // BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD) && + // && !BUILDFLAG(IS_ANDROID) diff --git a/www/chromium/files/patch-net_dns_dns__reloader.h b/www/chromium/files/patch-net_dns_dns__reloader.h index e2a65cda4995..c5d9a00751c0 100644 --- a/www/chromium/files/patch-net_dns_dns__reloader.h +++ b/www/chromium/files/patch-net_dns_dns__reloader.h @@ -1,11 +1,11 @@ ---- net/dns/dns_reloader.h.orig 2022-02-07 13:39:41 UTC +--- net/dns/dns_reloader.h.orig 2022-02-28 16:54:41 UTC +++ net/dns/dns_reloader.h @@ -7,7 +7,7 @@ #include "build/build_config.h" --#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) -+#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_BSD) +-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_OPENBSD) ++#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD) namespace net { // Call on the network thread before calling DnsReloaderMaybeReload() anywhere. diff --git a/www/chromium/files/patch-net_dns_dns__util.cc b/www/chromium/files/patch-net_dns_dns__util.cc index 4453cb52e222..fd21a857ad0d 100644 --- a/www/chromium/files/patch-net_dns_dns__util.cc +++ b/www/chromium/files/patch-net_dns_dns__util.cc @@ -1,4 +1,4 @@ ---- net/dns/dns_util.cc.orig 2021-07-19 18:45:19 UTC +--- net/dns/dns_util.cc.orig 2022-02-28 16:54:41 UTC +++ net/dns/dns_util.cc @@ -28,6 +28,8 @@ #include "third_party/abseil-cpp/absl/types/optional.h" @@ -6,6 +6,6 @@ +#include <sys/socket.h> + - #if defined(OS_POSIX) + #if BUILDFLAG(IS_POSIX) #include <netinet/in.h> #include <net/if.h> diff --git a/www/chromium/files/patch-net_dns_host__resolver__manager.cc b/www/chromium/files/patch-net_dns_host__resolver__manager.cc index 767c44ba8a9e..6c58f20fcb6b 100644 --- a/www/chromium/files/patch-net_dns_host__resolver__manager.cc +++ b/www/chromium/files/patch-net_dns_host__resolver__manager.cc @@ -1,11 +1,11 @@ ---- net/dns/host_resolver_manager.cc.orig 2022-02-07 13:39:41 UTC +--- net/dns/host_resolver_manager.cc.orig 2022-02-28 16:54:41 UTC +++ net/dns/host_resolver_manager.cc -@@ -2932,7 +2932,7 @@ HostResolverManager::HostResolverManager( +@@ -3014,7 +3014,7 @@ HostResolverManager::HostResolverManager( NetworkChangeNotifier::AddConnectionTypeObserver(this); if (system_dns_config_notifier_) system_dns_config_notifier_->AddObserver(this); --#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \ -+#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_BSD) && \ - !defined(OS_ANDROID) +-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_OPENBSD) && \ ++#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD) && \ + !BUILDFLAG(IS_ANDROID) EnsureDnsReloaderInit(); #endif diff --git a/www/chromium/files/patch-net_dns_host__resolver__proc.cc b/www/chromium/files/patch-net_dns_host__resolver__proc.cc index aadadf29fbdf..b0d72b598594 100644 --- a/www/chromium/files/patch-net_dns_host__resolver__proc.cc +++ b/www/chromium/files/patch-net_dns_host__resolver__proc.cc @@ -1,10 +1,10 @@ ---- net/dns/host_resolver_proc.cc.orig 2022-02-07 13:39:41 UTC +--- net/dns/host_resolver_proc.cc.orig 2022-02-28 16:54:41 UTC +++ net/dns/host_resolver_proc.cc @@ -19,10 +19,6 @@ #include "net/dns/dns_util.h" #include "net/dns/host_resolver.h" --#if defined(OS_OPENBSD) +-#if BUILDFLAG(IS_OPENBSD) -#define AI_ADDRCONFIG 0 -#endif - @@ -14,9 +14,9 @@ @@ -177,7 +173,7 @@ int SystemHostResolverCall(const std::string& host, base::BlockingType::WILL_BLOCK); - #if defined(OS_POSIX) && \ -- !(defined(OS_APPLE) || defined(OS_OPENBSD) || defined(OS_ANDROID)) -+ !(defined(OS_APPLE) || defined(OS_BSD) || defined(OS_ANDROID)) + #if BUILDFLAG(IS_POSIX) && \ +- !(BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_ANDROID)) ++ !(BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) || BUILDFLAG(IS_ANDROID)) DnsReloaderMaybeReload(); #endif absl::optional<AddressInfo> ai; diff --git a/www/chromium/files/patch-net_dns_public_BUILD.gn b/www/chromium/files/patch-net_dns_public_BUILD.gn index 89afc86d31b6..9444650053b6 100644 --- a/www/chromium/files/patch-net_dns_public_BUILD.gn +++ b/www/chromium/files/patch-net_dns_public_BUILD.gn @@ -1,11 +1,11 @@ ---- net/dns/public/BUILD.gn.orig 2021-12-17 14:33:52 UTC +--- net/dns/public/BUILD.gn.orig 2022-02-28 16:54:41 UTC +++ net/dns/public/BUILD.gn -@@ -37,7 +37,7 @@ source_set("public") { - "util.h", +@@ -72,7 +72,7 @@ source_set("tests") { + "util_unittest.cc", ] -- if (is_linux) { -+ if (is_linux && !is_bsd) { - sources += [ - "resolv_reader.cc", - "resolv_reader.h", +- if (is_posix && !is_android) { ++ if (is_posix && !is_android && !is_bsd) { + sources += [ "resolv_reader_unittest.cc" ] + } + diff --git a/www/chromium/files/patch-net_dns_public_resolv__reader.h b/www/chromium/files/patch-net_dns_public_resolv__reader.h index ece1efb2cb55..8e97c9b36f33 100644 --- a/www/chromium/files/patch-net_dns_public_resolv__reader.h +++ b/www/chromium/files/patch-net_dns_public_resolv__reader.h @@ -1,9 +1,10 @@ ---- net/dns/public/resolv_reader.h.orig 2022-02-07 13:39:41 UTC +--- net/dns/public/resolv_reader.h.orig 2022-02-28 16:54:41 UTC +++ net/dns/public/resolv_reader.h -@@ -34,4 +34,4 @@ NET_EXPORT absl::optional<std::vector<IPEndPoint>> Get +@@ -5,6 +5,7 @@ + #ifndef NET_DNS_PUBLIC_RESOLV_READER_H_ + #define NET_DNS_PUBLIC_RESOLV_READER_H_ - } // namespace net ++#include <netinet/in.h> + #include <resolv.h> --#endif // NET_DNS_PUBLIC_RESOLV_READER_H_ -\ No newline at end of file -+#endif // NET_DNS_PUBLIC_RESOLV_READER_H_ + #include <memory> diff --git a/www/chromium/files/patch-net_dns_public_scoped__res__state.h b/www/chromium/files/patch-net_dns_public_scoped__res__state.h new file mode 100644 index 000000000000..b31a6ae09de1 --- /dev/null +++ b/www/chromium/files/patch-net_dns_public_scoped__res__state.h @@ -0,0 +1,10 @@ +--- net/dns/public/scoped_res_state.h.orig 2022-02-28 16:54:41 UTC ++++ net/dns/public/scoped_res_state.h +@@ -5,6 +5,7 @@ + #ifndef NET_DNS_PUBLIC_SCOPED_RES_STATE_H_ + #define NET_DNS_PUBLIC_SCOPED_RES_STATE_H_ + ++#include <netinet/in.h> + #include <resolv.h> + + #include "build/build_config.h" diff --git a/www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc b/www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc index c2fe73b3c2e3..02ad3249f4c0 100644 --- a/www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc +++ b/www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc @@ -1,12 +1,12 @@ ---- net/http/http_auth_gssapi_posix.cc.orig 2021-12-14 11:45:09 UTC +--- net/http/http_auth_gssapi_posix.cc.orig 2022-02-28 16:54:41 UTC +++ net/http/http_auth_gssapi_posix.cc -@@ -369,8 +369,9 @@ base::NativeLibrary GSSAPISharedLibrary::LoadSharedLib +@@ -370,8 +370,9 @@ base::NativeLibrary GSSAPISharedLibrary::LoadSharedLib static const char* const kDefaultLibraryNames[] = { - #if defined(OS_APPLE) + #if BUILDFLAG(IS_APPLE) "/System/Library/Frameworks/GSS.framework/GSS" --#elif defined(OS_OPENBSD) -- "libgssapi.so" // Heimdal - OpenBSD -+#elif defined(OS_BSD) +-#elif BUILDFLAG(IS_OPENBSD) +- "libgssapi.so" // Heimdal - OpenBSD ++#elif BUILDFLAG(IS_BSD) + "libgssapi_krb5.so.2", // MIT Kerberos - FreeBSD + "libgssapi.so" // Heimdal - OpenBSD, FreeBSD #else diff --git a/www/chromium/files/patch-net_http_http__auth__gssapi__posix.h b/www/chromium/files/patch-net_http_http__auth__gssapi__posix.h index 94221c705ee7..4622cadf1a61 100644 --- a/www/chromium/files/patch-net_http_http__auth__gssapi__posix.h +++ b/www/chromium/files/patch-net_http_http__auth__gssapi__posix.h @@ -1,9 +1,9 @@ ---- net/http/http_auth_gssapi_posix.h.orig 2022-02-07 13:39:41 UTC +--- net/http/http_auth_gssapi_posix.h.orig 2022-02-28 16:54:41 UTC +++ net/http/http_auth_gssapi_posix.h @@ -20,6 +20,9 @@ - #if defined(OS_APPLE) + #if BUILDFLAG(IS_APPLE) #include <GSS/gssapi.h> - #elif defined(OS_FREEBSD) + #elif BUILDFLAG(IS_FREEBSD) +#ifndef GSS_C_DELEG_POLICY_FLAG +#define GSS_C_DELEG_POLICY_FLAG 32768 +#endif diff --git a/www/chromium/files/patch-net_proxy__resolution_configured__proxy__resolution__service.cc b/www/chromium/files/patch-net_proxy__resolution_configured__proxy__resolution__service.cc index 2834beea3489..f5c0329a53dd 100644 --- a/www/chromium/files/patch-net_proxy__resolution_configured__proxy__resolution__service.cc +++ b/www/chromium/files/patch-net_proxy__resolution_configured__proxy__resolution__service.cc @@ -1,20 +1,20 @@ ---- net/proxy_resolution/configured_proxy_resolution_service.cc.orig 2022-02-07 13:39:41 UTC +--- net/proxy_resolution/configured_proxy_resolution_service.cc.orig 2022-02-28 16:54:41 UTC +++ net/proxy_resolution/configured_proxy_resolution_service.cc @@ -52,7 +52,7 @@ - #elif defined(OS_MAC) + #elif BUILDFLAG(IS_MAC) #include "net/proxy_resolution/proxy_config_service_mac.h" #include "net/proxy_resolution/proxy_resolver_mac.h" --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "net/proxy_resolution/proxy_config_service_linux.h" - #elif defined(OS_ANDROID) + #elif BUILDFLAG(IS_ANDROID) #include "net/proxy_resolution/proxy_config_service_android.h" @@ -64,7 +64,7 @@ namespace net { namespace { --#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) constexpr net::NetworkTrafficAnnotationTag kSystemProxyConfigTrafficAnnotation = net::DefineNetworkTrafficAnnotation("proxy_config_system", R"( semantics { @@ -22,8 +22,8 @@ << "profile_io_data.cc::CreateProxyConfigService and this should " << "be used only for examples."; return std::make_unique<UnsetProxyConfigService>(); --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) std::unique_ptr<ProxyConfigServiceLinux> linux_config_service( new ProxyConfigServiceLinux()); diff --git a/www/chromium/files/patch-net_socket_socket__posix.cc b/www/chromium/files/patch-net_socket_socket__posix.cc new file mode 100644 index 000000000000..8d528ce90eb3 --- /dev/null +++ b/www/chromium/files/patch-net_socket_socket__posix.cc @@ -0,0 +1,11 @@ +--- net/socket/socket_posix.cc.orig 2022-02-28 16:54:41 UTC ++++ net/socket/socket_posix.cc +@@ -519,7 +519,7 @@ void SocketPosix::ReadCompleted() { + } + + int SocketPosix::DoWrite(IOBuffer* buf, int buf_len) { +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + // Disable SIGPIPE for this write. Although Chromium globally disables + // SIGPIPE, the net stack may be used in other consumers which do not do + // this. MSG_NOSIGNAL is a Linux-only API. On OS X, this is a setsockopt on diff --git a/www/chromium/files/patch-net_socket_tcp__socket__posix.cc b/www/chromium/files/patch-net_socket_tcp__socket__posix.cc new file mode 100644 index 000000000000..45fed897114b --- /dev/null +++ b/www/chromium/files/patch-net_socket_tcp__socket__posix.cc @@ -0,0 +1,20 @@ +--- net/socket/tcp_socket_posix.cc.orig 2022-02-28 16:54:41 UTC ++++ net/socket/tcp_socket_posix.cc +@@ -95,6 +95,17 @@ bool SetTCPKeepAlive(int fd, bool enable, int delay) { + PLOG(ERROR) << "Failed to set TCP_KEEPALIVE on fd: " << fd; + return false; + } ++#elif BUILDFLAG(IS_FREEBSD) ++ // Set seconds until first TCP keep alive. ++ if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &delay, sizeof(delay))) { ++ PLOG(ERROR) << "Failed to set TCP_KEEPIDLE on fd: " << fd; ++ return false; ++ } ++ // Set seconds between TCP keep alives. ++ if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &delay, sizeof(delay))) { ++ PLOG(ERROR) << "Failed to set TCP_KEEPINTVL on fd: " << fd; ++ return false; ++ } + #endif + return true; + } diff --git a/www/chromium/files/patch-net_socket_udp__socket__posix.cc b/www/chromium/files/patch-net_socket_udp__socket__posix.cc index f70c756fa1c6..a1f355535c32 100644 --- a/www/chromium/files/patch-net_socket_udp__socket__posix.cc +++ b/www/chromium/files/patch-net_socket_udp__socket__posix.cc @@ -1,11 +1,11 @@ ---- net/socket/udp_socket_posix.cc.orig 2022-02-07 13:39:41 UTC +--- net/socket/udp_socket_posix.cc.orig 2022-02-28 16:54:41 UTC +++ net/socket/udp_socket_posix.cc @@ -636,7 +636,7 @@ int UDPSocketPosix::SetDoNotFragment() { } void UDPSocketPosix::SetMsgConfirm(bool confirm) { --#if !defined(OS_APPLE) -+#if !defined(OS_APPLE) && !defined(OS_BSD) +-#if !BUILDFLAG(IS_APPLE) ++#if !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD) if (confirm) { sendto_flags_ |= MSG_CONFIRM; } else { diff --git a/www/chromium/files/patch-net_socket_udp__socket__unittest.cc b/www/chromium/files/patch-net_socket_udp__socket__unittest.cc new file mode 100644 index 000000000000..3bc86afc1222 --- /dev/null +++ b/www/chromium/files/patch-net_socket_udp__socket__unittest.cc @@ -0,0 +1,47 @@ +--- net/socket/udp_socket_unittest.cc.orig 2022-02-28 16:54:41 UTC ++++ net/socket/udp_socket_unittest.cc +@@ -324,7 +324,7 @@ TEST_F(UDPSocketTest, PartialRecv) { + EXPECT_EQ(second_packet, received); + } + +-#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + // - MacOS: requires root permissions on OSX 10.7+. + // - Android: devices attached to testbots don't have default network, so + // broadcasting to 255.255.255.255 returns error -109 (Address not reachable). +@@ -584,7 +584,7 @@ TEST_F(UDPSocketTest, ClientSetDoNotFragment) { + EXPECT_THAT(rv, IsOk()); + + rv = client.SetDoNotFragment(); +-#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FUCHSIA) ++#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + // TODO(crbug.com/945590): IP_MTU_DISCOVER is not implemented on Fuchsia. + EXPECT_THAT(rv, IsError(ERR_NOT_IMPLEMENTED)); + #else +@@ -606,7 +606,7 @@ TEST_F(UDPSocketTest, ServerSetDoNotFragment) { + EXPECT_THAT(rv, IsOk()); + + rv = server.SetDoNotFragment(); +-#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FUCHSIA) ++#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + // TODO(crbug.com/945590): IP_MTU_DISCOVER is not implemented on Fuchsia. + EXPECT_THAT(rv, IsError(ERR_NOT_IMPLEMENTED)); + #else +@@ -665,7 +665,7 @@ TEST_F(UDPSocketTest, JoinMulticastGroup) { + + // TODO(https://crbug.com/947115): failing on device on iOS 12.2. + // TODO(https://crbug.com/1227554): flaky on Mac 11. +-#if BUILDFLAG(IS_IOS) || defined(OS_MAC) ++#if BUILDFLAG(IS_IOS) || defined(OS_MAC) || defined(IS_BSD) + #define MAYBE_SharedMulticastAddress DISABLED_SharedMulticastAddress + #else + #define MAYBE_SharedMulticastAddress SharedMulticastAddress +@@ -719,7 +719,7 @@ TEST_F(UDPSocketTest, MAYBE_SharedMulticastAddress) { + NetLogSource()); + ASSERT_THAT(client_socket.Connect(send_address), IsOk()); + +-#if !BUILDFLAG(IS_CHROMEOS_ASH) ++#if !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_BSD) + // Send a message via the multicast group. That message is expected be be + // received by both receving sockets. + // diff --git a/www/chromium/files/patch-net_socket_unix__domain__client__socket__posix.cc b/www/chromium/files/patch-net_socket_unix__domain__client__socket__posix.cc new file mode 100644 index 000000000000..f24c61654424 --- /dev/null +++ b/www/chromium/files/patch-net_socket_unix__domain__client__socket__posix.cc @@ -0,0 +1,11 @@ +--- net/socket/unix_domain_client_socket_posix.cc.orig 2022-02-28 16:54:41 UTC ++++ net/socket/unix_domain_client_socket_posix.cc +@@ -60,7 +60,7 @@ bool UnixDomainClientSocket::FillAddress(const std::st + return true; + } + +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // Convert the path given into abstract socket name. It must start with + // the '\0' character, so we are adding it. |addr_len| must specify the + // length of the structure exactly, as potentially the socket name may diff --git a/www/chromium/files/patch-net_third__party_quiche_BUILD.gn b/www/chromium/files/patch-net_third__party_quiche_BUILD.gn new file mode 100644 index 000000000000..c1c21bbe6826 --- /dev/null +++ b/www/chromium/files/patch-net_third__party_quiche_BUILD.gn @@ -0,0 +1,33 @@ +--- net/third_party/quiche/BUILD.gn.orig 2022-02-28 16:54:41 UTC ++++ net/third_party/quiche/BUILD.gn +@@ -706,7 +706,7 @@ proto_library("net_quic_test_tools_proto") { + extra_configs = [ "//build/config/compiler:wexit_time_destructors" ] + } + +-if (is_linux || is_chromeos) { ++if ((is_linux || is_chromeos) && !is_bsd) { + source_set("epoll_server_core") { + sources = [ + "src/epoll_server/platform/api/epoll_bug.h", +@@ -1061,7 +1061,7 @@ source_set("quic_test_tools_core") { + "//third_party/quic_trace:quic_trace_proto", + ] + +- if (is_linux || is_chromeos) { ++ if ((is_linux || is_chromeos) && !is_bsd) { + sources += [ + "src/epoll_server/fake_simple_epoll_server.cc", + "src/epoll_server/fake_simple_epoll_server.h", +@@ -1526,10 +1526,10 @@ source_set("quiche_tests") { + ] + public_deps = [] + +- if (is_linux || is_chromeos_lacros) { ++ if ((is_linux || is_chromeos_lacros) && !is_bsd) { + public_deps += [ "//net:epoll_quic_tools" ] + } +- if (is_linux || is_chromeos) { ++ if ((is_linux || is_chromeos) && !is_bsd) { + sources += [ + "src/epoll_server/simple_epoll_server_test.cc", + "src/quic/core/chlo_extractor_test.cc", diff --git a/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__comparision__tool.cc b/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__comparision__tool.cc index cf3e886d06cc..73fc5d48b427 100644 --- a/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__comparision__tool.cc +++ b/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__comparision__tool.cc @@ -1,11 +1,11 @@ ---- net/tools/cert_verify_tool/cert_verify_comparision_tool.cc.orig 2022-01-21 13:35:43 UTC +--- net/tools/cert_verify_tool/cert_verify_comparision_tool.cc.orig 2022-02-28 16:54:41 UTC +++ net/tools/cert_verify_tool/cert_verify_comparision_tool.cc @@ -35,7 +35,7 @@ #include "net/url_request/url_request_context_builder.h" #include "net/url_request/url_request_context_getter.h" --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "net/proxy_resolution/proxy_config.h" #include "net/proxy_resolution/proxy_config_service_fixed.h" #endif @@ -13,8 +13,8 @@ base::WaitableEvent* initialization_complete_event) { net::URLRequestContextBuilder url_request_context_builder; url_request_context_builder.set_user_agent(GetUserAgent()); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // On Linux, use a fixed ProxyConfigService, since the default one // depends on glib. // @@ -22,8 +22,8 @@ std::unique_ptr<CertVerifyImpl> CreateCertVerifyImplFromName( base::StringPiece impl_name, scoped_refptr<net::CertNetFetcher> cert_net_fetcher) { --#if !(defined(OS_FUCHSIA) || defined(OS_LINUX) || defined(OS_CHROMEOS)) -+#if !(defined(OS_FUCHSIA) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) +-#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) ++#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) if (impl_name == "platform") { return std::make_unique<CertVerifyImpl>( "CertVerifyProc (system)", net::CertVerifyProc::CreateSystemVerifyProc( diff --git a/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc b/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc index 40e80dc7b753..e4297a2b6fff 100644 --- a/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc +++ b/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc @@ -1,11 +1,11 @@ ---- net/tools/cert_verify_tool/cert_verify_tool.cc.orig 2022-02-07 13:39:41 UTC +--- net/tools/cert_verify_tool/cert_verify_tool.cc.orig 2022-02-28 16:54:41 UTC +++ net/tools/cert_verify_tool/cert_verify_tool.cc @@ -30,7 +30,7 @@ #include "net/url_request/url_request_context_builder.h" #include "net/url_request/url_request_context_getter.h" --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "net/proxy_resolution/proxy_config.h" #include "net/proxy_resolution/proxy_config_service_fixed.h" #endif @@ -13,8 +13,8 @@ base::WaitableEvent* initialization_complete_event) { net::URLRequestContextBuilder url_request_context_builder; url_request_context_builder.set_user_agent(GetUserAgent()); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // On Linux, use a fixed ProxyConfigService, since the default one // depends on glib. // @@ -22,8 +22,8 @@ base::StringPiece impl_name, scoped_refptr<net::CertNetFetcher> cert_net_fetcher, RootStoreType root_store_type) { --#if !(defined(OS_FUCHSIA) || defined(OS_LINUX) || defined(OS_CHROMEOS)) -+#if !(defined(OS_FUCHSIA) || defined(OS_LINUX) || defined(OS_CHROMEOS)) || defined(OS_BSD) +-#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) ++#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || BUILDFLAG(IS_BSD) if (impl_name == "platform") { if (root_store_type != RootStoreType::kSystem) { std::cerr << "WARNING: platform verifier not supported with " @@ -31,8 +31,8 @@ std::string impls_str = command_line.GetSwitchValueASCII("impls"); if (impls_str.empty()) { // Default value. --#if !(defined(OS_FUCHSIA) || defined(OS_LINUX) || defined(OS_CHROMEOS)) -+#if !(defined(OS_FUCHSIA) || defined(OS_LINUX) || defined(OS_CHROMEOS)) || defined(OS_BSD) +-#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) ++#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || BUILDFLAG(IS_BSD) impls_str = "platform,"; #endif impls_str += "builtin,pathbuilder"; diff --git a/www/chromium/files/patch-net_tools_quic_quic__http__proxy__backend.cc b/www/chromium/files/patch-net_tools_quic_quic__http__proxy__backend.cc index cfbd37439911..2aee8fe4a921 100644 --- a/www/chromium/files/patch-net_tools_quic_quic__http__proxy__backend.cc +++ b/www/chromium/files/patch-net_tools_quic_quic__http__proxy__backend.cc @@ -1,11 +1,11 @@ ---- net/tools/quic/quic_http_proxy_backend.cc.orig 2021-07-19 18:45:19 UTC +--- net/tools/quic/quic_http_proxy_backend.cc.orig 2022-02-28 16:54:41 UTC +++ net/tools/quic/quic_http_proxy_backend.cc @@ -161,7 +161,7 @@ void QuicHttpProxyBackend::InitializeURLRequestContext // Enable HTTP2, but disable QUIC on the backend context_builder.SetSpdyAndQuicEnabled(true /* http2 */, false /* quic */); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // On Linux, use a fixed ProxyConfigService, since the default one // depends on glib. context_builder.set_proxy_config_service( diff --git a/www/chromium/files/patch-net_traffic__annotation_network__traffic__annotation.h b/www/chromium/files/patch-net_traffic__annotation_network__traffic__annotation.h new file mode 100644 index 000000000000..fe7296201230 --- /dev/null +++ b/www/chromium/files/patch-net_traffic__annotation_network__traffic__annotation.h @@ -0,0 +1,20 @@ +--- net/traffic_annotation/network_traffic_annotation.h.orig 2022-02-28 16:54:41 UTC ++++ net/traffic_annotation/network_traffic_annotation.h +@@ -371,7 +371,7 @@ struct MutablePartialNetworkTrafficAnnotationTag { + } // namespace net + + // Placeholder for unannotated usages. +-#if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) ++#if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD) + #define TRAFFIC_ANNOTATION_WITHOUT_PROTO(ANNOTATION_ID) \ + net::DefineNetworkTrafficAnnotation(ANNOTATION_ID, "No proto yet.") + #endif +@@ -385,7 +385,7 @@ struct MutablePartialNetworkTrafficAnnotationTag { + // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is + // complete. + #if !BUILDFLAG(IS_WIN) && \ +- !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++ !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) + + #define NO_TRAFFIC_ANNOTATION_YET \ + net::DefineNetworkTrafficAnnotation("undefined", "Nothing here yet.") diff --git a/www/chromium/files/patch-net_url__request_url__fetcher.cc b/www/chromium/files/patch-net_url__request_url__fetcher.cc index 2b5af9b7744a..46b8f7eed7de 100644 --- a/www/chromium/files/patch-net_url__request_url__fetcher.cc +++ b/www/chromium/files/patch-net_url__request_url__fetcher.cc @@ -1,11 +1,11 @@ ---- net/url_request/url_fetcher.cc.orig 2021-04-14 18:41:07 UTC +--- net/url_request/url_fetcher.cc.orig 2022-02-28 16:54:41 UTC +++ net/url_request/url_fetcher.cc -@@ -24,7 +24,7 @@ void URLFetcher::SetIgnoreCertificateRequests(bool ign - +@@ -26,7 +26,7 @@ void URLFetcher::SetIgnoreCertificateRequests(bool ign // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. --#if !defined(OS_WIN) && !(defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+#if !defined(OS_WIN) && !(defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) + #if !BUILDFLAG(IS_WIN) && \ +- !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++ !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) // static std::unique_ptr<URLFetcher> URLFetcher::Create( const GURL& url, diff --git a/www/chromium/files/patch-net_url__request_url__fetcher.h b/www/chromium/files/patch-net_url__request_url__fetcher.h index b39912634bcd..3cc317e29c46 100644 --- a/www/chromium/files/patch-net_url__request_url__fetcher.h +++ b/www/chromium/files/patch-net_url__request_url__fetcher.h @@ -1,11 +1,11 @@ ---- net/url_request/url_fetcher.h.orig 2022-02-07 13:39:41 UTC +--- net/url_request/url_fetcher.h.orig 2022-02-28 16:54:41 UTC +++ net/url_request/url_fetcher.h @@ -354,7 +354,7 @@ class NET_EXPORT URLFetcher { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. - #if (!defined(OS_WIN) && \ -- !(defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))) || \ -+ !(defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD))) || \ - defined(OS_CHROMEOS) + #if (!BUILDFLAG(IS_WIN) && \ +- !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))) || \ ++ !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))) || \ + BUILDFLAG(IS_CHROMEOS) // |url| is the URL to send the request to. It must be valid. // |request_type| is the type of request to make. diff --git a/www/chromium/files/patch-net_url__request_url__request__context.cc b/www/chromium/files/patch-net_url__request_url__request__context.cc index f6a1bad38a11..4065c571abd5 100644 --- a/www/chromium/files/patch-net_url__request_url__request__context.cc +++ b/www/chromium/files/patch-net_url__request_url__request__context.cc @@ -1,11 +1,11 @@ ---- net/url_request/url_request_context.cc.orig 2021-12-31 00:57:37 UTC +--- net/url_request/url_request_context.cc.orig 2022-02-28 16:54:41 UTC +++ net/url_request/url_request_context.cc -@@ -87,7 +87,7 @@ const HttpNetworkSessionContext* URLRequestContext::Ge - +@@ -89,7 +89,7 @@ const HttpNetworkSessionContext* URLRequestContext::Ge // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. --#if !defined(OS_WIN) && !(defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+#if !defined(OS_WIN) && !(defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) + #if !BUILDFLAG(IS_WIN) && \ +- !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++ !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) std::unique_ptr<URLRequest> URLRequestContext::CreateRequest( const GURL& url, RequestPriority priority, diff --git a/www/chromium/files/patch-net_url__request_url__request__context.h b/www/chromium/files/patch-net_url__request_url__request__context.h index bda18f0ffbdf..afd5a144a82d 100644 --- a/www/chromium/files/patch-net_url__request_url__request__context.h +++ b/www/chromium/files/patch-net_url__request_url__request__context.h @@ -1,11 +1,11 @@ ---- net/url_request/url_request_context.h.orig 2021-12-31 00:57:37 UTC +--- net/url_request/url_request_context.h.orig 2022-02-28 16:54:41 UTC +++ net/url_request/url_request_context.h -@@ -81,7 +81,7 @@ class NET_EXPORT URLRequestContext { - +@@ -82,7 +82,7 @@ class NET_EXPORT URLRequestContext { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. --#if !defined(OS_WIN) && !(defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+#if !defined(OS_WIN) && !(defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) + #if !BUILDFLAG(IS_WIN) && \ +- !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++ !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) // This function should not be used in Chromium, please use the version with // NetworkTrafficAnnotationTag in the future. // diff --git a/www/chromium/files/patch-net_url__request_url__request__context__builder.cc b/www/chromium/files/patch-net_url__request_url__request__context__builder.cc index 5d1f63812ff3..b028f9251b83 100644 --- a/www/chromium/files/patch-net_url__request_url__request__context__builder.cc +++ b/www/chromium/files/patch-net_url__request_url__request__context__builder.cc @@ -1,11 +1,11 @@ ---- net/url_request/url_request_context_builder.cc.orig 2022-02-07 13:39:41 UTC +--- net/url_request/url_request_context_builder.cc.orig 2022-02-28 16:54:41 UTC +++ net/url_request/url_request_context_builder.cc -@@ -424,7 +424,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu +@@ -427,7 +427,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu } if (!proxy_resolution_service_) { --#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID) -+#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID) && !defined(OS_BSD) +-#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_ANDROID) ++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_BSD) // TODO(willchan): Switch to using this code when // ConfiguredProxyResolutionService::CreateSystemProxyConfigService()'s // signature doesn't suck. diff --git a/www/chromium/files/patch-pdf_font__table__linux.cc b/www/chromium/files/patch-pdf_font__table__linux.cc deleted file mode 100644 index 38ab54e5a3fd..000000000000 --- a/www/chromium/files/patch-pdf_font__table__linux.cc +++ /dev/null @@ -1,10 +0,0 @@ ---- pdf/font_table_linux.cc.orig 2022-02-07 13:39:41 UTC -+++ pdf/font_table_linux.cc -@@ -5,6 +5,7 @@ - #include "pdf/font_table_linux.h" - - #include <sys/stat.h> -+#include <unistd.h> - - #include <algorithm> - #include <limits> diff --git a/www/chromium/files/patch-pdf_out__of__process__instance.cc b/www/chromium/files/patch-pdf_out__of__process__instance.cc index 08fa2bec1016..9a6c556e32fe 100644 --- a/www/chromium/files/patch-pdf_out__of__process__instance.cc +++ b/www/chromium/files/patch-pdf_out__of__process__instance.cc @@ -1,20 +1,20 @@ ---- pdf/out_of_process_instance.cc.orig 2022-02-07 13:39:41 UTC +--- pdf/out_of_process_instance.cc.orig 2022-02-28 16:54:41 UTC +++ pdf/out_of_process_instance.cc -@@ -75,7 +75,7 @@ +@@ -74,7 +74,7 @@ #include "ui/gfx/geometry/size.h" #include "url/gurl.h" --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "pdf/ppapi_migration/pdfium_font_linux.h" #endif -@@ -735,7 +735,7 @@ void OutOfProcessInstance::RotateCounterclockwise() { +@@ -734,7 +734,7 @@ void OutOfProcessInstance::RotateCounterclockwise() { } void OutOfProcessInstance::SetLastPluginInstance() { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) SetLastPepperInstance(this); #endif } diff --git a/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc b/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc index aba7f7cd5d75..2bef5c5b364a 100644 --- a/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc +++ b/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc @@ -1,11 +1,11 @@ ---- pdf/pdfium/pdfium_engine.cc.orig 2021-12-31 00:57:37 UTC +--- pdf/pdfium/pdfium_engine.cc.orig 2022-02-28 16:54:41 UTC +++ pdf/pdfium/pdfium_engine.cc @@ -84,7 +84,7 @@ #include "gin/public/cppgc.h" #endif --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "pdf/pdfium/pdfium_font_linux.h" #endif @@ -13,8 +13,8 @@ FPDF_InitLibraryWithConfig(&config); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) g_font_mapping_mode = font_mapping_mode; InitializeLinuxFontMapper(); #endif diff --git a/www/chromium/files/patch-printing_mojom_printing__context__mojom__traits.cc b/www/chromium/files/patch-printing_mojom_printing__context__mojom__traits.cc index 6a85c8189130..1408b965110d 100644 --- a/www/chromium/files/patch-printing_mojom_printing__context__mojom__traits.cc +++ b/www/chromium/files/patch-printing_mojom_printing__context__mojom__traits.cc @@ -1,11 +1,11 @@ ---- printing/mojom/printing_context_mojom_traits.cc.orig 2022-02-07 13:39:41 UTC +--- printing/mojom/printing_context_mojom_traits.cc.orig 2022-02-28 16:54:41 UTC +++ printing/mojom/printing_context_mojom_traits.cc @@ -16,7 +16,7 @@ #include "ui/gfx/geometry/mojom/geometry_mojom_traits.h" #include "ui/gfx/geometry/size.h" --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "mojo/public/mojom/base/values.mojom.h" #endif @@ -13,8 +13,8 @@ } out->set_pages_per_sheet(data.pages_per_sheet()); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) DCHECK(out->advanced_settings().empty()); if (!data.ReadAdvancedSettings(&out->advanced_settings())) return false; diff --git a/www/chromium/files/patch-printing_mojom_printing__context__mojom__traits.h b/www/chromium/files/patch-printing_mojom_printing__context__mojom__traits.h index abef324c9456..8d439f07445f 100644 --- a/www/chromium/files/patch-printing_mojom_printing__context__mojom__traits.h +++ b/www/chromium/files/patch-printing_mojom_printing__context__mojom__traits.h @@ -1,11 +1,11 @@ ---- printing/mojom/printing_context_mojom_traits.h.orig 2022-02-07 13:39:41 UTC +--- printing/mojom/printing_context_mojom_traits.h.orig 2022-02-28 16:54:41 UTC +++ printing/mojom/printing_context_mojom_traits.h @@ -168,7 +168,7 @@ struct StructTraits<printing::mojom::PrintSettingsData return s.pages_per_sheet(); } --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) static const printing::PrintSettings::AdvancedSettings& advanced_settings( const printing::PrintSettings& s) { return s.advanced_settings(); diff --git a/www/chromium/files/patch-printing_print__settings.cc b/www/chromium/files/patch-printing_print__settings.cc index ded21563a9eb..38b6c7a5bc9a 100644 --- a/www/chromium/files/patch-printing_print__settings.cc +++ b/www/chromium/files/patch-printing_print__settings.cc @@ -1,29 +1,29 @@ ---- printing/print_settings.cc.orig 2022-02-07 13:39:41 UTC +--- printing/print_settings.cc.orig 2022-02-28 16:54:41 UTC +++ printing/print_settings.cc @@ -265,7 +265,7 @@ PrintSettings::PrintSettings(const PrintSettings& sett #endif is_modifiable_ = settings.is_modifiable_; pages_per_sheet_ = settings.pages_per_sheet_; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) for (const auto& item : settings.advanced_settings_) advanced_settings_.emplace(item.first, item.second.Clone()); - #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -305,7 +305,7 @@ PrintSettings& PrintSettings::operator=(const PrintSet #endif is_modifiable_ = settings.is_modifiable_; pages_per_sheet_ = settings.pages_per_sheet_; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) for (const auto& item : settings.advanced_settings_) advanced_settings_.emplace(item.first, item.second.Clone()); - #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -345,7 +345,7 @@ void PrintSettings::Clear() { #endif is_modifiable_ = true; pages_per_sheet_ = 1; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) advanced_settings_.clear(); - #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) - #if defined(OS_CHROMEOS) + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) + #if BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-printing_print__settings.h b/www/chromium/files/patch-printing_print__settings.h index db9e6887b65b..2b49fc4fb602 100644 --- a/www/chromium/files/patch-printing_print__settings.h +++ b/www/chromium/files/patch-printing_print__settings.h @@ -1,11 +1,11 @@ ---- printing/print_settings.h.orig 2022-02-07 13:39:41 UTC +--- printing/print_settings.h.orig 2022-02-28 16:54:41 UTC +++ printing/print_settings.h @@ -18,7 +18,7 @@ #include "ui/gfx/geometry/rect.h" #include "ui/gfx/geometry/size.h" --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include <map> #include "base/values.h" @@ -13,17 +13,17 @@ } }; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) using AdvancedSettings = std::map<std::string, base::Value>; - #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -221,7 +221,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings { pages_per_sheet_ = pages_per_sheet; } --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) AdvancedSettings& advanced_settings() { return advanced_settings_; } const AdvancedSettings& advanced_settings() const { return advanced_settings_; @@ -31,8 +31,8 @@ // Number of pages per sheet. int pages_per_sheet_; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Advanced settings. AdvancedSettings advanced_settings_; - #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-printing_print__settings__conversion.cc b/www/chromium/files/patch-printing_print__settings__conversion.cc index 0fd0d3497c45..3199a832c226 100644 --- a/www/chromium/files/patch-printing_print__settings__conversion.cc +++ b/www/chromium/files/patch-printing_print__settings__conversion.cc @@ -1,11 +1,11 @@ ---- printing/print_settings_conversion.cc.orig 2022-02-07 13:39:41 UTC +--- printing/print_settings_conversion.cc.orig 2022-02-28 16:54:41 UTC +++ printing/print_settings_conversion.cc -@@ -217,7 +217,7 @@ std::unique_ptr<PrintSettings> PrintSettingsFromJobSet +@@ -216,7 +216,7 @@ std::unique_ptr<PrintSettings> PrintSettingsFromJobSet settings->set_is_modifiable(is_modifiable.value()); } --#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && defined(USE_CUPS)) -+#if defined(OS_CHROMEOS) || ((defined(OS_BSD) || defined(OS_LINUX)) && defined(USE_CUPS)) +-#if BUILDFLAG(IS_CHROMEOS) || (BUILDFLAG(IS_LINUX) && defined(USE_CUPS)) ++#if BUILDFLAG(IS_CHROMEOS) || ((BUILDFLAG(IS_BSD) || BUILDFLAG(IS_LINUX)) && defined(USE_CUPS)) const base::Value* advanced_settings = job_settings.FindDictKey(kSettingAdvancedSettings); if (advanced_settings) { diff --git a/www/chromium/files/patch-printing_printing__features.cc b/www/chromium/files/patch-printing_printing__features.cc index d0c3562efe55..0d569895cb8e 100644 --- a/www/chromium/files/patch-printing_printing__features.cc +++ b/www/chromium/files/patch-printing_printing__features.cc @@ -1,11 +1,11 @@ ---- printing/printing_features.cc.orig 2022-02-07 13:39:41 UTC +--- printing/printing_features.cc.orig 2022-02-28 16:54:41 UTC +++ printing/printing_features.cc @@ -8,7 +8,7 @@ #include "printing/buildflags/buildflags.h" - #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ -- defined(OS_CHROMEOS) -+ defined(OS_CHROMEOS) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "base/metrics/field_trial_params.h" #endif diff --git a/www/chromium/files/patch-printing_sandbox_print__backend__sandbox__hook__linux.cc b/www/chromium/files/patch-printing_sandbox_print__backend__sandbox__hook__linux.cc index 10e65d6b1120..db949c62110d 100644 --- a/www/chromium/files/patch-printing_sandbox_print__backend__sandbox__hook__linux.cc +++ b/www/chromium/files/patch-printing_sandbox_print__backend__sandbox__hook__linux.cc @@ -1,34 +1,35 @@ ---- printing/sandbox/print_backend_sandbox_hook_linux.cc.orig 2022-02-07 13:39:41 UTC +--- printing/sandbox/print_backend_sandbox_hook_linux.cc.orig 2022-02-28 16:54:41 UTC +++ printing/sandbox/print_backend_sandbox_hook_linux.cc -@@ -9,20 +9,27 @@ - #include "base/files/file_path.h" +@@ -9,21 +9,28 @@ #include "base/files/file_util.h" #include "base/path_service.h" -+#if !defined(OS_BSD) + #include "build/build_config.h" ++#if !BUILDFLAG(IS_BSD) #include "sandbox/linux/syscall_broker/broker_command.h" #include "sandbox/linux/syscall_broker/broker_file_permission.h" + #include "sandbox/policy/export.h" #include "sandbox/policy/linux/sandbox_linux.h" #include "services/network/network_sandbox_hook_linux.h" +#else +#include "sandbox/policy/openbsd/sandbox_openbsd.h" +#endif - #if defined(OS_CHROMEOS) && defined(USE_CUPS) + #if BUILDFLAG(IS_CHROMEOS) && defined(USE_CUPS) #include "printing/backend/cups_connection_pool.h" #endif -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) using sandbox::syscall_broker::BrokerFilePermission; using sandbox::syscall_broker::MakeBrokerCommandSet; +#endif namespace printing { -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) namespace { sandbox::syscall_broker::BrokerCommandSet GetPrintBackendBrokerCommandSet() { -@@ -83,9 +90,11 @@ std::vector<BrokerFilePermission> GetPrintBackendFileP +@@ -84,9 +91,11 @@ std::vector<BrokerFilePermission> GetPrintBackendFileP } } // namespace @@ -36,11 +37,11 @@ bool PrintBackendPreSandboxHook( sandbox::policy::SandboxLinux::Options options) { -+#if !defined(OS_BSD) - #if defined(OS_CHROMEOS) && defined(USE_CUPS) ++#if !BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_CHROMEOS) && defined(USE_CUPS) // Create the socket connections to the CUPS server before engaging the // sandbox, since new connections cannot be made after that. -@@ -99,6 +108,7 @@ bool PrintBackendPreSandboxHook( +@@ -100,6 +109,7 @@ bool PrintBackendPreSandboxHook( sandbox::policy::SandboxLinux::PreSandboxHook(), options); instance->EngageNamespaceSandboxIfPossible(); diff --git a/www/chromium/files/patch-remoting_base_chromoting__event.cc b/www/chromium/files/patch-remoting_base_chromoting__event.cc index 229bff708f04..49d5b00dda5d 100644 --- a/www/chromium/files/patch-remoting_base_chromoting__event.cc +++ b/www/chromium/files/patch-remoting_base_chromoting__event.cc @@ -1,11 +1,11 @@ ---- remoting/base/chromoting_event.cc.orig 2021-04-14 18:41:07 UTC +--- remoting/base/chromoting_event.cc.orig 2022-02-28 16:54:41 UTC +++ remoting/base/chromoting_event.cc -@@ -189,7 +189,7 @@ void ChromotingEvent::AddSystemInfo() { +@@ -190,7 +190,7 @@ void ChromotingEvent::AddSystemInfo() { SetString(kCpuKey, base::SysInfo::OperatingSystemArchitecture()); SetString(kOsVersionKey, base::SysInfo::OperatingSystemVersion()); SetString(kWebAppVersionKey, STRINGIZE(VERSION)); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) Os os = Os::CHROMOTING_LINUX; #elif BUILDFLAG(IS_CHROMEOS_ASH) Os os = Os::CHROMOTING_CHROMEOS; diff --git a/www/chromium/files/patch-remoting_base_host__settings.cc b/www/chromium/files/patch-remoting_base_host__settings.cc index e277b1b6c4d0..7a7c6d643459 100644 --- a/www/chromium/files/patch-remoting_base_host__settings.cc +++ b/www/chromium/files/patch-remoting_base_host__settings.cc @@ -1,20 +1,20 @@ ---- remoting/base/host_settings.cc.orig 2021-12-16 15:16:45 UTC +--- remoting/base/host_settings.cc.orig 2022-02-28 16:54:41 UTC +++ remoting/base/host_settings.cc @@ -7,7 +7,7 @@ #include "base/no_destructor.h" #include "build/build_config.h" --#if defined(OS_APPLE) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+#if defined(OS_APPLE) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) +-#if BUILDFLAG(IS_APPLE) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)) ++#if BUILDFLAG(IS_APPLE) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)) || BUILDFLAG(IS_BSD) #include "remoting/base/file_host_settings.h" - #endif // defined(OS_LINUX) + #endif // BUILDFLAG(IS_LINUX) @@ -44,7 +44,7 @@ HostSettings::~HostSettings() = default; // static HostSettings* HostSettings::GetInstance() { --#if defined(OS_APPLE) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+#if defined(OS_APPLE) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) +-#if BUILDFLAG(IS_APPLE) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)) ++#if BUILDFLAG(IS_APPLE) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)) || BUILDFLAG(IS_BSD) static base::NoDestructor<FileHostSettings> instance( FileHostSettings::GetSettingsFilePath()); - #elif defined(OS_WIN) + #elif BUILDFLAG(IS_WIN) diff --git a/www/chromium/files/patch-remoting_client_display_sys__opengl.h b/www/chromium/files/patch-remoting_client_display_sys__opengl.h index 005b84abe90d..78ba20a4ba8b 100644 --- a/www/chromium/files/patch-remoting_client_display_sys__opengl.h +++ b/www/chromium/files/patch-remoting_client_display_sys__opengl.h @@ -1,11 +1,11 @@ ---- remoting/client/display/sys_opengl.h.orig 2021-04-14 18:41:07 UTC +--- remoting/client/display/sys_opengl.h.orig 2022-02-28 16:54:41 UTC +++ remoting/client/display/sys_opengl.h @@ -9,7 +9,7 @@ - #if defined(OS_IOS) + #if BUILDFLAG(IS_IOS) #include <OpenGLES/ES3/gl.h> --#elif defined(OS_LINUX) || defined(OS_CHROMEOS) -+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #define GL_GLEXT_PROTOTYPES #include <GL/gl.h> #include <GL/glext.h> diff --git a/www/chromium/files/patch-remoting_codec_webrtc__video__encoder__vpx.cc b/www/chromium/files/patch-remoting_codec_webrtc__video__encoder__vpx.cc index 085c668e9f55..a201baaefe52 100644 --- a/www/chromium/files/patch-remoting_codec_webrtc__video__encoder__vpx.cc +++ b/www/chromium/files/patch-remoting_codec_webrtc__video__encoder__vpx.cc @@ -1,11 +1,11 @@ ---- remoting/codec/webrtc_video_encoder_vpx.cc.orig 2022-02-07 13:39:41 UTC +--- remoting/codec/webrtc_video_encoder_vpx.cc.orig 2022-02-28 16:54:41 UTC +++ remoting/codec/webrtc_video_encoder_vpx.cc @@ -85,7 +85,7 @@ void SetVp8CodecParameters(vpx_codec_enc_cfg_t* config const webrtc::DesktopSize& size) { SetCommonCodecParameters(config, size); --#if defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS) -+#if (defined(OS_BSD) || defined(OS_LINUX)) && !BUILDFLAG(IS_CHROMEOS_LACROS) +-#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS) ++#if (BUILDFLAG(IS_BSD) || BUILDFLAG(IS_LINUX)) && !BUILDFLAG(IS_CHROMEOS_LACROS) // On Linux, using too many threads for VP8 encoding has been linked to high // CPU usage on machines that are under stress. See http://crbug.com/1151148. config->g_threads = std::min(config->g_threads, 2U); diff --git a/www/chromium/files/patch-remoting_host_base_switches.cc b/www/chromium/files/patch-remoting_host_base_switches.cc index bdf6b220a786..8fcb8ff987b5 100644 --- a/www/chromium/files/patch-remoting_host_base_switches.cc +++ b/www/chromium/files/patch-remoting_host_base_switches.cc @@ -1,11 +1,11 @@ ---- remoting/host/base/switches.cc.orig 2022-02-07 13:39:41 UTC +--- remoting/host/base/switches.cc.orig 2022-02-28 16:54:41 UTC +++ remoting/host/base/switches.cc @@ -23,7 +23,7 @@ const char kProcessTypeEvaluateCapability[] = "evaluat const char kProcessTypeFileChooser[] = "file_chooser"; const char kProcessTypeUrlForwarderConfigurator[] = "url_forwarder_configurator"; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) const char kProcessTypeXSessionChooser[] = "xsession_chooser"; - #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-remoting_host_base_switches.h b/www/chromium/files/patch-remoting_host_base_switches.h index 673f8a22ea3a..a2dd4f6f3ccd 100644 --- a/www/chromium/files/patch-remoting_host_base_switches.h +++ b/www/chromium/files/patch-remoting_host_base_switches.h @@ -1,11 +1,11 @@ ---- remoting/host/base/switches.h.orig 2022-02-07 13:39:41 UTC +--- remoting/host/base/switches.h.orig 2022-02-28 16:54:41 UTC +++ remoting/host/base/switches.h @@ -35,7 +35,7 @@ extern const char kProcessTypeRdpDesktopSession[]; extern const char kProcessTypeEvaluateCapability[]; extern const char kProcessTypeFileChooser[]; extern const char kProcessTypeUrlForwarderConfigurator[]; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) extern const char kProcessTypeXSessionChooser[]; - #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-remoting_host_chromoting__host.cc b/www/chromium/files/patch-remoting_host_chromoting__host.cc index 92048a75b4fd..b43ae9b89705 100644 --- a/www/chromium/files/patch-remoting_host_chromoting__host.cc +++ b/www/chromium/files/patch-remoting_host_chromoting__host.cc @@ -1,11 +1,11 @@ ---- remoting/host/chromoting_host.cc.orig 2022-02-07 13:39:41 UTC +--- remoting/host/chromoting_host.cc.orig 2022-02-28 16:54:41 UTC +++ remoting/host/chromoting_host.cc @@ -124,7 +124,7 @@ void ChromotingHost::StartChromotingHostServices() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); DCHECK(!ipc_server_); --#if defined(OS_LINUX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) ipc_server_ = std::make_unique<MojoIpcServer<mojom::ChromotingHostServices>>( GetChromotingHostServicesServerName(), this); ipc_server_->StartServer(); diff --git a/www/chromium/files/patch-remoting_host_chromoting__host__context.cc b/www/chromium/files/patch-remoting_host_chromoting__host__context.cc index ffa1d59e4cac..9eb30d2cc011 100644 --- a/www/chromium/files/patch-remoting_host_chromoting__host__context.cc +++ b/www/chromium/files/patch-remoting_host_chromoting__host__context.cc @@ -1,11 +1,11 @@ ---- remoting/host/chromoting_host_context.cc.orig 2022-02-07 13:39:41 UTC +--- remoting/host/chromoting_host_context.cc.orig 2022-02-28 16:54:41 UTC +++ remoting/host/chromoting_host_context.cc @@ -143,7 +143,7 @@ std::unique_ptr<ChromotingHostContext> ChromotingHostC // on a UI thread. scoped_refptr<AutoThreadTaskRunner> input_task_runner = AutoThread::CreateWithType("ChromotingInputThread", ui_task_runner, --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) base::MessagePumpType::UI); #else base::MessagePumpType::IO); diff --git a/www/chromium/files/patch-remoting_host_chromoting__host__services__client.cc b/www/chromium/files/patch-remoting_host_chromoting__host__services__client.cc index bd3ee531935c..18c13a723b7c 100644 --- a/www/chromium/files/patch-remoting_host_chromoting__host__services__client.cc +++ b/www/chromium/files/patch-remoting_host_chromoting__host__services__client.cc @@ -1,20 +1,20 @@ ---- remoting/host/chromoting_host_services_client.cc.orig 2022-02-07 13:39:41 UTC +--- remoting/host/chromoting_host_services_client.cc.orig 2022-02-28 16:54:41 UTC +++ remoting/host/chromoting_host_services_client.cc -@@ -24,7 +24,7 @@ namespace remoting { +@@ -28,7 +28,7 @@ bool g_initialized = false; - namespace { + } // namespace --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - constexpr char kChromeRemoteDesktopSessionEnvVar[] = - "CHROME_REMOTE_DESKTOP_SESSION"; - #endif -@@ -104,7 +104,7 @@ bool ChromotingHostServicesClient::EnsureSessionServic +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + + // static + constexpr char +@@ -112,7 +112,7 @@ bool ChromotingHostServicesClient::EnsureSessionServic if (session_services_remote_.is_bound()) { return true; } --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (!environment_->HasVar(kChromeRemoteDesktopSessionEnvVar)) { LOG(WARNING) << "Current desktop environment is not remotable."; return false; diff --git a/www/chromium/files/patch-remoting_host_evaluate__capability.cc b/www/chromium/files/patch-remoting_host_evaluate__capability.cc index 799257b25a00..336d7f574080 100644 --- a/www/chromium/files/patch-remoting_host_evaluate__capability.cc +++ b/www/chromium/files/patch-remoting_host_evaluate__capability.cc @@ -1,11 +1,11 @@ ---- remoting/host/evaluate_capability.cc.orig 2021-04-14 18:41:08 UTC +--- remoting/host/evaluate_capability.cc.orig 2022-02-28 16:54:41 UTC +++ remoting/host/evaluate_capability.cc @@ -55,7 +55,7 @@ base::FilePath BuildHostBinaryPath() { } #endif --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (path.BaseName().value() == FILE_PATH_LITERAL("chrome-remote-desktop-host")) { return path; diff --git a/www/chromium/files/patch-remoting_host_heartbeat__sender.cc b/www/chromium/files/patch-remoting_host_heartbeat__sender.cc index 916d96c6d496..4fe0d5bb8558 100644 --- a/www/chromium/files/patch-remoting_host_heartbeat__sender.cc +++ b/www/chromium/files/patch-remoting_host_heartbeat__sender.cc @@ -1,11 +1,11 @@ ---- remoting/host/heartbeat_sender.cc.orig 2021-12-14 11:45:09 UTC +--- remoting/host/heartbeat_sender.cc.orig 2022-02-28 16:54:41 UTC +++ remoting/host/heartbeat_sender.cc @@ -111,7 +111,7 @@ const net::BackoffEntry::Policy kBackoffPolicy = { std::string GetHostname() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag // switch of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) return net::GetHostName(); - #elif defined(OS_WIN) + #elif BUILDFLAG(IS_WIN) wchar_t buffer[MAX_PATH] = {0}; diff --git a/www/chromium/files/patch-remoting_host_host__attributes.cc b/www/chromium/files/patch-remoting_host_host__attributes.cc index 3560ed2ad39c..d78310e15a13 100644 --- a/www/chromium/files/patch-remoting_host_host__attributes.cc +++ b/www/chromium/files/patch-remoting_host_host__attributes.cc @@ -1,11 +1,11 @@ ---- remoting/host/host_attributes.cc.orig 2021-05-12 22:05:58 UTC +--- remoting/host/host_attributes.cc.orig 2022-02-28 16:54:41 UTC +++ remoting/host/host_attributes.cc @@ -122,7 +122,7 @@ std::string GetHostAttributes() { media::InitializeMediaFoundation()) { result.push_back("HWEncoder"); } --#elif defined(OS_LINUX) || defined(OS_CHROMEOS) -+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) result.push_back("HWEncoder"); #endif diff --git a/www/chromium/files/patch-remoting_host_host__details.cc b/www/chromium/files/patch-remoting_host_host__details.cc index 776f3dd26092..556c96a8d502 100644 --- a/www/chromium/files/patch-remoting_host_host__details.cc +++ b/www/chromium/files/patch-remoting_host_host__details.cc @@ -1,11 +1,11 @@ ---- remoting/host/host_details.cc.orig 2022-02-07 13:39:41 UTC +--- remoting/host/host_details.cc.orig 2022-02-28 16:54:41 UTC +++ remoting/host/host_details.cc @@ -23,7 +23,7 @@ std::string GetHostOperatingSystemName() { return "Mac"; #elif BUILDFLAG(IS_CHROMEOS_ASH) return "ChromeOS"; --#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) return "Linux"; - #elif defined(OS_ANDROID) + #elif BUILDFLAG(IS_ANDROID) return "Android"; diff --git a/www/chromium/files/patch-remoting_host_host__main.cc b/www/chromium/files/patch-remoting_host_host__main.cc index ac8a319f73d0..71415397194e 100644 --- a/www/chromium/files/patch-remoting_host_host__main.cc +++ b/www/chromium/files/patch-remoting_host_host__main.cc @@ -1,29 +1,29 @@ ---- remoting/host/host_main.cc.orig 2022-02-07 13:39:41 UTC +--- remoting/host/host_main.cc.orig 2022-02-28 16:54:41 UTC +++ remoting/host/host_main.cc @@ -50,7 +50,7 @@ int FileChooserMain(); int RdpDesktopSessionMain(); int UrlForwarderConfiguratorMain(); - #endif // defined(OS_WIN) --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + #endif // BUILDFLAG(IS_WIN) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) int XSessionChooserMain(); - #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -63,7 +63,7 @@ const char kUsageMessage[] = "\n" "Options:\n" --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) " --audio-pipe-name=<pipe> - Sets the pipe name to capture audio on " "Linux.\n" - #endif // defined(OS_LINUX) + #endif // BUILDFLAG(IS_LINUX) @@ -152,7 +152,7 @@ MainRoutineFn SelectMainRoutine(const std::string& pro } else if (process_type == kProcessTypeUrlForwarderConfigurator) { main_routine = &UrlForwarderConfiguratorMain; - #endif // defined(OS_WIN) --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + #endif // BUILDFLAG(IS_WIN) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) } else if (process_type == kProcessTypeXSessionChooser) { main_routine = &XSessionChooserMain; - #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/chromium/files/patch-remoting_host_ipc__constants.cc b/www/chromium/files/patch-remoting_host_ipc__constants.cc index 5de9e4e688d1..2a6bb3b88ddb 100644 --- a/www/chromium/files/patch-remoting_host_ipc__constants.cc +++ b/www/chromium/files/patch-remoting_host_ipc__constants.cc @@ -1,11 +1,11 @@ ---- remoting/host/ipc_constants.cc.orig 2022-02-07 13:39:41 UTC +--- remoting/host/ipc_constants.cc.orig 2022-02-28 16:54:41 UTC +++ remoting/host/ipc_constants.cc @@ -16,7 +16,7 @@ namespace remoting { namespace { --#if !defined(NDEBUG) && defined(OS_LINUX) -+#if !defined(NDEBUG) && (defined(OS_LINUX) || defined(OS_BSD)) +-#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. diff --git a/www/chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc b/www/chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc index fbb6b259ba8a..0d2aba957d12 100644 --- a/www/chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc +++ b/www/chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc @@ -1,11 +1,11 @@ ---- remoting/host/it2me/it2me_native_messaging_host_main.cc.orig 2022-02-07 13:39:41 UTC +--- remoting/host/it2me/it2me_native_messaging_host_main.cc.orig 2022-02-28 16:54:41 UTC +++ remoting/host/it2me/it2me_native_messaging_host_main.cc @@ -30,7 +30,7 @@ #include "remoting/host/resources.h" #include "remoting/host/usage_stats_consent.h" --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include <gtk/gtk.h> #include "base/linux_util.h" @@ -13,8 +13,8 @@ // Creates a It2MeNativeMessagingHost instance, attaches it to stdin/stdout and // runs the task executor until It2MeNativeMessagingHost signals shutdown. int It2MeNativeMessagingHostMain(int argc, char** argv) { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Initialize Xlib for multi-threaded use, allowing non-Chromium code to // use X11 safely (such as the WebRTC capturer, GTK ...) x11::InitXlib(); @@ -22,8 +22,8 @@ remoting::LoadResources(""); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Required for any calls into GTK functions, such as the Disconnect and // Continue windows. Calling with nullptr arguments because we don't have // any command line arguments for gtk to consume. @@ -31,8 +31,8 @@ PolicyWatcher::CreateWithTaskRunner(context->file_task_runner(), context->management_service()); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Create an X11EventSource on all UI threads, so the global X11 connection // (x11::Connection::Get()) can dispatch X events. auto event_source = @@ -40,8 +40,8 @@ // Run the loop until channel is alive. run_loop.Run(); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) input_task_runner->PostTask(FROM_HERE, base::BindOnce([]() { delete ui::X11EventSource::GetInstance(); })); diff --git a/www/chromium/files/patch-remoting_host_me2me__desktop__environment.cc b/www/chromium/files/patch-remoting_host_me2me__desktop__environment.cc index 7c56285720e7..5801e14df8a0 100644 --- a/www/chromium/files/patch-remoting_host_me2me__desktop__environment.cc +++ b/www/chromium/files/patch-remoting_host_me2me__desktop__environment.cc @@ -1,11 +1,11 @@ ---- remoting/host/me2me_desktop_environment.cc.orig 2021-12-31 00:57:37 UTC +--- remoting/host/me2me_desktop_environment.cc.orig 2022-02-28 16:54:41 UTC +++ remoting/host/me2me_desktop_environment.cc @@ -143,7 +143,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. --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) bool want_user_interface = false; - #elif defined(OS_APPLE) + #elif BUILDFLAG(IS_APPLE) // Don't try to display any UI on top of the system's login screen as this diff --git a/www/chromium/files/patch-remoting_host_remote__open__url_remote__open__url__client.cc b/www/chromium/files/patch-remoting_host_remote__open__url_remote__open__url__client.cc index 0bd22272c32c..5e8953f7d363 100644 --- a/www/chromium/files/patch-remoting_host_remote__open__url_remote__open__url__client.cc +++ b/www/chromium/files/patch-remoting_host_remote__open__url_remote__open__url__client.cc @@ -1,20 +1,20 @@ ---- remoting/host/remote_open_url/remote_open_url_client.cc.orig 2022-02-07 13:39:41 UTC +--- remoting/host/remote_open_url/remote_open_url_client.cc.orig 2022-02-28 16:54:41 UTC +++ remoting/host/remote_open_url/remote_open_url_client.cc @@ -15,7 +15,7 @@ #include "remoting/host/mojom/chromoting_host_services.mojom.h" #include "remoting/host/mojom/remote_url_opener.mojom.h" --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "remoting/host/remote_open_url/remote_open_url_client_delegate_linux.h" - #elif defined(OS_WIN) + #elif BUILDFLAG(IS_WIN) #include "remoting/host/remote_open_url/remote_open_url_client_delegate_win.h" @@ -28,7 +28,7 @@ namespace { constexpr base::TimeDelta kRequestTimeout = base::Seconds(5); std::unique_ptr<RemoteOpenUrlClient::Delegate> CreateDelegate() { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return std::make_unique<RemoteOpenUrlClientDelegateLinux>(); - #elif defined(OS_WIN) + #elif BUILDFLAG(IS_WIN) return std::make_unique<RemoteOpenUrlClientDelegateWin>(); diff --git a/www/chromium/files/patch-remoting_host_remote__open__url_remote__open__url__util.cc b/www/chromium/files/patch-remoting_host_remote__open__url_remote__open__url__util.cc index 152c03e5e57d..5847c1f1f77d 100644 --- a/www/chromium/files/patch-remoting_host_remote__open__url_remote__open__url__util.cc +++ b/www/chromium/files/patch-remoting_host_remote__open__url_remote__open__url__util.cc @@ -1,11 +1,11 @@ ---- remoting/host/remote_open_url/remote_open_url_util.cc.orig 2021-12-16 15:17:52 UTC +--- remoting/host/remote_open_url/remote_open_url_util.cc.orig 2022-02-28 16:54:41 UTC +++ remoting/host/remote_open_url/remote_open_url_util.cc @@ -30,7 +30,7 @@ const wchar_t kRegisteredApplicationsKeyName[] = #endif // defined (OS_WIN) bool IsRemoteOpenUrlSupported() { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return true; - #elif defined(OS_WIN) + #elif BUILDFLAG(IS_WIN) // The modern default apps settings dialog is only available to Windows 8+. diff --git a/www/chromium/files/patch-remoting_host_remote__open__url_url__forwarder__configurator.cc b/www/chromium/files/patch-remoting_host_remote__open__url_url__forwarder__configurator.cc index bb806ba9cd59..b59e8f067d2b 100644 --- a/www/chromium/files/patch-remoting_host_remote__open__url_url__forwarder__configurator.cc +++ b/www/chromium/files/patch-remoting_host_remote__open__url_url__forwarder__configurator.cc @@ -1,11 +1,11 @@ ---- remoting/host/remote_open_url/url_forwarder_configurator.cc.orig 2022-02-07 13:39:41 UTC +--- remoting/host/remote_open_url/url_forwarder_configurator.cc.orig 2022-02-28 16:54:41 UTC +++ remoting/host/remote_open_url/url_forwarder_configurator.cc @@ -12,7 +12,7 @@ UrlForwarderConfigurator::UrlForwarderConfigurator() = UrlForwarderConfigurator::~UrlForwarderConfigurator() = default; --#if !defined(OS_LINUX) && !defined(OS_WIN) -+#if !defined(OS_LINUX) && !defined(OS_WIN) && !defined(OS_BSD) +-#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_WIN) ++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_BSD) // static std::unique_ptr<UrlForwarderConfigurator> UrlForwarderConfigurator::Create() { diff --git a/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc b/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc index db087d2757bc..ce0d6a17f7ad 100644 --- a/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc +++ b/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc @@ -1,11 +1,11 @@ ---- remoting/host/remoting_me2me_host.cc.orig 2022-02-07 13:39:41 UTC +--- remoting/host/remoting_me2me_host.cc.orig 2022-02-28 16:54:41 UTC +++ remoting/host/remoting_me2me_host.cc @@ -123,7 +123,7 @@ #include "remoting/host/mac/permission_utils.h" - #endif // defined(OS_APPLE) + #endif // BUILDFLAG(IS_APPLE) --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include <gtk/gtk.h> #include "base/linux_util.h" @@ -13,80 +13,80 @@ const char kStdinConfigPath[] = "-"; #endif // !defined(REMOTING_MULTI_PROCESS) --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // The command line switch used to pass name of the pipe to capture audio on // linux. const char kAudioPipeSwitchName[] = "audio-pipe-name"; -@@ -366,7 +366,7 @@ class HostProcess : public ConfigWatcher::Delegate, +@@ -368,7 +368,7 @@ class HostProcess : public ConfigWatcher::Delegate, std::unique_ptr<ChromotingHostContext> context_; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Watch for certificate changes and kill the host when changes occur std::unique_ptr<CertificateWatcher> cert_watcher_; #endif -@@ -790,7 +790,7 @@ void HostProcess::CreateAuthenticatorFactory() { +@@ -741,7 +741,7 @@ void HostProcess::StartOnNetworkThread() { + void HostProcess::ShutdownOnNetworkThread() { + DCHECK(context_->network_task_runner()->BelongsToCurrentThread()); + config_watcher_.reset(); +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + cert_watcher_.reset(); + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) + } +@@ -800,7 +800,7 @@ void HostProcess::CreateAuthenticatorFactory() { DCHECK(third_party_auth_config_.token_url.is_valid()); DCHECK(third_party_auth_config_.token_validation_url.is_valid()); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (!cert_watcher_) { cert_watcher_ = std::make_unique<CertificateWatcher>( - base::BindRepeating(&HostProcess::ShutdownHost, this, -@@ -904,7 +904,7 @@ void HostProcess::StartOnUiThread() { + base::BindRepeating(&HostProcess::ShutdownHost, +@@ -914,7 +914,7 @@ void HostProcess::StartOnUiThread() { base::BindRepeating(&HostProcess::OnPolicyUpdate, base::Unretained(this)), base::BindRepeating(&HostProcess::OnPolicyError, base::Unretained(this))); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#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()-> -@@ -962,7 +962,7 @@ void HostProcess::ShutdownOnUiThread() { +@@ -975,7 +975,7 @@ void HostProcess::ShutdownOnUiThread() { // It is now safe for the HostProcess to be deleted. self_ = nullptr; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // 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. -@@ -1667,7 +1667,7 @@ void HostProcess::StartHost() { +@@ -1685,7 +1685,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_); --#if defined(OS_LINUX) || !defined(NDEBUG) -+#if (defined(OS_LINUX) || defined(OS_BSD) || !defined(NDEBUG) +-#if BUILDFLAG(IS_LINUX) || !defined(NDEBUG) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || !defined(NDEBUG) // Experimental feature. Enabled on Linux for easier testing. if (is_googler_) { desktop_environment_options_.set_enable_remote_webauthn(true); -@@ -1864,7 +1864,7 @@ void HostProcess::CrashHostProcess(const std::string& +@@ -1882,7 +1882,7 @@ void HostProcess::CrashHostProcess(const std::string& int HostProcessMain() { HOST_LOG << "Starting host process: version " << STRINGIZE(VERSION); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Initialize Xlib for multi-threaded use, allowing non-Chromium code to // use X11 safely (such as the WebRTC capturer, GTK ...) x11::InitXlib(); -@@ -1901,7 +1901,7 @@ int HostProcessMain() { +@@ -1919,7 +1919,7 @@ int HostProcessMain() { std::unique_ptr<net::NetworkChangeNotifier> network_change_notifier( net::NetworkChangeNotifier::CreateIfNeeded()); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Create an X11EventSource on all UI threads, so the global X11 connection // (x11::Connection::Get()) can dispatch X events. auto event_source = -@@ -1922,7 +1922,7 @@ int HostProcessMain() { - // Run the main (also UI) task executor until the host no longer needs it. - run_loop.Run(); - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - input_task_runner->PostTask(FROM_HERE, base::BindOnce([]() { - delete ui::X11EventSource::GetInstance(); - })); diff --git a/www/chromium/files/patch-remoting_host_setup_start__host__main.cc b/www/chromium/files/patch-remoting_host_setup_start__host__main.cc index 1c5aacd298ed..36de6e32f65f 100644 --- a/www/chromium/files/patch-remoting_host_setup_start__host__main.cc +++ b/www/chromium/files/patch-remoting_host_setup_start__host__main.cc @@ -1,20 +1,20 @@ ---- remoting/host/setup/start_host_main.cc.orig 2022-02-07 13:39:41 UTC +--- remoting/host/setup/start_host_main.cc.orig 2022-02-28 16:54:41 UTC +++ remoting/host/setup/start_host_main.cc @@ -32,7 +32,7 @@ #include <unistd.h> - #endif // defined(OS_POSIX) + #endif // BUILDFLAG(IS_POSIX) --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "remoting/host/setup/daemon_controller_delegate_linux.h" #include "remoting/host/setup/start_host_as_root.h" - #endif // defined(OS_LINUX) + #endif // BUILDFLAG(IS_LINUX) @@ -126,7 +126,7 @@ void OnDone(HostStarter::Result result) { } // namespace int StartHostMain(int argc, char** argv) { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Minimize the amount of code that runs as root on Posix systems. if (getuid() == 0) { return remoting::StartHostAsRoot(argc, argv); @@ -22,8 +22,8 @@ // for the account which generated |code|. std::string host_owner = command_line->GetSwitchValueASCII("host-owner"); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (command_line->HasSwitch("no-start")) { // On Linux, registering the host with systemd and starting it is the only // reason start_host requires root. The --no-start options skips that final diff --git a/www/chromium/files/patch-remoting_resources_remoting__strings.grd b/www/chromium/files/patch-remoting_resources_remoting__strings.grd index d4d8549b3826..82f5798580ee 100644 --- a/www/chromium/files/patch-remoting_resources_remoting__strings.grd +++ b/www/chromium/files/patch-remoting_resources_remoting__strings.grd @@ -1,6 +1,6 @@ ---- remoting/resources/remoting_strings.grd.orig 2021-12-14 11:45:09 UTC +--- remoting/resources/remoting_strings.grd.orig 2022-02-28 16:54:41 UTC +++ remoting/resources/remoting_strings.grd -@@ -924,7 +924,7 @@ If '<ph name="SERVICE_SCRIPT_NAME">$3<ex>org.chromium. +@@ -936,7 +936,7 @@ If '<ph name="SERVICE_SCRIPT_NAME">$3<ex>org.chromium. <message name="IDS_URL_FORWARDER_INCORRECTLY_CONFIGURED" desc="Message shown when the Chrome Remote Desktop URL forwarder is incorrectly configured."> <ph name="URL_FORWARDER_NAME">%s<ex>Chrome Remote Desktop URL Forwarder</ex></ph> is not configured correctly. Please choose a different default web browser and then enable URL forwarding again. </message> @@ -9,7 +9,7 @@ <message name="IDS_SESSION_DIALOG_MESSAGE" desc="The message to show at the top of the session-selection dialog."> Select a session to launch within your Chrome Remote Desktop environment. (Note that some session types may not support running within Chrome Remote Desktop and on the local console simultaneously.) </message> -@@ -940,7 +940,7 @@ If '<ph name="SERVICE_SCRIPT_NAME">$3<ex>org.chromium. +@@ -952,7 +952,7 @@ If '<ph name="SERVICE_SCRIPT_NAME">$3<ex>org.chromium. <message name="IDS_SESSION_DIALOG_DEFAULT_SESSION_COMMENT" desc="The comment for the entry to launch the default session."> Launch the default XSession </message> diff --git a/www/chromium/files/patch-sandbox_linux_services_libc__interceptor.cc b/www/chromium/files/patch-sandbox_linux_services_libc__interceptor.cc index 8644dc664732..95d56126696b 100644 --- a/www/chromium/files/patch-sandbox_linux_services_libc__interceptor.cc +++ b/www/chromium/files/patch-sandbox_linux_services_libc__interceptor.cc @@ -1,4 +1,4 @@ ---- sandbox/linux/services/libc_interceptor.cc.orig 2021-09-14 01:52:00 UTC +--- sandbox/linux/services/libc_interceptor.cc.orig 2022-02-28 16:54:41 UTC +++ sandbox/linux/services/libc_interceptor.cc @@ -11,7 +11,9 @@ #include <stddef.h> @@ -10,7 +10,7 @@ #include <sys/socket.h> #include <sys/types.h> #include <time.h> -@@ -96,7 +98,7 @@ bool ReadTimeStruct(base::PickleIterator* iter, +@@ -94,7 +96,7 @@ bool ReadTimeStruct(base::PickleIterator* iter, } else { base::AutoLock lock(g_timezones_lock.Get()); auto ret_pair = g_timezones.Get().insert(timezone); diff --git a/www/chromium/files/patch-sandbox_policy_features.cc b/www/chromium/files/patch-sandbox_policy_features.cc index 829e48b9fd06..a19b5c10a58e 100644 --- a/www/chromium/files/patch-sandbox_policy_features.cc +++ b/www/chromium/files/patch-sandbox_policy_features.cc @@ -1,14 +1,14 @@ ---- sandbox/policy/features.cc.orig 2022-02-07 13:39:41 UTC +--- sandbox/policy/features.cc.orig 2022-02-28 16:54:41 UTC +++ sandbox/policy/features.cc @@ -16,7 +16,11 @@ namespace features { // Enables network service sandbox. // (Only causes an effect when feature kNetworkService is enabled.) const base::Feature kNetworkServiceSandbox{"NetworkServiceSandbox", -+#if defined(OS_BSD) ++#if BUILDFLAG(IS_BSD) + base::FEATURE_ENABLED_BY_DEFAULT}; +#else base::FEATURE_DISABLED_BY_DEFAULT}; +#endif - #endif // !defined(OS_MAC) && !defined(OS_FUCHSIA) + #endif // !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_FUCHSIA) - #if defined(OS_WIN) + #if BUILDFLAG(IS_WIN) diff --git a/www/chromium/files/patch-sandbox_policy_mojom_sandbox.mojom b/www/chromium/files/patch-sandbox_policy_mojom_sandbox.mojom index eaf2f8ba6174..764e8985529b 100644 --- a/www/chromium/files/patch-sandbox_policy_mojom_sandbox.mojom +++ b/www/chromium/files/patch-sandbox_policy_mojom_sandbox.mojom @@ -1,6 +1,6 @@ ---- sandbox/policy/mojom/sandbox.mojom.orig 2022-02-07 13:39:41 UTC +--- sandbox/policy/mojom/sandbox.mojom.orig 2022-02-28 16:54:41 UTC +++ sandbox/policy/mojom/sandbox.mojom -@@ -63,6 +63,12 @@ enum Sandbox { +@@ -68,6 +68,12 @@ enum Sandbox { [EnableIf=is_fuchsia] kVideoCapture, diff --git a/www/chromium/files/patch-sandbox_policy_sandbox.cc b/www/chromium/files/patch-sandbox_policy_sandbox.cc index 7e2c8176a47b..1cd4771d4c1c 100644 --- a/www/chromium/files/patch-sandbox_policy_sandbox.cc +++ b/www/chromium/files/patch-sandbox_policy_sandbox.cc @@ -1,22 +1,22 @@ ---- sandbox/policy/sandbox.cc.orig 2022-02-07 13:39:41 UTC +--- sandbox/policy/sandbox.cc.orig 2022-02-28 16:54:41 UTC +++ sandbox/policy/sandbox.cc @@ -17,6 +17,10 @@ #include "sandbox/policy/linux/sandbox_linux.h" - #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if defined(OS_BSD) ++#if BUILDFLAG(IS_BSD) +#include "sandbox/policy/openbsd/sandbox_openbsd.h" -+#endif // defined(OS_BSD) ++#endif // BUILDFLAG(IS_BSD) + - #if defined(OS_MAC) + #if BUILDFLAG(IS_MAC) #include "sandbox/mac/seatbelt.h" - #endif // defined(OS_MAC) + #endif // BUILDFLAG(IS_MAC) @@ -30,7 +34,7 @@ namespace sandbox { namespace policy { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) bool Sandbox::Initialize(sandbox::mojom::Sandbox sandbox_type, SandboxLinux::PreSandboxHook hook, const SandboxLinux::Options& options) { diff --git a/www/chromium/files/patch-sandbox_policy_sandbox.h b/www/chromium/files/patch-sandbox_policy_sandbox.h index a42cd1e2a453..e94b3c010f2b 100644 --- a/www/chromium/files/patch-sandbox_policy_sandbox.h +++ b/www/chromium/files/patch-sandbox_policy_sandbox.h @@ -1,10 +1,10 @@ ---- sandbox/policy/sandbox.h.orig 2022-02-07 13:39:41 UTC +--- sandbox/policy/sandbox.h.orig 2022-02-28 16:54:41 UTC +++ sandbox/policy/sandbox.h @@ -12,6 +12,10 @@ #include "sandbox/policy/linux/sandbox_linux.h" #endif -+#if defined(OS_BSD) ++#if BUILDFLAG(IS_BSD) +#include "sandbox/policy/openbsd/sandbox_openbsd.h" +#endif + @@ -15,8 +15,8 @@ class SANDBOX_POLICY_EXPORT Sandbox { public: --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) static bool Initialize(sandbox::mojom::Sandbox sandbox_type, SandboxLinux::PreSandboxHook hook, const SandboxLinux::Options& options); diff --git a/www/chromium/files/patch-sandbox_policy_sandbox__type.cc b/www/chromium/files/patch-sandbox_policy_sandbox__type.cc index 0a1bbbaa267c..9b9d2fa1656b 100644 --- a/www/chromium/files/patch-sandbox_policy_sandbox__type.cc +++ b/www/chromium/files/patch-sandbox_policy_sandbox__type.cc @@ -1,38 +1,38 @@ ---- sandbox/policy/sandbox_type.cc.orig 2022-02-07 13:39:41 UTC +--- sandbox/policy/sandbox_type.cc.orig 2022-02-28 16:54:41 UTC +++ sandbox/policy/sandbox_type.cc @@ -39,7 +39,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { #endif case Sandbox::kAudio: return false; --#if defined(OS_FUCHSIA) -+#if defined(OS_FUCHSIA) || defined(OS_BSD) +-#if BUILDFLAG(IS_FUCHSIA) ++#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) case Sandbox::kVideoCapture: return false; #endif -@@ -120,7 +120,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi +@@ -122,7 +122,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi #endif case Sandbox::kPrintCompositor: case Sandbox::kAudio: --#if defined(OS_FUCHSIA) -+#if defined(OS_FUCHSIA) || defined(OS_BSD) +-#if BUILDFLAG(IS_FUCHSIA) ++#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) case Sandbox::kVideoCapture: #endif - #if defined(OS_WIN) -@@ -248,7 +248,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb + #if BUILDFLAG(IS_WIN) +@@ -247,7 +247,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb return switches::kUtilitySandbox; case Sandbox::kAudio: return switches::kAudioSandbox; --#if defined(OS_FUCHSIA) -+#if defined(OS_FUCHSIA) || defined(OS_BSD) +-#if BUILDFLAG(IS_FUCHSIA) ++#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) case Sandbox::kVideoCapture: return switches::kVideoCaptureSandbox; #endif -@@ -352,7 +352,7 @@ sandbox::mojom::Sandbox UtilitySandboxTypeFromString( +@@ -355,7 +355,7 @@ sandbox::mojom::Sandbox UtilitySandboxTypeFromString( return Sandbox::kAudio; if (sandbox_string == switches::kSpeechRecognitionSandbox) return Sandbox::kSpeechRecognition; --#if defined(OS_FUCHSIA) -+#if defined(OS_FUCHSIA) || defined(OS_BSD) +-#if BUILDFLAG(IS_FUCHSIA) ++#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) if (sandbox_string == switches::kVideoCaptureSandbox) return Sandbox::kVideoCapture; #endif diff --git a/www/chromium/files/patch-sandbox_policy_switches.cc b/www/chromium/files/patch-sandbox_policy_switches.cc index 4c98bdb90be3..8bcc33d0a596 100644 --- a/www/chromium/files/patch-sandbox_policy_switches.cc +++ b/www/chromium/files/patch-sandbox_policy_switches.cc @@ -1,13 +1,13 @@ ---- sandbox/policy/switches.cc.orig 2022-02-07 13:39:41 UTC +--- sandbox/policy/switches.cc.orig 2022-02-28 16:54:41 UTC +++ sandbox/policy/switches.cc -@@ -94,7 +94,9 @@ const char kGpuSandboxFailuresFatal[] = "gpu-sandbox-f +@@ -95,7 +95,9 @@ const char kGpuSandboxFailuresFatal[] = "gpu-sandbox-f // Meant to be used as a browser-level switch for testing purposes only. const char kNoSandbox[] = "no-sandbox"; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +const char kDisableUnveil[] = "disable-unveil"; + -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Instructs the zygote to launch without a sandbox. Processes forked from this // type of zygote will apply their own custom sandboxes later. const char kNoZygoteSandbox[] = "no-zygote-sandbox"; diff --git a/www/chromium/files/patch-sandbox_policy_switches.h b/www/chromium/files/patch-sandbox_policy_switches.h index 3c7d2f4b4f43..dc91e6fc6604 100644 --- a/www/chromium/files/patch-sandbox_policy_switches.h +++ b/www/chromium/files/patch-sandbox_policy_switches.h @@ -1,12 +1,12 @@ ---- sandbox/policy/switches.h.orig 2022-02-07 13:39:41 UTC +--- sandbox/policy/switches.h.orig 2022-02-28 16:54:41 UTC +++ sandbox/policy/switches.h -@@ -70,7 +70,8 @@ SANDBOX_POLICY_EXPORT extern const char kDisableSetuid +@@ -71,7 +71,8 @@ SANDBOX_POLICY_EXPORT extern const char kDisableSetuid SANDBOX_POLICY_EXPORT extern const char kGpuSandboxAllowSysVShm[]; SANDBOX_POLICY_EXPORT extern const char kGpuSandboxFailuresFatal[]; SANDBOX_POLICY_EXPORT extern const char kNoSandbox[]; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +SANDBOX_POLICY_EXPORT extern const char kDisableUnveil[]; -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) SANDBOX_POLICY_EXPORT extern const char kNoZygoteSandbox[]; #endif - #if defined(OS_WIN) + #if BUILDFLAG(IS_WIN) diff --git a/www/chromium/files/patch-services_cert__verifier_cert__verifier__creation.cc b/www/chromium/files/patch-services_cert__verifier_cert__verifier__creation.cc index 942faed2628b..7507614ed649 100644 --- a/www/chromium/files/patch-services_cert__verifier_cert__verifier__creation.cc +++ b/www/chromium/files/patch-services_cert__verifier_cert__verifier__creation.cc @@ -1,11 +1,11 @@ ---- services/cert_verifier/cert_verifier_creation.cc.orig 2021-12-14 11:45:09 UTC +--- services/cert_verifier/cert_verifier_creation.cc.orig 2022-02-28 16:54:41 UTC +++ services/cert_verifier/cert_verifier_creation.cc @@ -86,7 +86,7 @@ scoped_refptr<net::CertVerifyProc> CreateCertVerifyPro scoped_refptr<net::CertVerifyProc> CreateOldDefaultWithoutCaching( scoped_refptr<net::CertNetFetcher> cert_net_fetcher) { scoped_refptr<net::CertVerifyProc> verify_proc; --#if defined(OS_FUCHSIA) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_FUCHSIA) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) verify_proc = net::CertVerifyProc::CreateBuiltinVerifyProc(std::move(cert_net_fetcher)); #else @@ -13,17 +13,18 @@ scoped_refptr<net::CertNetFetcher> cert_net_fetcher) { scoped_refptr<net::CertVerifyProc> verify_proc; #if BUILDFLAG(CHROME_ROOT_STORE_SUPPORTED) && \ -- (defined(OS_LINUX) || defined(OS_WIN)) -+ (defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)) +- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)) verify_proc = net::CreateCertVerifyProcBuiltin( std::move(cert_net_fetcher), net::CreateSslSystemTrustStoreChromeRoot()); #elif BUILDFLAG(BUILTIN_CERT_VERIFIER_FEATURE_SUPPORTED) -@@ -120,7 +120,7 @@ scoped_refptr<net::CertVerifyProc> CreateNewDefaultWit - - bool IsUsingCertNetFetcher() { - #if defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_CHROMEOS) || \ -- defined(OS_LINUX) || \ -+ defined(OS_LINUX) || defined(OS_BSD) || \ - BUILDFLAG(TRIAL_COMPARISON_CERT_VERIFIER_SUPPORTED) || \ - BUILDFLAG(BUILTIN_CERT_VERIFIER_FEATURE_SUPPORTED) +@@ -122,7 +122,8 @@ bool IsUsingCertNetFetcher() { + #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || \ + BUILDFLAG(TRIAL_COMPARISON_CERT_VERIFIER_SUPPORTED) || \ +- BUILDFLAG(BUILTIN_CERT_VERIFIER_FEATURE_SUPPORTED) ++ BUILDFLAG(BUILTIN_CERT_VERIFIER_FEATURE_SUPPORTED) || \ ++ BUILDFLAG(IS_BSD) return true; + #else + return false; diff --git a/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc b/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc index 6df9248f3107..86f216c72fe8 100644 --- a/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc +++ b/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc @@ -1,11 +1,11 @@ ---- services/device/geolocation/location_arbitrator.cc.orig 2021-07-19 18:45:20 UTC +--- services/device/geolocation/location_arbitrator.cc.orig 2022-02-28 16:54:41 UTC +++ services/device/geolocation/location_arbitrator.cc @@ -161,7 +161,7 @@ LocationArbitrator::NewNetworkLocationProvider( std::unique_ptr<LocationProvider> LocationArbitrator::NewSystemLocationProvider() { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) return nullptr; #else return device::NewSystemLocationProvider(main_task_runner_, diff --git a/www/chromium/files/patch-services_device_hid_BUILD.gn b/www/chromium/files/patch-services_device_hid_BUILD.gn index 8daba5b6e471..75291680145b 100644 --- a/www/chromium/files/patch-services_device_hid_BUILD.gn +++ b/www/chromium/files/patch-services_device_hid_BUILD.gn @@ -1,6 +1,6 @@ ---- services/device/hid/BUILD.gn.orig 2022-02-07 13:39:41 UTC +--- services/device/hid/BUILD.gn.orig 2022-02-28 16:54:41 UTC +++ services/device/hid/BUILD.gn -@@ -33,6 +33,25 @@ source_set("hid") { +@@ -35,6 +35,25 @@ source_set("hid") { "//services/device/public/mojom", ] diff --git a/www/chromium/files/patch-services_device_hid_hid__service.cc b/www/chromium/files/patch-services_device_hid_hid__service.cc index 318ed19b3b68..fec0b0ae6285 100644 --- a/www/chromium/files/patch-services_device_hid_hid__service.cc +++ b/www/chromium/files/patch-services_device_hid_hid__service.cc @@ -1,24 +1,24 @@ ---- services/device/hid/hid_service.cc.orig 2022-02-07 13:39:41 UTC +--- services/device/hid/hid_service.cc.orig 2022-02-28 16:54:41 UTC +++ services/device/hid/hid_service.cc @@ -18,6 +18,10 @@ - #if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(USE_UDEV) + #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(USE_UDEV) #include "services/device/hid/hid_service_linux.h" -+#elif defined(OS_OPENBSD) ++#elif BUILDFLAG(IS_OPENBSD) +#include "services/device/hid/hid_service_fido.h" -+#elif defined(OS_FREEBSD) ++#elif BUILDFLAG(IS_FREEBSD) +#include "services/device/hid/hid_service_freebsd.h" - #elif defined(OS_MAC) + #elif BUILDFLAG(IS_MAC) #include "services/device/hid/hid_service_mac.h" - #elif defined(OS_WIN) + #elif BUILDFLAG(IS_WIN) @@ -61,6 +65,10 @@ constexpr base::TaskTraits HidService::kBlockingTaskTr std::unique_ptr<HidService> HidService::Create() { - #if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(USE_UDEV) + #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(USE_UDEV) return base::WrapUnique(new HidServiceLinux()); -+#elif defined(OS_OPENBSD) ++#elif BUILDFLAG(IS_OPENBSD) + return base::WrapUnique(new HidServiceFido()); -+#elif defined(OS_FREEBSD) ++#elif BUILDFLAG(IS_FREEBSD) + return base::WrapUnique(new HidServiceFreeBSD()); - #elif defined(OS_MAC) + #elif BUILDFLAG(IS_MAC) return base::WrapUnique(new HidServiceMac()); - #elif defined(OS_WIN) + #elif BUILDFLAG(IS_WIN) diff --git a/www/chromium/files/patch-services_device_serial_serial__device__enumerator.cc b/www/chromium/files/patch-services_device_serial_serial__device__enumerator.cc index a1600d4c0ce4..5ac0482aaa6d 100644 --- a/www/chromium/files/patch-services_device_serial_serial__device__enumerator.cc +++ b/www/chromium/files/patch-services_device_serial_serial__device__enumerator.cc @@ -1,20 +1,20 @@ ---- services/device/serial/serial_device_enumerator.cc.orig 2021-04-14 18:41:08 UTC +--- services/device/serial/serial_device_enumerator.cc.orig 2022-02-28 16:54:41 UTC +++ services/device/serial/serial_device_enumerator.cc @@ -10,7 +10,7 @@ #include "build/build_config.h" #include "components/device_event_log/device_event_log.h" --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "services/device/serial/serial_device_enumerator_linux.h" - #elif defined(OS_MAC) + #elif BUILDFLAG(IS_MAC) #include "services/device/serial/serial_device_enumerator_mac.h" @@ -23,7 +23,7 @@ namespace device { // static std::unique_ptr<SerialDeviceEnumerator> SerialDeviceEnumerator::Create( scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) return SerialDeviceEnumeratorLinux::Create(); - #elif defined(OS_MAC) + #elif BUILDFLAG(IS_MAC) return std::make_unique<SerialDeviceEnumeratorMac>(); diff --git a/www/chromium/files/patch-services_device_serial_serial__io__handler__posix.cc b/www/chromium/files/patch-services_device_serial_serial__io__handler__posix.cc index 6ce65c30d344..9b477e51ff61 100644 --- a/www/chromium/files/patch-services_device_serial_serial__io__handler__posix.cc +++ b/www/chromium/files/patch-services_device_serial_serial__io__handler__posix.cc @@ -1,11 +1,11 @@ ---- services/device/serial/serial_io_handler_posix.cc.orig 2022-02-07 13:39:41 UTC +--- services/device/serial/serial_io_handler_posix.cc.orig 2022-02-28 16:54:41 UTC +++ services/device/serial/serial_io_handler_posix.cc @@ -68,7 +68,7 @@ bool BitrateToSpeedConstant(int bitrate, speed_t* spee BITRATE_TO_SPEED_CASE(9600) BITRATE_TO_SPEED_CASE(19200) BITRATE_TO_SPEED_CASE(38400) --#if !defined(OS_MAC) -+#if !defined(OS_MAC) && !defined(OS_BSD) +-#if !BUILDFLAG(IS_MAC) ++#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD) BITRATE_TO_SPEED_CASE(57600) BITRATE_TO_SPEED_CASE(115200) BITRATE_TO_SPEED_CASE(230400) diff --git a/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc b/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc index 452169afee37..9eb05649b683 100644 --- a/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc +++ b/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc @@ -1,6 +1,6 @@ ---- services/device/time_zone_monitor/time_zone_monitor_linux.cc.orig 2021-12-31 00:57:38 UTC +--- services/device/time_zone_monitor/time_zone_monitor_linux.cc.orig 2022-02-28 16:54:41 UTC +++ services/device/time_zone_monitor/time_zone_monitor_linux.cc -@@ -130,7 +130,11 @@ class TimeZoneMonitorLinuxImpl +@@ -137,7 +137,11 @@ class TimeZoneMonitorLinuxImpl // false positives are harmless, assuming the false positive rate is // reasonable. const char* const kFilesToWatch[] = { diff --git a/www/chromium/files/patch-services_device_usb_BUILD.gn b/www/chromium/files/patch-services_device_usb_BUILD.gn index 5feccc6d00b6..9e9f692c95ad 100644 --- a/www/chromium/files/patch-services_device_usb_BUILD.gn +++ b/www/chromium/files/patch-services_device_usb_BUILD.gn @@ -1,6 +1,6 @@ ---- services/device/usb/BUILD.gn.orig 2022-02-07 13:39:41 UTC +--- services/device/usb/BUILD.gn.orig 2022-02-28 16:54:41 UTC +++ services/device/usb/BUILD.gn -@@ -102,15 +102,17 @@ static_library("usb") { +@@ -103,15 +103,17 @@ static_library("usb") { deps += [ "//third_party/re2" ] } @@ -27,7 +27,7 @@ # These sources and deps are required for libusb. # TODO(https://crbug.com/1096743) Remove these sources. -@@ -151,7 +153,7 @@ static_library("usb") { +@@ -152,7 +154,7 @@ static_library("usb") { deps += [ "//device/udev_linux" ] } diff --git a/www/chromium/files/patch-services_network_BUILD.gn b/www/chromium/files/patch-services_network_BUILD.gn index f1882501ec19..44e0956698eb 100644 --- a/www/chromium/files/patch-services_network_BUILD.gn +++ b/www/chromium/files/patch-services_network_BUILD.gn @@ -1,6 +1,6 @@ ---- services/network/BUILD.gn.orig 2022-02-07 13:39:41 UTC +--- services/network/BUILD.gn.orig 2022-02-28 16:54:41 UTC +++ services/network/BUILD.gn -@@ -311,7 +311,6 @@ if (is_linux || is_chromeos) { +@@ -323,7 +323,6 @@ if (is_linux || is_chromeos) { ] deps = [ "//base:base", diff --git a/www/chromium/files/patch-services_network_network__context.cc b/www/chromium/files/patch-services_network_network__context.cc deleted file mode 100644 index f37c6d4b0aa9..000000000000 --- a/www/chromium/files/patch-services_network_network__context.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- services/network/network_context.cc.orig 2022-02-07 13:39:41 UTC -+++ services/network/network_context.cc -@@ -2544,7 +2544,7 @@ NetworkContext::MakeSessionCleanupCookieStore() const - - net::CookieCryptoDelegate* crypto_delegate = nullptr; - if (params_->enable_encrypted_cookies) { --#if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ -+#if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) && \ - !BUILDFLAG(IS_CHROMECAST) - DCHECK(network_service_->os_crypt_config_set()) - << "NetworkService::SetCryptConfig must be called before creating a " diff --git a/www/chromium/files/patch-services_network_network__service.cc b/www/chromium/files/patch-services_network_network__service.cc index d1601bd73ed2..c87c21f075a7 100644 --- a/www/chromium/files/patch-services_network_network__service.cc +++ b/www/chromium/files/patch-services_network_network__service.cc @@ -1,20 +1,11 @@ ---- services/network/network_service.cc.orig 2022-02-07 13:39:41 UTC +--- services/network/network_service.cc.orig 2022-02-28 16:54:41 UTC +++ services/network/network_service.cc -@@ -76,7 +76,7 @@ +@@ -77,7 +77,7 @@ #include "third_party/boringssl/src/include/openssl/cpu.h" #endif --#if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ -+#if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) && \ +-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) && \ !BUILDFLAG(IS_CHROMECAST) #include "components/os_crypt/key_storage_config_linux.h" #endif -@@ -625,7 +625,7 @@ void NetworkService::OnCertDBChanged() { - net::CertDatabase::GetInstance()->NotifyObserversCertDBChanged(); - } - --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) - void NetworkService::SetCryptConfig(mojom::CryptConfigPtr crypt_config) { - #if !BUILDFLAG(IS_CHROMECAST) - DCHECK(!os_crypt_config_set_); diff --git a/www/chromium/files/patch-services_network_network__service.h b/www/chromium/files/patch-services_network_network__service.h deleted file mode 100644 index ef78ae181cd1..000000000000 --- a/www/chromium/files/patch-services_network_network__service.h +++ /dev/null @@ -1,11 +0,0 @@ ---- services/network/network_service.h.orig 2021-12-14 11:45:09 UTC -+++ services/network/network_service.h -@@ -165,7 +165,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService - base::span<const uint8_t> crl_set, - mojom::NetworkService::UpdateCRLSetCallback callback) override; - void OnCertDBChanged() override; --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) - void SetCryptConfig(mojom::CryptConfigPtr crypt_config) override; - #endif - #if defined(OS_WIN) || defined(OS_MAC) diff --git a/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h b/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h index 9437ca58e43d..f91b0917c11f 100644 --- a/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h +++ b/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h @@ -1,20 +1,20 @@ ---- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h.orig 2022-02-07 13:39:41 UTC +--- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h.orig 2022-02-28 16:54:41 UTC +++ services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h @@ -45,7 +45,7 @@ class COMPONENT_EXPORT( mojom::RawOSMemDump*); static std::vector<mojom::VmRegionPtr> GetProcessMemoryMaps(base::ProcessId); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) static void SetProcSmapsForTesting(FILE*); - #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) - -@@ -61,7 +61,7 @@ class COMPONENT_EXPORT( + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || + // BUILDFLAG(IS_ANDROID) +@@ -62,7 +62,7 @@ class COMPONENT_EXPORT( static std::vector<mojom::VmRegionPtr> GetProcessModules(base::ProcessId); #endif --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) // Provides information on the dump state of resident pages. These values are // written to logs. New enum values can be added, but existing enums must // never be renumbered or deleted and reused. diff --git a/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__linux.cc b/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__linux.cc index d0ec9ff6cc67..0c02405f77a5 100644 --- a/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__linux.cc +++ b/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__linux.cc @@ -1,4 +1,4 @@ ---- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc.orig 2022-02-07 13:39:41 UTC +--- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc.orig 2022-02-28 16:54:41 UTC +++ services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc @@ -5,7 +5,9 @@ #include <dlfcn.h> @@ -48,7 +48,7 @@ // files. Refactor to get everything from /status using ProcessMetric. auto statm_file = GetProcPidDir(pid).Append("statm"); @@ -336,10 +345,12 @@ bool OSMetrics::FillOSMemoryDump(base::ProcessId pid, - #endif // defined(OS_ANDROID) + #endif // BUILDFLAG(IS_ANDROID) return true; +#endif diff --git a/www/chromium/files/patch-services_tracing_public_cpp_perfetto_perfetto__config.cc b/www/chromium/files/patch-services_tracing_public_cpp_perfetto_perfetto__config.cc index 65ba0a409e05..1f26208a7d6e 100644 --- a/www/chromium/files/patch-services_tracing_public_cpp_perfetto_perfetto__config.cc +++ b/www/chromium/files/patch-services_tracing_public_cpp_perfetto_perfetto__config.cc @@ -1,11 +1,11 @@ ---- services/tracing/public/cpp/perfetto/perfetto_config.cc.orig 2021-12-14 11:45:10 UTC +--- services/tracing/public/cpp/perfetto/perfetto_config.cc.orig 2022-02-28 16:54:41 UTC +++ services/tracing/public/cpp/perfetto/perfetto_config.cc @@ -124,7 +124,7 @@ void AddDataSourceConfigs( // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. #if BUILDFLAG(IS_CHROMEOS_ASH) || \ -- (BUILDFLAG(IS_CHROMECAST) && defined(OS_LINUX)) -+ (BUILDFLAG(IS_CHROMECAST) && (defined(OS_LINUX) || defined(OS_BSD))) +- (BUILDFLAG(IS_CHROMECAST) && BUILDFLAG(IS_LINUX)) ++ (BUILDFLAG(IS_CHROMECAST) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD))) if (source_names.empty() || source_names.count(tracing::mojom::kSystemTraceDataSourceName) == 1) { AddDataSourceConfig( diff --git a/www/chromium/files/patch-services_video__capture_broadcasting__receiver.cc b/www/chromium/files/patch-services_video__capture_broadcasting__receiver.cc index 5410c0a5f6b0..e39571c78e5b 100644 --- a/www/chromium/files/patch-services_video__capture_broadcasting__receiver.cc +++ b/www/chromium/files/patch-services_video__capture_broadcasting__receiver.cc @@ -1,11 +1,11 @@ ---- services/video_capture/broadcasting_receiver.cc.orig 2021-12-31 00:57:38 UTC +--- services/video_capture/broadcasting_receiver.cc.orig 2022-02-28 16:54:41 UTC +++ services/video_capture/broadcasting_receiver.cc @@ -28,7 +28,7 @@ void CloneSharedBufferHandle(const mojo::ScopedSharedB void CloneSharedBufferToRawFileDescriptorHandle( const mojo::ScopedSharedBufferHandle& source, media::mojom::VideoBufferHandlePtr* target) { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // |source| is unwrapped to a |PlatformSharedMemoryRegion|, from whence a file // descriptor can be extracted which is then mojo-wrapped. base::subtle::PlatformSharedMemoryRegion platform_region = @@ -13,8 +13,8 @@ ConvertRawFileDescriptorToSharedBuffer() { DCHECK(buffer_handle_->is_shared_memory_via_raw_file_descriptor()); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // The conversion unwraps the descriptor from its mojo handle to the raw file // descriptor (ie, an int). This is used to create a // PlatformSharedMemoryRegion which is then wrapped as a diff --git a/www/chromium/files/patch-third__party_angle_src_common_system__utils__posix.cpp b/www/chromium/files/patch-third__party_angle_src_common_system__utils__posix.cpp index 04acef3da032..2a2c884e552f 100644 --- a/www/chromium/files/patch-third__party_angle_src_common_system__utils__posix.cpp +++ b/www/chromium/files/patch-third__party_angle_src_common_system__utils__posix.cpp @@ -1,6 +1,6 @@ ---- third_party/angle/src/common/system_utils_posix.cpp.orig 2022-02-07 13:39:41 UTC +--- third_party/angle/src/common/system_utils_posix.cpp.orig 2022-02-28 16:54:41 UTC +++ third_party/angle/src/common/system_utils_posix.cpp -@@ -159,7 +159,9 @@ Library *OpenSharedLibraryWithExtension(const char *li +@@ -248,7 +248,9 @@ Library *OpenSharedLibraryWithExtensionAndGetError(con int extraFlags = 0; if (searchType == SearchType::AlreadyLoaded) { diff --git a/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp b/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp index bbb30270d0c6..5ea43497f6f3 100644 --- a/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp +++ b/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp @@ -1,4 +1,4 @@ ---- third_party/angle/src/libANGLE/Display.cpp.orig 2022-02-07 13:39:41 UTC +--- third_party/angle/src/libANGLE/Display.cpp.orig 2022-02-28 16:54:41 UTC +++ third_party/angle/src/libANGLE/Display.cpp @@ -55,7 +55,7 @@ # include "libANGLE/renderer/gl/wgl/DisplayWGL.h" @@ -36,7 +36,7 @@ # if defined(ANGLE_USE_X11) if (platformType == EGL_PLATFORM_X11_EXT && rx::IsVulkanXcbDisplayAvailable()) { -@@ -1815,7 +1815,7 @@ static ClientExtensions GenerateClientExtensions() +@@ -1893,7 +1893,7 @@ static ClientExtensions GenerateClientExtensions() extensions.x11Visual = true; #endif diff --git a/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h b/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h index f2bbeca87d53..9e0cb54e9bbd 100644 --- a/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h +++ b/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h @@ -1,6 +1,6 @@ ---- third_party/angle/src/libANGLE/renderer/driver_utils.h.orig 2022-02-07 13:39:41 UTC +--- third_party/angle/src/libANGLE/renderer/driver_utils.h.orig 2022-02-28 16:54:41 UTC +++ third_party/angle/src/libANGLE/renderer/driver_utils.h -@@ -173,7 +173,7 @@ inline bool IsWindows() +@@ -179,7 +179,7 @@ inline bool IsWindows() inline bool IsLinux() { diff --git a/www/chromium/files/patch-third__party_angle_src_libANGLE_validationEGL.h b/www/chromium/files/patch-third__party_angle_src_libANGLE_validationEGL.h deleted file mode 100644 index 91633795bf61..000000000000 --- a/www/chromium/files/patch-third__party_angle_src_libANGLE_validationEGL.h +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/angle/src/libANGLE/validationEGL.h.orig 2022-02-07 13:39:41 UTC -+++ third_party/angle/src/libANGLE/validationEGL.h -@@ -121,7 +121,7 @@ inline const AttributeMap PackParam<const AttributeMap - - // In a 32-bit environment the EGLAttrib and EGLint types are the same. We need to mask out one of - // the two specializations to avoid having an override ambiguity. --#if defined(ANGLE_IS_64_BIT_CPU) -+#if defined(ANGLE_IS_64_BIT_CPU) || defined(ANGLE_PLATFORM_OPENBSD) - template <> - inline const AttributeMap PackParam<const AttributeMap &, const EGLAttrib *>( - const EGLAttrib *attribs) diff --git a/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc b/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc index a89c64c0d4bc..9a1fe95c2fc0 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc @@ -1,26 +1,26 @@ ---- third_party/blink/renderer/controller/blink_initializer.cc.orig 2022-02-07 13:39:41 UTC +--- third_party/blink/renderer/controller/blink_initializer.cc.orig 2022-02-28 16:54:41 UTC +++ third_party/blink/renderer/controller/blink_initializer.cc @@ -71,12 +71,12 @@ #include "third_party/blink/renderer/controller/oom_intervention_impl.h" #endif --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "third_party/blink/renderer/controller/memory_usage_monitor_posix.h" #endif - #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ -- defined(OS_MAC) || defined(OS_WIN) -+ defined(OS_MAC) || defined(OS_WIN) || defined(OS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ +- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) #include "third_party/blink/renderer/controller/highest_pmf_reporter.h" #include "third_party/blink/renderer/controller/user_level_memory_pressure_signal_generator.h" #endif @@ -156,7 +156,7 @@ void InitializeCommon(Platform* platform, mojo::Binder #endif - #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ -- defined(OS_MAC) || defined(OS_WIN) -+ defined(OS_MAC) || defined(OS_WIN) || defined(OS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ +- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) // Initialize UserLevelMemoryPressureSignalGenerator so it starts monitoring. if (UserLevelMemoryPressureSignalGenerator::Enabled()) UserLevelMemoryPressureSignalGenerator::Instance(); @@ -28,8 +28,8 @@ main_thread->GetTaskRunner()); #endif --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) binders.Add(ConvertToBaseRepeatingCallback( CrossThreadBindRepeating(&MemoryUsageMonitorPosix::Bind)), main_thread->GetTaskRunner()); diff --git a/www/chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc b/www/chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc index 3b274f0a4ce6..4cc481597288 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc @@ -1,10 +1,10 @@ ---- third_party/blink/renderer/controller/memory_usage_monitor_posix.cc.orig 2022-02-07 13:39:41 UTC +--- third_party/blink/renderer/controller/memory_usage_monitor_posix.cc.orig 2022-02-28 16:54:41 UTC +++ third_party/blink/renderer/controller/memory_usage_monitor_posix.cc -@@ -126,15 +126,17 @@ void MemoryUsageMonitorPosix::ResetFileDescriptors() { +@@ -128,15 +128,17 @@ void MemoryUsageMonitorPosix::ResetFileDescriptors() { void MemoryUsageMonitorPosix::SetProcFiles(base::File statm_file, base::File status_file) { -+#if !defined(OS_BSD) ++#if !BUILDFLAG(IS_BSD) DCHECK(statm_file.IsValid()); DCHECK(status_file.IsValid()); DCHECK_EQ(-1, statm_fd_.get()); @@ -14,8 +14,8 @@ +#endif } --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // static void MemoryUsageMonitorPosix::Bind( mojo::PendingReceiver<mojom::blink::MemoryUsageMonitorLinux> receiver) { diff --git a/www/chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.h b/www/chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.h index 82d6b2783a63..179fa1f6b946 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.h +++ b/www/chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.h @@ -1,11 +1,11 @@ ---- third_party/blink/renderer/controller/memory_usage_monitor_posix.h.orig 2021-12-14 11:45:11 UTC +--- third_party/blink/renderer/controller/memory_usage_monitor_posix.h.orig 2022-02-28 16:54:41 UTC +++ third_party/blink/renderer/controller/memory_usage_monitor_posix.h @@ -13,7 +13,7 @@ #include "third_party/blink/renderer/controller/controller_export.h" #include "third_party/blink/renderer/controller/memory_usage_monitor.h" --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "third_party/blink/public/mojom/memory_usage_monitor_linux.mojom-blink.h" #endif @@ -13,8 +13,8 @@ // MemoryUsageMonitor implementation for Android and Linux. class CONTROLLER_EXPORT MemoryUsageMonitorPosix : public MemoryUsageMonitor --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) , public mojom::blink::MemoryUsageMonitorLinux #endif @@ -22,8 +22,8 @@ public: MemoryUsageMonitorPosix() = default; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) static void Bind( mojo::PendingReceiver<mojom::blink::MemoryUsageMonitorLinux> receiver); #endif @@ -31,8 +31,8 @@ uint64_t* vm_size, uint64_t* vm_hwm_size); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // mojom::MemoryUsageMonitorLinux implementations: void SetProcFiles(base::File statm_file, base::File status_file) override; #endif @@ -40,8 +40,8 @@ base::ScopedFD statm_fd_; base::ScopedFD status_fd_; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) mojo::Receiver<mojom::blink::MemoryUsageMonitorLinux> receiver_{this}; #endif }; diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_editing_editing__behavior.cc b/www/chromium/files/patch-third__party_blink_renderer_core_editing_editing__behavior.cc index 397303369086..4297a55b2180 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_editing_editing__behavior.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_editing_editing__behavior.cc @@ -1,11 +1,11 @@ ---- third_party/blink/renderer/core/editing/editing_behavior.cc.orig 2021-12-14 11:45:11 UTC +--- third_party/blink/renderer/core/editing/editing_behavior.cc.orig 2022-02-28 16:54:41 UTC +++ third_party/blink/renderer/core/editing/editing_behavior.cc @@ -280,7 +280,7 @@ bool EditingBehavior::ShouldInsertCharacter(const Keyb // unexpected behaviour if (ch < ' ') return false; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // According to XKB map no keyboard combinations with ctrl key are mapped to // printable characters, however we need the filter as the DomKey/text could // contain printable characters. diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc b/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc index 7eecf3cdc106..75593e01cc42 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc @@ -1,11 +1,11 @@ ---- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2022-02-07 13:39:41 UTC +--- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2022-02-28 16:54:41 UTC +++ third_party/blink/renderer/core/exported/web_view_impl.cc -@@ -402,7 +402,7 @@ SkFontHinting RendererPreferencesToSkiaHinting( +@@ -401,7 +401,7 @@ SkFontHinting RendererPreferencesToSkiaHinting( const blink::RendererPreferences& prefs) { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) 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' @@ -13,8 +13,8 @@ renderer_preferences_.use_subpixel_positioning); // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. --#if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && !defined(OS_ANDROID) -+#if (defined(OS_LINUX) || defined(OS_BSD) || BUILDFLAG(IS_CHROMEOS_LACROS)) && !defined(OS_ANDROID) +-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) && \ + !BUILDFLAG(IS_ANDROID) if (!renderer_preferences_.system_font_family_name.empty()) { WebFontRenderStyle::SetSystemFontFamily(blink::WebString::FromUTF8( - renderer_preferences_.system_font_family_name)); diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc b/www/chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc new file mode 100644 index 000000000000..c414266c3dd9 --- /dev/null +++ b/www/chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc @@ -0,0 +1,20 @@ +--- third_party/blink/renderer/core/frame/web_frame_test.cc.orig 2022-02-28 16:54:41 UTC ++++ third_party/blink/renderer/core/frame/web_frame_test.cc +@@ -6310,7 +6310,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) { + EXPECT_EQ(64, ComputeOffset(layout_object, 1000, 1000)); + } + +-#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) ++#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD) + TEST_F(WebFrameTest, SelectRangeStaysHorizontallyAlignedWhenMoved) { + RegisterMockedHttpURLLoad("move_caret.html"); + +@@ -6689,7 +6689,7 @@ TEST_F(CompositedSelectionBoundsTest, SVGBasic) { + TEST_F(CompositedSelectionBoundsTest, SVGTextWithFragments) { + RunTest("composited_selection_bounds_svg_text_with_fragments.html"); + } +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #if !BUILDFLAG(IS_ANDROID) + TEST_F(CompositedSelectionBoundsTest, Input) { + web_view_helper_.GetWebView()->GetSettings()->SetDefaultFontSize(16); diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc b/www/chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc index 5ac574b6c65f..063605f9fbcd 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc @@ -1,11 +1,11 @@ ---- third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig 2022-02-07 13:39:41 UTC +--- third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig 2022-02-28 16:54:41 UTC +++ third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc @@ -44,7 +44,7 @@ constexpr base::TimeDelta kEncodeRowSlackBeforeDeadlin /* The value is based on user statistics on Nov 2017. */ - #if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ -- defined(OS_WIN)) -+ defined(OS_WIN)) || defined(OS_BSD) + #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN)) ++ BUILDFLAG(IS_WIN)) || BUILDFLAG(IS_BSD) const double kIdleTaskStartTimeoutDelayMs = 1000.0; #else const double kIdleTaskStartTimeoutDelayMs = 4000.0; // For ChromeOS, Mobile diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc b/www/chromium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc index 89c359ce5ed1..6787f1bc9ad7 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc @@ -1,11 +1,11 @@ ---- third_party/blink/renderer/core/html/forms/internal_popup_menu.cc.orig 2021-12-14 11:45:12 UTC +--- third_party/blink/renderer/core/html/forms/internal_popup_menu.cc.orig 2022-02-28 16:54:41 UTC +++ third_party/blink/renderer/core/html/forms/internal_popup_menu.cc @@ -159,7 +159,7 @@ class InternalPopupMenu::ItemIterationContext { is_in_group_(false), buffer_(buffer) { DCHECK(buffer_); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // On other platforms, the <option> background color is the same as the // <select> background color. On Linux, that makes the <option> // background color very dark, so by default, try to use a lighter diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc b/www/chromium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc index 38bb5e0a4735..c7b78f2a0dc7 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc @@ -1,11 +1,11 @@ ---- third_party/blink/renderer/core/inspector/inspector_memory_agent.cc.orig 2021-04-14 18:41:10 UTC +--- third_party/blink/renderer/core/inspector/inspector_memory_agent.cc.orig 2022-02-28 16:54:41 UTC +++ third_party/blink/renderer/core/inspector/inspector_memory_agent.cc @@ -186,7 +186,7 @@ InspectorMemoryAgent::GetSamplingProfileById(uint32_t Vector<String> InspectorMemoryAgent::Symbolize( const WebVector<void*>& addresses) { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // TODO(alph): Move symbolization to the client. Vector<void*> addresses_to_symbolize; for (size_t i = 0; i < addresses.size(); i++) { diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc b/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc index 7348113f9588..47728e01b468 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc @@ -1,20 +1,20 @@ ---- third_party/blink/renderer/core/layout/layout_view.cc.orig 2021-12-14 11:45:12 UTC +--- third_party/blink/renderer/core/layout/layout_view.cc.orig 2022-02-28 16:54:41 UTC +++ third_party/blink/renderer/core/layout/layout_view.cc -@@ -64,7 +64,7 @@ - #include "third_party/blink/renderer/platform/runtime_enabled_features.h" +@@ -63,7 +63,7 @@ #include "ui/display/screen_info.h" + #include "ui/gfx/geometry/quad_f.h" --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "third_party/blink/renderer/platform/fonts/font_cache.h" #endif -@@ -362,7 +362,7 @@ void LayoutView::UpdateLayout() { +@@ -357,7 +357,7 @@ void LayoutView::UpdateLayout() { DCHECK(!layout_state_); LayoutState root_layout_state(*this); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // The font code in FontPlatformData does not have a direct connection to the // document, the frame or anything from which we could retrieve the device // scale factor. After using zoom for DSF, the GraphicsContext does only ever diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc b/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc index db49392b466c..150ecdb32192 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc @@ -1,11 +1,11 @@ ---- third_party/blink/renderer/core/paint/paint_layer.cc.orig 2021-12-14 11:45:12 UTC +--- third_party/blink/renderer/core/paint/paint_layer.cc.orig 2022-02-28 16:54:41 UTC +++ third_party/blink/renderer/core/paint/paint_layer.cc -@@ -112,7 +112,7 @@ namespace { - static CompositingQueryMode g_compositing_query_mode = - kCompositingQueriesAreOnlyAllowedInCertainDocumentLifecyclePhases; +@@ -108,7 +108,7 @@ namespace blink { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + namespace { + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) struct SameSizeAsPaintLayer : GarbageCollected<PaintLayer>, DisplayItemClient { // The bit fields may fit into the machine word of DisplayItemClient which // has only 8-bit data. diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc b/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc index 1a7ea22d71d9..b66dff4e1d7b 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc @@ -1,20 +1,20 @@ ---- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2022-02-07 13:39:41 UTC +--- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2022-02-28 16:54:41 UTC +++ third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc -@@ -152,7 +152,7 @@ bool ScrollbarThemeAura::SupportsDragSnapBack() const +@@ -151,7 +151,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. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) return false; #else return true; -@@ -327,7 +327,7 @@ bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scr +@@ -326,7 +326,7 @@ bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scr const WebMouseEvent& event) { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) if (event.button == WebPointerProperties::Button::kMiddle) return true; #endif diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_media_audio_audio__device__factory.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_media_audio_audio__device__factory.cc new file mode 100644 index 000000000000..cb1cb611fb66 --- /dev/null +++ b/www/chromium/files/patch-third__party_blink_renderer_modules_media_audio_audio__device__factory.cc @@ -0,0 +1,11 @@ +--- third_party/blink/renderer/modules/media/audio/audio_device_factory.cc.orig 2022-02-28 16:54:41 UTC ++++ third_party/blink/renderer/modules/media/audio/audio_device_factory.cc +@@ -34,7 +34,7 @@ AudioDeviceFactory* AudioDeviceFactory::factory_ = nul + namespace { + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS_LACROS) ++ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + // Due to driver deadlock issues on Windows (http://crbug/422522) there is a + // chance device authorization response is never received from the browser side. + // In this case we will time out, to avoid renderer hang forever waiting for diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc new file mode 100644 index 000000000000..70c37604e227 --- /dev/null +++ b/www/chromium/files/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc @@ -0,0 +1,11 @@ +--- third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc.orig 2022-02-28 16:54:41 UTC ++++ third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc +@@ -678,7 +678,7 @@ TEST_F(AudioRendererMixerManagerTest, MixerParamsLaten + mixer->get_output_params_for_testing().sample_rate()); + + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + // Use 10 ms buffer (441 frames per buffer). + EXPECT_EQ(output_sample_rate / 100, + mixer->get_output_params_for_testing().frames_per_buffer()); diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc new file mode 100644 index 000000000000..278c182daa2e --- /dev/null +++ b/www/chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc @@ -0,0 +1,11 @@ +--- third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig 2022-02-28 16:54:41 UTC ++++ third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc +@@ -291,7 +291,7 @@ TEST_F(MAYBE_WebRtcAudioRendererTest, DISABLED_VerifyS + SetupRenderer(kDefaultOutputDeviceId); + renderer_proxy_->Start(); + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + static const int kExpectedBufferSize = kHardwareSampleRate / 100; + #elif BUILDFLAG(IS_ANDROID) + static const int kExpectedBufferSize = 2 * kHardwareSampleRate / 100; diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc new file mode 100644 index 000000000000..2013dbe181bb --- /dev/null +++ b/www/chromium/files/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc @@ -0,0 +1,11 @@ +--- third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc.orig 2022-02-28 16:54:41 UTC ++++ third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc +@@ -379,7 +379,7 @@ class AudioWorkletThreadPriorityTest + + // TODO(crbug.com/1022888): The worklet thread priority is always NORMAL + // on OS_LINUX and OS_CHROMEOS regardless of the thread priority setting. +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + if (expected_priority == base::ThreadPriority::REALTIME_AUDIO || + expected_priority == base::ThreadPriority::DISPLAY) { + EXPECT_EQ(actual_priority, base::ThreadPriority::NORMAL); diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc index 5c9e4bf4e0b1..f32b6fc1dbe6 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc @@ -1,11 +1,11 @@ ---- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2022-02-07 13:39:41 UTC +--- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2022-02-28 16:54:41 UTC +++ third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc @@ -6102,7 +6102,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid constexpr bool kAllowZeroCopyImages = true; #endif --#if defined(OS_ANDROID) || defined(OS_LINUX) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // TODO(crbug.com/1175907): Only TexImage2D seems to work with the GPU path on // Android M -- appears to work fine on R, but to avoid regressions in <video> // limit to TexImage2D only for now. Fails conformance test on Nexus 5X: diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__webcodecs__video__frame.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__webcodecs__video__frame.cc index 28be31d52db6..06a7625ca0b0 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__webcodecs__video__frame.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__webcodecs__video__frame.cc @@ -1,11 +1,11 @@ ---- third_party/blink/renderer/modules/webgl/webgl_webcodecs_video_frame.cc.orig 2021-09-14 01:52:03 UTC +--- third_party/blink/renderer/modules/webgl/webgl_webcodecs_video_frame.cc.orig 2022-02-28 16:54:41 UTC +++ third_party/blink/renderer/modules/webgl/webgl_webcodecs_video_frame.cc -@@ -98,7 +98,7 @@ WebGLExtensionName WebGLWebCodecsVideoFrame::GetName() - bool WebGLWebCodecsVideoFrame::Supported(WebGLRenderingContextBase* context) { +@@ -99,7 +99,7 @@ bool WebGLWebCodecsVideoFrame::Supported(WebGLRenderin // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_FUCHSIA) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_FUCHSIA) || defined(OS_BSD) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) // TODO(jie.a.chen@intel.com): Add Linux support. return false; - #elif defined(OS_MAC) + #elif BUILDFLAG(IS_MAC) diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn b/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn new file mode 100644 index 000000000000..fb505f4addde --- /dev/null +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn @@ -0,0 +1,11 @@ +--- third_party/blink/renderer/platform/BUILD.gn.orig 2022-02-28 16:54:41 UTC ++++ third_party/blink/renderer/platform/BUILD.gn +@@ -1902,7 +1902,7 @@ static_library("test_support") { + ] + + # fuzzed_data_provider may not work with a custom toolchain. +- if (custom_toolchain == "" && is_clang) { ++ if ((custom_toolchain == "" && is_clang) && !is_bsd) { + sources += [ + "testing/fuzzed_data_provider.cc", + "testing/fuzzed_data_provider.h", diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc index f840b2e5185c..fefe7799edec 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/fonts/font_description.cc.orig 2021-12-14 11:45:12 UTC +--- third_party/blink/renderer/platform/fonts/font_description.cc.orig 2022-02-28 16:54:41 UTC +++ third_party/blink/renderer/platform/fonts/font_description.cc -@@ -38,7 +38,7 @@ +@@ -39,7 +39,7 @@ #include "third_party/blink/renderer/platform/wtf/text/string_hash.h" #include "third_party/blink/renderer/platform/wtf/text/string_hasher.h" @@ -9,7 +9,7 @@ #include "third_party/blink/renderer/platform/fonts/font_cache.h" #endif -@@ -259,7 +259,7 @@ FontCacheKey FontDescription::CacheKey( +@@ -262,7 +262,7 @@ FontCacheKey FontDescription::CacheKey( static_cast<unsigned>(fields_.orientation_) << 1 | // bit 2-3 static_cast<unsigned>(fields_.subpixel_text_position_); // bit 1 diff --git a/www/chromium/files/patch-third__party_boringssl_BUILD.generated.gni b/www/chromium/files/patch-third__party_boringssl_BUILD.generated.gni index 2c560f4c783e..3950bc4e9899 100644 --- a/www/chromium/files/patch-third__party_boringssl_BUILD.generated.gni +++ b/www/chromium/files/patch-third__party_boringssl_BUILD.generated.gni @@ -1,6 +1,6 @@ ---- third_party/boringssl/BUILD.generated.gni.orig 2022-02-07 13:39:41 UTC +--- third_party/boringssl/BUILD.generated.gni.orig 2022-02-28 16:54:41 UTC +++ third_party/boringssl/BUILD.generated.gni -@@ -183,6 +183,7 @@ crypto_sources = [ +@@ -184,6 +184,7 @@ crypto_sources = [ "src/crypto/rand_extra/deterministic.c", "src/crypto/rand_extra/forkunsafe.c", "src/crypto/rand_extra/fuchsia.c", diff --git a/www/chromium/files/patch-third__party_boringssl_BUILD.gn b/www/chromium/files/patch-third__party_boringssl_BUILD.gn new file mode 100644 index 000000000000..bd397418d100 --- /dev/null +++ b/www/chromium/files/patch-third__party_boringssl_BUILD.gn @@ -0,0 +1,11 @@ +--- third_party/boringssl/BUILD.gn.orig 2022-03-01 11:59:41 UTC ++++ third_party/boringssl/BUILD.gn +@@ -92,7 +92,7 @@ if (is_win && !is_msan && current_cpu != "arm64") { + public_configs = [ ":no_asm_config" ] + } + } else if (current_cpu == "arm64") { +- if (is_linux || is_chromeos || is_android) { ++ if ((is_linux || is_chromeos || is_android) && !is_bsd) { + sources += crypto_sources_linux_aarch64 + } else if (is_apple) { + # TODO(davidben): Rename all the file lists, etc., upstream from mac diff --git a/www/chromium/files/patch-third__party_boringssl_src_include_openssl_cpu.h b/www/chromium/files/patch-third__party_boringssl_src_include_openssl_cpu.h deleted file mode 100644 index 147fd4d260d8..000000000000 --- a/www/chromium/files/patch-third__party_boringssl_src_include_openssl_cpu.h +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/boringssl/src/include/openssl/cpu.h.orig 2022-02-07 13:39:41 UTC -+++ third_party/boringssl/src/include/openssl/cpu.h -@@ -105,7 +105,7 @@ OPENSSL_INLINE const uint32_t *OPENSSL_ia32cap_get(voi - - #if defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64) - --#if defined(OPENSSL_APPLE) -+#if defined(OPENSSL_APPLE) || defined(OPENSSL_OPENBSD) - // iOS builds use the static ARM configuration. - #define OPENSSL_STATIC_ARMCAP - #endif diff --git a/www/chromium/files/patch-third__party_crashpad_crashpad_minidump_minidump__misc__info__writer.cc b/www/chromium/files/patch-third__party_crashpad_crashpad_minidump_minidump__misc__info__writer.cc index 48ccdc304a85..ab705ee46ed1 100644 --- a/www/chromium/files/patch-third__party_crashpad_crashpad_minidump_minidump__misc__info__writer.cc +++ b/www/chromium/files/patch-third__party_crashpad_crashpad_minidump_minidump__misc__info__writer.cc @@ -1,8 +1,8 @@ ---- third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc.orig 2022-02-07 13:39:41 UTC +--- third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc.orig 2022-02-28 16:54:41 UTC +++ third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc @@ -119,6 +119,10 @@ std::string MinidumpMiscInfoDebugBuildString() { static constexpr char kOS[] = "win"; - #elif defined(OS_FUCHSIA) + #elif BUILDFLAG(IS_FUCHSIA) static constexpr char kOS[] = "fuchsia"; +#elif defined(OS_OPENBSD) + static constexpr char kOS[] = "openbsd"; diff --git a/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_address__types.h b/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_address__types.h index 7277e7be8040..bfb69fcfc0d0 100644 --- a/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_address__types.h +++ b/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_address__types.h @@ -1,20 +1,20 @@ ---- third_party/crashpad/crashpad/util/misc/address_types.h.orig 2022-02-07 13:39:41 UTC +--- third_party/crashpad/crashpad/util/misc/address_types.h.orig 2022-02-28 16:54:41 UTC +++ third_party/crashpad/crashpad/util/misc/address_types.h @@ -25,7 +25,7 @@ #include <mach/mach_types.h> - #elif defined(OS_WIN) + #elif BUILDFLAG(IS_WIN) #include "util/win/address_types.h" --#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) -+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) #include "util/linux/address_types.h" - #elif defined(OS_FUCHSIA) + #elif BUILDFLAG(IS_FUCHSIA) #include <zircon/types.h> @@ -55,7 +55,7 @@ using VMSize = mach_vm_size_t; using VMAddress = WinVMAddress; using VMSize = WinVMSize; --#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) -+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) using VMAddress = LinuxVMAddress; using VMSize = LinuxVMSize; diff --git a/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_capture__context.h b/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_capture__context.h index 41979d9dd0c2..89caf45be9d7 100644 --- a/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_capture__context.h +++ b/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_capture__context.h @@ -1,21 +1,22 @@ ---- third_party/crashpad/crashpad/util/misc/capture_context.h.orig 2022-02-07 13:39:41 UTC +--- third_party/crashpad/crashpad/util/misc/capture_context.h.orig 2022-02-28 16:54:41 UTC +++ third_party/crashpad/crashpad/util/misc/capture_context.h @@ -21,7 +21,8 @@ #include <mach/mach.h> - #elif defined(OS_WIN) + #elif BUILDFLAG(IS_WIN) #include <windows.h> --#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) -+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ -+ defined(OS_FREEBSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ ++ BUILDFLAG(IS_FREEBSD) #include <ucontext.h> - #elif defined(OS_FUCHSIA) + #elif BUILDFLAG(IS_FUCHSIA) #include <signal.h> -@@ -38,7 +39,7 @@ using NativeCPUContext = arm_unified_thread_state; - #elif defined(OS_WIN) +@@ -38,7 +39,8 @@ using NativeCPUContext = arm_unified_thread_state; + #elif BUILDFLAG(IS_WIN) using NativeCPUContext = CONTEXT; - #elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ -- defined(OS_FUCHSIA) -+ defined(OS_FUCHSIA) || defined(OS_BSD) + #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ ++ BUILDFLAG(IS_BSD) using NativeCPUContext = ucontext_t; - #endif // OS_APPLE + #endif // BUILDFLAG(IS_APPLE) diff --git a/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_metrics.cc b/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_metrics.cc index 50408ed31b3a..a444c9f0a8e6 100644 --- a/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_metrics.cc +++ b/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_metrics.cc @@ -1,11 +1,11 @@ ---- third_party/crashpad/crashpad/util/misc/metrics.cc.orig 2022-02-07 13:39:41 UTC +--- third_party/crashpad/crashpad/util/misc/metrics.cc.orig 2022-02-28 16:54:41 UTC +++ third_party/crashpad/crashpad/util/misc/metrics.cc @@ -25,7 +25,7 @@ #define METRICS_OS_NAME "Win" - #elif defined(OS_ANDROID) + #elif BUILDFLAG(IS_ANDROID) #define METRICS_OS_NAME "Android" --#elif defined(OS_LINUX) || defined(OS_CHROMEOS) -+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #define METRICS_OS_NAME "Linux" - #elif defined(OS_FUCHSIA) + #elif BUILDFLAG(IS_FUCHSIA) #define METRICS_OS_NAME "Fuchsia" diff --git a/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_uuid.cc b/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_uuid.cc index c5966046234d..114a1c66d674 100644 --- a/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_uuid.cc +++ b/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_uuid.cc @@ -1,11 +1,11 @@ ---- third_party/crashpad/crashpad/util/misc/uuid.cc.orig 2022-02-07 13:39:41 UTC +--- third_party/crashpad/crashpad/util/misc/uuid.cc.orig 2022-02-28 16:54:41 UTC +++ third_party/crashpad/crashpad/util/misc/uuid.cc -@@ -100,7 +100,7 @@ bool UUID::InitializeWithNew() { +@@ -101,7 +101,7 @@ bool UUID::InitializeWithNew() { InitializeFromBytes(uuid); return true; - #elif defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -- defined(OS_ANDROID) || defined(OS_FUCHSIA) -+ defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD) + #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) // Linux, Android, and Fuchsia do not provide a UUID generator in a // widely-available system library. On Linux and Android, uuid_generate() // from libuuid is not available everywhere. diff --git a/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_close__multiple.cc b/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_close__multiple.cc index 2d339e682896..64580c643c83 100644 --- a/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_close__multiple.cc +++ b/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_close__multiple.cc @@ -1,11 +1,11 @@ ---- third_party/crashpad/crashpad/util/posix/close_multiple.cc.orig 2022-02-07 13:39:41 UTC +--- third_party/crashpad/crashpad/util/posix/close_multiple.cc.orig 2022-02-28 16:54:41 UTC +++ third_party/crashpad/crashpad/util/posix/close_multiple.cc @@ -72,7 +72,7 @@ void CloseNowOrOnExec(int fd, bool ebadf_ok) { // This is an advantage over looping over all possible file descriptors, because // no attempt needs to be made to close file descriptors that are not open. bool CloseMultipleNowOrOnExecUsingFDDir(int min_fd, int preserve_fd) { --#if defined(OS_APPLE) -+#if defined(OS_APPLE) || defined(OS_BSD) +-#if BUILDFLAG(IS_APPLE) ++#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) static constexpr char kFDDir[] = "/dev/fd"; - #elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) + #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) static constexpr char kFDDir[] = "/proc/self/fd"; diff --git a/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_drop__privileges.cc b/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_drop__privileges.cc index ed5802c696a0..035241c5dc1b 100644 --- a/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_drop__privileges.cc +++ b/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_drop__privileges.cc @@ -1,11 +1,11 @@ ---- third_party/crashpad/crashpad/util/posix/drop_privileges.cc.orig 2022-02-07 13:39:41 UTC +--- third_party/crashpad/crashpad/util/posix/drop_privileges.cc.orig 2022-02-28 16:54:41 UTC +++ third_party/crashpad/crashpad/util/posix/drop_privileges.cc @@ -25,7 +25,7 @@ void DropPrivileges() { gid_t gid = getgid(); uid_t uid = getuid(); --#if defined(OS_APPLE) -+#if defined(OS_APPLE) || defined(OS_BSD) +-#if BUILDFLAG(IS_APPLE) ++#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) // Based on the POSIX.1-2008 2013 edition documentation for setreuid() and // setregid(), setreuid() and setregid() alone should be sufficient to drop // privileges. The standard specifies that the saved ID should be set to the diff --git a/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_signals.cc b/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_signals.cc index cad1e5f82aec..4142e07930a7 100644 --- a/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_signals.cc +++ b/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_signals.cc @@ -1,24 +1,24 @@ ---- third_party/crashpad/crashpad/util/posix/signals.cc.orig 2022-02-07 13:39:41 UTC +--- third_party/crashpad/crashpad/util/posix/signals.cc.orig 2022-02-28 16:54:41 UTC +++ third_party/crashpad/crashpad/util/posix/signals.cc -@@ -50,7 +50,7 @@ constexpr int kCrashSignals[] = { +@@ -51,7 +51,7 @@ constexpr int kCrashSignals[] = { #if defined(SIGEMT) SIGEMT, #endif // defined(SIGEMT) --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) SIGXCPU, SIGXFSZ, - #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) -@@ -90,7 +90,7 @@ constexpr int kTerminateSignals[] = { + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +@@ -91,7 +91,7 @@ constexpr int kTerminateSignals[] = { SIGXCPU, SIGXFSZ, - #endif // defined(OS_APPLE) --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + #endif // BUILDFLAG(IS_APPLE) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) SIGIO, - #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) }; -@@ -232,8 +232,12 @@ bool Signals::WillSignalReraiseAutonomously(const sigi +@@ -233,8 +233,12 @@ bool Signals::WillSignalReraiseAutonomously(const sigi // remains. See 10.12.3 xnu-3789.41.3/bsd/kern/kern_sig.c // psignal_internal(). (code > 0 && diff --git a/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_symbolic__constants__posix.cc b/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_symbolic__constants__posix.cc index c47ff29b9163..df30cd15423b 100644 --- a/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_symbolic__constants__posix.cc +++ b/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_symbolic__constants__posix.cc @@ -1,20 +1,20 @@ ---- third_party/crashpad/crashpad/util/posix/symbolic_constants_posix.cc.orig 2022-02-07 13:39:41 UTC +--- third_party/crashpad/crashpad/util/posix/symbolic_constants_posix.cc.orig 2022-02-28 16:54:41 UTC +++ third_party/crashpad/crashpad/util/posix/symbolic_constants_posix.cc -@@ -64,7 +64,7 @@ constexpr const char* kSignalNames[] = { +@@ -66,7 +66,7 @@ constexpr const char* kSignalNames[] = { "INFO", "USR1", "USR2", --#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) -+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) #if defined(ARCH_CPU_MIPS_FAMILY) "HUP", "INT", -@@ -135,7 +135,7 @@ constexpr const char* kSignalNames[] = { +@@ -137,7 +137,7 @@ constexpr const char* kSignalNames[] = { #endif // defined(ARCH_CPU_MIPS_FAMILY) #endif }; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) // NSIG is 64 to account for real-time signals. static_assert(base::size(kSignalNames) == 32, "kSignalNames length"); #else diff --git a/www/chromium/files/patch-third__party_dawn_src_include_dawn__native_VulkanBackend.h b/www/chromium/files/patch-third__party_dawn_src_include_dawn__native_VulkanBackend.h index f572587d8778..eb2c1f59a696 100644 --- a/www/chromium/files/patch-third__party_dawn_src_include_dawn__native_VulkanBackend.h +++ b/www/chromium/files/patch-third__party_dawn_src_include_dawn__native_VulkanBackend.h @@ -1,6 +1,6 @@ ---- third_party/dawn/src/include/dawn_native/VulkanBackend.h.orig 2022-02-07 13:39:41 UTC +--- third_party/dawn/src/include/dawn_native/VulkanBackend.h.orig 2022-02-28 16:54:41 UTC +++ third_party/dawn/src/include/dawn_native/VulkanBackend.h -@@ -69,7 +69,7 @@ namespace dawn_native { namespace vulkan { +@@ -69,7 +69,7 @@ namespace dawn::native::vulkan { }; // Can't use DAWN_PLATFORM_LINUX since header included in both Dawn and Chrome diff --git a/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config.h b/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config.h index afd06806ed04..88bd6742fec4 100644 --- a/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config.h +++ b/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config.h @@ -1,15 +1,15 @@ ---- third_party/ffmpeg/chromium/config/Chrome/openbsd/arm64/config.h.orig 2022-02-07 13:39:41 UTC +--- third_party/ffmpeg/chromium/config/Chrome/openbsd/arm64/config.h.orig 2022-02-28 16:54:41 UTC +++ third_party/ffmpeg/chromium/config/Chrome/openbsd/arm64/config.h -@@ -0,0 +1,2703 @@ +@@ -0,0 +1,2744 @@ +/* Automatically generated by configure - do not modify! */ +#ifndef FFMPEG_CONFIG_H +#define FFMPEG_CONFIG_H -+/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/chromium/chromium-git/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags=-O2 --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=aarch64 --enable-armv8 --extra-cflags='-march=armv8-a' --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ ++/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/jrummell/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags=-O2 --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=aarch64 --enable-armv8 --extra-cflags='-march=armv8-a' --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ +#define FFMPEG_LICENSE "LGPL version 2.1 or later" +#define CONFIG_THIS_YEAR 2021 +#define FFMPEG_DATADIR "/usr/local/share/ffmpeg" +#define AVCONV_DATADIR "/usr/local/share/ffmpeg" -+#define CC_IDENT "OpenBSD clang version 11.1.0" ++#define CC_IDENT "OpenBSD clang version 13.0.0" +#define OS_NAME openbsd +#define av_restrict restrict +#define EXTERN_PREFIX "" @@ -32,6 +32,7 @@ +#define ARCH_PARISC 0 +#define ARCH_PPC 0 +#define ARCH_PPC64 0 ++#define ARCH_RISCV 0 +#define ARCH_S390 0 +#define ARCH_SH4 0 +#define ARCH_SPARC 0 @@ -362,6 +363,10 @@ +#define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_SMPTE_ST_2084_PQ 0 +#define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_ITU_R_2100_HLG 0 +#define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_LINEAR 0 ++#define HAVE_KCVIMAGEBUFFERYCBCRMATRIX_ITU_R_2020 0 ++#define HAVE_KCVIMAGEBUFFERCOLORPRIMARIES_ITU_R_2020 0 ++#define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_ITU_R_2020 0 ++#define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_SMPTE_ST_428_1 0 +#define HAVE_SOCKLEN_T 0 +#define HAVE_STRUCT_ADDRINFO 0 +#define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -376,6 +381,7 @@ +#define HAVE_STRUCT_SOCKADDR_STORAGE 0 +#define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1 +#define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 1 ++#define HAVE_GZIP 1 +#define HAVE_LIBDRM_GETFB2 0 +#define HAVE_MAKEINFO 1 +#define HAVE_MAKEINFO_HTML 0 @@ -388,6 +394,8 @@ +#define HAVE_PERL 1 +#define HAVE_POD2MAN 1 +#define HAVE_TEXI2HTML 0 ++#define HAVE_XMLLINT 1 ++#define HAVE_ZLIB_GZIP 0 +#define CONFIG_DOC 0 +#define CONFIG_HTMLPAGES 0 +#define CONFIG_MANPAGES 0 @@ -429,7 +437,6 @@ +#define CONFIG_LIBXVID 0 +#define CONFIG_DECKLINK 0 +#define CONFIG_LIBFDK_AAC 0 -+#define CONFIG_OPENSSL 0 +#define CONFIG_LIBTLS 0 +#define CONFIG_GMP 0 +#define CONFIG_LIBARIBB24 0 @@ -508,6 +515,7 @@ +#define CONFIG_MEDIACODEC 0 +#define CONFIG_OPENAL 0 +#define CONFIG_OPENGL 0 ++#define CONFIG_OPENSSL 0 +#define CONFIG_POCKETSPHINX 0 +#define CONFIG_VAPOURSYNTH 0 +#define CONFIG_ALSA 0 @@ -592,14 +600,16 @@ +#define CONFIG_FONTCONFIG 0 +#define CONFIG_LARGE_TESTS 1 +#define CONFIG_LINUX_PERF 0 ++#define CONFIG_MACOS_KPERF 0 +#define CONFIG_MEMORY_POISONING 0 +#define CONFIG_NEON_CLOBBER_TEST 0 +#define CONFIG_OSSFUZZ 0 +#define CONFIG_PIC 1 ++#define CONFIG_PTX_COMPRESSION 0 +#define CONFIG_THUMB 0 +#define CONFIG_VALGRIND_BACKTRACE 0 +#define CONFIG_XMM_CLOBBER_TEST 0 -+#define CONFIG_BSFS 1 ++#define CONFIG_BSFS 0 +#define CONFIG_DECODERS 1 +#define CONFIG_ENCODERS 0 +#define CONFIG_HWACCELS 0 @@ -725,7 +735,7 @@ +#define CONFIG_MPEG4_UNPACK_BFRAMES_BSF 0 +#define CONFIG_MOV2TEXTSUB_BSF 0 +#define CONFIG_NOISE_BSF 0 -+#define CONFIG_NULL_BSF 1 ++#define CONFIG_NULL_BSF 0 +#define CONFIG_OPUS_METADATA_BSF 0 +#define CONFIG_PCM_RECHUNK_BSF 0 +#define CONFIG_PRORES_METADATA_BSF 0 @@ -815,6 +825,7 @@ +#define CONFIG_FRWU_DECODER 0 +#define CONFIG_G2M_DECODER 0 +#define CONFIG_GDV_DECODER 0 ++#define CONFIG_GEM_DECODER 0 +#define CONFIG_GIF_DECODER 0 +#define CONFIG_H261_DECODER 0 +#define CONFIG_H263_DECODER 0 @@ -947,6 +958,7 @@ +#define CONFIG_SNOW_DECODER 0 +#define CONFIG_SP5X_DECODER 0 +#define CONFIG_SPEEDHQ_DECODER 0 ++#define CONFIG_SPEEX_DECODER 0 +#define CONFIG_SRGC_DECODER 0 +#define CONFIG_SUNRAST_DECODER 0 +#define CONFIG_SVQ1_DECODER 0 @@ -1084,6 +1096,7 @@ +#define CONFIG_MP3ON4_DECODER 0 +#define CONFIG_MPC7_DECODER 0 +#define CONFIG_MPC8_DECODER 0 ++#define CONFIG_MSNSIREN_DECODER 0 +#define CONFIG_NELLYMOSER_DECODER 0 +#define CONFIG_ON2AVC_DECODER 0 +#define CONFIG_OPUS_DECODER 0 @@ -1353,6 +1366,7 @@ +#define CONFIG_RV20_ENCODER 0 +#define CONFIG_S302M_ENCODER 0 +#define CONFIG_SGI_ENCODER 0 ++#define CONFIG_SMC_ENCODER 0 +#define CONFIG_SNOW_ENCODER 0 +#define CONFIG_SPEEDHQ_ENCODER 0 +#define CONFIG_SUNRAST_ENCODER 0 @@ -1486,7 +1500,6 @@ +#define CONFIG_LIBWEBP_ENCODER 0 +#define CONFIG_LIBX262_ENCODER 0 +#define CONFIG_LIBX264_ENCODER 0 -+#define CONFIG_LIBX264_ENCODER 0 +#define CONFIG_LIBX264RGB_ENCODER 0 +#define CONFIG_LIBX265_ENCODER 0 +#define CONFIG_LIBXAVS_ENCODER 0 @@ -1586,6 +1599,7 @@ +#define CONFIG_AAC_LATM_PARSER 0 +#define CONFIG_AC3_PARSER 0 +#define CONFIG_ADX_PARSER 0 ++#define CONFIG_AMR_PARSER 0 +#define CONFIG_AV1_PARSER 0 +#define CONFIG_AVS2_PARSER 0 +#define CONFIG_AVS3_PARSER 0 @@ -1677,6 +1691,7 @@ +#define CONFIG_ACRUSHER_FILTER 0 +#define CONFIG_ADECLICK_FILTER 0 +#define CONFIG_ADECLIP_FILTER 0 ++#define CONFIG_ADECORRELATE_FILTER 0 +#define CONFIG_ADELAY_FILTER 0 +#define CONFIG_ADENORM_FILTER 0 +#define CONFIG_ADERIVATIVE_FILTER 0 @@ -1690,10 +1705,12 @@ +#define CONFIG_AFIR_FILTER 0 +#define CONFIG_AFORMAT_FILTER 0 +#define CONFIG_AFREQSHIFT_FILTER 0 ++#define CONFIG_AFWTDN_FILTER 0 +#define CONFIG_AGATE_FILTER 0 +#define CONFIG_AIIR_FILTER 0 +#define CONFIG_AINTEGRAL_FILTER 0 +#define CONFIG_AINTERLEAVE_FILTER 0 ++#define CONFIG_ALATENCY_FILTER 0 +#define CONFIG_ALIMITER_FILTER 0 +#define CONFIG_ALLPASS_FILTER 0 +#define CONFIG_ALOOP_FILTER 0 @@ -1709,11 +1726,14 @@ +#define CONFIG_APERMS_FILTER 0 +#define CONFIG_APHASER_FILTER 0 +#define CONFIG_APHASESHIFT_FILTER 0 ++#define CONFIG_APSYCLIP_FILTER 0 +#define CONFIG_APULSATOR_FILTER 0 +#define CONFIG_AREALTIME_FILTER 0 +#define CONFIG_ARESAMPLE_FILTER 0 +#define CONFIG_AREVERSE_FILTER 0 +#define CONFIG_ARNNDN_FILTER 0 ++#define CONFIG_ASDR_FILTER 0 ++#define CONFIG_ASEGMENT_FILTER 0 +#define CONFIG_ASELECT_FILTER 0 +#define CONFIG_ASENDCMD_FILTER 0 +#define CONFIG_ASETNSAMPLES_FILTER 0 @@ -1733,6 +1753,7 @@ +#define CONFIG_ASUPERPASS_FILTER 0 +#define CONFIG_ASUPERSTOP_FILTER 0 +#define CONFIG_ATEMPO_FILTER 0 ++#define CONFIG_ATILT_FILTER 0 +#define CONFIG_ATRIM_FILTER 0 +#define CONFIG_AXCORRELATE_FILTER 0 +#define CONFIG_AZMQ_FILTER 0 @@ -1911,7 +1932,9 @@ +#define CONFIG_GEQ_FILTER 0 +#define CONFIG_GRADFUN_FILTER 0 +#define CONFIG_GRAPHMONITOR_FILTER 0 ++#define CONFIG_GRAYWORLD_FILTER 0 +#define CONFIG_GREYEDGE_FILTER 0 ++#define CONFIG_GUIDED_FILTER 0 +#define CONFIG_HALDCLUT_FILTER 0 +#define CONFIG_HFLIP_FILTER 0 +#define CONFIG_HISTEQ_FILTER 0 @@ -1919,7 +1942,10 @@ +#define CONFIG_HQDN3D_FILTER 0 +#define CONFIG_HQX_FILTER 0 +#define CONFIG_HSTACK_FILTER 0 ++#define CONFIG_HSVHOLD_FILTER 0 ++#define CONFIG_HSVKEY_FILTER 0 +#define CONFIG_HUE_FILTER 0 ++#define CONFIG_HUESATURATION_FILTER 0 +#define CONFIG_HWDOWNLOAD_FILTER 0 +#define CONFIG_HWMAP_FILTER 0 +#define CONFIG_HWUPLOAD_FILTER 0 @@ -1934,9 +1960,11 @@ +#define CONFIG_KERNDEINT_FILTER 0 +#define CONFIG_KIRSCH_FILTER 0 +#define CONFIG_LAGFUN_FILTER 0 ++#define CONFIG_LATENCY_FILTER 0 +#define CONFIG_LENSCORRECTION_FILTER 0 +#define CONFIG_LENSFUN_FILTER 0 +#define CONFIG_LIBVMAF_FILTER 0 ++#define CONFIG_LIMITDIFF_FILTER 0 +#define CONFIG_LIMITER_FILTER 0 +#define CONFIG_LOOP_FILTER 0 +#define CONFIG_LUMAKEY_FILTER 0 @@ -1961,6 +1989,7 @@ +#define CONFIG_MINTERPOLATE_FILTER 0 +#define CONFIG_MIX_FILTER 0 +#define CONFIG_MONOCHROME_FILTER 0 ++#define CONFIG_MORPHO_FILTER 0 +#define CONFIG_MPDECIMATE_FILTER 0 +#define CONFIG_MSAD_FILTER 0 +#define CONFIG_NEGATE_FILTER 0 @@ -2022,8 +2051,11 @@ +#define CONFIG_SCALE_VAAPI_FILTER 0 +#define CONFIG_SCALE_VULKAN_FILTER 0 +#define CONFIG_SCALE2REF_FILTER 0 ++#define CONFIG_SCALE2REF_NPP_FILTER 0 +#define CONFIG_SCDET_FILTER 0 ++#define CONFIG_SCHARR_FILTER 0 +#define CONFIG_SCROLL_FILTER 0 ++#define CONFIG_SEGMENT_FILTER 0 +#define CONFIG_SELECT_FILTER 0 +#define CONFIG_SELECTIVECOLOR_FILTER 0 +#define CONFIG_SENDCMD_FILTER 0 @@ -2035,6 +2067,7 @@ +#define CONFIG_SETRANGE_FILTER 0 +#define CONFIG_SETSAR_FILTER 0 +#define CONFIG_SETTB_FILTER 0 ++#define CONFIG_SHARPEN_NPP_FILTER 0 +#define CONFIG_SHARPNESS_VAAPI_FILTER 0 +#define CONFIG_SHEAR_FILTER 0 +#define CONFIG_SHOWINFO_FILTER 0 @@ -2086,6 +2119,7 @@ +#define CONFIG_USPP_FILTER 0 +#define CONFIG_V360_FILTER 0 +#define CONFIG_VAGUEDENOISER_FILTER 0 ++#define CONFIG_VARBLUR_FILTER 0 +#define CONFIG_VECTORSCOPE_FILTER 0 +#define CONFIG_VFLIP_FILTER 0 +#define CONFIG_VFRDET_FILTER 0 @@ -2101,6 +2135,7 @@ +#define CONFIG_WAVEFORM_FILTER 0 +#define CONFIG_WEAVE_FILTER 0 +#define CONFIG_XBR_FILTER 0 ++#define CONFIG_XCORRELATE_FILTER 0 +#define CONFIG_XFADE_FILTER 0 +#define CONFIG_XFADE_OPENCL_FILTER 0 +#define CONFIG_XMEDIAN_FILTER 0 @@ -2183,6 +2218,7 @@ +#define CONFIG_AQTITLE_DEMUXER 0 +#define CONFIG_ARGO_ASF_DEMUXER 0 +#define CONFIG_ARGO_BRP_DEMUXER 0 ++#define CONFIG_ARGO_CVG_DEMUXER 0 +#define CONFIG_ASF_DEMUXER 0 +#define CONFIG_ASF_O_DEMUXER 0 +#define CONFIG_ASS_DEMUXER 0 @@ -2456,6 +2492,7 @@ +#define CONFIG_IMAGE_DDS_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_DPX_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_EXR_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_GEM_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_GIF_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_J2K_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_JPEG_PIPE_DEMUXER 0 @@ -2497,6 +2534,7 @@ +#define CONFIG_APTX_MUXER 0 +#define CONFIG_APTX_HD_MUXER 0 +#define CONFIG_ARGO_ASF_MUXER 0 ++#define CONFIG_ARGO_CVG_MUXER 0 +#define CONFIG_ASF_MUXER 0 +#define CONFIG_ASS_MUXER 0 +#define CONFIG_AST_MUXER 0 @@ -2505,6 +2543,7 @@ +#define CONFIG_AVI_MUXER 0 +#define CONFIG_AVM2_MUXER 0 +#define CONFIG_AVS2_MUXER 0 ++#define CONFIG_AVS3_MUXER 0 +#define CONFIG_BIT_MUXER 0 +#define CONFIG_CAF_MUXER 0 +#define CONFIG_CAVSVIDEO_MUXER 0 @@ -2582,6 +2621,7 @@ +#define CONFIG_MXF_OPATOM_MUXER 0 +#define CONFIG_NULL_MUXER 0 +#define CONFIG_NUT_MUXER 0 ++#define CONFIG_OBU_MUXER 0 +#define CONFIG_OGA_MUXER 0 +#define CONFIG_OGG_MUXER 0 +#define CONFIG_OGV_MUXER 0 @@ -2658,6 +2698,7 @@ +#define CONFIG_BLURAY_PROTOCOL 0 +#define CONFIG_CACHE_PROTOCOL 0 +#define CONFIG_CONCAT_PROTOCOL 0 ++#define CONFIG_CONCATF_PROTOCOL 0 +#define CONFIG_CRYPTO_PROTOCOL 0 +#define CONFIG_DATA_PROTOCOL 0 +#define CONFIG_FFRTMPCRYPT_PROTOCOL 0 diff --git a/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config.asm b/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config.asm index 2858eade463b..f644cda18bde 100644 --- a/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config.asm +++ b/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config.asm @@ -1,6 +1,6 @@ ---- third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.asm.orig 2022-02-07 13:39:41 UTC +--- third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.asm.orig 2022-02-28 16:54:41 UTC +++ third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.asm -@@ -0,0 +1,2686 @@ +@@ -0,0 +1,2727 @@ +; Automatically generated by configure - do not modify! +%define ARCH_AARCH64 0 +%define ARCH_ALPHA 0 @@ -16,6 +16,7 @@ +%define ARCH_PARISC 0 +%define ARCH_PPC 0 +%define ARCH_PPC64 0 ++%define ARCH_RISCV 0 +%define ARCH_S390 0 +%define ARCH_SH4 0 +%define ARCH_SPARC 0 @@ -90,7 +91,7 @@ +%define HAVE_AMD3DNOWEXT_EXTERNAL 1 +%define HAVE_AVX_EXTERNAL 1 +%define HAVE_AVX2_EXTERNAL 1 -+%define HAVE_AVX512_EXTERNAL 0 ++%define HAVE_AVX512_EXTERNAL 1 +%define HAVE_FMA3_EXTERNAL 1 +%define HAVE_FMA4_EXTERNAL 1 +%define HAVE_MMX_EXTERNAL 1 @@ -334,7 +335,7 @@ +%define HAVE_INLINE_ASM_LABELS 1 +%define HAVE_INLINE_ASM_NONLOCAL_LABELS 1 +%define HAVE_PRAGMA_DEPRECATED 1 -+%define HAVE_RSYNC_CONTIMEOUT 0 ++%define HAVE_RSYNC_CONTIMEOUT 1 +%define HAVE_SYMVER_ASM_LABEL 1 +%define HAVE_SYMVER_GNU_ASM 1 +%define HAVE_VFP_ARGS 0 @@ -346,6 +347,10 @@ +%define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_SMPTE_ST_2084_PQ 0 +%define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_ITU_R_2100_HLG 0 +%define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_LINEAR 0 ++%define HAVE_KCVIMAGEBUFFERYCBCRMATRIX_ITU_R_2020 0 ++%define HAVE_KCVIMAGEBUFFERCOLORPRIMARIES_ITU_R_2020 0 ++%define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_ITU_R_2020 0 ++%define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_SMPTE_ST_428_1 0 +%define HAVE_SOCKLEN_T 0 +%define HAVE_STRUCT_ADDRINFO 0 +%define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -360,6 +365,7 @@ +%define HAVE_STRUCT_SOCKADDR_STORAGE 0 +%define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1 +%define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 1 ++%define HAVE_GZIP 1 +%define HAVE_LIBDRM_GETFB2 0 +%define HAVE_MAKEINFO 1 +%define HAVE_MAKEINFO_HTML 0 @@ -372,6 +378,8 @@ +%define HAVE_PERL 1 +%define HAVE_POD2MAN 1 +%define HAVE_TEXI2HTML 0 ++%define HAVE_XMLLINT 1 ++%define HAVE_ZLIB_GZIP 0 +%define CONFIG_DOC 0 +%define CONFIG_HTMLPAGES 0 +%define CONFIG_MANPAGES 0 @@ -413,7 +421,6 @@ +%define CONFIG_LIBXVID 0 +%define CONFIG_DECKLINK 0 +%define CONFIG_LIBFDK_AAC 0 -+%define CONFIG_OPENSSL 0 +%define CONFIG_LIBTLS 0 +%define CONFIG_GMP 0 +%define CONFIG_LIBARIBB24 0 @@ -492,6 +499,7 @@ +%define CONFIG_MEDIACODEC 0 +%define CONFIG_OPENAL 0 +%define CONFIG_OPENGL 0 ++%define CONFIG_OPENSSL 0 +%define CONFIG_POCKETSPHINX 0 +%define CONFIG_VAPOURSYNTH 0 +%define CONFIG_ALSA 0 @@ -576,10 +584,12 @@ +%define CONFIG_FONTCONFIG 0 +%define CONFIG_LARGE_TESTS 1 +%define CONFIG_LINUX_PERF 0 ++%define CONFIG_MACOS_KPERF 0 +%define CONFIG_MEMORY_POISONING 0 +%define CONFIG_NEON_CLOBBER_TEST 0 +%define CONFIG_OSSFUZZ 0 +%define CONFIG_PIC 1 ++%define CONFIG_PTX_COMPRESSION 0 +%define CONFIG_THUMB 0 +%define CONFIG_VALGRIND_BACKTRACE 0 +%define CONFIG_XMM_CLOBBER_TEST 0 @@ -799,6 +809,7 @@ +%define CONFIG_FRWU_DECODER 0 +%define CONFIG_G2M_DECODER 0 +%define CONFIG_GDV_DECODER 0 ++%define CONFIG_GEM_DECODER 0 +%define CONFIG_GIF_DECODER 0 +%define CONFIG_H261_DECODER 0 +%define CONFIG_H263_DECODER 0 @@ -931,6 +942,7 @@ +%define CONFIG_SNOW_DECODER 0 +%define CONFIG_SP5X_DECODER 0 +%define CONFIG_SPEEDHQ_DECODER 0 ++%define CONFIG_SPEEX_DECODER 0 +%define CONFIG_SRGC_DECODER 0 +%define CONFIG_SUNRAST_DECODER 0 +%define CONFIG_SVQ1_DECODER 0 @@ -1068,6 +1080,7 @@ +%define CONFIG_MP3ON4_DECODER 0 +%define CONFIG_MPC7_DECODER 0 +%define CONFIG_MPC8_DECODER 0 ++%define CONFIG_MSNSIREN_DECODER 0 +%define CONFIG_NELLYMOSER_DECODER 0 +%define CONFIG_ON2AVC_DECODER 0 +%define CONFIG_OPUS_DECODER 0 @@ -1337,6 +1350,7 @@ +%define CONFIG_RV20_ENCODER 0 +%define CONFIG_S302M_ENCODER 0 +%define CONFIG_SGI_ENCODER 0 ++%define CONFIG_SMC_ENCODER 0 +%define CONFIG_SNOW_ENCODER 0 +%define CONFIG_SPEEDHQ_ENCODER 0 +%define CONFIG_SUNRAST_ENCODER 0 @@ -1470,7 +1484,6 @@ +%define CONFIG_LIBWEBP_ENCODER 0 +%define CONFIG_LIBX262_ENCODER 0 +%define CONFIG_LIBX264_ENCODER 0 -+%define CONFIG_LIBX264_ENCODER 0 +%define CONFIG_LIBX264RGB_ENCODER 0 +%define CONFIG_LIBX265_ENCODER 0 +%define CONFIG_LIBXAVS_ENCODER 0 @@ -1570,6 +1583,7 @@ +%define CONFIG_AAC_LATM_PARSER 0 +%define CONFIG_AC3_PARSER 0 +%define CONFIG_ADX_PARSER 0 ++%define CONFIG_AMR_PARSER 0 +%define CONFIG_AV1_PARSER 0 +%define CONFIG_AVS2_PARSER 0 +%define CONFIG_AVS3_PARSER 0 @@ -1661,6 +1675,7 @@ +%define CONFIG_ACRUSHER_FILTER 0 +%define CONFIG_ADECLICK_FILTER 0 +%define CONFIG_ADECLIP_FILTER 0 ++%define CONFIG_ADECORRELATE_FILTER 0 +%define CONFIG_ADELAY_FILTER 0 +%define CONFIG_ADENORM_FILTER 0 +%define CONFIG_ADERIVATIVE_FILTER 0 @@ -1674,10 +1689,12 @@ +%define CONFIG_AFIR_FILTER 0 +%define CONFIG_AFORMAT_FILTER 0 +%define CONFIG_AFREQSHIFT_FILTER 0 ++%define CONFIG_AFWTDN_FILTER 0 +%define CONFIG_AGATE_FILTER 0 +%define CONFIG_AIIR_FILTER 0 +%define CONFIG_AINTEGRAL_FILTER 0 +%define CONFIG_AINTERLEAVE_FILTER 0 ++%define CONFIG_ALATENCY_FILTER 0 +%define CONFIG_ALIMITER_FILTER 0 +%define CONFIG_ALLPASS_FILTER 0 +%define CONFIG_ALOOP_FILTER 0 @@ -1693,11 +1710,14 @@ +%define CONFIG_APERMS_FILTER 0 +%define CONFIG_APHASER_FILTER 0 +%define CONFIG_APHASESHIFT_FILTER 0 ++%define CONFIG_APSYCLIP_FILTER 0 +%define CONFIG_APULSATOR_FILTER 0 +%define CONFIG_AREALTIME_FILTER 0 +%define CONFIG_ARESAMPLE_FILTER 0 +%define CONFIG_AREVERSE_FILTER 0 +%define CONFIG_ARNNDN_FILTER 0 ++%define CONFIG_ASDR_FILTER 0 ++%define CONFIG_ASEGMENT_FILTER 0 +%define CONFIG_ASELECT_FILTER 0 +%define CONFIG_ASENDCMD_FILTER 0 +%define CONFIG_ASETNSAMPLES_FILTER 0 @@ -1717,6 +1737,7 @@ +%define CONFIG_ASUPERPASS_FILTER 0 +%define CONFIG_ASUPERSTOP_FILTER 0 +%define CONFIG_ATEMPO_FILTER 0 ++%define CONFIG_ATILT_FILTER 0 +%define CONFIG_ATRIM_FILTER 0 +%define CONFIG_AXCORRELATE_FILTER 0 +%define CONFIG_AZMQ_FILTER 0 @@ -1895,7 +1916,9 @@ +%define CONFIG_GEQ_FILTER 0 +%define CONFIG_GRADFUN_FILTER 0 +%define CONFIG_GRAPHMONITOR_FILTER 0 ++%define CONFIG_GRAYWORLD_FILTER 0 +%define CONFIG_GREYEDGE_FILTER 0 ++%define CONFIG_GUIDED_FILTER 0 +%define CONFIG_HALDCLUT_FILTER 0 +%define CONFIG_HFLIP_FILTER 0 +%define CONFIG_HISTEQ_FILTER 0 @@ -1903,7 +1926,10 @@ +%define CONFIG_HQDN3D_FILTER 0 +%define CONFIG_HQX_FILTER 0 +%define CONFIG_HSTACK_FILTER 0 ++%define CONFIG_HSVHOLD_FILTER 0 ++%define CONFIG_HSVKEY_FILTER 0 +%define CONFIG_HUE_FILTER 0 ++%define CONFIG_HUESATURATION_FILTER 0 +%define CONFIG_HWDOWNLOAD_FILTER 0 +%define CONFIG_HWMAP_FILTER 0 +%define CONFIG_HWUPLOAD_FILTER 0 @@ -1918,9 +1944,11 @@ +%define CONFIG_KERNDEINT_FILTER 0 +%define CONFIG_KIRSCH_FILTER 0 +%define CONFIG_LAGFUN_FILTER 0 ++%define CONFIG_LATENCY_FILTER 0 +%define CONFIG_LENSCORRECTION_FILTER 0 +%define CONFIG_LENSFUN_FILTER 0 +%define CONFIG_LIBVMAF_FILTER 0 ++%define CONFIG_LIMITDIFF_FILTER 0 +%define CONFIG_LIMITER_FILTER 0 +%define CONFIG_LOOP_FILTER 0 +%define CONFIG_LUMAKEY_FILTER 0 @@ -1945,6 +1973,7 @@ +%define CONFIG_MINTERPOLATE_FILTER 0 +%define CONFIG_MIX_FILTER 0 +%define CONFIG_MONOCHROME_FILTER 0 ++%define CONFIG_MORPHO_FILTER 0 +%define CONFIG_MPDECIMATE_FILTER 0 +%define CONFIG_MSAD_FILTER 0 +%define CONFIG_NEGATE_FILTER 0 @@ -2006,8 +2035,11 @@ +%define CONFIG_SCALE_VAAPI_FILTER 0 +%define CONFIG_SCALE_VULKAN_FILTER 0 +%define CONFIG_SCALE2REF_FILTER 0 ++%define CONFIG_SCALE2REF_NPP_FILTER 0 +%define CONFIG_SCDET_FILTER 0 ++%define CONFIG_SCHARR_FILTER 0 +%define CONFIG_SCROLL_FILTER 0 ++%define CONFIG_SEGMENT_FILTER 0 +%define CONFIG_SELECT_FILTER 0 +%define CONFIG_SELECTIVECOLOR_FILTER 0 +%define CONFIG_SENDCMD_FILTER 0 @@ -2019,6 +2051,7 @@ +%define CONFIG_SETRANGE_FILTER 0 +%define CONFIG_SETSAR_FILTER 0 +%define CONFIG_SETTB_FILTER 0 ++%define CONFIG_SHARPEN_NPP_FILTER 0 +%define CONFIG_SHARPNESS_VAAPI_FILTER 0 +%define CONFIG_SHEAR_FILTER 0 +%define CONFIG_SHOWINFO_FILTER 0 @@ -2070,6 +2103,7 @@ +%define CONFIG_USPP_FILTER 0 +%define CONFIG_V360_FILTER 0 +%define CONFIG_VAGUEDENOISER_FILTER 0 ++%define CONFIG_VARBLUR_FILTER 0 +%define CONFIG_VECTORSCOPE_FILTER 0 +%define CONFIG_VFLIP_FILTER 0 +%define CONFIG_VFRDET_FILTER 0 @@ -2085,6 +2119,7 @@ +%define CONFIG_WAVEFORM_FILTER 0 +%define CONFIG_WEAVE_FILTER 0 +%define CONFIG_XBR_FILTER 0 ++%define CONFIG_XCORRELATE_FILTER 0 +%define CONFIG_XFADE_FILTER 0 +%define CONFIG_XFADE_OPENCL_FILTER 0 +%define CONFIG_XMEDIAN_FILTER 0 @@ -2167,6 +2202,7 @@ +%define CONFIG_AQTITLE_DEMUXER 0 +%define CONFIG_ARGO_ASF_DEMUXER 0 +%define CONFIG_ARGO_BRP_DEMUXER 0 ++%define CONFIG_ARGO_CVG_DEMUXER 0 +%define CONFIG_ASF_DEMUXER 0 +%define CONFIG_ASF_O_DEMUXER 0 +%define CONFIG_ASS_DEMUXER 0 @@ -2440,6 +2476,7 @@ +%define CONFIG_IMAGE_DDS_PIPE_DEMUXER 0 +%define CONFIG_IMAGE_DPX_PIPE_DEMUXER 0 +%define CONFIG_IMAGE_EXR_PIPE_DEMUXER 0 ++%define CONFIG_IMAGE_GEM_PIPE_DEMUXER 0 +%define CONFIG_IMAGE_GIF_PIPE_DEMUXER 0 +%define CONFIG_IMAGE_J2K_PIPE_DEMUXER 0 +%define CONFIG_IMAGE_JPEG_PIPE_DEMUXER 0 @@ -2481,6 +2518,7 @@ +%define CONFIG_APTX_MUXER 0 +%define CONFIG_APTX_HD_MUXER 0 +%define CONFIG_ARGO_ASF_MUXER 0 ++%define CONFIG_ARGO_CVG_MUXER 0 +%define CONFIG_ASF_MUXER 0 +%define CONFIG_ASS_MUXER 0 +%define CONFIG_AST_MUXER 0 @@ -2489,6 +2527,7 @@ +%define CONFIG_AVI_MUXER 0 +%define CONFIG_AVM2_MUXER 0 +%define CONFIG_AVS2_MUXER 0 ++%define CONFIG_AVS3_MUXER 0 +%define CONFIG_BIT_MUXER 0 +%define CONFIG_CAF_MUXER 0 +%define CONFIG_CAVSVIDEO_MUXER 0 @@ -2566,6 +2605,7 @@ +%define CONFIG_MXF_OPATOM_MUXER 0 +%define CONFIG_NULL_MUXER 0 +%define CONFIG_NUT_MUXER 0 ++%define CONFIG_OBU_MUXER 0 +%define CONFIG_OGA_MUXER 0 +%define CONFIG_OGG_MUXER 0 +%define CONFIG_OGV_MUXER 0 @@ -2642,6 +2682,7 @@ +%define CONFIG_BLURAY_PROTOCOL 0 +%define CONFIG_CACHE_PROTOCOL 0 +%define CONFIG_CONCAT_PROTOCOL 0 ++%define CONFIG_CONCATF_PROTOCOL 0 +%define CONFIG_CRYPTO_PROTOCOL 0 +%define CONFIG_DATA_PROTOCOL 0 +%define CONFIG_FFRTMPCRYPT_PROTOCOL 0 diff --git a/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config.h b/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config.h index fb297338d13f..65302b7298dd 100644 --- a/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config.h +++ b/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config.h @@ -1,15 +1,15 @@ ---- third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.h.orig 2022-02-07 13:39:41 UTC +--- third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.h.orig 2022-02-28 16:54:41 UTC +++ third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.h -@@ -0,0 +1,2703 @@ +@@ -0,0 +1,2744 @@ +/* Automatically generated by configure - do not modify! */ +#ifndef FFMPEG_CONFIG_H +#define FFMPEG_CONFIG_H -+/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/chromium/chromium-git/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags=-O2 --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=i686 --extra-cflags=-m32 --extra-ldflags=-m32 --enable-pic --cc=clang --cxx=clang++ --ld=clang --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ ++/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/jrummell/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=i686 --extra-cflags='\"-m32\"' --extra-ldflags='\"-m32\"' --enable-pic --cc=clang --cxx=clang++ --ld=clang --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ +#define FFMPEG_LICENSE "LGPL version 2.1 or later" +#define CONFIG_THIS_YEAR 2021 +#define FFMPEG_DATADIR "/usr/local/share/ffmpeg" +#define AVCONV_DATADIR "/usr/local/share/ffmpeg" -+#define CC_IDENT "OpenBSD clang version 11.1.0" ++#define CC_IDENT "OpenBSD clang version 13.0.0" +#define OS_NAME openbsd +#define av_restrict restrict +#define EXTERN_PREFIX "" @@ -32,6 +32,7 @@ +#define ARCH_PARISC 0 +#define ARCH_PPC 0 +#define ARCH_PPC64 0 ++#define ARCH_RISCV 0 +#define ARCH_S390 0 +#define ARCH_SH4 0 +#define ARCH_SPARC 0 @@ -106,7 +107,7 @@ +#define HAVE_AMD3DNOWEXT_EXTERNAL 1 +#define HAVE_AVX_EXTERNAL 1 +#define HAVE_AVX2_EXTERNAL 1 -+#define HAVE_AVX512_EXTERNAL 0 ++#define HAVE_AVX512_EXTERNAL 1 +#define HAVE_FMA3_EXTERNAL 1 +#define HAVE_FMA4_EXTERNAL 1 +#define HAVE_MMX_EXTERNAL 1 @@ -350,7 +351,7 @@ +#define HAVE_INLINE_ASM_LABELS 1 +#define HAVE_INLINE_ASM_NONLOCAL_LABELS 1 +#define HAVE_PRAGMA_DEPRECATED 1 -+#define HAVE_RSYNC_CONTIMEOUT 0 ++#define HAVE_RSYNC_CONTIMEOUT 1 +#define HAVE_SYMVER_ASM_LABEL 1 +#define HAVE_SYMVER_GNU_ASM 1 +#define HAVE_VFP_ARGS 0 @@ -362,6 +363,10 @@ +#define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_SMPTE_ST_2084_PQ 0 +#define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_ITU_R_2100_HLG 0 +#define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_LINEAR 0 ++#define HAVE_KCVIMAGEBUFFERYCBCRMATRIX_ITU_R_2020 0 ++#define HAVE_KCVIMAGEBUFFERCOLORPRIMARIES_ITU_R_2020 0 ++#define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_ITU_R_2020 0 ++#define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_SMPTE_ST_428_1 0 +#define HAVE_SOCKLEN_T 0 +#define HAVE_STRUCT_ADDRINFO 0 +#define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -376,6 +381,7 @@ +#define HAVE_STRUCT_SOCKADDR_STORAGE 0 +#define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1 +#define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 1 ++#define HAVE_GZIP 1 +#define HAVE_LIBDRM_GETFB2 0 +#define HAVE_MAKEINFO 1 +#define HAVE_MAKEINFO_HTML 0 @@ -388,6 +394,8 @@ +#define HAVE_PERL 1 +#define HAVE_POD2MAN 1 +#define HAVE_TEXI2HTML 0 ++#define HAVE_XMLLINT 1 ++#define HAVE_ZLIB_GZIP 0 +#define CONFIG_DOC 0 +#define CONFIG_HTMLPAGES 0 +#define CONFIG_MANPAGES 0 @@ -429,7 +437,6 @@ +#define CONFIG_LIBXVID 0 +#define CONFIG_DECKLINK 0 +#define CONFIG_LIBFDK_AAC 0 -+#define CONFIG_OPENSSL 0 +#define CONFIG_LIBTLS 0 +#define CONFIG_GMP 0 +#define CONFIG_LIBARIBB24 0 @@ -508,6 +515,7 @@ +#define CONFIG_MEDIACODEC 0 +#define CONFIG_OPENAL 0 +#define CONFIG_OPENGL 0 ++#define CONFIG_OPENSSL 0 +#define CONFIG_POCKETSPHINX 0 +#define CONFIG_VAPOURSYNTH 0 +#define CONFIG_ALSA 0 @@ -592,10 +600,12 @@ +#define CONFIG_FONTCONFIG 0 +#define CONFIG_LARGE_TESTS 1 +#define CONFIG_LINUX_PERF 0 ++#define CONFIG_MACOS_KPERF 0 +#define CONFIG_MEMORY_POISONING 0 +#define CONFIG_NEON_CLOBBER_TEST 0 +#define CONFIG_OSSFUZZ 0 +#define CONFIG_PIC 1 ++#define CONFIG_PTX_COMPRESSION 0 +#define CONFIG_THUMB 0 +#define CONFIG_VALGRIND_BACKTRACE 0 +#define CONFIG_XMM_CLOBBER_TEST 0 @@ -815,6 +825,7 @@ +#define CONFIG_FRWU_DECODER 0 +#define CONFIG_G2M_DECODER 0 +#define CONFIG_GDV_DECODER 0 ++#define CONFIG_GEM_DECODER 0 +#define CONFIG_GIF_DECODER 0 +#define CONFIG_H261_DECODER 0 +#define CONFIG_H263_DECODER 0 @@ -947,6 +958,7 @@ +#define CONFIG_SNOW_DECODER 0 +#define CONFIG_SP5X_DECODER 0 +#define CONFIG_SPEEDHQ_DECODER 0 ++#define CONFIG_SPEEX_DECODER 0 +#define CONFIG_SRGC_DECODER 0 +#define CONFIG_SUNRAST_DECODER 0 +#define CONFIG_SVQ1_DECODER 0 @@ -1084,6 +1096,7 @@ +#define CONFIG_MP3ON4_DECODER 0 +#define CONFIG_MPC7_DECODER 0 +#define CONFIG_MPC8_DECODER 0 ++#define CONFIG_MSNSIREN_DECODER 0 +#define CONFIG_NELLYMOSER_DECODER 0 +#define CONFIG_ON2AVC_DECODER 0 +#define CONFIG_OPUS_DECODER 0 @@ -1353,6 +1366,7 @@ +#define CONFIG_RV20_ENCODER 0 +#define CONFIG_S302M_ENCODER 0 +#define CONFIG_SGI_ENCODER 0 ++#define CONFIG_SMC_ENCODER 0 +#define CONFIG_SNOW_ENCODER 0 +#define CONFIG_SPEEDHQ_ENCODER 0 +#define CONFIG_SUNRAST_ENCODER 0 @@ -1486,7 +1500,6 @@ +#define CONFIG_LIBWEBP_ENCODER 0 +#define CONFIG_LIBX262_ENCODER 0 +#define CONFIG_LIBX264_ENCODER 0 -+#define CONFIG_LIBX264_ENCODER 0 +#define CONFIG_LIBX264RGB_ENCODER 0 +#define CONFIG_LIBX265_ENCODER 0 +#define CONFIG_LIBXAVS_ENCODER 0 @@ -1586,6 +1599,7 @@ +#define CONFIG_AAC_LATM_PARSER 0 +#define CONFIG_AC3_PARSER 0 +#define CONFIG_ADX_PARSER 0 ++#define CONFIG_AMR_PARSER 0 +#define CONFIG_AV1_PARSER 0 +#define CONFIG_AVS2_PARSER 0 +#define CONFIG_AVS3_PARSER 0 @@ -1677,6 +1691,7 @@ +#define CONFIG_ACRUSHER_FILTER 0 +#define CONFIG_ADECLICK_FILTER 0 +#define CONFIG_ADECLIP_FILTER 0 ++#define CONFIG_ADECORRELATE_FILTER 0 +#define CONFIG_ADELAY_FILTER 0 +#define CONFIG_ADENORM_FILTER 0 +#define CONFIG_ADERIVATIVE_FILTER 0 @@ -1690,10 +1705,12 @@ +#define CONFIG_AFIR_FILTER 0 +#define CONFIG_AFORMAT_FILTER 0 +#define CONFIG_AFREQSHIFT_FILTER 0 ++#define CONFIG_AFWTDN_FILTER 0 +#define CONFIG_AGATE_FILTER 0 +#define CONFIG_AIIR_FILTER 0 +#define CONFIG_AINTEGRAL_FILTER 0 +#define CONFIG_AINTERLEAVE_FILTER 0 ++#define CONFIG_ALATENCY_FILTER 0 +#define CONFIG_ALIMITER_FILTER 0 +#define CONFIG_ALLPASS_FILTER 0 +#define CONFIG_ALOOP_FILTER 0 @@ -1709,11 +1726,14 @@ +#define CONFIG_APERMS_FILTER 0 +#define CONFIG_APHASER_FILTER 0 +#define CONFIG_APHASESHIFT_FILTER 0 ++#define CONFIG_APSYCLIP_FILTER 0 +#define CONFIG_APULSATOR_FILTER 0 +#define CONFIG_AREALTIME_FILTER 0 +#define CONFIG_ARESAMPLE_FILTER 0 +#define CONFIG_AREVERSE_FILTER 0 +#define CONFIG_ARNNDN_FILTER 0 ++#define CONFIG_ASDR_FILTER 0 ++#define CONFIG_ASEGMENT_FILTER 0 +#define CONFIG_ASELECT_FILTER 0 +#define CONFIG_ASENDCMD_FILTER 0 +#define CONFIG_ASETNSAMPLES_FILTER 0 @@ -1733,6 +1753,7 @@ +#define CONFIG_ASUPERPASS_FILTER 0 +#define CONFIG_ASUPERSTOP_FILTER 0 +#define CONFIG_ATEMPO_FILTER 0 ++#define CONFIG_ATILT_FILTER 0 +#define CONFIG_ATRIM_FILTER 0 +#define CONFIG_AXCORRELATE_FILTER 0 +#define CONFIG_AZMQ_FILTER 0 @@ -1911,7 +1932,9 @@ +#define CONFIG_GEQ_FILTER 0 +#define CONFIG_GRADFUN_FILTER 0 +#define CONFIG_GRAPHMONITOR_FILTER 0 ++#define CONFIG_GRAYWORLD_FILTER 0 +#define CONFIG_GREYEDGE_FILTER 0 ++#define CONFIG_GUIDED_FILTER 0 +#define CONFIG_HALDCLUT_FILTER 0 +#define CONFIG_HFLIP_FILTER 0 +#define CONFIG_HISTEQ_FILTER 0 @@ -1919,7 +1942,10 @@ +#define CONFIG_HQDN3D_FILTER 0 +#define CONFIG_HQX_FILTER 0 +#define CONFIG_HSTACK_FILTER 0 ++#define CONFIG_HSVHOLD_FILTER 0 ++#define CONFIG_HSVKEY_FILTER 0 +#define CONFIG_HUE_FILTER 0 ++#define CONFIG_HUESATURATION_FILTER 0 +#define CONFIG_HWDOWNLOAD_FILTER 0 +#define CONFIG_HWMAP_FILTER 0 +#define CONFIG_HWUPLOAD_FILTER 0 @@ -1934,9 +1960,11 @@ +#define CONFIG_KERNDEINT_FILTER 0 +#define CONFIG_KIRSCH_FILTER 0 +#define CONFIG_LAGFUN_FILTER 0 ++#define CONFIG_LATENCY_FILTER 0 +#define CONFIG_LENSCORRECTION_FILTER 0 +#define CONFIG_LENSFUN_FILTER 0 +#define CONFIG_LIBVMAF_FILTER 0 ++#define CONFIG_LIMITDIFF_FILTER 0 +#define CONFIG_LIMITER_FILTER 0 +#define CONFIG_LOOP_FILTER 0 +#define CONFIG_LUMAKEY_FILTER 0 @@ -1961,6 +1989,7 @@ +#define CONFIG_MINTERPOLATE_FILTER 0 +#define CONFIG_MIX_FILTER 0 +#define CONFIG_MONOCHROME_FILTER 0 ++#define CONFIG_MORPHO_FILTER 0 +#define CONFIG_MPDECIMATE_FILTER 0 +#define CONFIG_MSAD_FILTER 0 +#define CONFIG_NEGATE_FILTER 0 @@ -2022,8 +2051,11 @@ +#define CONFIG_SCALE_VAAPI_FILTER 0 +#define CONFIG_SCALE_VULKAN_FILTER 0 +#define CONFIG_SCALE2REF_FILTER 0 ++#define CONFIG_SCALE2REF_NPP_FILTER 0 +#define CONFIG_SCDET_FILTER 0 ++#define CONFIG_SCHARR_FILTER 0 +#define CONFIG_SCROLL_FILTER 0 ++#define CONFIG_SEGMENT_FILTER 0 +#define CONFIG_SELECT_FILTER 0 +#define CONFIG_SELECTIVECOLOR_FILTER 0 +#define CONFIG_SENDCMD_FILTER 0 @@ -2035,6 +2067,7 @@ +#define CONFIG_SETRANGE_FILTER 0 +#define CONFIG_SETSAR_FILTER 0 +#define CONFIG_SETTB_FILTER 0 ++#define CONFIG_SHARPEN_NPP_FILTER 0 +#define CONFIG_SHARPNESS_VAAPI_FILTER 0 +#define CONFIG_SHEAR_FILTER 0 +#define CONFIG_SHOWINFO_FILTER 0 @@ -2086,6 +2119,7 @@ +#define CONFIG_USPP_FILTER 0 +#define CONFIG_V360_FILTER 0 +#define CONFIG_VAGUEDENOISER_FILTER 0 ++#define CONFIG_VARBLUR_FILTER 0 +#define CONFIG_VECTORSCOPE_FILTER 0 +#define CONFIG_VFLIP_FILTER 0 +#define CONFIG_VFRDET_FILTER 0 @@ -2101,6 +2135,7 @@ +#define CONFIG_WAVEFORM_FILTER 0 +#define CONFIG_WEAVE_FILTER 0 +#define CONFIG_XBR_FILTER 0 ++#define CONFIG_XCORRELATE_FILTER 0 +#define CONFIG_XFADE_FILTER 0 +#define CONFIG_XFADE_OPENCL_FILTER 0 +#define CONFIG_XMEDIAN_FILTER 0 @@ -2183,6 +2218,7 @@ +#define CONFIG_AQTITLE_DEMUXER 0 +#define CONFIG_ARGO_ASF_DEMUXER 0 +#define CONFIG_ARGO_BRP_DEMUXER 0 ++#define CONFIG_ARGO_CVG_DEMUXER 0 +#define CONFIG_ASF_DEMUXER 0 +#define CONFIG_ASF_O_DEMUXER 0 +#define CONFIG_ASS_DEMUXER 0 @@ -2456,6 +2492,7 @@ +#define CONFIG_IMAGE_DDS_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_DPX_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_EXR_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_GEM_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_GIF_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_J2K_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_JPEG_PIPE_DEMUXER 0 @@ -2497,6 +2534,7 @@ +#define CONFIG_APTX_MUXER 0 +#define CONFIG_APTX_HD_MUXER 0 +#define CONFIG_ARGO_ASF_MUXER 0 ++#define CONFIG_ARGO_CVG_MUXER 0 +#define CONFIG_ASF_MUXER 0 +#define CONFIG_ASS_MUXER 0 +#define CONFIG_AST_MUXER 0 @@ -2505,6 +2543,7 @@ +#define CONFIG_AVI_MUXER 0 +#define CONFIG_AVM2_MUXER 0 +#define CONFIG_AVS2_MUXER 0 ++#define CONFIG_AVS3_MUXER 0 +#define CONFIG_BIT_MUXER 0 +#define CONFIG_CAF_MUXER 0 +#define CONFIG_CAVSVIDEO_MUXER 0 @@ -2582,6 +2621,7 @@ +#define CONFIG_MXF_OPATOM_MUXER 0 +#define CONFIG_NULL_MUXER 0 +#define CONFIG_NUT_MUXER 0 ++#define CONFIG_OBU_MUXER 0 +#define CONFIG_OGA_MUXER 0 +#define CONFIG_OGG_MUXER 0 +#define CONFIG_OGV_MUXER 0 @@ -2658,6 +2698,7 @@ +#define CONFIG_BLURAY_PROTOCOL 0 +#define CONFIG_CACHE_PROTOCOL 0 +#define CONFIG_CONCAT_PROTOCOL 0 ++#define CONFIG_CONCATF_PROTOCOL 0 +#define CONFIG_CRYPTO_PROTOCOL 0 +#define CONFIG_DATA_PROTOCOL 0 +#define CONFIG_FFRTMPCRYPT_PROTOCOL 0 diff --git a/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.asm b/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.asm index 93d7ce8a6917..98ddcbdebff3 100644 --- a/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.asm +++ b/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.asm @@ -1,6 +1,6 @@ ---- third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.asm.orig 2022-02-07 13:39:41 UTC +--- third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.asm.orig 2022-02-28 16:54:41 UTC +++ third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.asm -@@ -0,0 +1,2685 @@ +@@ -0,0 +1,2727 @@ +; Automatically generated by configure - do not modify! +%define ARCH_AARCH64 0 +%define ARCH_ALPHA 0 @@ -16,6 +16,7 @@ +%define ARCH_PARISC 0 +%define ARCH_PPC 0 +%define ARCH_PPC64 0 ++%define ARCH_RISCV 0 +%define ARCH_S390 0 +%define ARCH_SH4 0 +%define ARCH_SPARC 0 @@ -68,7 +69,6 @@ +%define HAVE_MIPSDSP 0 +%define HAVE_MIPSDSPR2 0 +%define HAVE_MSA 0 -+%define HAVE_MSA2 0 +%define HAVE_LOONGSON2 0 +%define HAVE_LOONGSON3 0 +%define HAVE_MMI 0 @@ -91,7 +91,7 @@ +%define HAVE_AMD3DNOWEXT_EXTERNAL 1 +%define HAVE_AVX_EXTERNAL 1 +%define HAVE_AVX2_EXTERNAL 1 -+%define HAVE_AVX512_EXTERNAL 0 ++%define HAVE_AVX512_EXTERNAL 1 +%define HAVE_FMA3_EXTERNAL 1 +%define HAVE_FMA4_EXTERNAL 1 +%define HAVE_MMX_EXTERNAL 1 @@ -114,7 +114,6 @@ +%define HAVE_MIPSDSP_EXTERNAL 0 +%define HAVE_MIPSDSPR2_EXTERNAL 0 +%define HAVE_MSA_EXTERNAL 0 -+%define HAVE_MSA2_EXTERNAL 0 +%define HAVE_LOONGSON2_EXTERNAL 0 +%define HAVE_LOONGSON3_EXTERNAL 0 +%define HAVE_MMI_EXTERNAL 0 @@ -160,7 +159,6 @@ +%define HAVE_MIPSDSP_INLINE 0 +%define HAVE_MIPSDSPR2_INLINE 0 +%define HAVE_MSA_INLINE 0 -+%define HAVE_MSA2_INLINE 0 +%define HAVE_LOONGSON2_INLINE 0 +%define HAVE_LOONGSON3_INLINE 0 +%define HAVE_MMI_INLINE 0 @@ -344,10 +342,15 @@ +%define HAVE_XFORM_ASM 0 +%define HAVE_XMM_CLOBBERS 1 +%define HAVE_KCMVIDEOCODECTYPE_HEVC 0 ++%define HAVE_KCMVIDEOCODECTYPE_HEVCWITHALPHA 0 +%define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 +%define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_SMPTE_ST_2084_PQ 0 +%define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_ITU_R_2100_HLG 0 +%define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_LINEAR 0 ++%define HAVE_KCVIMAGEBUFFERYCBCRMATRIX_ITU_R_2020 0 ++%define HAVE_KCVIMAGEBUFFERCOLORPRIMARIES_ITU_R_2020 0 ++%define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_ITU_R_2020 0 ++%define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_SMPTE_ST_428_1 0 +%define HAVE_SOCKLEN_T 0 +%define HAVE_STRUCT_ADDRINFO 0 +%define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -362,6 +365,7 @@ +%define HAVE_STRUCT_SOCKADDR_STORAGE 0 +%define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1 +%define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 1 ++%define HAVE_GZIP 1 +%define HAVE_LIBDRM_GETFB2 0 +%define HAVE_MAKEINFO 1 +%define HAVE_MAKEINFO_HTML 0 @@ -374,6 +378,8 @@ +%define HAVE_PERL 1 +%define HAVE_POD2MAN 1 +%define HAVE_TEXI2HTML 0 ++%define HAVE_XMLLINT 1 ++%define HAVE_ZLIB_GZIP 0 +%define CONFIG_DOC 0 +%define CONFIG_HTMLPAGES 0 +%define CONFIG_MANPAGES 0 @@ -415,7 +421,6 @@ +%define CONFIG_LIBXVID 0 +%define CONFIG_DECKLINK 0 +%define CONFIG_LIBFDK_AAC 0 -+%define CONFIG_OPENSSL 0 +%define CONFIG_LIBTLS 0 +%define CONFIG_GMP 0 +%define CONFIG_LIBARIBB24 0 @@ -465,6 +470,7 @@ +%define CONFIG_LIBPULSE 0 +%define CONFIG_LIBRABBITMQ 0 +%define CONFIG_LIBRAV1E 0 ++%define CONFIG_LIBRIST 0 +%define CONFIG_LIBRSVG 0 +%define CONFIG_LIBRTMP 0 +%define CONFIG_LIBSHINE 0 @@ -493,6 +499,7 @@ +%define CONFIG_MEDIACODEC 0 +%define CONFIG_OPENAL 0 +%define CONFIG_OPENGL 0 ++%define CONFIG_OPENSSL 0 +%define CONFIG_POCKETSPHINX 0 +%define CONFIG_VAPOURSYNTH 0 +%define CONFIG_ALSA 0 @@ -557,7 +564,6 @@ +%define CONFIG_AVFORMAT 1 +%define CONFIG_AVCODEC 1 +%define CONFIG_SWRESAMPLE 0 -+%define CONFIG_AVRESAMPLE 0 +%define CONFIG_AVUTIL 1 +%define CONFIG_FFPLAY 0 +%define CONFIG_FFPROBE 0 @@ -578,10 +584,12 @@ +%define CONFIG_FONTCONFIG 0 +%define CONFIG_LARGE_TESTS 1 +%define CONFIG_LINUX_PERF 0 ++%define CONFIG_MACOS_KPERF 0 +%define CONFIG_MEMORY_POISONING 0 +%define CONFIG_NEON_CLOBBER_TEST 0 +%define CONFIG_OSSFUZZ 0 +%define CONFIG_PIC 1 ++%define CONFIG_PTX_COMPRESSION 0 +%define CONFIG_THUMB 0 +%define CONFIG_VALGRIND_BACKTRACE 0 +%define CONFIG_XMM_CLOBBER_TEST 0 @@ -801,6 +809,7 @@ +%define CONFIG_FRWU_DECODER 0 +%define CONFIG_G2M_DECODER 0 +%define CONFIG_GDV_DECODER 0 ++%define CONFIG_GEM_DECODER 0 +%define CONFIG_GIF_DECODER 0 +%define CONFIG_H261_DECODER 0 +%define CONFIG_H263_DECODER 0 @@ -933,6 +942,7 @@ +%define CONFIG_SNOW_DECODER 0 +%define CONFIG_SP5X_DECODER 0 +%define CONFIG_SPEEDHQ_DECODER 0 ++%define CONFIG_SPEEX_DECODER 0 +%define CONFIG_SRGC_DECODER 0 +%define CONFIG_SUNRAST_DECODER 0 +%define CONFIG_SVQ1_DECODER 0 @@ -1070,6 +1080,7 @@ +%define CONFIG_MP3ON4_DECODER 0 +%define CONFIG_MPC7_DECODER 0 +%define CONFIG_MPC8_DECODER 0 ++%define CONFIG_MSNSIREN_DECODER 0 +%define CONFIG_NELLYMOSER_DECODER 0 +%define CONFIG_ON2AVC_DECODER 0 +%define CONFIG_OPUS_DECODER 0 @@ -1161,6 +1172,7 @@ +%define CONFIG_ADPCM_G722_DECODER 0 +%define CONFIG_ADPCM_G726_DECODER 0 +%define CONFIG_ADPCM_G726LE_DECODER 0 ++%define CONFIG_ADPCM_IMA_ACORN_DECODER 0 +%define CONFIG_ADPCM_IMA_AMV_DECODER 0 +%define CONFIG_ADPCM_IMA_ALP_DECODER 0 +%define CONFIG_ADPCM_IMA_APC_DECODER 0 @@ -1338,6 +1350,7 @@ +%define CONFIG_RV20_ENCODER 0 +%define CONFIG_S302M_ENCODER 0 +%define CONFIG_SGI_ENCODER 0 ++%define CONFIG_SMC_ENCODER 0 +%define CONFIG_SNOW_ENCODER 0 +%define CONFIG_SPEEDHQ_ENCODER 0 +%define CONFIG_SUNRAST_ENCODER 0 @@ -1427,6 +1440,7 @@ +%define CONFIG_ADPCM_IMA_QT_ENCODER 0 +%define CONFIG_ADPCM_IMA_SSI_ENCODER 0 +%define CONFIG_ADPCM_IMA_WAV_ENCODER 0 ++%define CONFIG_ADPCM_IMA_WS_ENCODER 0 +%define CONFIG_ADPCM_MS_ENCODER 0 +%define CONFIG_ADPCM_SWF_ENCODER 0 +%define CONFIG_ADPCM_YAMAHA_ENCODER 0 @@ -1487,9 +1501,6 @@ +%define CONFIG_H264_V4L2M2M_ENCODER 0 +%define CONFIG_H264_VAAPI_ENCODER 0 +%define CONFIG_H264_VIDEOTOOLBOX_ENCODER 0 -+%define CONFIG_NVENC_ENCODER 0 -+%define CONFIG_NVENC_H264_ENCODER 0 -+%define CONFIG_NVENC_HEVC_ENCODER 0 +%define CONFIG_HEVC_AMF_ENCODER 0 +%define CONFIG_HEVC_MF_ENCODER 0 +%define CONFIG_HEVC_NVENC_ENCODER 0 @@ -1572,6 +1583,7 @@ +%define CONFIG_AAC_LATM_PARSER 0 +%define CONFIG_AC3_PARSER 0 +%define CONFIG_ADX_PARSER 0 ++%define CONFIG_AMR_PARSER 0 +%define CONFIG_AV1_PARSER 0 +%define CONFIG_AVS2_PARSER 0 +%define CONFIG_AVS3_PARSER 0 @@ -1663,6 +1675,7 @@ +%define CONFIG_ACRUSHER_FILTER 0 +%define CONFIG_ADECLICK_FILTER 0 +%define CONFIG_ADECLIP_FILTER 0 ++%define CONFIG_ADECORRELATE_FILTER 0 +%define CONFIG_ADELAY_FILTER 0 +%define CONFIG_ADENORM_FILTER 0 +%define CONFIG_ADERIVATIVE_FILTER 0 @@ -1676,10 +1689,12 @@ +%define CONFIG_AFIR_FILTER 0 +%define CONFIG_AFORMAT_FILTER 0 +%define CONFIG_AFREQSHIFT_FILTER 0 ++%define CONFIG_AFWTDN_FILTER 0 +%define CONFIG_AGATE_FILTER 0 +%define CONFIG_AIIR_FILTER 0 +%define CONFIG_AINTEGRAL_FILTER 0 +%define CONFIG_AINTERLEAVE_FILTER 0 ++%define CONFIG_ALATENCY_FILTER 0 +%define CONFIG_ALIMITER_FILTER 0 +%define CONFIG_ALLPASS_FILTER 0 +%define CONFIG_ALOOP_FILTER 0 @@ -1695,11 +1710,14 @@ +%define CONFIG_APERMS_FILTER 0 +%define CONFIG_APHASER_FILTER 0 +%define CONFIG_APHASESHIFT_FILTER 0 ++%define CONFIG_APSYCLIP_FILTER 0 +%define CONFIG_APULSATOR_FILTER 0 +%define CONFIG_AREALTIME_FILTER 0 +%define CONFIG_ARESAMPLE_FILTER 0 +%define CONFIG_AREVERSE_FILTER 0 +%define CONFIG_ARNNDN_FILTER 0 ++%define CONFIG_ASDR_FILTER 0 ++%define CONFIG_ASEGMENT_FILTER 0 +%define CONFIG_ASELECT_FILTER 0 +%define CONFIG_ASENDCMD_FILTER 0 +%define CONFIG_ASETNSAMPLES_FILTER 0 @@ -1719,6 +1737,7 @@ +%define CONFIG_ASUPERPASS_FILTER 0 +%define CONFIG_ASUPERSTOP_FILTER 0 +%define CONFIG_ATEMPO_FILTER 0 ++%define CONFIG_ATILT_FILTER 0 +%define CONFIG_ATRIM_FILTER 0 +%define CONFIG_AXCORRELATE_FILTER 0 +%define CONFIG_AZMQ_FILTER 0 @@ -1759,7 +1778,6 @@ +%define CONFIG_MCOMPAND_FILTER 0 +%define CONFIG_PAN_FILTER 0 +%define CONFIG_REPLAYGAIN_FILTER 0 -+%define CONFIG_RESAMPLE_FILTER 0 +%define CONFIG_RUBBERBAND_FILTER 0 +%define CONFIG_SIDECHAINCOMPRESS_FILTER 0 +%define CONFIG_SIDECHAINGATE_FILTER 0 @@ -1857,6 +1875,8 @@ +%define CONFIG_DILATION_FILTER 0 +%define CONFIG_DILATION_OPENCL_FILTER 0 +%define CONFIG_DISPLACE_FILTER 0 ++%define CONFIG_DNN_CLASSIFY_FILTER 0 ++%define CONFIG_DNN_DETECT_FILTER 0 +%define CONFIG_DNN_PROCESSING_FILTER 0 +%define CONFIG_DOUBLEWEAVE_FILTER 0 +%define CONFIG_DRAWBOX_FILTER 0 @@ -1896,7 +1916,9 @@ +%define CONFIG_GEQ_FILTER 0 +%define CONFIG_GRADFUN_FILTER 0 +%define CONFIG_GRAPHMONITOR_FILTER 0 ++%define CONFIG_GRAYWORLD_FILTER 0 +%define CONFIG_GREYEDGE_FILTER 0 ++%define CONFIG_GUIDED_FILTER 0 +%define CONFIG_HALDCLUT_FILTER 0 +%define CONFIG_HFLIP_FILTER 0 +%define CONFIG_HISTEQ_FILTER 0 @@ -1904,7 +1926,10 @@ +%define CONFIG_HQDN3D_FILTER 0 +%define CONFIG_HQX_FILTER 0 +%define CONFIG_HSTACK_FILTER 0 ++%define CONFIG_HSVHOLD_FILTER 0 ++%define CONFIG_HSVKEY_FILTER 0 +%define CONFIG_HUE_FILTER 0 ++%define CONFIG_HUESATURATION_FILTER 0 +%define CONFIG_HWDOWNLOAD_FILTER 0 +%define CONFIG_HWMAP_FILTER 0 +%define CONFIG_HWUPLOAD_FILTER 0 @@ -1919,9 +1944,11 @@ +%define CONFIG_KERNDEINT_FILTER 0 +%define CONFIG_KIRSCH_FILTER 0 +%define CONFIG_LAGFUN_FILTER 0 ++%define CONFIG_LATENCY_FILTER 0 +%define CONFIG_LENSCORRECTION_FILTER 0 +%define CONFIG_LENSFUN_FILTER 0 +%define CONFIG_LIBVMAF_FILTER 0 ++%define CONFIG_LIMITDIFF_FILTER 0 +%define CONFIG_LIMITER_FILTER 0 +%define CONFIG_LOOP_FILTER 0 +%define CONFIG_LUMAKEY_FILTER 0 @@ -1946,6 +1973,7 @@ +%define CONFIG_MINTERPOLATE_FILTER 0 +%define CONFIG_MIX_FILTER 0 +%define CONFIG_MONOCHROME_FILTER 0 ++%define CONFIG_MORPHO_FILTER 0 +%define CONFIG_MPDECIMATE_FILTER 0 +%define CONFIG_MSAD_FILTER 0 +%define CONFIG_NEGATE_FILTER 0 @@ -2007,8 +2035,11 @@ +%define CONFIG_SCALE_VAAPI_FILTER 0 +%define CONFIG_SCALE_VULKAN_FILTER 0 +%define CONFIG_SCALE2REF_FILTER 0 ++%define CONFIG_SCALE2REF_NPP_FILTER 0 +%define CONFIG_SCDET_FILTER 0 ++%define CONFIG_SCHARR_FILTER 0 +%define CONFIG_SCROLL_FILTER 0 ++%define CONFIG_SEGMENT_FILTER 0 +%define CONFIG_SELECT_FILTER 0 +%define CONFIG_SELECTIVECOLOR_FILTER 0 +%define CONFIG_SENDCMD_FILTER 0 @@ -2020,6 +2051,7 @@ +%define CONFIG_SETRANGE_FILTER 0 +%define CONFIG_SETSAR_FILTER 0 +%define CONFIG_SETTB_FILTER 0 ++%define CONFIG_SHARPEN_NPP_FILTER 0 +%define CONFIG_SHARPNESS_VAAPI_FILTER 0 +%define CONFIG_SHEAR_FILTER 0 +%define CONFIG_SHOWINFO_FILTER 0 @@ -2071,6 +2103,7 @@ +%define CONFIG_USPP_FILTER 0 +%define CONFIG_V360_FILTER 0 +%define CONFIG_VAGUEDENOISER_FILTER 0 ++%define CONFIG_VARBLUR_FILTER 0 +%define CONFIG_VECTORSCOPE_FILTER 0 +%define CONFIG_VFLIP_FILTER 0 +%define CONFIG_VFRDET_FILTER 0 @@ -2086,6 +2119,7 @@ +%define CONFIG_WAVEFORM_FILTER 0 +%define CONFIG_WEAVE_FILTER 0 +%define CONFIG_XBR_FILTER 0 ++%define CONFIG_XCORRELATE_FILTER 0 +%define CONFIG_XFADE_FILTER 0 +%define CONFIG_XFADE_OPENCL_FILTER 0 +%define CONFIG_XMEDIAN_FILTER 0 @@ -2168,6 +2202,7 @@ +%define CONFIG_AQTITLE_DEMUXER 0 +%define CONFIG_ARGO_ASF_DEMUXER 0 +%define CONFIG_ARGO_BRP_DEMUXER 0 ++%define CONFIG_ARGO_CVG_DEMUXER 0 +%define CONFIG_ASF_DEMUXER 0 +%define CONFIG_ASF_O_DEMUXER 0 +%define CONFIG_ASS_DEMUXER 0 @@ -2441,6 +2476,7 @@ +%define CONFIG_IMAGE_DDS_PIPE_DEMUXER 0 +%define CONFIG_IMAGE_DPX_PIPE_DEMUXER 0 +%define CONFIG_IMAGE_EXR_PIPE_DEMUXER 0 ++%define CONFIG_IMAGE_GEM_PIPE_DEMUXER 0 +%define CONFIG_IMAGE_GIF_PIPE_DEMUXER 0 +%define CONFIG_IMAGE_J2K_PIPE_DEMUXER 0 +%define CONFIG_IMAGE_JPEG_PIPE_DEMUXER 0 @@ -2482,6 +2518,7 @@ +%define CONFIG_APTX_MUXER 0 +%define CONFIG_APTX_HD_MUXER 0 +%define CONFIG_ARGO_ASF_MUXER 0 ++%define CONFIG_ARGO_CVG_MUXER 0 +%define CONFIG_ASF_MUXER 0 +%define CONFIG_ASS_MUXER 0 +%define CONFIG_AST_MUXER 0 @@ -2490,6 +2527,7 @@ +%define CONFIG_AVI_MUXER 0 +%define CONFIG_AVM2_MUXER 0 +%define CONFIG_AVS2_MUXER 0 ++%define CONFIG_AVS3_MUXER 0 +%define CONFIG_BIT_MUXER 0 +%define CONFIG_CAF_MUXER 0 +%define CONFIG_CAVSVIDEO_MUXER 0 @@ -2567,6 +2605,7 @@ +%define CONFIG_MXF_OPATOM_MUXER 0 +%define CONFIG_NULL_MUXER 0 +%define CONFIG_NUT_MUXER 0 ++%define CONFIG_OBU_MUXER 0 +%define CONFIG_OGA_MUXER 0 +%define CONFIG_OGG_MUXER 0 +%define CONFIG_OGV_MUXER 0 @@ -2607,7 +2646,6 @@ +%define CONFIG_SEGAFILM_MUXER 0 +%define CONFIG_SEGMENT_MUXER 0 +%define CONFIG_STREAM_SEGMENT_MUXER 0 -+%define CONFIG_SINGLEJPEG_MUXER 0 +%define CONFIG_SMJPEG_MUXER 0 +%define CONFIG_SMOOTHSTREAMING_MUXER 0 +%define CONFIG_SOX_MUXER 0 @@ -2635,6 +2673,7 @@ +%define CONFIG_WEBM_CHUNK_MUXER 0 +%define CONFIG_WEBP_MUXER 0 +%define CONFIG_WEBVTT_MUXER 0 ++%define CONFIG_WSAUD_MUXER 0 +%define CONFIG_WTV_MUXER 0 +%define CONFIG_WV_MUXER 0 +%define CONFIG_YUV4MPEGPIPE_MUXER 0 @@ -2643,6 +2682,7 @@ +%define CONFIG_BLURAY_PROTOCOL 0 +%define CONFIG_CACHE_PROTOCOL 0 +%define CONFIG_CONCAT_PROTOCOL 0 ++%define CONFIG_CONCATF_PROTOCOL 0 +%define CONFIG_CRYPTO_PROTOCOL 0 +%define CONFIG_DATA_PROTOCOL 0 +%define CONFIG_FFRTMPCRYPT_PROTOCOL 0 @@ -2650,6 +2690,7 @@ +%define CONFIG_FILE_PROTOCOL 0 +%define CONFIG_FTP_PROTOCOL 0 +%define CONFIG_GOPHER_PROTOCOL 0 ++%define CONFIG_GOPHERS_PROTOCOL 0 +%define CONFIG_HLS_PROTOCOL 0 +%define CONFIG_HTTP_PROTOCOL 0 +%define CONFIG_HTTPPROXY_PROTOCOL 0 @@ -2677,6 +2718,7 @@ +%define CONFIG_UDPLITE_PROTOCOL 0 +%define CONFIG_UNIX_PROTOCOL 0 +%define CONFIG_LIBAMQP_PROTOCOL 0 ++%define CONFIG_LIBRIST_PROTOCOL 0 +%define CONFIG_LIBRTMP_PROTOCOL 0 +%define CONFIG_LIBRTMPE_PROTOCOL 0 +%define CONFIG_LIBRTMPS_PROTOCOL 0 diff --git a/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.h b/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.h index 3bd34f781503..aa1e645f6ca5 100644 --- a/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.h +++ b/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.h @@ -1,15 +1,15 @@ ---- third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.h.orig 2022-02-07 13:39:41 UTC +--- third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.h.orig 2022-02-28 16:54:41 UTC +++ third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.h -@@ -0,0 +1,2702 @@ +@@ -0,0 +1,2744 @@ +/* Automatically generated by configure - do not modify! */ +#ifndef FFMPEG_CONFIG_H +#define FFMPEG_CONFIG_H -+/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/ssd/trunk_blink_tot/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags=-O2 --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-lto --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264' --cc=clang --cxx=clang++" -- elide long configuration string from binary */ ++/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/jrummell/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-lto --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ +#define FFMPEG_LICENSE "LGPL version 2.1 or later" +#define CONFIG_THIS_YEAR 2021 +#define FFMPEG_DATADIR "/usr/local/share/ffmpeg" +#define AVCONV_DATADIR "/usr/local/share/ffmpeg" -+#define CC_IDENT "OpenBSD clang version 10.0.1" ++#define CC_IDENT "OpenBSD clang version 13.0.0" +#define OS_NAME openbsd +#define av_restrict restrict +#define EXTERN_PREFIX "" @@ -32,6 +32,7 @@ +#define ARCH_PARISC 0 +#define ARCH_PPC 0 +#define ARCH_PPC64 0 ++#define ARCH_RISCV 0 +#define ARCH_S390 0 +#define ARCH_SH4 0 +#define ARCH_SPARC 0 @@ -84,7 +85,6 @@ +#define HAVE_MIPSDSP 0 +#define HAVE_MIPSDSPR2 0 +#define HAVE_MSA 0 -+#define HAVE_MSA2 0 +#define HAVE_LOONGSON2 0 +#define HAVE_LOONGSON3 0 +#define HAVE_MMI 0 @@ -107,7 +107,7 @@ +#define HAVE_AMD3DNOWEXT_EXTERNAL 1 +#define HAVE_AVX_EXTERNAL 1 +#define HAVE_AVX2_EXTERNAL 1 -+#define HAVE_AVX512_EXTERNAL 0 ++#define HAVE_AVX512_EXTERNAL 1 +#define HAVE_FMA3_EXTERNAL 1 +#define HAVE_FMA4_EXTERNAL 1 +#define HAVE_MMX_EXTERNAL 1 @@ -130,7 +130,6 @@ +#define HAVE_MIPSDSP_EXTERNAL 0 +#define HAVE_MIPSDSPR2_EXTERNAL 0 +#define HAVE_MSA_EXTERNAL 0 -+#define HAVE_MSA2_EXTERNAL 0 +#define HAVE_LOONGSON2_EXTERNAL 0 +#define HAVE_LOONGSON3_EXTERNAL 0 +#define HAVE_MMI_EXTERNAL 0 @@ -176,7 +175,6 @@ +#define HAVE_MIPSDSP_INLINE 0 +#define HAVE_MIPSDSPR2_INLINE 0 +#define HAVE_MSA_INLINE 0 -+#define HAVE_MSA2_INLINE 0 +#define HAVE_LOONGSON2_INLINE 0 +#define HAVE_LOONGSON3_INLINE 0 +#define HAVE_MMI_INLINE 0 @@ -238,7 +236,7 @@ +#define HAVE_TERMIOS_H 1 +#define HAVE_UDPLITE_H 0 +#define HAVE_UNISTD_H 1 -+#define HAVE_VALGRIND_VALGRIND_H 0 ++#define HAVE_VALGRIND_VALGRIND_H 0 /* #define HAVE_VALGRIND_VALGRIND_H 1 -- forced to 0. See https://crbug.com/590440 */ +#define HAVE_WINDOWS_H 0 +#define HAVE_WINSOCK2_H 0 +#define HAVE_INTRINSICS_NEON 0 @@ -360,10 +358,15 @@ +#define HAVE_XFORM_ASM 0 +#define HAVE_XMM_CLOBBERS 1 +#define HAVE_KCMVIDEOCODECTYPE_HEVC 0 ++#define HAVE_KCMVIDEOCODECTYPE_HEVCWITHALPHA 0 +#define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 +#define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_SMPTE_ST_2084_PQ 0 +#define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_ITU_R_2100_HLG 0 +#define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_LINEAR 0 ++#define HAVE_KCVIMAGEBUFFERYCBCRMATRIX_ITU_R_2020 0 ++#define HAVE_KCVIMAGEBUFFERCOLORPRIMARIES_ITU_R_2020 0 ++#define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_ITU_R_2020 0 ++#define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_SMPTE_ST_428_1 0 +#define HAVE_SOCKLEN_T 0 +#define HAVE_STRUCT_ADDRINFO 0 +#define HAVE_STRUCT_GROUP_SOURCE_REQ 0 @@ -378,6 +381,7 @@ +#define HAVE_STRUCT_SOCKADDR_STORAGE 0 +#define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1 +#define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 1 ++#define HAVE_GZIP 1 +#define HAVE_LIBDRM_GETFB2 0 +#define HAVE_MAKEINFO 1 +#define HAVE_MAKEINFO_HTML 0 @@ -390,6 +394,8 @@ +#define HAVE_PERL 1 +#define HAVE_POD2MAN 1 +#define HAVE_TEXI2HTML 0 ++#define HAVE_XMLLINT 1 ++#define HAVE_ZLIB_GZIP 0 +#define CONFIG_DOC 0 +#define CONFIG_HTMLPAGES 0 +#define CONFIG_MANPAGES 0 @@ -431,7 +437,6 @@ +#define CONFIG_LIBXVID 0 +#define CONFIG_DECKLINK 0 +#define CONFIG_LIBFDK_AAC 0 -+#define CONFIG_OPENSSL 0 +#define CONFIG_LIBTLS 0 +#define CONFIG_GMP 0 +#define CONFIG_LIBARIBB24 0 @@ -481,6 +486,7 @@ +#define CONFIG_LIBPULSE 0 +#define CONFIG_LIBRABBITMQ 0 +#define CONFIG_LIBRAV1E 0 ++#define CONFIG_LIBRIST 0 +#define CONFIG_LIBRSVG 0 +#define CONFIG_LIBRTMP 0 +#define CONFIG_LIBSHINE 0 @@ -509,6 +515,7 @@ +#define CONFIG_MEDIACODEC 0 +#define CONFIG_OPENAL 0 +#define CONFIG_OPENGL 0 ++#define CONFIG_OPENSSL 0 +#define CONFIG_POCKETSPHINX 0 +#define CONFIG_VAPOURSYNTH 0 +#define CONFIG_ALSA 0 @@ -573,7 +580,6 @@ +#define CONFIG_AVFORMAT 1 +#define CONFIG_AVCODEC 1 +#define CONFIG_SWRESAMPLE 0 -+#define CONFIG_AVRESAMPLE 0 +#define CONFIG_AVUTIL 1 +#define CONFIG_FFPLAY 0 +#define CONFIG_FFPROBE 0 @@ -594,10 +600,12 @@ +#define CONFIG_FONTCONFIG 0 +#define CONFIG_LARGE_TESTS 1 +#define CONFIG_LINUX_PERF 0 ++#define CONFIG_MACOS_KPERF 0 +#define CONFIG_MEMORY_POISONING 0 +#define CONFIG_NEON_CLOBBER_TEST 0 +#define CONFIG_OSSFUZZ 0 +#define CONFIG_PIC 1 ++#define CONFIG_PTX_COMPRESSION 0 +#define CONFIG_THUMB 0 +#define CONFIG_VALGRIND_BACKTRACE 0 +#define CONFIG_XMM_CLOBBER_TEST 0 @@ -817,6 +825,7 @@ +#define CONFIG_FRWU_DECODER 0 +#define CONFIG_G2M_DECODER 0 +#define CONFIG_GDV_DECODER 0 ++#define CONFIG_GEM_DECODER 0 +#define CONFIG_GIF_DECODER 0 +#define CONFIG_H261_DECODER 0 +#define CONFIG_H263_DECODER 0 @@ -949,6 +958,7 @@ +#define CONFIG_SNOW_DECODER 0 +#define CONFIG_SP5X_DECODER 0 +#define CONFIG_SPEEDHQ_DECODER 0 ++#define CONFIG_SPEEX_DECODER 0 +#define CONFIG_SRGC_DECODER 0 +#define CONFIG_SUNRAST_DECODER 0 +#define CONFIG_SVQ1_DECODER 0 @@ -1086,6 +1096,7 @@ +#define CONFIG_MP3ON4_DECODER 0 +#define CONFIG_MPC7_DECODER 0 +#define CONFIG_MPC8_DECODER 0 ++#define CONFIG_MSNSIREN_DECODER 0 +#define CONFIG_NELLYMOSER_DECODER 0 +#define CONFIG_ON2AVC_DECODER 0 +#define CONFIG_OPUS_DECODER 0 @@ -1177,6 +1188,7 @@ +#define CONFIG_ADPCM_G722_DECODER 0 +#define CONFIG_ADPCM_G726_DECODER 0 +#define CONFIG_ADPCM_G726LE_DECODER 0 ++#define CONFIG_ADPCM_IMA_ACORN_DECODER 0 +#define CONFIG_ADPCM_IMA_AMV_DECODER 0 +#define CONFIG_ADPCM_IMA_ALP_DECODER 0 +#define CONFIG_ADPCM_IMA_APC_DECODER 0 @@ -1354,6 +1366,7 @@ +#define CONFIG_RV20_ENCODER 0 +#define CONFIG_S302M_ENCODER 0 +#define CONFIG_SGI_ENCODER 0 ++#define CONFIG_SMC_ENCODER 0 +#define CONFIG_SNOW_ENCODER 0 +#define CONFIG_SPEEDHQ_ENCODER 0 +#define CONFIG_SUNRAST_ENCODER 0 @@ -1443,6 +1456,7 @@ +#define CONFIG_ADPCM_IMA_QT_ENCODER 0 +#define CONFIG_ADPCM_IMA_SSI_ENCODER 0 +#define CONFIG_ADPCM_IMA_WAV_ENCODER 0 ++#define CONFIG_ADPCM_IMA_WS_ENCODER 0 +#define CONFIG_ADPCM_MS_ENCODER 0 +#define CONFIG_ADPCM_SWF_ENCODER 0 +#define CONFIG_ADPCM_YAMAHA_ENCODER 0 @@ -1503,9 +1517,6 @@ +#define CONFIG_H264_V4L2M2M_ENCODER 0 +#define CONFIG_H264_VAAPI_ENCODER 0 +#define CONFIG_H264_VIDEOTOOLBOX_ENCODER 0 -+#define CONFIG_NVENC_ENCODER 0 -+#define CONFIG_NVENC_H264_ENCODER 0 -+#define CONFIG_NVENC_HEVC_ENCODER 0 +#define CONFIG_HEVC_AMF_ENCODER 0 +#define CONFIG_HEVC_MF_ENCODER 0 +#define CONFIG_HEVC_NVENC_ENCODER 0 @@ -1588,6 +1599,7 @@ +#define CONFIG_AAC_LATM_PARSER 0 +#define CONFIG_AC3_PARSER 0 +#define CONFIG_ADX_PARSER 0 ++#define CONFIG_AMR_PARSER 0 +#define CONFIG_AV1_PARSER 0 +#define CONFIG_AVS2_PARSER 0 +#define CONFIG_AVS3_PARSER 0 @@ -1679,6 +1691,7 @@ +#define CONFIG_ACRUSHER_FILTER 0 +#define CONFIG_ADECLICK_FILTER 0 +#define CONFIG_ADECLIP_FILTER 0 ++#define CONFIG_ADECORRELATE_FILTER 0 +#define CONFIG_ADELAY_FILTER 0 +#define CONFIG_ADENORM_FILTER 0 +#define CONFIG_ADERIVATIVE_FILTER 0 @@ -1692,10 +1705,12 @@ +#define CONFIG_AFIR_FILTER 0 +#define CONFIG_AFORMAT_FILTER 0 +#define CONFIG_AFREQSHIFT_FILTER 0 ++#define CONFIG_AFWTDN_FILTER 0 +#define CONFIG_AGATE_FILTER 0 +#define CONFIG_AIIR_FILTER 0 +#define CONFIG_AINTEGRAL_FILTER 0 +#define CONFIG_AINTERLEAVE_FILTER 0 ++#define CONFIG_ALATENCY_FILTER 0 +#define CONFIG_ALIMITER_FILTER 0 +#define CONFIG_ALLPASS_FILTER 0 +#define CONFIG_ALOOP_FILTER 0 @@ -1711,11 +1726,14 @@ +#define CONFIG_APERMS_FILTER 0 +#define CONFIG_APHASER_FILTER 0 +#define CONFIG_APHASESHIFT_FILTER 0 ++#define CONFIG_APSYCLIP_FILTER 0 +#define CONFIG_APULSATOR_FILTER 0 +#define CONFIG_AREALTIME_FILTER 0 +#define CONFIG_ARESAMPLE_FILTER 0 +#define CONFIG_AREVERSE_FILTER 0 +#define CONFIG_ARNNDN_FILTER 0 ++#define CONFIG_ASDR_FILTER 0 ++#define CONFIG_ASEGMENT_FILTER 0 +#define CONFIG_ASELECT_FILTER 0 +#define CONFIG_ASENDCMD_FILTER 0 +#define CONFIG_ASETNSAMPLES_FILTER 0 @@ -1735,6 +1753,7 @@ +#define CONFIG_ASUPERPASS_FILTER 0 +#define CONFIG_ASUPERSTOP_FILTER 0 +#define CONFIG_ATEMPO_FILTER 0 ++#define CONFIG_ATILT_FILTER 0 +#define CONFIG_ATRIM_FILTER 0 +#define CONFIG_AXCORRELATE_FILTER 0 +#define CONFIG_AZMQ_FILTER 0 @@ -1775,7 +1794,6 @@ +#define CONFIG_MCOMPAND_FILTER 0 +#define CONFIG_PAN_FILTER 0 +#define CONFIG_REPLAYGAIN_FILTER 0 -+#define CONFIG_RESAMPLE_FILTER 0 +#define CONFIG_RUBBERBAND_FILTER 0 +#define CONFIG_SIDECHAINCOMPRESS_FILTER 0 +#define CONFIG_SIDECHAINGATE_FILTER 0 @@ -1873,6 +1891,8 @@ +#define CONFIG_DILATION_FILTER 0 +#define CONFIG_DILATION_OPENCL_FILTER 0 +#define CONFIG_DISPLACE_FILTER 0 ++#define CONFIG_DNN_CLASSIFY_FILTER 0 ++#define CONFIG_DNN_DETECT_FILTER 0 +#define CONFIG_DNN_PROCESSING_FILTER 0 +#define CONFIG_DOUBLEWEAVE_FILTER 0 +#define CONFIG_DRAWBOX_FILTER 0 @@ -1912,7 +1932,9 @@ +#define CONFIG_GEQ_FILTER 0 +#define CONFIG_GRADFUN_FILTER 0 +#define CONFIG_GRAPHMONITOR_FILTER 0 ++#define CONFIG_GRAYWORLD_FILTER 0 +#define CONFIG_GREYEDGE_FILTER 0 ++#define CONFIG_GUIDED_FILTER 0 +#define CONFIG_HALDCLUT_FILTER 0 +#define CONFIG_HFLIP_FILTER 0 +#define CONFIG_HISTEQ_FILTER 0 @@ -1920,7 +1942,10 @@ +#define CONFIG_HQDN3D_FILTER 0 +#define CONFIG_HQX_FILTER 0 +#define CONFIG_HSTACK_FILTER 0 ++#define CONFIG_HSVHOLD_FILTER 0 ++#define CONFIG_HSVKEY_FILTER 0 +#define CONFIG_HUE_FILTER 0 ++#define CONFIG_HUESATURATION_FILTER 0 +#define CONFIG_HWDOWNLOAD_FILTER 0 +#define CONFIG_HWMAP_FILTER 0 +#define CONFIG_HWUPLOAD_FILTER 0 @@ -1935,9 +1960,11 @@ +#define CONFIG_KERNDEINT_FILTER 0 +#define CONFIG_KIRSCH_FILTER 0 +#define CONFIG_LAGFUN_FILTER 0 ++#define CONFIG_LATENCY_FILTER 0 +#define CONFIG_LENSCORRECTION_FILTER 0 +#define CONFIG_LENSFUN_FILTER 0 +#define CONFIG_LIBVMAF_FILTER 0 ++#define CONFIG_LIMITDIFF_FILTER 0 +#define CONFIG_LIMITER_FILTER 0 +#define CONFIG_LOOP_FILTER 0 +#define CONFIG_LUMAKEY_FILTER 0 @@ -1962,6 +1989,7 @@ +#define CONFIG_MINTERPOLATE_FILTER 0 +#define CONFIG_MIX_FILTER 0 +#define CONFIG_MONOCHROME_FILTER 0 ++#define CONFIG_MORPHO_FILTER 0 +#define CONFIG_MPDECIMATE_FILTER 0 +#define CONFIG_MSAD_FILTER 0 +#define CONFIG_NEGATE_FILTER 0 @@ -2023,8 +2051,11 @@ +#define CONFIG_SCALE_VAAPI_FILTER 0 +#define CONFIG_SCALE_VULKAN_FILTER 0 +#define CONFIG_SCALE2REF_FILTER 0 ++#define CONFIG_SCALE2REF_NPP_FILTER 0 +#define CONFIG_SCDET_FILTER 0 ++#define CONFIG_SCHARR_FILTER 0 +#define CONFIG_SCROLL_FILTER 0 ++#define CONFIG_SEGMENT_FILTER 0 +#define CONFIG_SELECT_FILTER 0 +#define CONFIG_SELECTIVECOLOR_FILTER 0 +#define CONFIG_SENDCMD_FILTER 0 @@ -2036,6 +2067,7 @@ +#define CONFIG_SETRANGE_FILTER 0 +#define CONFIG_SETSAR_FILTER 0 +#define CONFIG_SETTB_FILTER 0 ++#define CONFIG_SHARPEN_NPP_FILTER 0 +#define CONFIG_SHARPNESS_VAAPI_FILTER 0 +#define CONFIG_SHEAR_FILTER 0 +#define CONFIG_SHOWINFO_FILTER 0 @@ -2087,6 +2119,7 @@ +#define CONFIG_USPP_FILTER 0 +#define CONFIG_V360_FILTER 0 +#define CONFIG_VAGUEDENOISER_FILTER 0 ++#define CONFIG_VARBLUR_FILTER 0 +#define CONFIG_VECTORSCOPE_FILTER 0 +#define CONFIG_VFLIP_FILTER 0 +#define CONFIG_VFRDET_FILTER 0 @@ -2102,6 +2135,7 @@ +#define CONFIG_WAVEFORM_FILTER 0 +#define CONFIG_WEAVE_FILTER 0 +#define CONFIG_XBR_FILTER 0 ++#define CONFIG_XCORRELATE_FILTER 0 +#define CONFIG_XFADE_FILTER 0 +#define CONFIG_XFADE_OPENCL_FILTER 0 +#define CONFIG_XMEDIAN_FILTER 0 @@ -2184,6 +2218,7 @@ +#define CONFIG_AQTITLE_DEMUXER 0 +#define CONFIG_ARGO_ASF_DEMUXER 0 +#define CONFIG_ARGO_BRP_DEMUXER 0 ++#define CONFIG_ARGO_CVG_DEMUXER 0 +#define CONFIG_ASF_DEMUXER 0 +#define CONFIG_ASF_O_DEMUXER 0 +#define CONFIG_ASS_DEMUXER 0 @@ -2457,6 +2492,7 @@ +#define CONFIG_IMAGE_DDS_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_DPX_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_EXR_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_GEM_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_GIF_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_J2K_PIPE_DEMUXER 0 +#define CONFIG_IMAGE_JPEG_PIPE_DEMUXER 0 @@ -2498,6 +2534,7 @@ +#define CONFIG_APTX_MUXER 0 +#define CONFIG_APTX_HD_MUXER 0 +#define CONFIG_ARGO_ASF_MUXER 0 ++#define CONFIG_ARGO_CVG_MUXER 0 +#define CONFIG_ASF_MUXER 0 +#define CONFIG_ASS_MUXER 0 +#define CONFIG_AST_MUXER 0 @@ -2506,6 +2543,7 @@ +#define CONFIG_AVI_MUXER 0 +#define CONFIG_AVM2_MUXER 0 +#define CONFIG_AVS2_MUXER 0 ++#define CONFIG_AVS3_MUXER 0 +#define CONFIG_BIT_MUXER 0 +#define CONFIG_CAF_MUXER 0 +#define CONFIG_CAVSVIDEO_MUXER 0 @@ -2583,6 +2621,7 @@ +#define CONFIG_MXF_OPATOM_MUXER 0 +#define CONFIG_NULL_MUXER 0 +#define CONFIG_NUT_MUXER 0 ++#define CONFIG_OBU_MUXER 0 +#define CONFIG_OGA_MUXER 0 +#define CONFIG_OGG_MUXER 0 +#define CONFIG_OGV_MUXER 0 @@ -2623,7 +2662,6 @@ +#define CONFIG_SEGAFILM_MUXER 0 +#define CONFIG_SEGMENT_MUXER 0 +#define CONFIG_STREAM_SEGMENT_MUXER 0 -+#define CONFIG_SINGLEJPEG_MUXER 0 +#define CONFIG_SMJPEG_MUXER 0 +#define CONFIG_SMOOTHSTREAMING_MUXER 0 +#define CONFIG_SOX_MUXER 0 @@ -2651,6 +2689,7 @@ +#define CONFIG_WEBM_CHUNK_MUXER 0 +#define CONFIG_WEBP_MUXER 0 +#define CONFIG_WEBVTT_MUXER 0 ++#define CONFIG_WSAUD_MUXER 0 +#define CONFIG_WTV_MUXER 0 +#define CONFIG_WV_MUXER 0 +#define CONFIG_YUV4MPEGPIPE_MUXER 0 @@ -2659,6 +2698,7 @@ +#define CONFIG_BLURAY_PROTOCOL 0 +#define CONFIG_CACHE_PROTOCOL 0 +#define CONFIG_CONCAT_PROTOCOL 0 ++#define CONFIG_CONCATF_PROTOCOL 0 +#define CONFIG_CRYPTO_PROTOCOL 0 +#define CONFIG_DATA_PROTOCOL 0 +#define CONFIG_FFRTMPCRYPT_PROTOCOL 0 @@ -2666,6 +2706,7 @@ +#define CONFIG_FILE_PROTOCOL 0 +#define CONFIG_FTP_PROTOCOL 0 +#define CONFIG_GOPHER_PROTOCOL 0 ++#define CONFIG_GOPHERS_PROTOCOL 0 +#define CONFIG_HLS_PROTOCOL 0 +#define CONFIG_HTTP_PROTOCOL 0 +#define CONFIG_HTTPPROXY_PROTOCOL 0 @@ -2693,6 +2734,7 @@ +#define CONFIG_UDPLITE_PROTOCOL 0 +#define CONFIG_UNIX_PROTOCOL 0 +#define CONFIG_LIBAMQP_PROTOCOL 0 ++#define CONFIG_LIBRIST_PROTOCOL 0 +#define CONFIG_LIBRTMP_PROTOCOL 0 +#define CONFIG_LIBRTMPE_PROTOCOL 0 +#define CONFIG_LIBRTMPS_PROTOCOL 0 diff --git a/www/chromium/files/patch-third__party_libxml_linux_config.h b/www/chromium/files/patch-third__party_libxml_linux_config.h index 1a0a7f54aec2..59d91455a6dd 100644 --- a/www/chromium/files/patch-third__party_libxml_linux_config.h +++ b/www/chromium/files/patch-third__party_libxml_linux_config.h @@ -1,6 +1,6 @@ ---- third_party/libxml/linux/config.h.orig 2022-02-07 13:39:41 UTC +--- third_party/libxml/linux/config.h.orig 2022-02-28 16:54:41 UTC +++ third_party/libxml/linux/config.h -@@ -129,6 +129,9 @@ +@@ -118,6 +118,9 @@ /* Define to 1 if you have the `rand' function. */ #define HAVE_RAND 1 diff --git a/www/chromium/files/patch-third__party_maldoca_BUILD.gn b/www/chromium/files/patch-third__party_maldoca_BUILD.gn new file mode 100644 index 000000000000..dc249c266e8a --- /dev/null +++ b/www/chromium/files/patch-third__party_maldoca_BUILD.gn @@ -0,0 +1,13 @@ +--- third_party/maldoca/BUILD.gn.orig 2022-02-28 16:54:41 UTC ++++ third_party/maldoca/BUILD.gn +@@ -299,6 +299,10 @@ static_library("maldoca") { + ":maldoca_chromium_config", + ":maldoca_flags", + ] ++ ++ if (is_bsd) { ++ libs = [ "iconv" ] ++ } + } + + fuzzer_test("process_doc_fuzzer") { diff --git a/www/chromium/files/patch-third__party_nasm_BUILD.gn b/www/chromium/files/patch-third__party_nasm_BUILD.gn index fbf6537090b2..18c63bc66f12 100644 --- a/www/chromium/files/patch-third__party_nasm_BUILD.gn +++ b/www/chromium/files/patch-third__party_nasm_BUILD.gn @@ -1,5 +1,5 @@ ---- third_party/nasm/BUILD.gn 2022-02-21 07:21:41 UTC -+++ third_party/nasm/BUILD.gn +--- third_party/nasm/BUILD.gn.orig 2022-02-28 16:54:41 UTC ++++ third_party/nasm/BUILD.gn @@ -59,6 +59,13 @@ config("nasm_config") { defines = [ "HAVE_CONFIG_H" ] diff --git a/www/chromium/files/patch-third__party_pdfium_core_fxcrt_cfx__datetime.cpp b/www/chromium/files/patch-third__party_pdfium_core_fxcrt_cfx__datetime.cpp index 517331df81a0..56cfeefe64b7 100644 --- a/www/chromium/files/patch-third__party_pdfium_core_fxcrt_cfx__datetime.cpp +++ b/www/chromium/files/patch-third__party_pdfium_core_fxcrt_cfx__datetime.cpp @@ -1,11 +1,11 @@ ---- third_party/pdfium/core/fxcrt/cfx_datetime.cpp.orig 2022-02-07 13:39:41 UTC +--- third_party/pdfium/core/fxcrt/cfx_datetime.cpp.orig 2022-02-28 16:54:41 UTC +++ third_party/pdfium/core/fxcrt/cfx_datetime.cpp @@ -11,7 +11,7 @@ #include "third_party/base/check.h" - #if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -- defined(OS_APPLE) || defined(OS_ASMJS) -+ defined(OS_APPLE) || defined(OS_ASMJS) || defined(OS_BSD) + #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_APPLE) || defined(OS_ASMJS) ++ BUILDFLAG(IS_APPLE) || defined(OS_ASMJS) || BUILDFLAG(IS_BSD) #include <sys/time.h> #include <time.h> #endif diff --git a/www/chromium/files/patch-third__party_pdfium_core_fxge_cfx__fontmapper.cpp b/www/chromium/files/patch-third__party_pdfium_core_fxge_cfx__fontmapper.cpp index 641669a7c068..9042d78d56ea 100644 --- a/www/chromium/files/patch-third__party_pdfium_core_fxge_cfx__fontmapper.cpp +++ b/www/chromium/files/patch-third__party_pdfium_core_fxge_cfx__fontmapper.cpp @@ -1,11 +1,11 @@ ---- third_party/pdfium/core/fxge/cfx_fontmapper.cpp.orig 2022-02-07 13:39:41 UTC +--- third_party/pdfium/core/fxge/cfx_fontmapper.cpp.orig 2022-02-28 16:54:41 UTC +++ third_party/pdfium/core/fxge/cfx_fontmapper.cpp -@@ -156,7 +156,7 @@ constexpr AltFontFamily kAltFontFamilies[] = { +@@ -155,7 +155,7 @@ constexpr AltFontFamily kAltFontFamilies[] = { {"ForteMT", "Forte"}, }; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ASMJS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ASMJS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(OS_ASMJS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(OS_ASMJS) || BUILDFLAG(IS_BSD) const char kNarrowFamily[] = "LiberationSansNarrow"; - #elif defined(OS_ANDROID) + #elif BUILDFLAG(IS_ANDROID) const char kNarrowFamily[] = "RobotoCondensed"; diff --git a/www/chromium/files/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp b/www/chromium/files/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp index d0db499d3f63..172029d5cfe1 100644 --- a/www/chromium/files/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp +++ b/www/chromium/files/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp @@ -1,11 +1,11 @@ ---- third_party/pdfium/core/fxge/linux/fx_linux_impl.cpp.orig 2022-02-07 13:39:41 UTC +--- third_party/pdfium/core/fxge/linux/fx_linux_impl.cpp.orig 2022-02-28 16:54:41 UTC +++ third_party/pdfium/core/fxge/linux/fx_linux_impl.cpp @@ -17,7 +17,7 @@ #include "third_party/base/check.h" #include "third_party/base/cxx17_backports.h" --#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ASMJS) -+#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ASMJS) && !defined(OS_BSD) +-#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !defined(OS_ASMJS) ++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !defined(OS_ASMJS) && !BUILDFLAG(IS_BSD) #error "Included on the wrong platform" #endif diff --git a/www/chromium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp b/www/chromium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp index 037b2f9ae9ce..c1067be6ea7f 100644 --- a/www/chromium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp +++ b/www/chromium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp @@ -1,4 +1,4 @@ ---- third_party/pdfium/fxjs/fx_date_helpers.cpp.orig 2021-04-14 18:43:07 UTC +--- third_party/pdfium/fxjs/fx_date_helpers.cpp.orig 2022-02-28 16:54:41 UTC +++ third_party/pdfium/fxjs/fx_date_helpers.cpp @@ -36,6 +36,11 @@ double GetLocalTZA() { return 0; @@ -10,7 +10,7 @@ + return (double)(-(lt.tm_gmtoff * 1000)); +#else FXSYS_localtime(&t); - #if defined(OS_WIN) + #if BUILDFLAG(IS_WIN) // In gcc 'timezone' is a global variable declared in time.h. In VC++, that @@ -44,6 +49,7 @@ double GetLocalTZA() { _get_timezone(&timezone); diff --git a/www/chromium/files/patch-third__party_pdfium_xfa_fxfa_parser_cxfa__timezoneprovider.cpp b/www/chromium/files/patch-third__party_pdfium_xfa_fxfa_parser_cxfa__timezoneprovider.cpp index 576f50efd7b7..c9bbf1096187 100644 --- a/www/chromium/files/patch-third__party_pdfium_xfa_fxfa_parser_cxfa__timezoneprovider.cpp +++ b/www/chromium/files/patch-third__party_pdfium_xfa_fxfa_parser_cxfa__timezoneprovider.cpp @@ -1,4 +1,4 @@ ---- third_party/pdfium/xfa/fxfa/parser/cxfa_timezoneprovider.cpp.orig 2022-02-07 13:39:41 UTC +--- third_party/pdfium/xfa/fxfa/parser/cxfa_timezoneprovider.cpp.orig 2022-02-28 16:54:41 UTC +++ third_party/pdfium/xfa/fxfa/parser/cxfa_timezoneprovider.cpp @@ -6,12 +6,16 @@ @@ -15,7 +15,7 @@ +static long g_lTimeZoneOffset = 0; +#endif - #if defined(OS_WIN) + #if BUILDFLAG(IS_WIN) #define TIMEZONE _timezone @@ -24,9 +28,21 @@ static bool g_bProviderTimeZoneSet = false; CXFA_TimeZoneProvider::CXFA_TimeZoneProvider() { diff --git a/www/chromium/files/patch-third__party_perfetto_src_base_test_vm__test__utils.cc b/www/chromium/files/patch-third__party_perfetto_src_base_test_vm__test__utils.cc new file mode 100644 index 000000000000..7f0feaeb7c37 --- /dev/null +++ b/www/chromium/files/patch-third__party_perfetto_src_base_test_vm__test__utils.cc @@ -0,0 +1,11 @@ +--- third_party/perfetto/src/base/test/vm_test_utils.cc.orig 2022-02-28 16:54:41 UTC ++++ third_party/perfetto/src/base/test/vm_test_utils.cc +@@ -92,7 +92,7 @@ bool IsMapped(void* start, size_t size) { + // Fuchsia doesn't yet support paging (b/119503290). + ignore_result(page_size); + return true; +-#elif PERFETTO_BUILDFLAG(PERFETTO_OS_NACL) ++#elif PERFETTO_BUILDFLAG(PERFETTO_OS_NACL) || PERFETTO_BUILDFLAG(PERFETTO_OS_BSD) + // mincore isn't available on NaCL. + ignore_result(page_size); + return true; diff --git a/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc b/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc index f69ad283021e..d8b1dbac6eec 100644 --- a/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc +++ b/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc @@ -1,6 +1,6 @@ ---- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2022-02-07 13:39:41 UTC +--- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2022-02-28 16:54:41 UTC +++ third_party/perfetto/src/tracing/core/tracing_service_impl.cc -@@ -2990,7 +2990,8 @@ bool TracingServiceImpl::SnapshotClocks( +@@ -3008,7 +3008,8 @@ bool TracingServiceImpl::SnapshotClocks( #if !PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) && \ !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN) && \ diff --git a/www/chromium/files/patch-third__party_skia_src_ports_SkOSFile__posix.cpp b/www/chromium/files/patch-third__party_skia_src_ports_SkOSFile__posix.cpp new file mode 100644 index 000000000000..bd078ab07755 --- /dev/null +++ b/www/chromium/files/patch-third__party_skia_src_ports_SkOSFile__posix.cpp @@ -0,0 +1,11 @@ +--- third_party/skia/src/ports/SkOSFile_posix.cpp.orig 2022-02-28 16:54:41 UTC ++++ third_party/skia/src/ports/SkOSFile_posix.cpp +@@ -25,7 +25,7 @@ + #endif + + void sk_fsync(FILE* f) { +-#if !defined(SK_BUILD_FOR_ANDROID) && !defined(__UCLIBC__) && !defined(_NEWLIB_VERSION) ++#if !defined(SK_BUILD_FOR_ANDROID) && !defined(__UCLIBC__) && !defined(_NEWLIB_VERSION) && !defined(__OpenBSD__) + int fd = fileno(f); + fsync(fd); + #endif diff --git a/www/chromium/files/patch-third__party_skia_src_ports_SkOSFile__stdio.cpp b/www/chromium/files/patch-third__party_skia_src_ports_SkOSFile__stdio.cpp deleted file mode 100644 index 1e273267bd29..000000000000 --- a/www/chromium/files/patch-third__party_skia_src_ports_SkOSFile__stdio.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/skia/src/ports/SkOSFile_stdio.cpp.orig 2022-02-07 13:39:41 UTC -+++ third_party/skia/src/ports/SkOSFile_stdio.cpp -@@ -130,7 +130,7 @@ void sk_fflush(FILE* f) { - - void sk_fsync(FILE* f) { - #if !defined(_WIN32) && !defined(SK_BUILD_FOR_ANDROID) && !defined(__UCLIBC__) \ -- && !defined(_NEWLIB_VERSION) -+ && !defined(_NEWLIB_VERSION) && !defined(__OpenBSD__) - int fd = fileno(f); - fsync(fd); - #endif diff --git a/www/chromium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c b/www/chromium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c index e4e7a5781d0b..a83e74e4c721 100644 --- a/www/chromium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c +++ b/www/chromium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c @@ -1,6 +1,6 @@ ---- third_party/sqlite/src/amalgamation/sqlite3.c.orig 2022-02-07 13:39:41 UTC +--- third_party/sqlite/src/amalgamation/sqlite3.c.orig 2022-02-28 16:54:41 UTC +++ third_party/sqlite/src/amalgamation/sqlite3.c -@@ -40698,7 +40698,12 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB +@@ -40896,7 +40896,12 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB memset(zBuf, 0, nBuf); randomnessPid = osGetpid(0); #if !defined(SQLITE_TEST) && !defined(SQLITE_OMIT_RANDOMNESS) @@ -13,7 +13,7 @@ int fd, got; fd = robust_open("/dev/urandom", O_RDONLY, 0); if( fd<0 ){ -@@ -40713,6 +40718,7 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB +@@ -40911,6 +40916,7 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB robust_close(0, fd, __LINE__); } } diff --git a/www/chromium/files/patch-third__party_swiftshader_src_WSI_libXCB.cpp b/www/chromium/files/patch-third__party_swiftshader_src_WSI_libXCB.cpp index 302d63f2a0f5..e7c050a6e2af 100644 --- a/www/chromium/files/patch-third__party_swiftshader_src_WSI_libXCB.cpp +++ b/www/chromium/files/patch-third__party_swiftshader_src_WSI_libXCB.cpp @@ -1,11 +1,11 @@ ---- third_party/swiftshader/src/WSI/libXCB.cpp.orig 2022-02-07 13:39:41 UTC +--- third_party/swiftshader/src/WSI/libXCB.cpp.orig 2022-02-28 16:54:41 UTC +++ third_party/swiftshader/src/WSI/libXCB.cpp -@@ -42,7 +42,7 @@ LibXcbExports *LibXCB::loadExports() - return LibXcbExports(RTLD_DEFAULT); +@@ -53,7 +53,7 @@ LibXcbExports *LibXCB::loadExports() } - -- if(void *lib = loadLibrary("libxcb.so.1")) -+ if(void *lib = loadLibrary("libxcb.so")) - { - return LibXcbExports(lib); + else + { +- libxcb = loadLibrary("libxcb.so.1"); ++ libxcb = loadLibrary("libxcb.so"); } + + if(getProcAddress(RTLD_DEFAULT, "xcb_shm_query_version")) // Search the global scope for pre-loaded XCB library. diff --git a/www/chromium/files/patch-third__party_test__fonts_fontconfig_BUILD.gn b/www/chromium/files/patch-third__party_test__fonts_fontconfig_BUILD.gn new file mode 100644 index 000000000000..180446a881d8 --- /dev/null +++ b/www/chromium/files/patch-third__party_test__fonts_fontconfig_BUILD.gn @@ -0,0 +1,15 @@ +--- third_party/test_fonts/fontconfig/BUILD.gn.orig 2022-03-01 11:59:41 UTC ++++ third_party/test_fonts/fontconfig/BUILD.gn +@@ -26,7 +26,11 @@ if (is_linux || is_chromeos) { + + copy("fonts_conf") { + sources = [ "fonts.conf" ] +- outputs = [ "$root_out_dir/etc/fonts/{{source_file_part}}" ] ++ if (is_freebsd) { ++ outputs = [ "$root_out_dir/usr/local/etc/fonts/{{source_file_part}}" ] ++ } else { ++ outputs = [ "$root_out_dir/etc/fonts/{{source_file_part}}" ] ++ } + } + + if (current_toolchain == host_toolchain) { diff --git a/www/chromium/files/patch-third__party_vulkan__memory__allocator_include_vk__mem__alloc.h b/www/chromium/files/patch-third__party_vulkan__memory__allocator_include_vk__mem__alloc.h index 4d081b6bc26c..9faee003ae78 100644 --- a/www/chromium/files/patch-third__party_vulkan__memory__allocator_include_vk__mem__alloc.h +++ b/www/chromium/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-07 13:39:41 UTC +--- 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 @@ -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__) +
+ 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/chromium/files/patch-third__party_webrtc_modules_desktop__capture_linux_x11_x__server__pixel__buffer.cc b/www/chromium/files/patch-third__party_webrtc_modules_desktop__capture_linux_x11_x__server__pixel__buffer.cc new file mode 100644 index 000000000000..c6c9c8213851 --- /dev/null +++ b/www/chromium/files/patch-third__party_webrtc_modules_desktop__capture_linux_x11_x__server__pixel__buffer.cc @@ -0,0 +1,15 @@ +--- third_party/webrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc.orig 2022-02-28 16:54:41 UTC ++++ third_party/webrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc +@@ -212,6 +212,12 @@ bool XServerPixelBuffer::Init(XAtomCache* cache, Windo + void XServerPixelBuffer::InitShm(const XWindowAttributes& attributes) { + Visual* default_visual = attributes.visual; + int default_depth = attributes.depth; ++#if defined(__OpenBSD__) ++// pledge(2) ++ RTC_LOG(LS_WARNING) << "Unable to use shmget(2) while using pledge(2). " ++ "Performance may be degraded."; ++ return; ++#endif + + int major, minor; + Bool have_pixmaps; diff --git a/www/chromium/files/patch-third__party_webrtc_modules_desktop__capture_linux_x__server__pixel__buffer.cc b/www/chromium/files/patch-third__party_webrtc_modules_desktop__capture_linux_x__server__pixel__buffer.cc deleted file mode 100644 index a3a45ddd1670..000000000000 --- a/www/chromium/files/patch-third__party_webrtc_modules_desktop__capture_linux_x__server__pixel__buffer.cc +++ /dev/null @@ -1,16 +0,0 @@ ---- third_party/webrtc/modules/desktop_capture/linux/x_server_pixel_buffer.cc.orig 2022-02-07 13:39:41 UTC -+++ third_party/webrtc/modules/desktop_capture/linux/x_server_pixel_buffer.cc -@@ -213,6 +213,13 @@ void XServerPixelBuffer::InitShm(const XWindowAttribut - Visual* default_visual = attributes.visual; - int default_depth = attributes.depth; - -+#if defined(__OpenBSD__) -+ // pledge(2) -+ RTC_LOG(LS_WARNING) << "Unable to use shmget(2) while using pledge(2). " -+ "Performance may be degraded."; -+ return; -+#endif -+ - int major, minor; - Bool have_pixmaps; - if (!XShmQueryVersion(display_, &major, &minor, &have_pixmaps)) { diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_rtc__base_BUILD.gn index 36c85d267df4..c9de4bee5d61 100644 --- a/www/chromium/files/patch-third__party_webrtc_rtc__base_BUILD.gn +++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/webrtc/rtc_base/BUILD.gn.orig 2022-02-07 13:39:41 UTC +--- third_party/webrtc/rtc_base/BUILD.gn.orig 2022-02-28 16:54:41 UTC +++ third_party/webrtc/rtc_base/BUILD.gn -@@ -1082,7 +1082,7 @@ rtc_library("rtc_base") { +@@ -1084,7 +1084,7 @@ rtc_library("rtc_base") { sources += [ "mac_ifaddrs_converter.cc" ] } diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc b/www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc new file mode 100644 index 000000000000..34f67f94b4b7 --- /dev/null +++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc @@ -0,0 +1,15 @@ +--- third_party/webrtc/rtc_base/network.cc.orig 2022-02-28 16:54:41 UTC ++++ third_party/webrtc/rtc_base/network.cc +@@ -260,7 +260,12 @@ AdapterType GetAdapterTypeFromName(const char* network + } + #endif + ++#if defined(WEBRTC_BSD) ++ // Treat all other network interface names as ethernet on BSD ++ return ADAPTER_TYPE_ETHERNET; ++#else + return ADAPTER_TYPE_UNKNOWN; ++#endif + } + + NetworkManager::NetworkManager() {} diff --git a/www/chromium/files/patch-tools_gn_build_gen.py b/www/chromium/files/patch-tools_gn_build_gen.py index 3487ae989952..52cb29c4e87d 100644 --- a/www/chromium/files/patch-tools_gn_build_gen.py +++ b/www/chromium/files/patch-tools_gn_build_gen.py @@ -1,6 +1,6 @@ ---- tools/gn/build/gen.py.orig 2022-02-07 13:39:41 UTC +--- tools/gn/build/gen.py.orig 2022-02-28 16:54:41 UTC +++ tools/gn/build/gen.py -@@ -91,6 +91,12 @@ class Platform(object): +@@ -92,6 +92,12 @@ class Platform(object): def is_solaris(self): return self._platform == 'solaris' @@ -13,7 +13,7 @@ def is_posix(self): return self._platform in ['linux', 'freebsd', 'darwin', 'aix', 'openbsd', 'haiku', 'solaris', 'msys', 'netbsd'] -@@ -228,7 +234,7 @@ def WriteGenericNinja(path, static_libraries, executab +@@ -276,7 +282,7 @@ def WriteGenericNinja(path, static_libraries, executab 'linux': 'build_linux.ninja.template', 'freebsd': 'build_linux.ninja.template', 'aix': 'build_aix.ninja.template', @@ -22,7 +22,7 @@ 'haiku': 'build_haiku.ninja.template', 'solaris': 'build_linux.ninja.template', 'netbsd': 'build_linux.ninja.template', -@@ -432,6 +438,9 @@ def WriteGNNinja(path, platform, host, options): +@@ -480,6 +486,9 @@ def WriteGNNinja(path, platform, host, options, args_l if platform.is_posix() and not platform.is_haiku(): ldflags.append('-pthread') diff --git a/www/chromium/files/patch-ui_base_clipboard_clipboard__constants.cc b/www/chromium/files/patch-ui_base_clipboard_clipboard__constants.cc index 6ac36dd920cd..2d068ccc9dd5 100644 --- a/www/chromium/files/patch-ui_base_clipboard_clipboard__constants.cc +++ b/www/chromium/files/patch-ui_base_clipboard_clipboard__constants.cc @@ -1,11 +1,11 @@ ---- ui/base/clipboard/clipboard_constants.cc.orig 2022-02-07 13:39:41 UTC +--- ui/base/clipboard/clipboard_constants.cc.orig 2022-02-28 16:54:41 UTC +++ ui/base/clipboard/clipboard_constants.cc -@@ -20,7 +20,7 @@ const char kMimeTypePNG[] = "image/png"; +@@ -22,7 +22,7 @@ const char kMimeTypePNG[] = "image/png"; // Used for image drag & drop from LaCrOS. const char kMimeTypeOctetStream[] = "application/octet-stream"; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) const char kMimeTypeLinuxUtf8String[] = "UTF8_STRING"; const char kMimeTypeLinuxString[] = "STRING"; const char kMimeTypeLinuxText[] = "TEXT"; diff --git a/www/chromium/files/patch-ui_base_clipboard_clipboard__constants.h b/www/chromium/files/patch-ui_base_clipboard_clipboard__constants.h index 2b6fed13ce93..c47ad7f58b66 100644 --- a/www/chromium/files/patch-ui_base_clipboard_clipboard__constants.h +++ b/www/chromium/files/patch-ui_base_clipboard_clipboard__constants.h @@ -1,11 +1,11 @@ ---- ui/base/clipboard/clipboard_constants.h.orig 2022-02-07 13:39:41 UTC +--- ui/base/clipboard/clipboard_constants.h.orig 2022-02-28 16:54:41 UTC +++ ui/base/clipboard/clipboard_constants.h -@@ -38,7 +38,7 @@ COMPONENT_EXPORT(UI_BASE_CLIPBOARD_TYPES) - extern const char kMimeTypeOctetStream[]; +@@ -44,7 +44,7 @@ extern const char kMimeTypeDataTransferEndpoint[]; + #endif // BUILDFLAG(IS_CHROMEOS) // Linux-specific MIME type constants (also used in Fuchsia). --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) COMPONENT_EXPORT(UI_BASE_CLIPBOARD_TYPES) extern const char kMimeTypeLinuxUtf8String[]; COMPONENT_EXPORT(UI_BASE_CLIPBOARD_TYPES) diff --git a/www/chromium/files/patch-ui_base_cursor_cursor__factory.cc b/www/chromium/files/patch-ui_base_cursor_cursor__factory.cc index 3bcd4653b7e0..e48df94619cc 100644 --- a/www/chromium/files/patch-ui_base_cursor_cursor__factory.cc +++ b/www/chromium/files/patch-ui_base_cursor_cursor__factory.cc @@ -1,11 +1,11 @@ ---- ui/base/cursor/cursor_factory.cc.orig 2022-02-07 13:39:41 UTC +--- ui/base/cursor/cursor_factory.cc.orig 2022-02-28 16:54:41 UTC +++ ui/base/cursor/cursor_factory.cc -@@ -80,7 +80,7 @@ void CursorFactory::ObserveThemeChanges() { +@@ -81,7 +81,7 @@ void CursorFactory::ObserveThemeChanges() { void CursorFactory::SetDeviceScaleFactor(float scale) {} --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Returns a cursor name compatible with either X11 or the FreeDesktop.org // cursor spec ([1] and [2]), followed by fallbacks that can work as diff --git a/www/chromium/files/patch-ui_base_cursor_cursor__factory.h b/www/chromium/files/patch-ui_base_cursor_cursor__factory.h index d2dfa12afad2..d155d2ff5289 100644 --- a/www/chromium/files/patch-ui_base_cursor_cursor__factory.h +++ b/www/chromium/files/patch-ui_base_cursor_cursor__factory.h @@ -1,11 +1,11 @@ ---- ui/base/cursor/cursor_factory.h.orig 2022-02-07 13:39:41 UTC +--- ui/base/cursor/cursor_factory.h.orig 2022-02-28 16:54:41 UTC +++ ui/base/cursor/cursor_factory.h @@ -81,7 +81,7 @@ class COMPONENT_EXPORT(UI_BASE_CURSOR) CursorFactory { base::ObserverList<CursorFactoryObserver>::Unchecked observers_; }; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) COMPONENT_EXPORT(UI_BASE_CURSOR) std::vector<std::string> CursorNamesFromType(mojom::CursorType type); #endif diff --git a/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc b/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc index 0f0bdd44b14c..6726b649d956 100644 --- a/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc +++ b/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc @@ -1,20 +1,20 @@ ---- ui/base/dragdrop/os_exchange_data_provider_factory.cc.orig 2022-02-07 13:39:41 UTC +--- ui/base/dragdrop/os_exchange_data_provider_factory.cc.orig 2022-02-28 16:54:41 UTC +++ ui/base/dragdrop/os_exchange_data_provider_factory.cc @@ -7,7 +7,7 @@ #include "base/notreached.h" #include "build/build_config.h" --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) #include "ui/base/dragdrop/os_exchange_data_provider_factory_ozone.h" #include "ui/base/dragdrop/os_exchange_data_provider_non_backed.h" - #elif defined(OS_APPLE) + #elif BUILDFLAG(IS_APPLE) @@ -21,7 +21,7 @@ namespace ui { // static std::unique_ptr<OSExchangeDataProvider> OSExchangeDataProviderFactory::CreateProvider() { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // The instance can be nullptr in tests that do not instantiate the platform, // or on platforms that do not implement specific drag'n'drop. For them, // falling back to the Aura provider should be fine. diff --git a/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.cc b/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.cc index 918d54722083..0f95132edd70 100644 --- a/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.cc +++ b/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.cc @@ -1,11 +1,11 @@ ---- ui/base/dragdrop/os_exchange_data_provider_non_backed.cc.orig 2022-02-07 13:39:41 UTC +--- ui/base/dragdrop/os_exchange_data_provider_non_backed.cc.orig 2022-02-28 16:54:41 UTC +++ ui/base/dragdrop/os_exchange_data_provider_non_backed.cc -@@ -85,7 +85,7 @@ void OSExchangeDataProviderNonBacked::SetPickledData( +@@ -94,7 +94,7 @@ void OSExchangeDataProviderNonBacked::SetPickledData( } bool OSExchangeDataProviderNonBacked::GetString(std::u16string* data) const { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (HasFile()) { // Various Linux file managers both pass a list of file:// URIs and set the // string representation to the URI. We explicitly don't want to return use diff --git a/www/chromium/files/patch-ui_base_ime_dummy__text__input__client.cc b/www/chromium/files/patch-ui_base_ime_dummy__text__input__client.cc index 0816dc206c0a..bf4dae585181 100644 --- a/www/chromium/files/patch-ui_base_ime_dummy__text__input__client.cc +++ b/www/chromium/files/patch-ui_base_ime_dummy__text__input__client.cc @@ -1,11 +1,11 @@ ---- ui/base/ime/dummy_text_input_client.cc.orig 2021-12-16 15:20:13 UTC +--- ui/base/ime/dummy_text_input_client.cc.orig 2022-02-28 16:54:41 UTC +++ ui/base/ime/dummy_text_input_client.cc -@@ -155,7 +155,7 @@ bool DummyTextInputClient::ShouldDoLearning() { +@@ -151,7 +151,7 @@ bool DummyTextInputClient::ShouldDoLearning() { return false; } --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) bool DummyTextInputClient::SetCompositionFromExistingText( const gfx::Range& range, const std::vector<ui::ImeTextSpan>& ui_ime_text_spans) { diff --git a/www/chromium/files/patch-ui_base_ime_dummy__text__input__client.h b/www/chromium/files/patch-ui_base_ime_dummy__text__input__client.h index fbc7afade9e9..64607ef8821e 100644 --- a/www/chromium/files/patch-ui_base_ime_dummy__text__input__client.h +++ b/www/chromium/files/patch-ui_base_ime_dummy__text__input__client.h @@ -1,11 +1,11 @@ ---- ui/base/ime/dummy_text_input_client.h.orig 2022-02-07 13:39:41 UTC +--- ui/base/ime/dummy_text_input_client.h.orig 2022-02-28 16:54:41 UTC +++ ui/base/ime/dummy_text_input_client.h @@ -63,7 +63,7 @@ class DummyTextInputClient : public TextInputClient { ukm::SourceId GetClientSourceForMetrics() const override; bool ShouldDoLearning() override; --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) bool SetCompositionFromExistingText( const gfx::Range& range, const std::vector<ui::ImeTextSpan>& ui_ime_text_spans) override; diff --git a/www/chromium/files/patch-ui_base_ime_fake__text__input__client.cc b/www/chromium/files/patch-ui_base_ime_fake__text__input__client.cc index 5775853dd12f..b6b545bddb38 100644 --- a/www/chromium/files/patch-ui_base_ime_fake__text__input__client.cc +++ b/www/chromium/files/patch-ui_base_ime_fake__text__input__client.cc @@ -1,11 +1,11 @@ ---- ui/base/ime/fake_text_input_client.cc.orig 2021-12-16 15:20:38 UTC +--- ui/base/ime/fake_text_input_client.cc.orig 2022-02-28 16:54:41 UTC +++ ui/base/ime/fake_text_input_client.cc -@@ -160,7 +160,7 @@ bool FakeTextInputClient::ShouldDoLearning() { +@@ -161,7 +161,7 @@ bool FakeTextInputClient::ShouldDoLearning() { return false; } --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) bool FakeTextInputClient::SetCompositionFromExistingText( const gfx::Range& range, const std::vector<ui::ImeTextSpan>& ui_ime_text_spans) { diff --git a/www/chromium/files/patch-ui_base_ime_fake__text__input__client.h b/www/chromium/files/patch-ui_base_ime_fake__text__input__client.h index 1ae72ba1423b..aa3aa8b32a7c 100644 --- a/www/chromium/files/patch-ui_base_ime_fake__text__input__client.h +++ b/www/chromium/files/patch-ui_base_ime_fake__text__input__client.h @@ -1,11 +1,11 @@ ---- ui/base/ime/fake_text_input_client.h.orig 2022-02-07 13:39:41 UTC +--- ui/base/ime/fake_text_input_client.h.orig 2022-02-28 16:54:41 UTC +++ ui/base/ime/fake_text_input_client.h @@ -69,7 +69,7 @@ class FakeTextInputClient : public TextInputClient { void SetTextEditCommandForNextKeyEvent(TextEditCommand command) override; ukm::SourceId GetClientSourceForMetrics() const override; bool ShouldDoLearning() override; --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) bool SetCompositionFromExistingText( const gfx::Range& range, const std::vector<ui::ImeTextSpan>& ui_ime_text_spans) override; diff --git a/www/chromium/files/patch-ui_base_ime_init_input__method__initializer.cc b/www/chromium/files/patch-ui_base_ime_init_input__method__initializer.cc index 4459d62eca04..2b686551d206 100644 --- a/www/chromium/files/patch-ui_base_ime_init_input__method__initializer.cc +++ b/www/chromium/files/patch-ui_base_ime_init_input__method__initializer.cc @@ -1,38 +1,38 @@ ---- ui/base/ime/init/input_method_initializer.cc.orig 2021-12-14 11:45:39 UTC +--- ui/base/ime/init/input_method_initializer.cc.orig 2022-02-28 16:54:41 UTC +++ ui/base/ime/init/input_method_initializer.cc -@@ -11,7 +11,7 @@ +@@ -10,7 +10,7 @@ + #include "build/chromeos_buildflags.h" - #if BUILDFLAG(IS_CHROMEOS_ASH) - #include "ui/base/ime/ash/ime_bridge.h" --#elif defined(USE_AURA) && (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+#elif defined(USE_AURA) && (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) + #if !BUILDFLAG(IS_CHROMEOS_ASH) && defined(USE_AURA) && \ +- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) #include "base/check.h" #include "ui/base/ime/linux/fake_input_method_context_factory.h" - #elif defined(OS_WIN) -@@ -21,7 +21,7 @@ + #elif BUILDFLAG(IS_WIN) +@@ -20,7 +20,7 @@ namespace { --#if defined(USE_AURA) && (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+#if defined(USE_AURA) && (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) +-#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) const ui::LinuxInputMethodContextFactory* g_linux_input_method_context_factory_for_testing; #endif -@@ -49,7 +49,7 @@ void ShutdownInputMethod() { +@@ -43,7 +43,7 @@ void ShutdownInputMethod() { + void InitializeInputMethodForTesting() { - #if BUILDFLAG(IS_CHROMEOS_ASH) - IMEBridge::Initialize(); --#elif defined(USE_AURA) && (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+#elif defined(USE_AURA) && (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) + #if !BUILDFLAG(IS_CHROMEOS_ASH) && defined(USE_AURA) && \ +- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) if (!g_linux_input_method_context_factory_for_testing) g_linux_input_method_context_factory_for_testing = new FakeInputMethodContextFactory(); -@@ -68,7 +68,7 @@ void InitializeInputMethodForTesting() { +@@ -61,7 +61,7 @@ void InitializeInputMethodForTesting() { + void ShutdownInputMethodForTesting() { - #if BUILDFLAG(IS_CHROMEOS_ASH) - IMEBridge::Shutdown(); --#elif defined(USE_AURA) && (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+#elif defined(USE_AURA) && (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) + #if !BUILDFLAG(IS_CHROMEOS_ASH) && defined(USE_AURA) && \ +- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) const LinuxInputMethodContextFactory* factory = LinuxInputMethodContextFactory::instance(); CHECK(!factory || factory == g_linux_input_method_context_factory_for_testing) diff --git a/www/chromium/files/patch-ui_base_ime_text__input__client.h b/www/chromium/files/patch-ui_base_ime_text__input__client.h index 8fa93f6aee5b..d7103e4bd42a 100644 --- a/www/chromium/files/patch-ui_base_ime_text__input__client.h +++ b/www/chromium/files/patch-ui_base_ime_text__input__client.h @@ -1,11 +1,11 @@ ---- ui/base/ime/text_input_client.h.orig 2021-12-16 15:21:05 UTC +--- ui/base/ime/text_input_client.h.orig 2022-02-28 16:54:41 UTC +++ ui/base/ime/text_input_client.h @@ -237,7 +237,7 @@ class COMPONENT_EXPORT(UI_BASE_IME) TextInputClient { // fields that are considered 'private' (e.g. in incognito tabs). virtual bool ShouldDoLearning() = 0; --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Start composition over a given UTF-16 code range from existing text. This // should only be used for composition scenario when IME wants to start // composition on existing text. Returns whether the operation was successful. diff --git a/www/chromium/files/patch-ui_base_resource_resource__bundle.cc b/www/chromium/files/patch-ui_base_resource_resource__bundle.cc index 6413b42700fc..447e9146bc22 100644 --- a/www/chromium/files/patch-ui_base_resource_resource__bundle.cc +++ b/www/chromium/files/patch-ui_base_resource_resource__bundle.cc @@ -1,11 +1,11 @@ ---- ui/base/resource/resource_bundle.cc.orig 2022-02-07 13:39:41 UTC +--- ui/base/resource/resource_bundle.cc.orig 2022-02-28 16:54:41 UTC +++ ui/base/resource/resource_bundle.cc @@ -849,7 +849,7 @@ void ResourceBundle::ReloadFonts() { } ResourceScaleFactor ResourceBundle::GetMaxResourceScaleFactor() const { --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) return max_scale_factor_; #else return GetSupportedResourceScaleFactors().back(); diff --git a/www/chromium/files/patch-ui_base_test_skia__gold__pixel__diff.cc b/www/chromium/files/patch-ui_base_test_skia__gold__pixel__diff.cc index bfd457be238a..b37a0230094f 100644 --- a/www/chromium/files/patch-ui_base_test_skia__gold__pixel__diff.cc +++ b/www/chromium/files/patch-ui_base_test_skia__gold__pixel__diff.cc @@ -1,11 +1,11 @@ ---- ui/base/test/skia_gold_pixel_diff.cc.orig 2021-12-14 11:45:39 UTC +--- ui/base/test/skia_gold_pixel_diff.cc.orig 2022-02-28 16:54:41 UTC +++ ui/base/test/skia_gold_pixel_diff.cc -@@ -146,7 +146,7 @@ std::string SkiaGoldPixelDiff::GetPlatform() { +@@ -150,7 +150,7 @@ std::string SkiaGoldPixelDiff::GetPlatform() { return "macOS"; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) return "linux"; #endif } diff --git a/www/chromium/files/patch-ui_base_ui__base__features.cc b/www/chromium/files/patch-ui_base_ui__base__features.cc index 417428c5a30e..3cdc6ea01e23 100644 --- a/www/chromium/files/patch-ui_base_ui__base__features.cc +++ b/www/chromium/files/patch-ui_base_ui__base__features.cc @@ -1,20 +1,20 @@ ---- ui/base/ui_base_features.cc.orig 2022-02-07 13:39:41 UTC +--- ui/base/ui_base_features.cc.orig 2022-02-28 16:54:41 UTC +++ ui/base/ui_base_features.cc -@@ -154,7 +154,7 @@ const base::Feature kExperimentalFlingAnimation { - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch +@@ -148,7 +148,7 @@ const base::Feature kExperimentalFlingAnimation { // of lacros-chrome is complete. - #if defined(OS_WIN) || (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ -- !BUILDFLAG(IS_CHROMEOS_LACROS)) -+ !BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || \ + (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ +- !BUILDFLAG(IS_CHROMEOS_LACROS)) ++ !BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD) base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -250,7 +250,7 @@ bool IsForcedColorsEnabled() { +@@ -244,7 +244,7 @@ bool IsForcedColorsEnabled() { // milestones. const base::Feature kEyeDropper { "EyeDropper", --#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT diff --git a/www/chromium/files/patch-ui_base_webui_web__ui__util.cc b/www/chromium/files/patch-ui_base_webui_web__ui__util.cc index 922f7448d1fa..a5d536e63247 100644 --- a/www/chromium/files/patch-ui_base_webui_web__ui__util.cc +++ b/www/chromium/files/patch-ui_base_webui_web__ui__util.cc @@ -1,11 +1,11 @@ ---- ui/base/webui/web_ui_util.cc.orig 2021-09-24 04:26:38 UTC +--- ui/base/webui/web_ui_util.cc.orig 2022-02-28 16:54:41 UTC +++ ui/base/webui/web_ui_util.cc @@ -221,7 +221,7 @@ std::string GetFontFamily() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) std::string font_name = ui::ResourceBundle::GetSharedInstance() .GetFont(ui::ResourceBundle::BaseFont) .GetFontName(); diff --git a/www/chromium/files/patch-ui_base_x_x11__shm__image__pool.cc b/www/chromium/files/patch-ui_base_x_x11__shm__image__pool.cc index 2ac95f9a102a..83be0d5ac856 100644 --- a/www/chromium/files/patch-ui_base_x_x11__shm__image__pool.cc +++ b/www/chromium/files/patch-ui_base_x_x11__shm__image__pool.cc @@ -1,4 +1,4 @@ ---- ui/base/x/x11_shm_image_pool.cc.orig 2022-02-07 13:39:41 UTC +--- ui/base/x/x11_shm_image_pool.cc.orig 2022-02-28 16:54:41 UTC +++ ui/base/x/x11_shm_image_pool.cc @@ -16,6 +16,7 @@ #include "base/environment.h" @@ -12,7 +12,7 @@ 1.0f / (kShmResizeThreshold * kShmResizeThreshold); std::size_t MaxShmSegmentSizeImpl() { -+#if defined(OS_BSD) ++#if BUILDFLAG(IS_BSD) + return base::SysInfo::MaxSharedMemorySize(); +#else struct shminfo info; @@ -27,7 +27,7 @@ } bool ShouldUseMitShm(x11::Connection* connection) { -+#if defined(OS_BSD) ++#if BUILDFLAG(IS_BSD) + return false; +#endif // MIT-SHM may be available on remote connetions, but it will be unusable. Do @@ -37,8 +37,8 @@ shmctl(state.shmid, IPC_RMID, nullptr); return false; } --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // On Linux, a shmid can still be attached after IPC_RMID if otherwise // kept alive. Detach before XShmAttach to prevent a memory leak in case // the process dies. @@ -46,8 +46,8 @@ return false; state.shmseg = shmseg; state.shmem_attached_to_server = true; --#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_BSD) +-#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) ++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD) // The Linux-specific shmctl behavior above may not be portable, so we're // forced to do IPC_RMID after the server has attached to the segment. shmctl(state.shmid, IPC_RMID, nullptr); diff --git a/www/chromium/files/patch-ui_compositor_compositor.cc b/www/chromium/files/patch-ui_compositor_compositor.cc index 7ca479040462..dec86bbe8a09 100644 --- a/www/chromium/files/patch-ui_compositor_compositor.cc +++ b/www/chromium/files/patch-ui_compositor_compositor.cc @@ -1,11 +1,11 @@ ---- ui/compositor/compositor.cc.orig 2022-02-07 13:39:41 UTC +--- ui/compositor/compositor.cc.orig 2022-02-28 16:54:41 UTC +++ ui/compositor/compositor.cc @@ -839,7 +839,7 @@ void Compositor::OnResume() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) void Compositor::OnCompleteSwapWithNewSize(const gfx::Size& size) { for (auto& observer : observer_list_) observer.OnCompositingCompleteSwapWithNewSize(this, size); diff --git a/www/chromium/files/patch-ui_compositor_compositor.h b/www/chromium/files/patch-ui_compositor_compositor.h index 4d562c9e823a..95e89938a1aa 100644 --- a/www/chromium/files/patch-ui_compositor_compositor.h +++ b/www/chromium/files/patch-ui_compositor_compositor.h @@ -1,11 +1,11 @@ ---- ui/compositor/compositor.h.orig 2022-02-07 13:39:41 UTC +--- ui/compositor/compositor.h.orig 2022-02-28 16:54:41 UTC +++ ui/compositor/compositor.h @@ -388,7 +388,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. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) void OnCompleteSwapWithNewSize(const gfx::Size& size); #endif diff --git a/www/chromium/files/patch-ui_compositor_compositor__observer.h b/www/chromium/files/patch-ui_compositor_compositor__observer.h index d5c108b83ce3..a590e267ffac 100644 --- a/www/chromium/files/patch-ui_compositor_compositor__observer.h +++ b/www/chromium/files/patch-ui_compositor_compositor__observer.h @@ -1,11 +1,11 @@ ---- ui/compositor/compositor_observer.h.orig 2022-02-07 13:39:41 UTC +--- ui/compositor/compositor_observer.h.orig 2022-02-28 16:54:41 UTC +++ ui/compositor/compositor_observer.h @@ -48,7 +48,7 @@ class COMPOSITOR_EXPORT CompositorObserver { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) // Called when a swap with new size is completed. virtual void OnCompositingCompleteSwapWithNewSize(ui::Compositor* compositor, const gfx::Size& size) {} diff --git a/www/chromium/files/patch-ui_events_event.cc b/www/chromium/files/patch-ui_events_event.cc index 72035f2eefd7..864c93821158 100644 --- a/www/chromium/files/patch-ui_events_event.cc +++ b/www/chromium/files/patch-ui_events_event.cc @@ -1,11 +1,11 @@ ---- ui/events/event.cc.orig 2021-12-31 00:58:32 UTC +--- ui/events/event.cc.orig 2022-02-28 16:54:41 UTC +++ ui/events/event.cc @@ -452,7 +452,7 @@ std::string LocatedEvent::ToString() const { MouseEvent::MouseEvent(const PlatformEvent& native_event) : LocatedEvent(native_event), changed_button_flags_(GetChangedMouseButtonFlagsFromNative(native_event)), --#if defined(OS_CHROMEOS) || defined(OS_LINUX) -+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) movement_(GetMouseMovementFromNative(native_event)), #endif pointer_details_(GetMousePointerDetailsFromNative(native_event)) { @@ -13,8 +13,8 @@ if (synthesize_key_repeat_enabled_ && IsRepeated(GetLastKeyEvent())) set_flags(flags() | EF_IS_REPEAT); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) NormalizeFlags(); - #elif defined(OS_WIN) + #elif BUILDFLAG(IS_WIN) // Only Windows has native character events. diff --git a/www/chromium/files/patch-ui_events_event__switches.cc b/www/chromium/files/patch-ui_events_event__switches.cc index 93730b0053aa..87aa7014f24b 100644 --- a/www/chromium/files/patch-ui_events_event__switches.cc +++ b/www/chromium/files/patch-ui_events_event__switches.cc @@ -1,11 +1,11 @@ ---- ui/events/event_switches.cc.orig 2021-04-14 18:41:39 UTC +--- ui/events/event_switches.cc.orig 2022-02-28 16:54:41 UTC +++ ui/events/event_switches.cc @@ -14,7 +14,7 @@ namespace switches { const char kCompensateForUnstablePinchZoom[] = "compensate-for-unstable-pinch-zoom"; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Tells chrome to interpret events from these devices as touch events. Only // available with XInput 2 (i.e. X server 1.8 or above). The id's of the // devices can be retrieved from 'xinput list'. diff --git a/www/chromium/files/patch-ui_events_event__switches.h b/www/chromium/files/patch-ui_events_event__switches.h index 31bd28d23c7c..f598832d3900 100644 --- a/www/chromium/files/patch-ui_events_event__switches.h +++ b/www/chromium/files/patch-ui_events_event__switches.h @@ -1,11 +1,11 @@ ---- ui/events/event_switches.h.orig 2022-02-07 13:39:41 UTC +--- ui/events/event_switches.h.orig 2022-02-28 16:54:41 UTC +++ ui/events/event_switches.h @@ -12,7 +12,7 @@ namespace switches { EVENTS_BASE_EXPORT extern const char kCompensateForUnstablePinchZoom[]; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) EVENTS_BASE_EXPORT extern const char kTouchDevices[]; EVENTS_BASE_EXPORT extern const char kPenDevices[]; #endif diff --git a/www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.cc b/www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.cc index c3a890fc9559..bb40cb5171b0 100644 --- a/www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.cc +++ b/www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.cc @@ -1,11 +1,11 @@ ---- ui/events/keycodes/dom/keycode_converter.cc.orig 2022-02-07 13:39:41 UTC +--- ui/events/keycodes/dom/keycode_converter.cc.orig 2022-02-28 16:54:41 UTC +++ ui/events/keycodes/dom/keycode_converter.cc @@ -24,7 +24,7 @@ namespace { - #if defined(OS_WIN) + #if BUILDFLAG(IS_WIN) #define DOM_CODE(usb, evdev, xkb, win, mac, code, id) \ { usb, win, code } --#elif defined(OS_LINUX) || defined(OS_CHROMEOS) -+#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #define DOM_CODE(usb, evdev, xkb, win, mac, code, id) \ { usb, xkb, code } - #elif defined(OS_APPLE) + #elif BUILDFLAG(IS_APPLE) diff --git a/www/chromium/files/patch-ui_gfx_BUILD.gn b/www/chromium/files/patch-ui_gfx_BUILD.gn index 4bc516901db4..57c0f7b02148 100644 --- a/www/chromium/files/patch-ui_gfx_BUILD.gn +++ b/www/chromium/files/patch-ui_gfx_BUILD.gn @@ -1,6 +1,6 @@ ---- ui/gfx/BUILD.gn.orig 2022-02-07 13:39:41 UTC +--- ui/gfx/BUILD.gn.orig 2022-02-28 16:54:41 UTC +++ ui/gfx/BUILD.gn -@@ -583,7 +583,7 @@ source_set("memory_buffer_sources") { +@@ -584,7 +584,7 @@ source_set("memory_buffer_sources") { deps += [ "//build/config/linux/libdrm" ] } diff --git a/www/chromium/files/patch-ui_gfx_canvas__skia.cc b/www/chromium/files/patch-ui_gfx_canvas__skia.cc index d98494bca865..3b2d9aa2a31a 100644 --- a/www/chromium/files/patch-ui_gfx_canvas__skia.cc +++ b/www/chromium/files/patch-ui_gfx_canvas__skia.cc @@ -1,11 +1,11 @@ ---- ui/gfx/canvas_skia.cc.orig 2022-02-07 13:39:41 UTC +--- ui/gfx/canvas_skia.cc.orig 2022-02-28 16:54:41 UTC +++ ui/gfx/canvas_skia.cc -@@ -209,7 +209,7 @@ void Canvas::DrawStringRectWithFlags(const std::u16str +@@ -200,7 +200,7 @@ void Canvas::DrawStringRectWithFlags(const std::u16str Range range = StripAcceleratorChars(flags, &adjusted_text); bool elide_text = ((flags & NO_ELLIPSIS) == 0); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // On Linux, eliding really means fading the end of the string. But only // for LTR text. RTL text is still elided (on the left) with "...". if (elide_text) { diff --git a/www/chromium/files/patch-ui_gfx_font__list.cc b/www/chromium/files/patch-ui_gfx_font__list.cc index 6ff242535203..cda1787ffdf7 100644 --- a/www/chromium/files/patch-ui_gfx_font__list.cc +++ b/www/chromium/files/patch-ui_gfx_font__list.cc @@ -1,11 +1,11 @@ ---- ui/gfx/font_list.cc.orig 2022-02-07 13:39:41 UTC +--- ui/gfx/font_list.cc.orig 2022-02-28 16:54:41 UTC +++ ui/gfx/font_list.cc @@ -27,7 +27,7 @@ base::LazyInstance<scoped_refptr<gfx::FontListImpl>>:: bool g_default_impl_initialized = false; bool IsFontFamilyAvailable(const std::string& family, SkFontMgr* fontManager) { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) return !!fontManager->legacyMakeTypeface(family.c_str(), SkFontStyle()); #else sk_sp<SkFontStyleSet> set(fontManager->matchFamily(family.c_str())); diff --git a/www/chromium/files/patch-ui_gfx_font__render__params.h b/www/chromium/files/patch-ui_gfx_font__render__params.h index 9e3468aa90fb..7ec38845feee 100644 --- a/www/chromium/files/patch-ui_gfx_font__render__params.h +++ b/www/chromium/files/patch-ui_gfx_font__render__params.h @@ -1,20 +1,20 @@ ---- ui/gfx/font_render_params.h.orig 2022-02-07 13:39:41 UTC +--- ui/gfx/font_render_params.h.orig 2022-02-28 16:54:41 UTC +++ ui/gfx/font_render_params.h @@ -109,7 +109,7 @@ GFX_EXPORT FontRenderParams GetFontRenderParams( const FontRenderParamsQuery& query, std::string* family_out); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Clears GetFontRenderParams()'s cache. Intended to be called by tests that are // changing Fontconfig's configuration. GFX_EXPORT void ClearFontRenderParamsCacheForTest(); @@ -119,7 +119,7 @@ GFX_EXPORT void ClearFontRenderParamsCacheForTest(); GFX_EXPORT float GetFontRenderParamsDeviceScaleFactor(); - #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -- defined(OS_ANDROID) || defined(OS_FUCHSIA) -+ defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) // Sets the device scale factor for FontRenderParams to decide // if it should enable subpixel positioning. GFX_EXPORT void SetFontRenderParamsDeviceScaleFactor( diff --git a/www/chromium/files/patch-ui_gfx_font__util.cc b/www/chromium/files/patch-ui_gfx_font__util.cc index 67aa410b0069..8727d4724110 100644 --- a/www/chromium/files/patch-ui_gfx_font__util.cc +++ b/www/chromium/files/patch-ui_gfx_font__util.cc @@ -1,11 +1,11 @@ ---- ui/gfx/font_util.cc.orig 2022-02-07 13:39:41 UTC +--- ui/gfx/font_util.cc.orig 2022-02-28 16:54:41 UTC +++ ui/gfx/font_util.cc @@ -6,7 +6,7 @@ #include "build/build_config.h" --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include <fontconfig/fontconfig.h> #include "ui/gfx/linux/fontconfig_util.h" #endif @@ -13,8 +13,8 @@ // background (resources have not yet been granted to cast) since it prevents // the long delay the user would have seen on first rendering. --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Ensures the config is created on this thread. FcConfig* config = GetGlobalFontConfig(); DCHECK(config); diff --git a/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.cc b/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.cc index 2bf5064d6378..533769a6d43e 100644 --- a/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.cc +++ b/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.cc @@ -1,11 +1,11 @@ ---- ui/gfx/gpu_memory_buffer.cc.orig 2021-04-14 18:41:39 UTC +--- ui/gfx/gpu_memory_buffer.cc.orig 2022-02-28 16:54:41 UTC +++ ui/gfx/gpu_memory_buffer.cc -@@ -53,7 +53,7 @@ GpuMemoryBufferHandle GpuMemoryBufferHandle::Clone() c +@@ -54,7 +54,7 @@ GpuMemoryBufferHandle GpuMemoryBufferHandle::Clone() c handle.region = region.Duplicate(); handle.offset = offset; handle.stride = stride; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) handle.native_pixmap_handle = CloneHandleForIPC(native_pixmap_handle); - #elif defined(OS_MAC) + #elif BUILDFLAG(IS_MAC) handle.io_surface = io_surface; diff --git a/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h b/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h index 049e358b81ae..e2762451c4e0 100644 --- a/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h +++ b/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h @@ -1,20 +1,20 @@ ---- ui/gfx/gpu_memory_buffer.h.orig 2021-12-31 00:58:32 UTC +--- ui/gfx/gpu_memory_buffer.h.orig 2022-02-28 16:54:41 UTC +++ ui/gfx/gpu_memory_buffer.h @@ -16,7 +16,7 @@ #include "ui/gfx/gfx_export.h" #include "ui/gfx/hdr_metadata.h" --#if defined(USE_OZONE) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(USE_OZONE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if defined(USE_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if defined(USE_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "ui/gfx/native_pixmap_handle.h" - #elif defined(OS_MAC) + #elif BUILDFLAG(IS_MAC) #include "ui/gfx/mac/io_surface.h" @@ -76,7 +76,7 @@ struct GFX_EXPORT GpuMemoryBufferHandle { base::UnsafeSharedMemoryRegion region; uint32_t offset = 0; int32_t stride = 0; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) NativePixmapHandle native_pixmap_handle; - #elif defined(OS_MAC) + #elif BUILDFLAG(IS_MAC) ScopedIOSurface io_surface; diff --git a/www/chromium/files/patch-ui_gfx_ipc_gfx__param__traits__macros.h b/www/chromium/files/patch-ui_gfx_ipc_gfx__param__traits__macros.h index e0e95ef6c58f..6e0338f01778 100644 --- a/www/chromium/files/patch-ui_gfx_ipc_gfx__param__traits__macros.h +++ b/www/chromium/files/patch-ui_gfx_ipc_gfx__param__traits__macros.h @@ -1,11 +1,11 @@ ---- ui/gfx/ipc/gfx_param_traits_macros.h.orig 2021-04-14 18:41:39 UTC +--- ui/gfx/ipc/gfx_param_traits_macros.h.orig 2022-02-28 16:54:41 UTC +++ ui/gfx/ipc/gfx_param_traits_macros.h @@ -18,7 +18,7 @@ #include "ui/gfx/selection_bound.h" #include "ui/gfx/swap_result.h" --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "ui/gfx/native_pixmap_handle.h" #endif @@ -13,32 +13,32 @@ IPC_STRUCT_TRAITS_MEMBER(region) IPC_STRUCT_TRAITS_MEMBER(offset) IPC_STRUCT_TRAITS_MEMBER(stride) --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) IPC_STRUCT_TRAITS_MEMBER(native_pixmap_handle) - #elif defined(OS_APPLE) + #elif BUILDFLAG(IS_APPLE) IPC_STRUCT_TRAITS_MEMBER(io_surface) @@ -63,12 +63,12 @@ IPC_STRUCT_TRAITS_BEGIN(gfx::GpuMemoryBufferId) IPC_STRUCT_TRAITS_MEMBER(id) IPC_STRUCT_TRAITS_END() --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) IPC_STRUCT_TRAITS_BEGIN(gfx::NativePixmapPlane) IPC_STRUCT_TRAITS_MEMBER(stride) IPC_STRUCT_TRAITS_MEMBER(offset) IPC_STRUCT_TRAITS_MEMBER(size) --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) IPC_STRUCT_TRAITS_MEMBER(fd) - #elif defined(OS_FUCHSIA) + #elif BUILDFLAG(IS_FUCHSIA) IPC_STRUCT_TRAITS_MEMBER(vmo) @@ -77,7 +77,7 @@ IPC_STRUCT_TRAITS_END() IPC_STRUCT_TRAITS_BEGIN(gfx::NativePixmapHandle) IPC_STRUCT_TRAITS_MEMBER(planes) --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) IPC_STRUCT_TRAITS_MEMBER(modifier) #endif - #if defined(OS_FUCHSIA) + #if BUILDFLAG(IS_FUCHSIA) diff --git a/www/chromium/files/patch-ui_gfx_mojom_buffer__types__mojom__traits.cc b/www/chromium/files/patch-ui_gfx_mojom_buffer__types__mojom__traits.cc index 0210e48b03df..697d7672959b 100644 --- a/www/chromium/files/patch-ui_gfx_mojom_buffer__types__mojom__traits.cc +++ b/www/chromium/files/patch-ui_gfx_mojom_buffer__types__mojom__traits.cc @@ -1,11 +1,11 @@ ---- ui/gfx/mojom/buffer_types_mojom_traits.cc.orig 2022-02-07 13:39:41 UTC +--- ui/gfx/mojom/buffer_types_mojom_traits.cc.orig 2022-02-28 16:54:41 UTC +++ ui/gfx/mojom/buffer_types_mojom_traits.cc @@ -33,7 +33,7 @@ gfx::mojom::GpuMemoryBufferPlatformHandlePtr StructTra return gfx::mojom::GpuMemoryBufferPlatformHandle::NewSharedMemoryHandle( std::move(handle.region)); case gfx::NATIVE_PIXMAP: --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(USE_OZONE) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(USE_OZONE) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) || BUILDFLAG(IS_BSD) return gfx::mojom::GpuMemoryBufferPlatformHandle::NewNativePixmapHandle( std::move(handle.native_pixmap_handle)); #else @@ -13,8 +13,8 @@ out->type = gfx::SHARED_MEMORY_BUFFER; out->region = std::move(platform_handle->get_shared_memory_handle()); return true; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(USE_OZONE) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(USE_OZONE) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) || BUILDFLAG(IS_BSD) case gfx::mojom::GpuMemoryBufferPlatformHandleDataView::Tag:: NATIVE_PIXMAP_HANDLE: out->type = gfx::NATIVE_PIXMAP; diff --git a/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc b/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc index 81f2ca90b50c..e75407e9a750 100644 --- a/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc +++ b/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc @@ -1,25 +1,25 @@ ---- ui/gfx/mojom/native_handle_types_mojom_traits.cc.orig 2022-02-07 13:39:41 UTC +--- ui/gfx/mojom/native_handle_types_mojom_traits.cc.orig 2022-02-28 16:54:41 UTC +++ ui/gfx/mojom/native_handle_types_mojom_traits.cc @@ -8,11 +8,11 @@ namespace mojo { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(USE_OZONE) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(USE_OZONE) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) || BUILDFLAG(IS_BSD) mojo::PlatformHandle StructTraits< gfx::mojom::NativePixmapPlaneDataView, gfx::NativePixmapPlane>::buffer_handle(gfx::NativePixmapPlane& plane) { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) return mojo::PlatformHandle(std::move(plane.fd)); - #elif defined(OS_FUCHSIA) + #elif BUILDFLAG(IS_FUCHSIA) return mojo::PlatformHandle(std::move(plane.vmo)); @@ -28,7 +28,7 @@ bool StructTraits< out->size = data.size(); mojo::PlatformHandle handle = data.TakeBufferHandle(); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (!handle.is_fd()) return false; out->fd = handle.TakeFD(); @@ -27,8 +27,8 @@ gfx::mojom::NativePixmapHandleDataView, gfx::NativePixmapHandle>::Read(gfx::mojom::NativePixmapHandleDataView data, gfx::NativePixmapHandle* out) { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) out->modifier = data.modifier(); #endif diff --git a/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h b/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h index bec2f7bc9f58..fe71a756be38 100644 --- a/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h +++ b/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h @@ -1,11 +1,11 @@ ---- ui/gfx/mojom/native_handle_types_mojom_traits.h.orig 2022-02-07 13:39:41 UTC +--- ui/gfx/mojom/native_handle_types_mojom_traits.h.orig 2022-02-28 16:54:41 UTC +++ ui/gfx/mojom/native_handle_types_mojom_traits.h @@ -15,7 +15,7 @@ #include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/gfx/mojom/native_handle_types.mojom-shared.h" --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(USE_OZONE) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(USE_OZONE) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) || BUILDFLAG(IS_BSD) #include "ui/gfx/native_pixmap_handle.h" #endif @@ -13,8 +13,8 @@ namespace mojo { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(USE_OZONE) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(USE_OZONE) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) || BUILDFLAG(IS_BSD) template <> struct COMPONENT_EXPORT(GFX_NATIVE_HANDLE_TYPES_SHARED_MOJOM_TRAITS) StructTraits<gfx::mojom::NativePixmapPlaneDataView, @@ -22,8 +22,8 @@ return pixmap_handle.planes; } --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) static uint64_t modifier(const gfx::NativePixmapHandle& pixmap_handle) { return pixmap_handle.modifier; } diff --git a/www/chromium/files/patch-ui_gfx_native__pixmap__handle.cc b/www/chromium/files/patch-ui_gfx_native__pixmap__handle.cc index 57a7276cfea2..52cad9f7723e 100644 --- a/www/chromium/files/patch-ui_gfx_native__pixmap__handle.cc +++ b/www/chromium/files/patch-ui_gfx_native__pixmap__handle.cc @@ -1,62 +1,62 @@ ---- ui/gfx/native_pixmap_handle.cc.orig 2022-02-07 13:39:41 UTC +--- ui/gfx/native_pixmap_handle.cc.orig 2022-02-28 16:54:41 UTC +++ ui/gfx/native_pixmap_handle.cc @@ -9,7 +9,7 @@ #include "base/logging.h" #include "build/build_config.h" --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include <drm_fourcc.h> - #include "base/posix/eintr_wrapper.h" - #endif -@@ -19,9 +19,13 @@ + #include <unistd.h> + +@@ -21,9 +21,13 @@ #include "base/fuchsia/fuchsia_logging.h" #endif -+#if defined(OS_BSD) ++#if BUILDFLAG(IS_BSD) +#include <unistd.h> +#endif + namespace gfx { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) static_assert(NativePixmapHandle::kNoModifier == DRM_FORMAT_MOD_INVALID, "gfx::NativePixmapHandle::kNoModifier should be an alias for" "DRM_FORMAT_MOD_INVALID"); -@@ -32,7 +36,7 @@ NativePixmapPlane::NativePixmapPlane() : stride(0), of +@@ -34,7 +38,7 @@ NativePixmapPlane::NativePixmapPlane() : stride(0), of NativePixmapPlane::NativePixmapPlane(int stride, int offset, uint64_t size --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) , base::ScopedFD fd - #elif defined(OS_FUCHSIA) -@@ -43,7 +47,7 @@ NativePixmapPlane::NativePixmapPlane(int stride, + #elif BUILDFLAG(IS_FUCHSIA) +@@ -45,7 +49,7 @@ NativePixmapPlane::NativePixmapPlane(int stride, : stride(stride), offset(offset), size(size) --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) , fd(std::move(fd)) - #elif defined(OS_FUCHSIA) -@@ -71,7 +75,7 @@ NativePixmapHandle& NativePixmapHandle::operator=(Nati + #elif BUILDFLAG(IS_FUCHSIA) +@@ -73,7 +77,7 @@ NativePixmapHandle& NativePixmapHandle::operator=(Nati NativePixmapHandle CloneHandleForIPC(const NativePixmapHandle& handle) { NativePixmapHandle clone; for (auto& plane : handle.planes) { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) DCHECK(plane.fd.is_valid()); base::ScopedFD fd_dup(HANDLE_EINTR(dup(plane.fd.get()))); if (!fd_dup.is_valid()) { -@@ -97,7 +101,7 @@ NativePixmapHandle CloneHandleForIPC(const NativePixma +@@ -99,7 +103,7 @@ NativePixmapHandle CloneHandleForIPC(const NativePixma #endif } --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) clone.modifier = handle.modifier; #endif diff --git a/www/chromium/files/patch-ui_gfx_native__pixmap__handle.h b/www/chromium/files/patch-ui_gfx_native__pixmap__handle.h index 5e1680118cc2..f7057e7ae43c 100644 --- a/www/chromium/files/patch-ui_gfx_native__pixmap__handle.h +++ b/www/chromium/files/patch-ui_gfx_native__pixmap__handle.h @@ -1,11 +1,11 @@ ---- ui/gfx/native_pixmap_handle.h.orig 2021-07-19 18:45:44 UTC +--- ui/gfx/native_pixmap_handle.h.orig 2022-02-28 16:54:41 UTC +++ ui/gfx/native_pixmap_handle.h @@ -15,7 +15,7 @@ #include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/gfx/gfx_export.h" --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "base/files/scoped_file.h" #endif @@ -13,26 +13,26 @@ NativePixmapPlane(int stride, int offset, uint64_t size --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) , base::ScopedFD fd - #elif defined(OS_FUCHSIA) + #elif BUILDFLAG(IS_FUCHSIA) @@ -53,7 +53,7 @@ struct GFX_EXPORT NativePixmapPlane { // This is necessary to map the buffers. uint64_t size; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // File descriptor for the underlying memory object (usually dmabuf). base::ScopedFD fd; - #elif defined(OS_FUCHSIA) + #elif BUILDFLAG(IS_FUCHSIA) @@ -82,7 +82,7 @@ struct GFX_EXPORT NativePixmapHandle { std::vector<NativePixmapPlane> planes; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // The modifier is retrieved from GBM library and passed to EGL driver. // Generally it's platform specific, and we don't need to modify it in // Chromium code. Also one per plane per entry. diff --git a/www/chromium/files/patch-ui_gfx_native__widget__types.h b/www/chromium/files/patch-ui_gfx_native__widget__types.h index a174bd507019..41e0ce3986f1 100644 --- a/www/chromium/files/patch-ui_gfx_native__widget__types.h +++ b/www/chromium/files/patch-ui_gfx_native__widget__types.h @@ -1,11 +1,11 @@ ---- ui/gfx/native_widget_types.h.orig 2021-04-14 18:41:39 UTC +--- ui/gfx/native_widget_types.h.orig 2022-02-28 16:54:41 UTC +++ ui/gfx/native_widget_types.h @@ -106,7 +106,7 @@ class SkBitmap; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) extern "C" { struct _AtkObject; typedef struct _AtkObject AtkObject; @@ -13,8 +13,8 @@ typedef id NativeViewAccessible; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) // Linux doesn't have a native font type. typedef AtkObject* NativeViewAccessible; #else diff --git a/www/chromium/files/patch-ui_gfx_render__text__api__fuzzer.cc b/www/chromium/files/patch-ui_gfx_render__text__api__fuzzer.cc index f4a9baaee41a..8b5c016b028e 100644 --- a/www/chromium/files/patch-ui_gfx_render__text__api__fuzzer.cc +++ b/www/chromium/files/patch-ui_gfx_render__text__api__fuzzer.cc @@ -1,29 +1,29 @@ ---- ui/gfx/render_text_api_fuzzer.cc.orig 2022-02-07 13:39:41 UTC +--- ui/gfx/render_text_api_fuzzer.cc.orig 2022-02-28 16:54:41 UTC +++ ui/gfx/render_text_api_fuzzer.cc -@@ -20,7 +20,7 @@ - +@@ -21,7 +21,7 @@ // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. --#if defined(OS_ANDROID) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+#if defined(OS_ANDROID) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) + #if BUILDFLAG(IS_ANDROID) || \ +- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) #include "base/test/test_discardable_memory_allocator.h" #endif -@@ -42,7 +42,7 @@ struct Environment { - logging::SetMinLogLevel(logging::LOG_FATAL); +@@ -44,7 +44,7 @@ struct Environment { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. --#if defined(OS_ANDROID) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+#if defined(OS_ANDROID) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) + #if BUILDFLAG(IS_ANDROID) || \ +- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) // Some platforms require discardable memory to use bitmap fonts. base::DiscardableMemoryAllocator::SetInstance( &discardable_memory_allocator); -@@ -53,7 +53,7 @@ struct Environment { - +@@ -56,7 +56,7 @@ struct Environment { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. --#if defined(OS_ANDROID) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+#if defined(OS_ANDROID) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) + #if BUILDFLAG(IS_ANDROID) || \ +- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) base::TestDiscardableMemoryAllocator discardable_memory_allocator; #endif diff --git a/www/chromium/files/patch-ui_gfx_switches.cc b/www/chromium/files/patch-ui_gfx_switches.cc index a9690c85a567..3f5285b48ac9 100644 --- a/www/chromium/files/patch-ui_gfx_switches.cc +++ b/www/chromium/files/patch-ui_gfx_switches.cc @@ -1,11 +1,11 @@ ---- ui/gfx/switches.cc.orig 2022-01-21 13:39:59 UTC +--- ui/gfx/switches.cc.orig 2022-02-28 16:54:41 UTC +++ ui/gfx/switches.cc @@ -26,7 +26,7 @@ const char kForcePrefersReducedMotion[] = "force-prefe // Run in headless mode, i.e., without a UI or display server dependencies. const char kHeadless[] = "headless"; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Which X11 display to connect to. Emulates the GTK+ "--display=" command line // argument. In use only with Ozone/X11. const char kX11Display[] = "display"; diff --git a/www/chromium/files/patch-ui_gfx_switches.h b/www/chromium/files/patch-ui_gfx_switches.h index e8b5359cd7b9..0bacccff8c67 100644 --- a/www/chromium/files/patch-ui_gfx_switches.h +++ b/www/chromium/files/patch-ui_gfx_switches.h @@ -1,11 +1,11 @@ ---- ui/gfx/switches.h.orig 2022-01-21 13:40:09 UTC +--- ui/gfx/switches.h.orig 2022-02-28 16:54:41 UTC +++ ui/gfx/switches.h @@ -17,7 +17,7 @@ GFX_SWITCHES_EXPORT extern const char kEnableNativeGpu GFX_SWITCHES_EXPORT extern const char kForcePrefersReducedMotion[]; GFX_SWITCHES_EXPORT extern const char kHeadless[]; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) GFX_SWITCHES_EXPORT extern const char kX11Display[]; GFX_SWITCHES_EXPORT extern const char kNoXshm[]; #endif diff --git a/www/chromium/files/patch-ui_gfx_x_generated__protos_dri3.cc b/www/chromium/files/patch-ui_gfx_x_generated__protos_dri3.cc index 2f6fbbdc61f2..ece38ca39b19 100644 --- a/www/chromium/files/patch-ui_gfx_x_generated__protos_dri3.cc +++ b/www/chromium/files/patch-ui_gfx_x_generated__protos_dri3.cc @@ -1,6 +1,6 @@ ---- ui/gfx/x/generated_protos/dri3.cc.orig 2021-10-08 06:26:48 UTC +--- ui/gfx/x/generated_protos/dri3.cc.orig 2022-02-28 16:54:41 UTC +++ ui/gfx/x/generated_protos/dri3.cc -@@ -43,6 +43,8 @@ +@@ -44,6 +44,8 @@ #include <xcb/xcb.h> #include <xcb/xcbext.h> diff --git a/www/chromium/files/patch-ui_gfx_x_generated__protos_shm.cc b/www/chromium/files/patch-ui_gfx_x_generated__protos_shm.cc index eb9e9fbab33d..ec4011950c6b 100644 --- a/www/chromium/files/patch-ui_gfx_x_generated__protos_shm.cc +++ b/www/chromium/files/patch-ui_gfx_x_generated__protos_shm.cc @@ -1,6 +1,6 @@ ---- ui/gfx/x/generated_protos/shm.cc.orig 2021-10-08 06:26:48 UTC +--- ui/gfx/x/generated_protos/shm.cc.orig 2022-02-28 16:54:41 UTC +++ ui/gfx/x/generated_protos/shm.cc -@@ -43,6 +43,8 @@ +@@ -44,6 +44,8 @@ #include <xcb/xcb.h> #include <xcb/xcbext.h> diff --git a/www/chromium/files/patch-ui_gl_BUILD.gn b/www/chromium/files/patch-ui_gl_BUILD.gn index d322121d3adb..e95022c2de59 100644 --- a/www/chromium/files/patch-ui_gl_BUILD.gn +++ b/www/chromium/files/patch-ui_gl_BUILD.gn @@ -1,4 +1,4 @@ ---- ui/gl/BUILD.gn.orig 2022-02-07 13:39:41 UTC +--- ui/gl/BUILD.gn.orig 2022-02-28 16:54:41 UTC +++ ui/gl/BUILD.gn @@ -162,8 +162,6 @@ component("gl") { defines += [ "GPU_ENABLE_SERVICE_LOGGING" ] @@ -25,12 +25,11 @@ ] if (enable_swiftshader) { data_deps += [ "//third_party/swiftshader" ] -@@ -636,8 +632,6 @@ test("gl_unittests") { - "//ui/platform_window", - "//ui/platform_window:platform_impls", +@@ -639,7 +635,6 @@ test("gl_unittests") { + + data_deps = [ + "//testing/buildbot/filters:gl_unittests_filters", +- "//third_party/mesa_headers", ] -- -- data_deps = [ "//third_party/mesa_headers" ] # TODO(https://crbug.com/789065): this must be moved to Ozone. - if (ozone_platform_x11) { diff --git a/www/chromium/files/patch-ui_gl_gl__features.cc b/www/chromium/files/patch-ui_gl_gl__features.cc index 69e0210476c5..9a3e22f8834d 100644 --- a/www/chromium/files/patch-ui_gl_gl__features.cc +++ b/www/chromium/files/patch-ui_gl_gl__features.cc @@ -1,11 +1,11 @@ ---- ui/gl/gl_features.cc.orig 2022-02-07 13:39:41 UTC +--- ui/gl/gl_features.cc.orig 2022-02-28 16:54:41 UTC +++ ui/gl/gl_features.cc @@ -72,7 +72,7 @@ bool IsDeviceBlocked(const char* field, const std::str const base::Feature kDefaultPassthroughCommandDecoder { "DefaultPassthroughCommandDecoder", - #if defined(OS_WIN) || defined(OS_FUCHSIA) || \ -- ((defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ -+ ((defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) && \ + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || \ +- ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ ++ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) && \ !defined(CHROMECAST_BUILD)) base::FEATURE_ENABLED_BY_DEFAULT #else diff --git a/www/chromium/files/patch-ui_gl_gl__image__glx__native__pixmap.cc b/www/chromium/files/patch-ui_gl_gl__image__glx__native__pixmap.cc index 1c31b11798ec..31b62a86dcfa 100644 --- a/www/chromium/files/patch-ui_gl_gl__image__glx__native__pixmap.cc +++ b/www/chromium/files/patch-ui_gl_gl__image__glx__native__pixmap.cc @@ -1,6 +1,6 @@ ---- ui/gl/gl_image_glx_native_pixmap.cc.orig 2022-02-07 13:39:41 UTC +--- ui/gl/gl_image_glx_native_pixmap.cc.orig 2022-02-28 16:54:41 UTC +++ ui/gl/gl_image_glx_native_pixmap.cc -@@ -14,6 +14,8 @@ +@@ -16,6 +16,8 @@ #include "ui/gl/buffer_format_utils.h" #include "ui/gl/gl_bindings.h" diff --git a/www/chromium/files/patch-ui_gl_init_gl__factory.cc b/www/chromium/files/patch-ui_gl_init_gl__factory.cc index 33ed770024da..168c103f8381 100644 --- a/www/chromium/files/patch-ui_gl_init_gl__factory.cc +++ b/www/chromium/files/patch-ui_gl_init_gl__factory.cc @@ -1,11 +1,11 @@ ---- ui/gl/init/gl_factory.cc.orig 2022-02-07 13:39:41 UTC +--- ui/gl/init/gl_factory.cc.orig 2022-02-28 16:54:41 UTC +++ ui/gl/init/gl_factory.cc @@ -171,7 +171,7 @@ bool InitializeGLOneOffPlatformHelper(bool init_extens } // namespace GLImplementationParts GetSoftwareGLImplementationForPlatform() { --#if defined(OS_WIN) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return GetSoftwareGLImplementation(); #else return GetLegacySoftwareGLImplementation(); diff --git a/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.cc b/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.cc index 76a35b371d4b..539e7fbe08d7 100644 --- a/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.cc +++ b/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.cc @@ -1,11 +1,11 @@ ---- ui/gl/sync_control_vsync_provider.cc.orig 2022-02-07 13:39:41 UTC +--- ui/gl/sync_control_vsync_provider.cc.orig 2022-02-28 16:54:41 UTC +++ ui/gl/sync_control_vsync_provider.cc @@ -11,7 +11,7 @@ #include "base/trace_event/trace_event.h" #include "build/build_config.h" --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // These constants define a reasonable range for a calculated refresh interval. // Calculating refreshes out of this range will be considered a fatal error. const int64_t kMinVsyncIntervalUs = base::Time::kMicrosecondsPerSecond / 400; @@ -13,8 +13,8 @@ namespace gl { SyncControlVSyncProvider::SyncControlVSyncProvider() : gfx::VSyncProvider() { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // On platforms where we can't get an accurate reading on the refresh // rate we fall back to the assumption that we're displaying 60 frames // per second. @@ -22,8 +22,8 @@ base::TimeTicks* timebase_out, base::TimeDelta* interval_out) { TRACE_EVENT0("gpu", "SyncControlVSyncProvider::GetVSyncParameters"); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // The actual clock used for the system time returned by glXGetSyncValuesOML // is unspecified. In practice, the clock used is likely to be either // CLOCK_REALTIME or CLOCK_MONOTONIC, so we compare the returned time to the @@ -31,8 +31,8 @@ } bool SyncControlVSyncProvider::SupportGetVSyncParametersIfAvailable() const { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) return true; #else return false; diff --git a/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.h b/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.h index 5e359889382c..0e3cc3e83590 100644 --- a/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.h +++ b/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.h @@ -1,11 +1,11 @@ ---- ui/gl/sync_control_vsync_provider.h.orig 2022-02-07 13:39:41 UTC +--- ui/gl/sync_control_vsync_provider.h.orig 2022-02-28 16:54:41 UTC +++ ui/gl/sync_control_vsync_provider.h @@ -30,7 +30,7 @@ class SyncControlVSyncProvider : public gfx::VSyncProv bool SupportGetVSyncParametersIfAvailable() const override; static constexpr bool IsSupported() { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) return true; #else return false; @@ -13,8 +13,8 @@ virtual bool GetMscRate(int32_t* numerator, int32_t* denominator) = 0; private: --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) base::TimeTicks last_timebase_; uint64_t last_media_stream_counter_ = 0; base::TimeDelta last_good_interval_; diff --git a/www/chromium/files/patch-ui_message__center_views_message__popup__view.cc b/www/chromium/files/patch-ui_message__center_views_message__popup__view.cc index bf36bad399fa..cb1b17abde47 100644 --- a/www/chromium/files/patch-ui_message__center_views_message__popup__view.cc +++ b/www/chromium/files/patch-ui_message__center_views_message__popup__view.cc @@ -1,11 +1,11 @@ ---- ui/message_center/views/message_popup_view.cc.orig 2021-12-14 11:45:40 UTC +--- ui/message_center/views/message_popup_view.cc.orig 2022-02-28 16:54:41 UTC +++ ui/message_center/views/message_popup_view.cc @@ -123,7 +123,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. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) // Make the widget explicitly activatable as TYPE_POPUP is not activatable by // default but we need focus for the inline reply textarea. params.activatable = views::Widget::InitParams::Activatable::kYes; diff --git a/www/chromium/files/patch-ui_native__theme_native__theme.h b/www/chromium/files/patch-ui_native__theme_native__theme.h index 070e090dd1db..9a601d501c05 100644 --- a/www/chromium/files/patch-ui_native__theme_native__theme.h +++ b/www/chromium/files/patch-ui_native__theme_native__theme.h @@ -1,11 +1,11 @@ ---- ui/native_theme/native_theme.h.orig 2021-12-31 00:58:32 UTC +--- ui/native_theme/native_theme.h.orig 2022-02-28 16:54:41 UTC +++ ui/native_theme/native_theme.h @@ -57,7 +57,7 @@ class NATIVE_THEME_EXPORT NativeTheme { kCheckbox, // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) kFrameTopArea, #endif kInnerSpinButton, diff --git a/www/chromium/files/patch-ui_native__theme_native__theme__base.cc b/www/chromium/files/patch-ui_native__theme_native__theme__base.cc index 7fbd1054a7d4..1eba3525d72b 100644 --- a/www/chromium/files/patch-ui_native__theme_native__theme__base.cc +++ b/www/chromium/files/patch-ui_native__theme_native__theme__base.cc @@ -1,11 +1,11 @@ ---- ui/native_theme/native_theme_base.cc.orig 2021-09-24 04:26:39 UTC +--- ui/native_theme/native_theme_base.cc.orig 2022-02-28 16:54:41 UTC +++ ui/native_theme/native_theme_base.cc -@@ -267,7 +267,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas, +@@ -269,7 +269,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas, break; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) case kFrameTopArea: PaintFrameTopArea(canvas, state, rect, extra.frame_top_area, color_scheme); diff --git a/www/chromium/files/patch-ui_ozone_common_egl__util.cc b/www/chromium/files/patch-ui_ozone_common_egl__util.cc index d52a8edb363e..f5cdbf82425c 100644 --- a/www/chromium/files/patch-ui_ozone_common_egl__util.cc +++ b/www/chromium/files/patch-ui_ozone_common_egl__util.cc @@ -1,8 +1,8 @@ ---- ui/ozone/common/egl_util.cc.orig 2022-02-07 13:39:41 UTC +--- ui/ozone/common/egl_util.cc.orig 2022-02-28 16:54:41 UTC +++ ui/ozone/common/egl_util.cc @@ -36,9 +36,9 @@ const base::FilePath::CharType kDefaultGlesSoname[] = FILE_PATH_LITERAL("libGLESv2.so"); - #else // !defined(OS_FUCHSIA) + #else // BUILDFLAG(IS_FUCHSIA) const base::FilePath::CharType kDefaultEglSoname[] = - FILE_PATH_LITERAL("libEGL.so.1"); + FILE_PATH_LITERAL("libEGL.so"); diff --git a/www/chromium/files/patch-ui_ozone_platform_x11_ozone__platform__x11.cc b/www/chromium/files/patch-ui_ozone_platform_x11_ozone__platform__x11.cc index 23c48fd6eab2..d5e641ddfc08 100644 --- a/www/chromium/files/patch-ui_ozone_platform_x11_ozone__platform__x11.cc +++ b/www/chromium/files/patch-ui_ozone_platform_x11_ozone__platform__x11.cc @@ -1,11 +1,11 @@ ---- ui/ozone/platform/x11/ozone_platform_x11.cc.orig 2022-02-07 13:39:41 UTC +--- ui/ozone/platform/x11/ozone_platform_x11.cc.orig 2022-02-28 16:54:41 UTC +++ ui/ozone/platform/x11/ozone_platform_x11.cc @@ -204,7 +204,7 @@ class OzonePlatformX11 : public OzonePlatform, properties->supports_global_application_menus = true; properties->app_modal_dialogs_use_event_blocker = true; properties->fetch_buffer_formats_for_gmb_on_gpu = true; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) properties->supports_vaapi = true; #endif diff --git a/www/chromium/files/patch-ui_ozone_public_ozone__platform.h b/www/chromium/files/patch-ui_ozone_public_ozone__platform.h index a4129cc27031..0b17c29d986c 100644 --- a/www/chromium/files/patch-ui_ozone_public_ozone__platform.h +++ b/www/chromium/files/patch-ui_ozone_public_ozone__platform.h @@ -1,11 +1,11 @@ ---- ui/ozone/public/ozone_platform.h.orig 2022-02-07 13:39:41 UTC +--- ui/ozone/public/ozone_platform.h.orig 2022-02-28 16:54:41 UTC +++ ui/ozone/public/ozone_platform.h -@@ -155,7 +155,7 @@ class COMPONENT_EXPORT(OZONE) OzonePlatform { +@@ -151,7 +151,7 @@ class COMPONENT_EXPORT(OZONE) OzonePlatform { // back via gpu extra info. bool fetch_buffer_formats_for_gmb_on_gpu = false; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // TODO(crbug.com/1116701): add vaapi support for other Ozone platforms on // Linux. At the moment, VA-API Linux implementation supports only X11 // backend. This implementation must be refactored to support Ozone diff --git a/www/chromium/files/patch-ui_strings_app__locale__settings.grd b/www/chromium/files/patch-ui_strings_app__locale__settings.grd index 017255cc27f8..d6f5d33bd358 100644 --- a/www/chromium/files/patch-ui_strings_app__locale__settings.grd +++ b/www/chromium/files/patch-ui_strings_app__locale__settings.grd @@ -1,11 +1,11 @@ ---- ui/strings/app_locale_settings.grd.orig 2022-02-07 13:39:41 UTC +--- ui/strings/app_locale_settings.grd.orig 2022-02-28 16:54:41 UTC +++ ui/strings/app_locale_settings.grd -@@ -223,7 +223,7 @@ +@@ -225,7 +225,7 @@ 75% </message> </if> -- <if expr="(is_linux or is_android or is_bsd or is_fuchsia) and not (chromeos or lacros)"> -+ <if expr="(is_posix or is_android or is_bsd or is_fuchsia) and not (chromeos or lacros)"> +- <if expr="(is_linux or is_android or is_bsd or is_fuchsia) and not (chromeos_ash or chromeos_lacros)"> ++ <if expr="(is_posix or is_android or is_bsd or is_fuchsia) and not (chromeos_ash or chromeos_lacros)"> <!-- The font used in Web UI (e.g. History). Note that these are only backups. We try to use the system font if possible. --> <message name="IDS_WEB_FONT_FAMILY" use_name_for_id="true"> diff --git a/www/chromium/files/patch-ui_views_controls_prefix__selector.cc b/www/chromium/files/patch-ui_views_controls_prefix__selector.cc index deb31fc0667a..c222ad18ed27 100644 --- a/www/chromium/files/patch-ui_views_controls_prefix__selector.cc +++ b/www/chromium/files/patch-ui_views_controls_prefix__selector.cc @@ -1,11 +1,11 @@ ---- ui/views/controls/prefix_selector.cc.orig 2021-12-16 15:23:23 UTC +--- ui/views/controls/prefix_selector.cc.orig 2022-02-28 16:54:41 UTC +++ ui/views/controls/prefix_selector.cc @@ -171,7 +171,7 @@ bool PrefixSelector::ShouldDoLearning() { return false; } --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) bool PrefixSelector::SetCompositionFromExistingText( const gfx::Range& range, const std::vector<ui::ImeTextSpan>& ui_ime_text_spans) { diff --git a/www/chromium/files/patch-ui_views_controls_prefix__selector.h b/www/chromium/files/patch-ui_views_controls_prefix__selector.h index 83df9b943a40..e8836e693954 100644 --- a/www/chromium/files/patch-ui_views_controls_prefix__selector.h +++ b/www/chromium/files/patch-ui_views_controls_prefix__selector.h @@ -1,11 +1,11 @@ ---- ui/views/controls/prefix_selector.h.orig 2021-12-16 15:23:32 UTC +--- ui/views/controls/prefix_selector.h.orig 2022-02-28 16:54:41 UTC +++ ui/views/controls/prefix_selector.h @@ -81,7 +81,7 @@ class VIEWS_EXPORT PrefixSelector : public ui::TextInp ukm::SourceId GetClientSourceForMetrics() const override; bool ShouldDoLearning() override; --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) bool SetCompositionFromExistingText( const gfx::Range& range, const std::vector<ui::ImeTextSpan>& ui_ime_text_spans) override; diff --git a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc index 0192e90acafc..db36bbb89acd 100644 --- a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc +++ b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc @@ -1,11 +1,11 @@ ---- ui/views/controls/textfield/textfield.cc.orig 2021-12-31 00:58:32 UTC +--- ui/views/controls/textfield/textfield.cc.orig 2022-02-28 16:54:41 UTC +++ ui/views/controls/textfield/textfield.cc @@ -73,7 +73,7 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) #include "ui/base/ime/linux/text_edit_command_auralinux.h" #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" #endif @@ -13,8 +13,8 @@ // Control-modified key combination, but we cannot extend it to other platforms // as Control has different meanings and behaviors. // https://crrev.com/2580483002/#msg46 --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) return flags & ui::EF_CONTROL_DOWN; #else return false; @@ -22,8 +22,8 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) ui::TextEditKeyBindingsDelegateAuraLinux* delegate = ui::GetTextEditKeyBindingsDelegate(); std::vector<ui::TextEditCommandAuraLinux> commands; @@ -31,8 +31,8 @@ bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) // Skip any accelerator handling that conflicts with custom keybindings. ui::TextEditKeyBindingsDelegateAuraLinux* delegate = ui::GetTextEditKeyBindingsDelegate(); @@ -40,25 +40,25 @@ return false; } --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // 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( -@@ -2222,14 +2222,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( +@@ -2221,14 +2221,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( #endif return ui::TextEditCommand::DELETE_BACKWARD; } --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Only erase by line break on Linux and ChromeOS. if (shift) return ui::TextEditCommand::DELETE_TO_BEGINNING_OF_LINE; #endif return ui::TextEditCommand::DELETE_WORD_BACKWARD; case ui::VKEY_DELETE: --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Only erase by line break on Linux and ChromeOS. if (shift && control) return ui::TextEditCommand::DELETE_TO_END_OF_LINE; diff --git a/www/chromium/files/patch-ui_views_controls_textfield_textfield.h b/www/chromium/files/patch-ui_views_controls_textfield_textfield.h index f58938e0880e..cc6139e939ef 100644 --- a/www/chromium/files/patch-ui_views_controls_textfield_textfield.h +++ b/www/chromium/files/patch-ui_views_controls_textfield_textfield.h @@ -1,11 +1,11 @@ ---- ui/views/controls/textfield/textfield.h.orig 2022-02-07 13:39:41 UTC +--- ui/views/controls/textfield/textfield.h.orig 2022-02-28 16:54:41 UTC +++ ui/views/controls/textfield/textfield.h -@@ -443,7 +443,7 @@ class VIEWS_EXPORT Textfield : public View, +@@ -445,7 +445,7 @@ class VIEWS_EXPORT Textfield : public View, // Set whether the text should be used to improve typing suggestions. void SetShouldDoLearning(bool value) { should_do_learning_ = value; } --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) bool SetCompositionFromExistingText( const gfx::Range& range, const std::vector<ui::ImeTextSpan>& ui_ime_text_spans) override; diff --git a/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc b/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc index 625f83d153a8..436ede7eade3 100644 --- a/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc +++ b/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc @@ -1,11 +1,11 @@ ---- ui/views/corewm/tooltip_aura.cc.orig 2021-12-14 11:45:40 UTC +--- ui/views/corewm/tooltip_aura.cc.orig 2022-02-28 16:54:41 UTC +++ ui/views/corewm/tooltip_aura.cc @@ -50,7 +50,7 @@ constexpr int kVerticalPaddingBottom = 5; bool CanUseTranslucentTooltipWidget() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_WIN) -+#if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_WIN) || defined(OS_BSD) +-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_WIN) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) return false; #else return true; diff --git a/www/chromium/files/patch-ui_views_examples_widget__example.cc b/www/chromium/files/patch-ui_views_examples_widget__example.cc index 8c1d239908b8..11dc52f2cd0d 100644 --- a/www/chromium/files/patch-ui_views_examples_widget__example.cc +++ b/www/chromium/files/patch-ui_views_examples_widget__example.cc @@ -1,11 +1,11 @@ ---- ui/views/examples/widget_example.cc.orig 2022-02-07 13:39:41 UTC +--- ui/views/examples/widget_example.cc.orig 2022-02-28 16:54:41 UTC +++ ui/views/examples/widget_example.cc @@ -49,7 +49,7 @@ void WidgetExample::CreateExampleView(View* container) modal_button->SetCallback( base::BindRepeating(&WidgetExample::CreateDialogWidget, base::Unretained(this), modal_button, true)); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Windows does not support TYPE_CONTROL top-level widgets. LabelButton* control_button = BuildButton( container, GetStringUTF16(IDS_WIDGET_CHILD_WIDGET_BUTTON_LABEL)); diff --git a/www/chromium/files/patch-ui_views_focus_focus__manager.cc b/www/chromium/files/patch-ui_views_focus_focus__manager.cc index 4e207aae1566..0787b7380710 100644 --- a/www/chromium/files/patch-ui_views_focus_focus__manager.cc +++ b/www/chromium/files/patch-ui_views_focus_focus__manager.cc @@ -1,11 +1,11 @@ ---- ui/views/focus/focus_manager.cc.orig 2021-12-14 11:45:40 UTC +--- ui/views/focus/focus_manager.cc.orig 2022-02-28 16:54:41 UTC +++ ui/views/focus/focus_manager.cc @@ -634,7 +634,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) // Processing an accelerator can delete things. Because we // need these objects afterwards on Linux, save widget_ as weak pointer and // save the close_on_deactivate property value of widget_delegate in a @@ -13,8 +13,8 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) // Need to manually close the bubble widget on Linux. On Linux when the // bubble is shown, the main widget remains active. Because of that when // focus is set to the main widget to process accelerator, the main widget diff --git a/www/chromium/files/patch-ui_views_style_platform__style.cc b/www/chromium/files/patch-ui_views_style_platform__style.cc index 3c48cf6c36f0..817ea4da49e4 100644 --- a/www/chromium/files/patch-ui_views_style_platform__style.cc +++ b/www/chromium/files/patch-ui_views_style_platform__style.cc @@ -1,20 +1,20 @@ ---- ui/views/style/platform_style.cc.orig 2021-09-24 04:26:39 UTC +--- ui/views/style/platform_style.cc.orig 2022-02-28 16:54:41 UTC +++ ui/views/style/platform_style.cc @@ -52,7 +52,7 @@ const View::FocusBehavior PlatformStyle::kDefaultFocus const bool PlatformStyle::kAdjustBubbleIfOffscreen = // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) false; #else true; @@ -82,7 +82,7 @@ gfx::Range PlatformStyle::RangeToDeleteBackwards(const - #endif // OS_MAC + #endif // !BUILDFLAG(IS_MAC) #if !BUILDFLAG(ENABLE_DESKTOP_AURA) || \ -- (!defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+ (!defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_BSD)) +- (!BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)) ++ (!BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD)) // static std::unique_ptr<Border> PlatformStyle::CreateThemedLabelButtonBorder( LabelButton* button) { diff --git a/www/chromium/files/patch-ui_views_views__delegate.cc b/www/chromium/files/patch-ui_views_views__delegate.cc index 08d428a200ec..5a24231acc6f 100644 --- a/www/chromium/files/patch-ui_views_views__delegate.cc +++ b/www/chromium/files/patch-ui_views_views__delegate.cc @@ -1,11 +1,11 @@ ---- ui/views/views_delegate.cc.orig 2021-12-14 11:45:40 UTC +--- ui/views/views_delegate.cc.orig 2022-02-28 16:54:41 UTC +++ ui/views/views_delegate.cc @@ -95,7 +95,7 @@ bool ViewsDelegate::IsWindowInMetro(gfx::NativeWindow return false; } #elif BUILDFLAG(ENABLE_DESKTOP_AURA) && \ -- (defined(OS_LINUX) || defined(OS_CHROMEOS)) -+ (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) +- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) gfx::ImageSkia* ViewsDelegate::GetDefaultWindowIcon() const { return nullptr; } diff --git a/www/chromium/files/patch-ui_views_views__delegate.h b/www/chromium/files/patch-ui_views_views__delegate.h index 9cd81d3c7ea7..90d0e4d91a68 100644 --- a/www/chromium/files/patch-ui_views_views__delegate.h +++ b/www/chromium/files/patch-ui_views_views__delegate.h @@ -1,11 +1,11 @@ ---- ui/views/views_delegate.h.orig 2022-02-07 13:39:41 UTC +--- ui/views/views_delegate.h.orig 2022-02-28 16:54:41 UTC +++ ui/views/views_delegate.h @@ -139,7 +139,7 @@ class VIEWS_EXPORT ViewsDelegate { // environment. virtual bool IsWindowInMetro(gfx::NativeWindow window) const; #elif BUILDFLAG(ENABLE_DESKTOP_AURA) && \ -- (defined(OS_LINUX) || defined(OS_CHROMEOS)) -+ (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) +- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) virtual gfx::ImageSkia* GetDefaultWindowIcon() const; #endif diff --git a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__screen__ozone.cc b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__screen__ozone.cc index 14742168db3f..4999013209be 100644 --- a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__screen__ozone.cc +++ b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__screen__ozone.cc @@ -1,11 +1,11 @@ ---- ui/views/widget/desktop_aura/desktop_screen_ozone.cc.orig 2021-12-14 11:45:40 UTC +--- ui/views/widget/desktop_aura/desktop_screen_ozone.cc.orig 2022-02-28 16:54:41 UTC +++ ui/views/widget/desktop_aura/desktop_screen_ozone.cc @@ -25,7 +25,7 @@ gfx::NativeWindow DesktopScreenOzone::GetNativeWindowF widget); } --#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_BSD) +-#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) ++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD) std::unique_ptr<display::Screen> CreateDesktopScreen() { auto screen = std::make_unique<aura::ScreenOzone>(); screen->Initialize(); diff --git a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc index b5e8f9a14e2c..4df9ddf60c5c 100644 --- a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc +++ b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc @@ -1,11 +1,11 @@ ---- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2022-02-07 13:39:41 UTC +--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2022-02-28 16:54:41 UTC +++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc -@@ -910,7 +910,7 @@ display::Display DesktopWindowTreeHostPlatform::GetDis +@@ -915,7 +915,7 @@ display::Display DesktopWindowTreeHostPlatform::GetDis // DesktopWindowTreeHost: // Linux subclasses this host and adds some Linux specific bits. --#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_BSD) +-#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) ++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD) // static DesktopWindowTreeHost* DesktopWindowTreeHost::Create( internal::NativeWidgetDelegate* native_widget_delegate, diff --git a/www/chromium/files/patch-ui_views_widget_native__widget__aura.cc b/www/chromium/files/patch-ui_views_widget_native__widget__aura.cc index d4a75cefed5e..861f419e0ed8 100644 --- a/www/chromium/files/patch-ui_views_widget_native__widget__aura.cc +++ b/www/chromium/files/patch-ui_views_widget_native__widget__aura.cc @@ -1,29 +1,29 @@ ---- ui/views/widget/native_widget_aura.cc.orig 2022-02-07 13:39:41 UTC +--- ui/views/widget/native_widget_aura.cc.orig 2022-02-28 16:54:41 UTC +++ ui/views/widget/native_widget_aura.cc @@ -69,7 +69,7 @@ #endif #if BUILDFLAG(ENABLE_DESKTOP_AURA) && \ -- (defined(OS_LINUX) || defined(OS_CHROMEOS)) -+ (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) +- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) #include "ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h" #endif -@@ -1159,7 +1159,7 @@ void NativeWidgetAura::SetInitialFocus(ui::WindowShowS +@@ -1151,7 +1151,7 @@ void NativeWidgetAura::SetInitialFocus(ui::WindowShowS namespace { #if BUILDFLAG(ENABLE_DESKTOP_AURA) && \ -- (defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)) -+ (defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) +- (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) ++ (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) void CloseWindow(aura::Window* window) { if (window) { Widget* widget = Widget::GetWidgetForNativeView(window); -@@ -1190,7 +1190,7 @@ void Widget::CloseAllSecondaryWidgets() { +@@ -1182,7 +1182,7 @@ void Widget::CloseAllSecondaryWidgets() { #endif #if BUILDFLAG(ENABLE_DESKTOP_AURA) && \ -- (defined(OS_LINUX) || defined(OS_CHROMEOS)) -+ (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) +- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) DesktopWindowTreeHostLinux::CleanUpWindowList(CloseWindow); #endif } diff --git a/www/chromium/files/patch-ui_views_widget_widget.cc b/www/chromium/files/patch-ui_views_widget_widget.cc index 41ee8e7c9cf2..b03b0b1a7d23 100644 --- a/www/chromium/files/patch-ui_views_widget_widget.cc +++ b/www/chromium/files/patch-ui_views_widget_widget.cc @@ -1,20 +1,20 @@ ---- ui/views/widget/widget.cc.orig 2022-02-07 13:39:41 UTC +--- ui/views/widget/widget.cc.orig 2022-02-28 16:54:41 UTC +++ ui/views/widget/widget.cc -@@ -50,7 +50,7 @@ +@@ -51,7 +51,7 @@ #include "ui/views/window/custom_frame_view.h" #include "ui/views/window/dialog_delegate.h" --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "ui/views/linux_ui/linux_ui.h" #endif -@@ -1780,7 +1780,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const +@@ -1785,7 +1785,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const parent_) return parent_->GetNativeTheme(); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) if (const views::LinuxUI* linux_ui = views::LinuxUI::instance()) { if (auto* native_theme = linux_ui->GetNativeTheme(GetNativeWindow())) return native_theme; diff --git a/www/chromium/files/patch-ui_views_window_custom__frame__view.cc b/www/chromium/files/patch-ui_views_window_custom__frame__view.cc index 257ff6ad0b81..b4a1c7a1554c 100644 --- a/www/chromium/files/patch-ui_views_window_custom__frame__view.cc +++ b/www/chromium/files/patch-ui_views_window_custom__frame__view.cc @@ -1,11 +1,11 @@ ---- ui/views/window/custom_frame_view.cc.orig 2021-12-14 11:45:40 UTC +--- ui/views/window/custom_frame_view.cc.orig 2022-02-28 16:54:41 UTC +++ ui/views/window/custom_frame_view.cc @@ -265,7 +265,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. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) return FrameBorderThickness(); #else return frame_->IsMaximized() ? FrameBorderThickness() : kFrameShadowThickness; diff --git a/www/chromium/files/patch-ui_views_window_dialog__delegate.cc b/www/chromium/files/patch-ui_views_window_dialog__delegate.cc index 3026adde9165..49d7a5b4a9aa 100644 --- a/www/chromium/files/patch-ui_views_window_dialog__delegate.cc +++ b/www/chromium/files/patch-ui_views_window_dialog__delegate.cc @@ -1,11 +1,11 @@ ---- ui/views/window/dialog_delegate.cc.orig 2021-09-14 01:52:23 UTC +--- ui/views/window/dialog_delegate.cc.orig 2022-02-28 16:54:41 UTC +++ ui/views/window/dialog_delegate.cc @@ -78,7 +78,7 @@ Widget* DialogDelegate::CreateDialogWidget( // static bool DialogDelegate::CanSupportCustomFrame(gfx::NativeView parent) { --#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && \ -+#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && \ +-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \ ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && \ BUILDFLAG(ENABLE_DESKTOP_AURA) // The new style doesn't support unparented dialogs on Linux desktop. return parent != nullptr; diff --git a/www/chromium/files/patch-ui_views_window_frame__background.cc b/www/chromium/files/patch-ui_views_window_frame__background.cc index 51f1e9705a5e..5c9450ab1a68 100644 --- a/www/chromium/files/patch-ui_views_window_frame__background.cc +++ b/www/chromium/files/patch-ui_views_window_frame__background.cc @@ -1,11 +1,11 @@ ---- ui/views/window/frame_background.cc.orig 2021-09-14 01:52:23 UTC +--- ui/views/window/frame_background.cc.orig 2022-02-28 16:54:41 UTC +++ ui/views/window/frame_background.cc -@@ -109,7 +109,7 @@ void FrameBackground::PaintMaximized(gfx::Canvas* canv +@@ -110,7 +110,7 @@ void FrameBackground::PaintMaximized(gfx::Canvas* canv int width) const { // Fill the top with the frame color first so we have a constant background // for areas not covered by the theme image. --#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && \ -+#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && \ +-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \ ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && \ BUILDFLAG(ENABLE_DESKTOP_AURA) ui::NativeTheme::ExtraParams params; params.frame_top_area.use_custom_frame = use_custom_frame_; diff --git a/www/chromium/files/patch-v8_BUILD.gn b/www/chromium/files/patch-v8_BUILD.gn index 73b4439524b6..35a4f184c936 100644 --- a/www/chromium/files/patch-v8_BUILD.gn +++ b/www/chromium/files/patch-v8_BUILD.gn @@ -1,6 +1,6 @@ ---- v8/BUILD.gn.orig 2022-02-07 13:39:41 UTC +--- v8/BUILD.gn.orig 2022-02-28 16:54:41 UTC +++ v8/BUILD.gn -@@ -1181,6 +1181,14 @@ config("toolchain") { +@@ -1198,6 +1198,14 @@ config("toolchain") { } else if (target_os == "win") { defines += [ "V8_HAVE_TARGET_OS" ] defines += [ "V8_TARGET_OS_WIN" ] @@ -15,7 +15,7 @@ } # TODO(jochen): Support v8_enable_prof on Windows. -@@ -5094,7 +5102,7 @@ v8_component("v8_libbase") { +@@ -5117,7 +5125,7 @@ v8_component("v8_libbase") { } } @@ -24,7 +24,7 @@ sources += [ "src/base/debug/stack_trace_posix.cc", "src/base/platform/platform-linux.cc", -@@ -5104,6 +5112,18 @@ v8_component("v8_libbase") { +@@ -5127,6 +5135,18 @@ v8_component("v8_libbase") { "dl", "rt", ] diff --git a/www/chromium/files/patch-v8_src_api_api.cc b/www/chromium/files/patch-v8_src_api_api.cc index 696e87d3f221..28645cdb88d1 100644 --- a/www/chromium/files/patch-v8_src_api_api.cc +++ b/www/chromium/files/patch-v8_src_api_api.cc @@ -1,4 +1,4 @@ ---- v8/src/api/api.cc.orig 2022-02-07 13:39:41 UTC +--- v8/src/api/api.cc.orig 2022-02-28 16:54:41 UTC +++ v8/src/api/api.cc @@ -140,7 +140,7 @@ #include "src/wasm/wasm-serialization.h" @@ -9,7 +9,7 @@ #include <signal.h> #include "include/v8-wasm-trap-handler-posix.h" #include "src/trap-handler/handler-inside-posix.h" -@@ -6126,7 +6126,7 @@ bool v8::V8::Initialize(const int build_config) { +@@ -6155,7 +6155,7 @@ bool v8::V8::Initialize(const int build_config) { return true; } diff --git a/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc b/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc index fec14de82660..3c6b60703e50 100644 --- a/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc +++ b/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc @@ -1,4 +1,4 @@ ---- v8/src/base/platform/platform-posix.cc.orig 2022-02-07 13:39:41 UTC +--- v8/src/base/platform/platform-posix.cc.orig 2022-02-28 16:54:41 UTC +++ v8/src/base/platform/platform-posix.cc @@ -65,7 +65,7 @@ #include <sys/syscall.h> @@ -33,7 +33,7 @@ // TODO(bbudge) Move Cygwin and Fuchsia stuff into platform-specific files. #if !V8_OS_CYGWIN && !V8_OS_FUCHSIA -@@ -547,7 +555,7 @@ bool OS::FreeAddressSpaceReservation(AddressSpaceReser +@@ -545,7 +553,7 @@ bool OS::FreeAddressSpaceReservation(AddressSpaceReser // static bool OS::HasLazyCommits() { @@ -42,7 +42,7 @@ return true; #else // TODO(bbudge) Return true for all POSIX platforms. -@@ -1140,7 +1148,7 @@ void Thread::SetThreadLocal(LocalStorageKey key, void* +@@ -1138,7 +1146,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_MACOSX) && !defined(_AIX) && \ diff --git a/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.cc b/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.cc index f8b0730ae1eb..0118f611e1e2 100644 --- a/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.cc +++ b/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.cc @@ -1,4 +1,4 @@ ---- weblayer/browser/content_browser_client_impl.cc.orig 2022-02-07 13:39:41 UTC +--- weblayer/browser/content_browser_client_impl.cc.orig 2022-02-28 16:54:41 UTC +++ weblayer/browser/content_browser_client_impl.cc @@ -152,7 +152,7 @@ @@ -9,16 +9,7 @@ #include "content/public/common/content_descriptors.h" #endif -@@ -492,7 +492,7 @@ void ContentBrowserClientImpl::OnNetworkServiceCreated - embedder_support::GetUserAgent()); - // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is - // complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) - network::mojom::CryptConfigPtr config = network::mojom::CryptConfig::New(); - content::GetNetworkService()->SetCryptConfig(std::move(config)); - #endif -@@ -998,7 +998,7 @@ SafeBrowsingService* ContentBrowserClientImpl::GetSafe +@@ -994,7 +994,7 @@ SafeBrowsingService* ContentBrowserClientImpl::GetSafe // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.h b/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.h index 963aea521d3b..194921f755f3 100644 --- a/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.h +++ b/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.h @@ -1,6 +1,6 @@ ---- weblayer/browser/content_browser_client_impl.h.orig 2022-02-07 13:39:41 UTC +--- weblayer/browser/content_browser_client_impl.h.orig 2022-02-28 16:54:41 UTC +++ weblayer/browser/content_browser_client_impl.h -@@ -178,7 +178,7 @@ class ContentBrowserClientImpl : public content::Conte +@@ -177,7 +177,7 @@ class ContentBrowserClientImpl : public content::Conte override; // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/chromium/pkg-plist b/www/chromium/pkg-plist index 0425ed4294f8..c2cf62c92e9e 100644 --- a/www/chromium/pkg-plist +++ b/www/chromium/pkg-plist @@ -8,6 +8,7 @@ bin/chrome %%DATADIR%%/libEGL.so %%DATADIR%%/libGLESv2.so %%DATADIR%%/libVkICD_mock_icd.so +%%DATADIR%%/libvulkan.so %%DATADIR%%/locales/am.pak %%DATADIR%%/locales/am.pak.info %%DATADIR%%/locales/ar.pak @@ -134,7 +135,6 @@ bin/chrome %%DEBUG%%%%DATADIR%%/libimmediate_crash_test_helper.so %%DEBUG%%%%DATADIR%%/libmalloc_wrapper.so %%DEBUG%%%%DATADIR%%/libtest_shared_library.so -%%DEBUG%%%%DATADIR%%/libvulkan.so.1 %%DRIVER%%bin/chromedriver man/man1/chrome.1.gz share/applications/chromium-browser.desktop |