diff options
| author | Matthias Wolf <freebsd@rheinwolf.de> | 2022-02-01 17:38:49 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2022-02-01 17:45:40 +0000 |
| commit | aa70a996eae7376396a5dd8a9e5105bebb6bc72c (patch) | |
| tree | ee91e0564101803a57091d4df8e4f3892eb8d0fc | |
| parent | 6d3db655f87ec3f89d074c523534f83fd01f56e5 (diff) | |
| download | ports-aa70a996eae7376396a5dd8a9e5105bebb6bc72c.tar.gz ports-aa70a996eae7376396a5dd8a9e5105bebb6bc72c.zip | |
www/chromium: update to 97.0.4692.99
Note that the port is currently broken on i386 as it does not compile there.
Security: https://vuxml.freebsd.org/freebsd/51496cbc-7a0e-11ec-a323-3065ec8fd3ec.html
Security: https://vuxml.freebsd.org/freebsd/9eeccbf3-6e26-11ec-bb10-3065ec8fd3ec.html
Security: https://vuxml.freebsd.org/freebsd/fb9ba490-5cc4-11ec-aac7-3065ec8fd3ec.html
Security: https://vuxml.freebsd.org/freebsd/18ac074c-579f-11ec-aac7-3065ec8fd3ec.html
Security: https://vuxml.freebsd.org/freebsd/b8c0cbca-472d-11ec-83dc-3065ec8fd3ec.html
Security: https://vuxml.freebsd.org/freebsd/976d7bf9-38ea-11ec-b3b0-3065ec8fd3ec.html
Security: https://vuxml.freebsd.org/freebsd/bdaecfad-3117-11ec-b3b0-3065ec8fd3ec.html
567 files changed, 3326 insertions, 2650 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile index f5f6ea1f51cf..b3c04a824fd4 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -1,8 +1,7 @@ # Created by: Florent Thoumie <flz@FreeBSD.org> PORTNAME= chromium -PORTVERSION= 94.0.4606.81 -PORTREVISION= 3 +PORTVERSION= 97.0.4692.99 CATEGORIES= www MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ LOCAL/rene/chromium/:fonts @@ -15,6 +14,7 @@ LICENSE= BSD3CLAUSE LGPL21 MPL11 LICENSE_COMB= multi ONLY_FOR_ARCHS= aarch64 amd64 i386 +BROKEN_i386= Does not compile, __ElfN macros unknown BUILD_DEPENDS= bash:shells/bash \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ diff --git a/www/chromium/distinfo b/www/chromium/distinfo index 1dd9e9755ba1..b74af3a6db33 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1633682206 -SHA256 (chromium-94.0.4606.81.tar.xz) = 7071aa2b2caf48094c2ae816395948b4daec940606f4982ad5bbf68e5d2de598 -SIZE (chromium-94.0.4606.81.tar.xz) = 1039841108 -SHA256 (chromium-94.0.4606.81-testdata.tar.xz) = 6cddfe2fe7a36c79770c165d08f3ef9d778f78ed5e0c0e98b3eaa2e54884df03 -SIZE (chromium-94.0.4606.81-testdata.tar.xz) = 257006276 +TIMESTAMP = 1642767718 +SHA256 (chromium-97.0.4692.99.tar.xz) = c91bae205705b367f2cfc1f72ce1ee99b2ceb5edfc584e15c60a6ab5ff01ecba +SIZE (chromium-97.0.4692.99.tar.xz) = 1213731872 +SHA256 (chromium-97.0.4692.99-testdata.tar.xz) = 4d27100d2a5dda623231fb341a53c5f71fb52a5e2eeec37ccee8f6dfd568d139 +SIZE (chromium-97.0.4692.99-testdata.tar.xz) = 259732316 SHA256 (test_fonts-85.tar.xz) = f22b61b3639acb147c98ec2e2305d8b96f0b55c8c74c40e2ea696402fae8cef9 SIZE (test_fonts-85.tar.xz) = 9511984 diff --git a/www/chromium/files/extra-patch-build_config_compiler_pgo_pgo.gni b/www/chromium/files/extra-patch-build_config_compiler_pgo_pgo.gni index c149f4f7bb49..9c861611d45c 100644 --- a/www/chromium/files/extra-patch-build_config_compiler_pgo_pgo.gni +++ b/www/chromium/files/extra-patch-build_config_compiler_pgo_pgo.gni @@ -1,4 +1,4 @@ ---- build/config/compiler/pgo/pgo.gni.orig 2021-10-08 06:25:34 UTC +--- build/config/compiler/pgo/pgo.gni.orig 2022-01-20 10:35:46 UTC +++ build/config/compiler/pgo/pgo.gni @@ -16,7 +16,7 @@ declare_args() { # TODO(crbug.com/1052397): Remove chromeos_is_browser_only once diff --git a/www/chromium/files/patch-3p-pdfium_3p_base_allocator_partition__allocator_page__allocator__internals__posix.h b/www/chromium/files/patch-3p-pdfium_3p_base_allocator_partition__allocator_page__allocator__internals__posix.h index a416c5026ea5..fdbba9ffa23b 100644 --- a/www/chromium/files/patch-3p-pdfium_3p_base_allocator_partition__allocator_page__allocator__internals__posix.h +++ b/www/chromium/files/patch-3p-pdfium_3p_base_allocator_partition__allocator_page__allocator__internals__posix.h @@ -1,4 +1,4 @@ ---- third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2021-10-08 06:29:18 UTC +--- third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2022-01-20 10:37:51 UTC +++ third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h @@ -16,7 +16,7 @@ #if defined(OS_ANDROID) diff --git a/www/chromium/files/patch-BUILD.gn b/www/chromium/files/patch-BUILD.gn index d283d4564188..88cb1c24f737 100644 --- a/www/chromium/files/patch-BUILD.gn +++ b/www/chromium/files/patch-BUILD.gn @@ -1,6 +1,6 @@ ---- BUILD.gn.orig 2021-09-24 04:25:55 UTC +--- BUILD.gn.orig 2021-12-31 00:57:15 UTC +++ BUILD.gn -@@ -449,7 +449,7 @@ group("gn_all") { +@@ -454,7 +454,7 @@ group("gn_all") { ] } @@ -9,7 +9,7 @@ deps += [ "//third_party/breakpad:breakpad_unittests", "//third_party/breakpad:core-2-minidump", -@@ -494,8 +494,6 @@ group("gn_all") { +@@ -500,8 +500,6 @@ group("gn_all") { "//net:disk_cache_memory_test", "//net:quic_client", "//net:quic_server", @@ -18,7 +18,7 @@ "//testing:empty_main", ] -@@ -506,7 +504,7 @@ group("gn_all") { +@@ -512,7 +510,7 @@ group("gn_all") { ] } @@ -27,7 +27,7 @@ # TODO(dpranke): add the linux_dump_symbols flag? deps += [ "//chrome:linux_symbols" ] } -@@ -550,10 +548,6 @@ group("gn_all") { +@@ -556,10 +554,6 @@ group("gn_all") { "//chrome/test:load_library_perf_tests", "//chrome/test:sync_performance_tests", "//chrome/test/chromedriver:chromedriver", @@ -38,7 +38,7 @@ "//media/cast:generate_barcode_video", "//media/cast:generate_timecode_audio", "//net:crash_cache", -@@ -612,10 +606,6 @@ group("gn_all") { +@@ -618,10 +612,6 @@ group("gn_all") { "//mojo:mojo_perftests", "//services/service_manager/public/cpp", "//testing/gmock:gmock_main", @@ -49,7 +49,7 @@ ] if (!is_android) { -@@ -693,7 +683,7 @@ group("gn_all") { +@@ -699,7 +689,7 @@ group("gn_all") { host_os == "win") { deps += [ "//chrome/test/mini_installer:mini_installer_tests" ] } @@ -58,7 +58,7 @@ deps += [ "//third_party/breakpad:symupload($host_toolchain)" ] } -@@ -708,7 +698,7 @@ group("gn_all") { +@@ -715,7 +705,7 @@ group("gn_all") { } } @@ -67,15 +67,34 @@ deps += [ "//third_party/crashpad/crashpad:crashpad_tests", "//third_party/crashpad/crashpad/handler:crashpad_handler", -@@ -825,7 +815,6 @@ group("gn_all") { - "//chrome/browser/vr:vr_common_perftests", +@@ -829,15 +819,17 @@ group("gn_all") { "//chrome/browser/vr:vr_common_unittests", "//chrome/browser/vr:vr_pixeltests", -- "//tools/perf/contrib/vr_benchmarks:vr_perf_tests", ] - if (is_android) { - deps += [ "//chrome/browser/android/vr:vr_android_unittests" ] -@@ -1131,7 +1120,7 @@ if (!is_ios) { +- if (!is_android) { +- deps += [ "//tools/perf/contrib/vr_benchmarks:vr_perf_tests" ] +- } else { +- deps += [ "//chrome/browser/android/vr:vr_android_unittests" ] +- import("//tools/perf/chrome_telemetry_build/android_browser_types.gni") +- foreach(_target_suffix, telemetry_android_browser_target_suffixes) { +- deps += [ +- "//tools/perf/contrib/vr_benchmarks:vr_perf_tests${_target_suffix}", +- ] ++ if (!is_bsd) { ++ if (!is_android) { ++ deps += [ "//tools/perf/contrib/vr_benchmarks:vr_perf_tests" ] ++ } else { ++ deps += [ "//chrome/browser/android/vr:vr_android_unittests" ] ++ import("//tools/perf/chrome_telemetry_build/android_browser_types.gni") ++ foreach(_target_suffix, telemetry_android_browser_target_suffixes) { ++ deps += [ ++ "//tools/perf/contrib/vr_benchmarks:vr_perf_tests${_target_suffix}", ++ ] ++ } + } + } + } +@@ -1140,7 +1132,7 @@ if (!is_ios) { data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ] } @@ -84,7 +103,7 @@ data_deps += [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } -@@ -1140,7 +1129,7 @@ if (!is_ios) { +@@ -1149,7 +1141,7 @@ if (!is_ios) { data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } @@ -93,7 +112,7 @@ data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } -@@ -1374,7 +1363,7 @@ group("chromium_builder_perf") { +@@ -1518,7 +1510,7 @@ group("chromium_builder_perf") { data_deps += [ "//chrome/test:performance_browser_tests" ] } if (is_linux || is_chromeos_lacros) { @@ -102,7 +121,7 @@ # In GN builds, this is controlled by the 'linux_dump_symbols' # flag, which defaults to 1 for official builds. For now, # we skip the separate flag and just key off of is_official_build. -@@ -1386,9 +1375,6 @@ group("chromium_builder_perf") { +@@ -1530,9 +1522,6 @@ group("chromium_builder_perf") { if (is_win) { data_deps += [ "//chrome/installer/mini_installer:mini_installer" ] diff --git a/www/chromium/files/patch-apps_app__restore__service__browsertest.cc b/www/chromium/files/patch-apps_app__restore__service__browsertest.cc index 25561c8131f0..f206af1b2f52 100644 --- a/www/chromium/files/patch-apps_app__restore__service__browsertest.cc +++ b/www/chromium/files/patch-apps_app__restore__service__browsertest.cc @@ -1,6 +1,6 @@ ---- apps/app_restore_service_browsertest.cc.orig 2021-04-14 18:40:47 UTC +--- apps/app_restore_service_browsertest.cc.orig 2021-12-14 11:44:54 UTC +++ apps/app_restore_service_browsertest.cc -@@ -148,7 +148,7 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, FileAcc +@@ -140,7 +140,7 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, FileAcc } // Flaky: crbug.com/269613 diff --git a/www/chromium/files/patch-ash_display_mirror__window__controller.cc b/www/chromium/files/patch-ash_display_mirror__window__controller.cc index 8e2ee6085452..764566caed12 100644 --- a/www/chromium/files/patch-ash_display_mirror__window__controller.cc +++ b/www/chromium/files/patch-ash_display_mirror__window__controller.cc @@ -1,6 +1,6 @@ ---- ash/display/mirror_window_controller.cc.orig 2021-07-19 18:45:04 UTC +--- ash/display/mirror_window_controller.cc.orig 2021-12-31 00:57:16 UTC +++ ash/display/mirror_window_controller.cc -@@ -287,7 +287,11 @@ void MirrorWindowController::UpdateWindow( +@@ -284,7 +284,11 @@ void MirrorWindowController::UpdateWindow( return info.id() == iter->first; }) == display_info_list.end()) { CloseAndDeleteHost(iter->second, true); diff --git a/www/chromium/files/patch-base_BUILD.gn b/www/chromium/files/patch-base_BUILD.gn index 97725237b20e..ac264690acfd 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 2021-09-24 04:25:55 UTC +--- base/BUILD.gn.orig 2021-12-31 00:57:18 UTC +++ base/BUILD.gn -@@ -935,7 +935,7 @@ component("base") { +@@ -954,7 +954,7 @@ component("base") { "timer/hi_res_timer_manager_posix.cc", ] @@ -9,7 +9,7 @@ sources += [ "cpu_affinity_posix.cc", "cpu_affinity_posix.h", -@@ -946,6 +946,11 @@ component("base") { +@@ -965,6 +965,11 @@ component("base") { "profiler/thread_delegate_posix.h", ] } @@ -21,7 +21,7 @@ } if (is_win) { -@@ -1367,7 +1372,7 @@ component("base") { +@@ -1391,7 +1396,7 @@ component("base") { # building inside the cros_sdk environment - use host_toolchain as a # more robust check for this. if (!use_sysroot && @@ -30,7 +30,7 @@ host_toolchain != "//build/toolchain/cros:host") { libs += [ "atomic" ] } -@@ -1420,7 +1425,7 @@ component("base") { +@@ -1444,7 +1449,7 @@ component("base") { "allocator/allocator_shim_default_dispatch_to_mac_zoned_malloc.cc", ] } @@ -39,7 +39,7 @@ sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ] } if (is_win) { -@@ -2099,6 +2104,34 @@ component("base") { +@@ -2142,6 +2147,34 @@ component("base") { } } @@ -74,7 +74,7 @@ # iOS if (is_ios) { sources -= [ -@@ -3292,7 +3325,7 @@ test("base_unittests") { +@@ -3359,7 +3392,7 @@ test("base_unittests") { } } @@ -83,7 +83,7 @@ sources += [ "debug/proc_maps_linux_unittest.cc", "files/scoped_file_linux_unittest.cc", -@@ -3339,7 +3372,7 @@ test("base_unittests") { +@@ -3406,7 +3439,7 @@ test("base_unittests") { "posix/unix_domain_socket_unittest.cc", "task/thread_pool/task_tracker_posix_unittest.cc", ] diff --git a/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc b/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc index 8b020cf5af31..c8722784b6ee 100644 --- a/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc +++ b/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc @@ -1,7 +1,7 @@ ---- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig 2021-04-14 18:40:48 UTC +--- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig 2021-12-14 11:44:55 UTC +++ base/allocator/allocator_shim_default_dispatch_to_glibc.cc -@@ -6,18 +6,28 @@ - #include "base/compiler_specific.h" +@@ -10,18 +10,28 @@ + #include "base/process/memory.h" #include <dlfcn.h> -#include <malloc.h> @@ -36,34 +36,46 @@ } // extern "C" namespace { -@@ -25,32 +35,32 @@ namespace { - using base::allocator::AllocatorDispatch; +@@ -39,7 +49,7 @@ void* GlibcMalloc(const AllocatorDispatch*, size_t siz + if (UNLIKELY(size >= kMaxAllowedSize)) + base::TerminateBecauseOutOfMemory(size); + +- return __libc_malloc(size); ++ return __malloc(size); + } + + void* GlibcUncheckedMalloc(const AllocatorDispatch*, +@@ -48,7 +58,7 @@ void* GlibcUncheckedMalloc(const AllocatorDispatch*, + if (UNLIKELY(size >= kMaxAllowedSize)) + return nullptr; - void* GlibcMalloc(const AllocatorDispatch*, size_t size, void* context) { - return __libc_malloc(size); + return __malloc(size); } void* GlibcCalloc(const AllocatorDispatch*, - size_t n, - size_t size, - void* context) { +@@ -59,7 +69,7 @@ void* GlibcCalloc(const AllocatorDispatch*, + if (UNLIKELY(!total.IsValid() || total.ValueOrDie() >= kMaxAllowedSize)) + base::TerminateBecauseOutOfMemory(size * n); + - return __libc_calloc(n, size); + return __calloc(n, size); } void* GlibcRealloc(const AllocatorDispatch*, - void* address, - size_t size, - void* context) { +@@ -69,7 +79,7 @@ void* GlibcRealloc(const AllocatorDispatch*, + if (UNLIKELY(size >= kMaxAllowedSize)) + base::TerminateBecauseOutOfMemory(size); + - return __libc_realloc(address, size); + return __realloc(address, size); } void* GlibcMemalign(const AllocatorDispatch*, - size_t alignment, - size_t size, - void* context) { +@@ -79,11 +89,11 @@ void* GlibcMemalign(const AllocatorDispatch*, + if (UNLIKELY(size >= kMaxAllowedSize)) + base::TerminateBecauseOutOfMemory(size); + - return __libc_memalign(alignment, size); + return __memalign(alignment, size); } diff --git a/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc b/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc index b7a8e8f3c8a8..3f3a8a53ae18 100644 --- a/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc +++ b/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc @@ -1,4 +1,4 @@ ---- base/allocator/allocator_shim_unittest.cc.orig 2021-09-14 01:51:47 UTC +--- base/allocator/allocator_shim_unittest.cc.orig 2021-12-14 11:44:55 UTC +++ base/allocator/allocator_shim_unittest.cc @@ -369,7 +369,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) { @@ -11,7 +11,7 @@ ASSERT_EQ(0u, reinterpret_cast<uintptr_t>(memalign_ptr) % 128); @@ -385,7 +385,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) { ASSERT_GE(aligned_allocs_intercepted_by_size[kPageSize], 1u); - #endif // !defined(OS_ANDROID) + #endif // defined(OS_POSIX) && !defined(OS_ANDROID) -#endif // !OS_WIN && !OS_APPLE +#endif // !OS_WIN && !OS_APPLE && !OS_BSD @@ -29,7 +29,7 @@ @@ -421,7 +421,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) { ASSERT_GE(frees_intercepted_by_addr[Hash(pvalloc_ptr)], 1u); - #endif // !defined(OS_ANDROID) + #endif // defined(OS_POSIX) && !defined(OS_ANDROID) -#endif // !OS_WIN && !OS_APPLE +#endif // !OS_WIN && !OS_APPLE && !OS_BSD diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_address__pool__manager.cc b/www/chromium/files/patch-base_allocator_partition__allocator_address__pool__manager.cc index 8c16e950e5ba..bd1771f1163f 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_address__pool__manager.cc +++ b/www/chromium/files/patch-base_allocator_partition__allocator_address__pool__manager.cc @@ -1,4 +1,4 @@ ---- base/allocator/partition_allocator/address_pool_manager.cc.orig 2021-07-19 18:45:05 UTC +--- base/allocator/partition_allocator/address_pool_manager.cc.orig 2021-12-14 11:44:55 UTC +++ base/allocator/partition_allocator/address_pool_manager.cc @@ -8,6 +8,13 @@ #include <sys/mman.h> @@ -14,18 +14,3 @@ #include <algorithm> #include <limits> -@@ -50,6 +57,14 @@ void DecommitPages(void* address, size_t size) { - void* ptr = mmap(address, size, PROT_NONE, - MAP_FIXED | MAP_ANONYMOUS | MAP_PRIVATE, -1, 0); - PA_CHECK(ptr == address); -+#elif defined(OS_FREEBSD) -+ int fd = HANDLE_EINTR(open("/dev/zero", O_RDONLY)); -+ PA_CHECK(fd != -1); -+ -+ void *ptr = mmap(address, size, PROT_NONE, -+ MAP_FIXED | MAP_PRIVATE, fd, 0); -+ PA_PCHECK(ptr == address); -+ HANDLE_EINTR(close(fd)); - #else - static_assert(DecommittedMemoryIsAlwaysZeroed(), ""); - DecommitSystemPages(address, size, PageUpdatePermissions); 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 new file mode 100644 index 000000000000..12f57b367556 --- /dev/null +++ b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator.h @@ -0,0 +1,11 @@ +--- base/allocator/partition_allocator/page_allocator.h.orig 2021-12-14 11:44:55 UTC ++++ base/allocator/partition_allocator/page_allocator.h +@@ -170,7 +170,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_FREEBSD) + 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 5e523e2c6be3..cf452245c7a2 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,4 +1,4 @@ ---- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2021-07-19 18:45:05 UTC +--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2021-12-14 11:44:55 UTC +++ base/allocator/partition_allocator/page_allocator_internals_posix.h @@ -28,10 +28,14 @@ #if defined(OS_ANDROID) @@ -34,7 +34,7 @@ int map_flags = MAP_ANONYMOUS | MAP_PRIVATE; +#endif - #if defined(OS_APPLE) + #if defined(OS_MAC) // On macOS 10.14 and higher, executables that are code signed with the @@ -183,6 +194,8 @@ void* SystemAllocPagesInternal(void* hint, prctl(PR_SET_VMA, PR_SET_VMA_ANON_NAME, ret, length, @@ -45,7 +45,7 @@ #endif return ret; -@@ -334,6 +347,8 @@ void DiscardSystemPagesInternal(void* address, size_t +@@ -346,6 +359,8 @@ void DiscardSystemPagesInternal(void* address, size_t ret = madvise(address, length, MADV_DONTNEED); } PA_PCHECK(ret == 0); diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.cc b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.cc index cd2ad5a2b820..eea69f0eebf4 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.cc +++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.cc @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/partition_alloc.cc.orig 2021-09-24 04:25:55 UTC +--- base/allocator/partition_allocator/partition_alloc.cc.orig 2021-12-31 00:57:18 UTC +++ base/allocator/partition_allocator/partition_alloc.cc -@@ -57,7 +57,12 @@ void PartitionAllocGlobalInit(OomFunction on_out_of_me +@@ -56,7 +56,12 @@ void PartitionAllocGlobalInit(OomFunction on_out_of_me "maximum direct mapped allocation"); // Check that some of our zanier calculations worked out as expected. 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 b65ad60524a2..047945ce0075 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,6 +1,6 @@ ---- base/allocator/partition_allocator/partition_alloc_config.h.orig 2021-09-24 04:25:55 UTC +--- base/allocator/partition_allocator/partition_alloc_config.h.orig 2021-12-31 00:57:18 UTC +++ base/allocator/partition_allocator/partition_alloc_config.h -@@ -61,9 +61,13 @@ static_assert(sizeof(void*) != 8, ""); +@@ -59,6 +59,10 @@ static_assert(sizeof(void*) != 8, ""); #define PA_HAS_LINUX_KERNEL #endif @@ -8,10 +8,15 @@ +#define PA_HAS_FREEBSD_KERNEL +#endif + - // SpinningMutex uses either futex(2) on Linux, or a fast userspace "try" - // operation, which is available on Windows. --#if defined(PA_HAS_LINUX_KERNEL) || defined(OS_WIN) -+#if defined(PA_HAS_LINUX_KERNEL) || defined(PA_HAS_FREEBSD_KERNEL) || defined(OS_WIN) - #define PA_HAS_SPINNING_MUTEX + // On some platforms, we implement locking by spinning in userspace, then going + // into the kernel only if there is contention. This requires platform support, + // namely: +@@ -73,7 +77,7 @@ static_assert(sizeof(void*) != 8, ""); + // assume that pthread_mutex_trylock() is suitable. + // + // Otherwise, a userspace spinlock implementation is used. +-#if defined(PA_HAS_LINUX_KERNEL) || defined(OS_WIN) || \ ++#if defined(PA_HAS_LINUX_KERNEL) || defined(PA_HAS_FREEBSD_KERNEL) || defined(OS_WIN) || \ + (defined(OS_POSIX) && !defined(OS_APPLE)) || defined(OS_FUCHSIA) + #define PA_HAS_FAST_MUTEX #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 new file mode 100644 index 000000000000..847ab3dc11a8 --- /dev/null +++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h @@ -0,0 +1,11 @@ +--- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2022-01-21 12:58:23 UTC ++++ base/allocator/partition_allocator/partition_alloc_constants.h +@@ -349,7 +349,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) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Set to a higher value on Linux, to assess impact on performance bots. This + // roughly halves the number of syscalls done during a speedometer 2.0 run on + // this platform. diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__unittest.cc b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__unittest.cc index f3baa9a491d9..f713b26a5cb3 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__unittest.cc +++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__unittest.cc @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/partition_alloc_unittest.cc.orig 2021-09-24 04:25:55 UTC +--- base/allocator/partition_allocator/partition_alloc_unittest.cc.orig 2021-12-31 00:57:18 UTC +++ base/allocator/partition_allocator/partition_alloc_unittest.cc -@@ -1755,7 +1755,7 @@ TEST_F(PartitionAllocTest, LostFreeSlotSpansBug) { +@@ -1803,7 +1803,7 @@ TEST_F(PartitionAllocTest, LostFreeSlotSpansBug) { // cause flake. #if !defined(OS_WIN) && \ (!defined(ARCH_CPU_64_BITS) || \ @@ -9,7 +9,7 @@ // The following four tests wrap a called function in an expect death statement // to perform their test, because they are non-hermetic. Specifically they are -@@ -1806,7 +1806,7 @@ TEST_F(PartitionAllocDeathTest, DISABLED_RepeatedTryRe +@@ -1869,7 +1869,7 @@ TEST_F(PartitionAllocDeathTest, DISABLED_RepeatedTryRe } #endif // !defined(ARCH_CPU_64_BITS) || (defined(OS_POSIX) && diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.cc b/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.cc index edb63a43d3f1..6eb3a48451aa 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.cc +++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.cc @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/partition_root.cc.orig 2021-09-14 01:51:47 UTC +--- base/allocator/partition_allocator/partition_root.cc.orig 2021-12-31 00:57:18 UTC +++ base/allocator/partition_allocator/partition_root.cc -@@ -27,7 +27,7 @@ +@@ -28,7 +28,7 @@ #include "wow64apiset.h" #endif @@ -9,7 +9,7 @@ #include <pthread.h> #endif -@@ -41,7 +41,7 @@ namespace base { +@@ -42,7 +42,7 @@ namespace base { namespace { @@ -18,7 +18,7 @@ // NO_THREAD_SAFETY_ANALYSIS: acquires the lock and doesn't release it, by // design. -@@ -94,7 +94,7 @@ void AfterForkInChild() { +@@ -111,7 +111,7 @@ void AfterForkInChild() { internal::ThreadCacheRegistry::Instance() .ForcePurgeAllThreadAfterForkUnsafe(); } @@ -27,7 +27,7 @@ std::atomic<bool> g_global_init_called; void PartitionAllocMallocInitOnce() { -@@ -104,7 +104,7 @@ void PartitionAllocMallocInitOnce() { +@@ -121,7 +121,7 @@ void PartitionAllocMallocInitOnce() { if (!g_global_init_called.compare_exchange_strong(expected, true)) return; @@ -36,7 +36,7 @@ // When fork() is called, only the current thread continues to execute in the // child process. If the lock is held, but *not* by this thread when fork() is // called, we have a deadlock. -@@ -129,7 +129,7 @@ void PartitionAllocMallocInitOnce() { +@@ -146,7 +146,7 @@ void PartitionAllocMallocInitOnce() { int err = pthread_atfork(BeforeForkInParent, AfterForkInParent, AfterForkInChild); PA_CHECK(err == 0); 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 1afd2fd91a8d..ad0050c3bb6f 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,6 +1,6 @@ ---- base/allocator/partition_allocator/spinning_mutex.cc.orig 2021-09-14 01:51:47 UTC +--- base/allocator/partition_allocator/spinning_mutex.cc.orig 2021-12-14 11:44:55 UTC +++ base/allocator/partition_allocator/spinning_mutex.cc -@@ -20,9 +20,16 @@ +@@ -22,6 +22,13 @@ #include <unistd.h> #endif // defined(PA_HAS_LINUX_KERNEL) @@ -9,16 +9,21 @@ +#include <sys/types.h> +#include <sys/thr.h> +#include <sys/umtx.h> -+#endif // defined(PA_HAS_FREEBSD_KERNEL) ++#endif // defined(PA_HAS_FREEBSD_KERNEL) + - namespace base { - namespace internal { + #if !defined(PA_HAS_FAST_MUTEX) + #include "base/threading/platform_thread.h" + +@@ -43,7 +50,7 @@ namespace internal { + + #if defined(PA_HAS_FAST_MUTEX) + -#if defined(PA_HAS_LINUX_KERNEL) +#if defined(PA_HAS_LINUX_KERNEL) || defined(PA_HAS_FREEBSD_KERNEL) void SpinningMutex::FutexWait() { // Save and restore errno. -@@ -46,8 +53,13 @@ void SpinningMutex::FutexWait() { +@@ -67,8 +74,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. @@ -32,7 +37,7 @@ if (err) { // These are programming error, check them. -@@ -59,8 +71,14 @@ void SpinningMutex::FutexWait() { +@@ -80,8 +92,14 @@ void SpinningMutex::FutexWait() { void SpinningMutex::FutexWake() { int saved_errno = errno; diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_spinning__mutex.h b/www/chromium/files/patch-base_allocator_partition__allocator_spinning__mutex.h index c33dc5dc8adc..a5899e29e5c8 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_spinning__mutex.h +++ b/www/chromium/files/patch-base_allocator_partition__allocator_spinning__mutex.h @@ -1,17 +1,17 @@ ---- base/allocator/partition_allocator/spinning_mutex.h.orig 2021-05-12 22:05:40 UTC +--- base/allocator/partition_allocator/spinning_mutex.h.orig 2021-12-14 11:44:55 UTC +++ base/allocator/partition_allocator/spinning_mutex.h -@@ -59,7 +59,7 @@ class LOCKABLE BASE_EXPORT SpinningMutex { - // as the slow path has better characteristics than SpinLocks's. - static constexpr int kSpinCount = 1000; +@@ -106,7 +106,7 @@ class LOCKABLE BASE_EXPORT SpinningMutex { + + #if defined(PA_HAS_FAST_MUTEX) -#if defined(PA_HAS_LINUX_KERNEL) +#if defined(PA_HAS_LINUX_KERNEL) || defined(PA_HAS_FREEBSD_KERNEL) void FutexWait(); void FutexWake(); -@@ -104,7 +104,7 @@ ALWAYS_INLINE void SpinningMutex::Acquire() { +@@ -176,7 +176,7 @@ inline constexpr SpinningMutex::SpinningMutex() = defa - inline constexpr SpinningMutex::SpinningMutex() = default; + #if defined(PA_HAS_FAST_MUTEX) -#if defined(PA_HAS_LINUX_KERNEL) +#if defined(PA_HAS_LINUX_KERNEL) || defined(PA_HAS_FREEBSD_KERNEL) diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_starscan_pcscan__internal.cc b/www/chromium/files/patch-base_allocator_partition__allocator_starscan_pcscan__internal.cc deleted file mode 100644 index 4b62e7b8dad3..000000000000 --- a/www/chromium/files/patch-base_allocator_partition__allocator_starscan_pcscan__internal.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- base/allocator/partition_allocator/starscan/pcscan_internal.cc.orig 2021-09-24 04:25:55 UTC -+++ base/allocator/partition_allocator/starscan/pcscan_internal.cc -@@ -59,7 +59,7 @@ namespace internal { - - namespace { - --#if DCHECK_IS_ON() && defined(OS_LINUX) -+#if DCHECK_IS_ON() && (defined(OS_LINUX) || defined(OS_BSD)) - // Currently, check reentracy only on Linux. On Android TLS is emulated by the - // runtime lib, which can allocate and therefore cause reentrancy. - struct ReentrantScannerGuard final { diff --git a/www/chromium/files/patch-base_cpu.cc b/www/chromium/files/patch-base_cpu.cc index cbc9bb558f06..6a0db27401ac 100644 --- a/www/chromium/files/patch-base_cpu.cc +++ b/www/chromium/files/patch-base_cpu.cc @@ -1,8 +1,8 @@ ---- base/cpu.cc.orig 2021-09-14 01:51:47 UTC +--- base/cpu.cc.orig 2021-12-14 11:44:55 UTC +++ base/cpu.cc -@@ -16,7 +16,7 @@ - +@@ -17,7 +17,7 @@ #include "base/cxx17_backports.h" + #include "base/no_destructor.h" -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) || \ @@ -24,7 +24,7 @@ #endif // defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || // defined(OS_LINUX) || defined(OS_CHROMEOS)) -@@ -357,6 +365,8 @@ void CPU::Initialize(bool require_branding) { +@@ -358,6 +366,8 @@ void CPU::Initialize(bool require_branding) { has_bti_ = hwcap2 & HWCAP2_BTI; #endif diff --git a/www/chromium/files/patch-base_cpu.h b/www/chromium/files/patch-base_cpu.h index f8c188751c1f..5b713f08f882 100644 --- a/www/chromium/files/patch-base_cpu.h +++ b/www/chromium/files/patch-base_cpu.h @@ -1,6 +1,6 @@ ---- base/cpu.h.orig 2021-07-19 18:45:05 UTC +--- base/cpu.h.orig 2021-12-14 11:44:55 UTC +++ base/cpu.h -@@ -96,7 +96,7 @@ class BASE_EXPORT CPU final { +@@ -103,7 +103,7 @@ class BASE_EXPORT CPU final { IntelMicroArchitecture GetIntelMicroArchitecture() const; const std::string& cpu_brand() const { return cpu_brand_; } @@ -9,7 +9,7 @@ defined(OS_AIX) enum class CoreType { kUnknown = 0, -@@ -147,7 +147,7 @@ class BASE_EXPORT CPU final { +@@ -154,7 +154,7 @@ class BASE_EXPORT CPU final { // cpuidle driver. using CoreIdleTimes = std::vector<TimeDelta>; static bool GetCumulativeCoreIdleTimes(CoreIdleTimes&); diff --git a/www/chromium/files/patch-base_debug_debugger__posix.cc b/www/chromium/files/patch-base_debug_debugger__posix.cc index 5ac1022dbb46..024e9e915cda 100644 --- a/www/chromium/files/patch-base_debug_debugger__posix.cc +++ b/www/chromium/files/patch-base_debug_debugger__posix.cc @@ -1,6 +1,6 @@ ---- base/debug/debugger_posix.cc.orig 2021-09-24 04:25:55 UTC +--- base/debug/debugger_posix.cc.orig 2021-12-14 11:44:55 UTC +++ base/debug/debugger_posix.cc -@@ -92,7 +92,7 @@ bool BeingDebugged() { +@@ -87,7 +87,7 @@ bool BeingDebugged() { KERN_PROC, KERN_PROC_PID, getpid() @@ -9,7 +9,7 @@ , sizeof(struct kinfo_proc), 0 #endif -@@ -100,33 +100,35 @@ bool BeingDebugged() { +@@ -95,33 +95,35 @@ bool BeingDebugged() { // Caution: struct kinfo_proc is marked __APPLE_API_UNSTABLE. The source and // binary interfaces may change. diff --git a/www/chromium/files/patch-base_debug_stack__trace.h b/www/chromium/files/patch-base_debug_stack__trace.h index 6e702f67799e..fd24a9ba8900 100644 --- a/www/chromium/files/patch-base_debug_stack__trace.h +++ b/www/chromium/files/patch-base_debug_stack__trace.h @@ -1,6 +1,6 @@ ---- base/debug/stack_trace.h.orig 2021-09-24 04:25:55 UTC +--- base/debug/stack_trace.h.orig 2021-12-14 11:44:55 UTC +++ base/debug/stack_trace.h -@@ -19,6 +19,7 @@ +@@ -18,6 +18,7 @@ #if !defined(OS_NACL) #include <signal.h> #endif @@ -8,7 +8,7 @@ #include <unistd.h> #endif -@@ -156,7 +157,7 @@ BASE_EXPORT size_t CollectStackTrace(void** trace, siz +@@ -155,7 +156,7 @@ BASE_EXPORT size_t CollectStackTrace(void** trace, siz // scanning area at the origin of the stack, wasting time and not finding any // frames (since Android libraries don't have frame pointers). Scanning is not // enabled on other posix platforms due to legacy reasons. 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 e54d8595294a..afefdadf5bf8 100644 --- a/www/chromium/files/patch-base_debug_stack__trace__posix.cc +++ b/www/chromium/files/patch-base_debug_stack__trace__posix.cc @@ -1,4 +1,4 @@ ---- base/debug/stack_trace_posix.cc.orig 2021-09-24 04:25:55 UTC +--- base/debug/stack_trace_posix.cc.orig 2021-12-14 11:44:55 UTC +++ base/debug/stack_trace_posix.cc @@ -35,7 +35,7 @@ #include <AvailabilityMacros.h> @@ -9,7 +9,7 @@ #include "base/debug/proc_maps_linux.h" #endif -@@ -424,7 +424,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf +@@ -446,7 +446,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf if (::signal(signal, SIG_DFL) == SIG_ERR) { _exit(EXIT_FAILURE); } @@ -18,7 +18,7 @@ // For all operating systems but Linux we do not reraise the signal that // brought us here but terminate the process immediately. // Otherwise various tests break on different operating systems, see -@@ -432,7 +432,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf +@@ -454,7 +454,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf PrintToStderr( "Calling _exit(EXIT_FAILURE). Core file will not be generated.\n"); _exit(EXIT_FAILURE); @@ -27,7 +27,7 @@ // After leaving this handler control flow returns to the point where the // signal was raised, raising the current signal once again but executing the -@@ -667,13 +667,21 @@ class SandboxSymbolizeHelper { +@@ -695,13 +695,21 @@ class SandboxSymbolizeHelper { // Reads /proc/self/maps. std::string contents; if (!ReadProcMaps(&contents)) { @@ -49,7 +49,7 @@ return false; } -@@ -704,7 +712,11 @@ class SandboxSymbolizeHelper { +@@ -732,7 +740,11 @@ class SandboxSymbolizeHelper { // Skip regions with empty file names. continue; } @@ -61,7 +61,7 @@ // Skip pseudo-paths, like [stack], [vdso], [heap], etc ... continue; } -@@ -801,9 +813,9 @@ bool EnableInProcessStackDumping() { +@@ -827,9 +839,9 @@ bool EnableInProcessStackDumping() { success &= (sigaction(SIGBUS, &action, nullptr) == 0); success &= (sigaction(SIGSEGV, &action, nullptr) == 0); // On Linux, SIGSYS is reserved by the kernel for seccomp-bpf sandboxing. diff --git a/www/chromium/files/patch-base_files_file__path__unittest.cc b/www/chromium/files/patch-base_files_file__path__unittest.cc index 1e0c52e1e74c..14bb60990cde 100644 --- a/www/chromium/files/patch-base_files_file__path__unittest.cc +++ b/www/chromium/files/patch-base_files_file__path__unittest.cc @@ -1,6 +1,6 @@ ---- base/files/file_path_unittest.cc.orig 2021-09-24 04:25:55 UTC +--- base/files/file_path_unittest.cc.orig 2021-12-14 11:44:55 UTC +++ base/files/file_path_unittest.cc -@@ -1188,7 +1188,7 @@ TEST_F(FilePathTest, FromUTF8Unsafe_And_AsUTF8Unsafe) +@@ -1202,7 +1202,7 @@ TEST_F(FilePathTest, FromUTF8Unsafe_And_AsUTF8Unsafe) "\xEF\xBC\xA1\xEF\xBC\xA2\xEF\xBC\xA3.txt" }, }; diff --git a/www/chromium/files/patch-base_files_file__util.cc b/www/chromium/files/patch-base_files_file__util.cc deleted file mode 100644 index 8cb98c28bfe2..000000000000 --- a/www/chromium/files/patch-base_files_file__util.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- base/files/file_util.cc.orig 2021-09-24 04:25:55 UTC -+++ base/files/file_util.cc -@@ -57,7 +57,7 @@ bool Move(const FilePath& from_path, const FilePath& t - } - - bool CopyFileContents(File& infile, File& outfile) { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) - bool retry_slow = false; - bool res = - internal::CopyFileContentsWithSendfile(infile, outfile, retry_slow); diff --git a/www/chromium/files/patch-base_files_file__util__unittest.cc b/www/chromium/files/patch-base_files_file__util__unittest.cc index 35ba78243376..17631593b4b2 100644 --- a/www/chromium/files/patch-base_files_file__util__unittest.cc +++ b/www/chromium/files/patch-base_files_file__util__unittest.cc @@ -1,4 +1,4 @@ ---- base/files/file_util_unittest.cc.orig 2021-09-14 01:51:47 UTC +--- base/files/file_util_unittest.cc.orig 2021-12-31 00:57:18 UTC +++ base/files/file_util_unittest.cc @@ -1640,7 +1640,7 @@ TEST_F(FileUtilTest, DeleteDirRecursiveWithOpenFile) { #endif @@ -18,7 +18,7 @@ TEST_F(FileUtilTest, MoveFileNew) { // Create a file -@@ -3508,7 +3508,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) { +@@ -3509,7 +3509,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) { } #endif // defined(OS_WIN) @@ -27,7 +27,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithProcFileSystem) { FilePath file_path("/proc/cpuinfo"); std::string data = "temp"; -@@ -3526,7 +3526,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithProcFileSyste +@@ -3527,7 +3527,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithProcFileSyste EXPECT_FALSE(ReadFileToStringWithMaxSize(file_path, nullptr, 4)); } diff --git a/www/chromium/files/patch-base_location__unittest.cc b/www/chromium/files/patch-base_location__unittest.cc index 655520cd69dd..9d9b94b7d045 100644 --- a/www/chromium/files/patch-base_location__unittest.cc +++ b/www/chromium/files/patch-base_location__unittest.cc @@ -1,6 +1,6 @@ ---- base/location_unittest.cc.orig 2021-04-14 18:40:48 UTC +--- base/location_unittest.cc.orig 2021-12-14 11:44:55 UTC +++ base/location_unittest.cc -@@ -32,7 +32,7 @@ TEST(LocationTest, CurrentYieldsCorrectValue) { +@@ -37,7 +37,7 @@ TEST(LocationTest, CurrentYieldsCorrectValue) { EXPECT_EQ(here.line_number(), previous_line + 1); EXPECT_STREQ("TestBody", here.function_name()); #endif diff --git a/www/chromium/files/patch-base_logging__unittest.cc b/www/chromium/files/patch-base_logging__unittest.cc index 4facaf43d7b5..a9cee4ddbae4 100644 --- a/www/chromium/files/patch-base_logging__unittest.cc +++ b/www/chromium/files/patch-base_logging__unittest.cc @@ -1,4 +1,4 @@ ---- base/logging_unittest.cc.orig 2021-07-19 18:45:05 UTC +--- base/logging_unittest.cc.orig 2021-12-31 00:57:18 UTC +++ base/logging_unittest.cc @@ -33,7 +33,7 @@ #include "base/posix/eintr_wrapper.h" @@ -9,7 +9,7 @@ #include <ucontext.h> #endif -@@ -559,7 +559,7 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo +@@ -553,7 +553,7 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo // need the arch-specific boilerplate below, which is inspired by breakpad. // At the same time, on OSX, ucontext.h is deprecated but si_addr works fine. uintptr_t crash_addr = 0; diff --git a/www/chromium/files/patch-base_memory_platform__shared__memory__region.h b/www/chromium/files/patch-base_memory_platform__shared__memory__region.h index f0959968cdd1..6057569add0b 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,6 +1,6 @@ ---- base/memory/platform_shared_memory_region.h.orig 2021-07-19 18:45:05 UTC +--- base/memory/platform_shared_memory_region.h.orig 2021-12-14 11:44:55 UTC +++ base/memory/platform_shared_memory_region.h -@@ -25,7 +25,7 @@ +@@ -24,7 +24,7 @@ #include "base/files/scoped_file.h" #endif @@ -9,7 +9,7 @@ namespace content { class SandboxIPCHandler; } -@@ -118,7 +118,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { +@@ -117,7 +117,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { kMaxValue = GET_SHMEM_TEMP_DIR_FAILURE }; @@ -18,7 +18,7 @@ // Structure to limit access to executable region creation. struct ExecutableRegion { private: -@@ -262,7 +262,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { +@@ -264,7 +264,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { CheckPlatformHandlePermissionsCorrespondToMode); static PlatformSharedMemoryRegion Create(Mode mode, size_t size 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 5659e90acc28..ac2e0f6b2691 100644 --- a/www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc +++ b/www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc @@ -1,4 +1,4 @@ ---- base/memory/platform_shared_memory_region_posix.cc.orig 2021-04-14 18:40:48 UTC +--- base/memory/platform_shared_memory_region_posix.cc.orig 2022-01-20 10:35:46 UTC +++ base/memory/platform_shared_memory_region_posix.cc @@ -23,7 +23,11 @@ struct ScopedPathUnlinkerTraits { static const FilePath* InvalidValue() { return nullptr; } @@ -39,6 +39,15 @@ , bool executable #endif +@@ -233,7 +237,7 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion: + // flag. + FilePath directory; + if (!GetShmemTempDir( +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + executable, + #else + false /* executable */, @@ -242,6 +246,22 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion: return {}; } diff --git a/www/chromium/files/patch-base_path__service__unittest.cc b/www/chromium/files/patch-base_path__service__unittest.cc index e67c5a871563..3bf8f3f4cc0f 100644 --- a/www/chromium/files/patch-base_path__service__unittest.cc +++ b/www/chromium/files/patch-base_path__service__unittest.cc @@ -1,11 +1,11 @@ ---- base/path_service_unittest.cc.orig 2021-04-14 18:40:48 UTC +--- base/path_service_unittest.cc.orig 2021-12-31 00:57:18 UTC +++ base/path_service_unittest.cc -@@ -38,7 +38,7 @@ bool ReturnsValidPath(int dir_type) { - if (dir_type == DIR_CACHE) +@@ -46,7 +46,7 @@ bool ReturnsValidPath(int key) { + if (key == DIR_CACHE) check_path_exists = false; #endif -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // On the linux try-bots: a path is returned (e.g. /home/chrome-bot/Desktop), // but it doesn't exist. - if (dir_type == DIR_USER_DESKTOP) + if (key == DIR_USER_DESKTOP) diff --git a/www/chromium/files/patch-base_process_internal__linux.h b/www/chromium/files/patch-base_process_internal__linux.h index 7a3c69cb475f..4f5d3719e412 100644 --- a/www/chromium/files/patch-base_process_internal__linux.h +++ b/www/chromium/files/patch-base_process_internal__linux.h @@ -1,6 +1,6 @@ ---- base/process/internal_linux.h.orig 2021-04-14 18:40:48 UTC +--- base/process/internal_linux.h.orig 2021-12-14 11:44:55 UTC +++ base/process/internal_linux.h -@@ -18,6 +18,8 @@ +@@ -20,6 +20,8 @@ #include "base/strings/string_number_conversions.h" #include "base/threading/platform_thread.h" @@ -9,7 +9,7 @@ namespace base { class Time; -@@ -59,6 +61,14 @@ bool ParseProcStats(const std::string& stats_data, +@@ -61,6 +63,14 @@ bool ParseProcStats(const std::string& stats_data, // If the ordering ever changes, carefully review functions that use these // values. enum ProcStatsFields { @@ -24,7 +24,7 @@ VM_COMM = 1, // Filename of executable, without parentheses. VM_STATE = 2, // Letter indicating the state of the process. VM_PPID = 3, // PID of the parent. -@@ -71,6 +81,7 @@ enum ProcStatsFields { +@@ -73,6 +83,7 @@ enum ProcStatsFields { VM_STARTTIME = 21, // The time the process started in clock ticks. VM_VSIZE = 22, // Virtual memory size in bytes. VM_RSS = 23, // Resident Set Size in pages. diff --git a/www/chromium/files/patch-base_process_kill__posix.cc b/www/chromium/files/patch-base_process_kill__posix.cc index 6aaac4f25cc0..23719e51bb67 100644 --- a/www/chromium/files/patch-base_process_kill__posix.cc +++ b/www/chromium/files/patch-base_process_kill__posix.cc @@ -1,7 +1,7 @@ ---- base/process/kill_posix.cc.orig 2021-04-14 18:40:48 UTC +--- base/process/kill_posix.cc.orig 2021-12-14 11:44:55 UTC +++ base/process/kill_posix.cc -@@ -160,7 +160,7 @@ void EnsureProcessTerminated(Process process) { - 0, new BackgroundReaper(std::move(process), TimeDelta::FromSeconds(2))); +@@ -162,7 +162,7 @@ void EnsureProcessTerminated(Process process) { + 0, new BackgroundReaper(std::move(process), Seconds(2))); } -#if defined(OS_LINUX) || defined(OS_CHROMEOS) @@ -9,7 +9,7 @@ void EnsureProcessGetsReaped(Process process) { DCHECK(!process.is_current()); -@@ -171,7 +171,7 @@ void EnsureProcessGetsReaped(Process process) { +@@ -173,7 +173,7 @@ void EnsureProcessGetsReaped(Process process) { PlatformThread::CreateNonJoinable( 0, new BackgroundReaper(std::move(process), TimeDelta())); } diff --git a/www/chromium/files/patch-base_process_launch.h b/www/chromium/files/patch-base_process_launch.h index a7a7825cf9a4..0c41c6fe1c3e 100644 --- a/www/chromium/files/patch-base_process_launch.h +++ b/www/chromium/files/patch-base_process_launch.h @@ -1,6 +1,6 @@ ---- base/process/launch.h.orig 2021-07-19 18:45:05 UTC +--- base/process/launch.h.orig 2021-12-14 11:44:55 UTC +++ base/process/launch.h -@@ -191,7 +191,7 @@ struct BASE_EXPORT LaunchOptions { +@@ -192,7 +192,7 @@ struct BASE_EXPORT LaunchOptions { bool clear_environment = false; #endif // OS_WIN || OS_POSIX || OS_FUCHSIA @@ -9,7 +9,7 @@ // 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 -@@ -204,7 +204,7 @@ struct BASE_EXPORT LaunchOptions { +@@ -205,7 +205,7 @@ struct BASE_EXPORT LaunchOptions { // Sets parent process death signal to SIGKILL. bool kill_on_parent_death = false; @@ -18,7 +18,7 @@ #if defined(OS_MAC) // Mach ports that will be accessible to the child process. These are not -@@ -416,7 +416,7 @@ BASE_EXPORT void RaiseProcessToHighPriority(); +@@ -417,7 +417,7 @@ BASE_EXPORT void RaiseProcessToHighPriority(); // binary. This should not be called in production/released code. BASE_EXPORT LaunchOptions LaunchOptionsForTest(); diff --git a/www/chromium/files/patch-base_process_memory__unittest.cc b/www/chromium/files/patch-base_process_memory__unittest.cc index 09dba6c1e236..3b2bc7a8d784 100644 --- a/www/chromium/files/patch-base_process_memory__unittest.cc +++ b/www/chromium/files/patch-base_process_memory__unittest.cc @@ -1,6 +1,6 @@ ---- base/process/memory_unittest.cc.orig 2021-07-19 18:45:05 UTC +--- base/process/memory_unittest.cc.orig 2021-12-14 11:44:55 UTC +++ base/process/memory_unittest.cc -@@ -37,6 +37,8 @@ +@@ -38,6 +38,8 @@ #if defined(OS_LINUX) || defined(OS_CHROMEOS) #include <malloc.h> #include "base/test/malloc_wrapper.h" @@ -9,7 +9,7 @@ #endif #if defined(OS_ANDROID) #include "base/android/build_info.h" -@@ -112,9 +114,9 @@ TEST(MemoryTest, AllocatorShimWorking) { +@@ -113,9 +115,9 @@ TEST(MemoryTest, AllocatorShimWorking) { #endif } @@ -21,7 +21,7 @@ !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) namespace { -@@ -336,7 +338,7 @@ TEST_F(OutOfMemoryDeathTest, SecurityAlignedRealloc) { +@@ -338,7 +340,7 @@ TEST_F(OutOfMemoryDeathTest, SecurityAlignedRealloc) { #endif // defined(OS_WIN) #endif // !defined(OS_MAC) && !defined(OS_ANDROID) @@ -30,7 +30,7 @@ TEST_F(OutOfMemoryDeathTest, Valloc) { ASSERT_OOM_DEATH({ -@@ -382,7 +384,7 @@ TEST_F(OutOfMemoryDeathTest, ViaSharedLibraries) { +@@ -384,7 +386,7 @@ TEST_F(OutOfMemoryDeathTest, ViaSharedLibraries) { value_ = MallocWrapper(test_size_); }); } @@ -39,7 +39,7 @@ // Android doesn't implement posix_memalign(). #if defined(OS_POSIX) && !defined(OS_ANDROID) -@@ -533,7 +535,7 @@ TEST_F(OutOfMemoryTest, TerminateBecauseOutOfMemoryRep +@@ -535,7 +537,7 @@ TEST_F(OutOfMemoryTest, TerminateBecauseOutOfMemoryRep #endif // OS_WIN #if defined(ARCH_CPU_32_BITS) && \ @@ -48,7 +48,7 @@ void TestAllocationsReleaseReservation(void* (*alloc_fn)(size_t), void (*free_fn)(void*)) { -@@ -591,7 +593,7 @@ TEST_F(OutOfMemoryHandledTest, NewReleasesReservation) +@@ -593,7 +595,7 @@ TEST_F(OutOfMemoryHandledTest, NewReleasesReservation) [](size_t size) { return static_cast<void*>(new char[size]); }, [](void* ptr) { delete[] static_cast<char*>(ptr); }); } @@ -56,11 +56,12 @@ +#endif // defined(ARCH_CPU_32_BITS) && (defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || // defined(OS_CHROMEOS)) - // See the comment in |UncheckedMalloc()|, it behaves as malloc() in these -@@ -653,5 +655,5 @@ TEST_F(OutOfMemoryHandledTest, UncheckedCalloc) { + #if defined(OS_ANDROID) || defined(OS_FUCHSIA) +@@ -654,7 +656,6 @@ TEST_F(OutOfMemoryHandledTest, UncheckedCalloc) { + EXPECT_EQ(0, bytes[i]); + free(value_); - #endif // BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) || defined(OS_ANDROID) +- EXPECT_FALSE(base::UncheckedCalloc(1, test_size_, &value_)); + EXPECT_TRUE(value_ == nullptr); + } --#endif // !defined(OS_OPENBSD) && BUILDFLAG(USE_ALLOCATOR_SHIM) && -+#endif // !defined(OS_BSD) && BUILDFLAG(USE_ALLOCATOR_SHIM) && - // !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) diff --git a/www/chromium/files/patch-base_process_process__metrics.h b/www/chromium/files/patch-base_process_process__metrics.h index f37e2d06ff3f..70884fc12fa6 100644 --- a/www/chromium/files/patch-base_process_process__metrics.h +++ b/www/chromium/files/patch-base_process_process__metrics.h @@ -1,4 +1,4 @@ ---- base/process/process_metrics.h.orig 2021-09-14 01:51:47 UTC +--- base/process/process_metrics.h.orig 2021-12-14 11:44:55 UTC +++ base/process/process_metrics.h @@ -37,7 +37,7 @@ #include "base/win/windows_types.h" @@ -27,7 +27,7 @@ // Convert a POSIX timeval to microseconds. BASE_EXPORT int64_t TimeValToMicroseconds(const struct timeval& tv); -@@ -105,7 +105,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -108,7 +108,7 @@ class BASE_EXPORT ProcessMetrics { // convenience wrapper for CreateProcessMetrics(). static std::unique_ptr<ProcessMetrics> CreateCurrentProcessMetrics(); @@ -36,7 +36,7 @@ // Resident Set Size is a Linux/Android specific memory concept. Do not // attempt to extend this to other platforms. BASE_EXPORT size_t GetResidentSetSize() const; -@@ -131,7 +131,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -134,7 +134,7 @@ class BASE_EXPORT ProcessMetrics { // will result in a time delta of 2 seconds/per 1 wall-clock second. TimeDelta GetCumulativeCPUUsage() WARN_UNUSED_RESULT; @@ -45,7 +45,7 @@ defined(OS_AIX) // Emits the cumulative CPU usage for all currently active threads since they // were started into the output parameter (replacing its current contents). -@@ -166,7 +166,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -169,7 +169,7 @@ class BASE_EXPORT ProcessMetrics { bool ParseProcTimeInState(const std::string& content, PlatformThreadId tid, TimeInStatePerThread& time_in_state_per_thread); @@ -54,7 +54,7 @@ // defined(OS_AIX) // Returns the number of average idle cpu wakeups per second since the last -@@ -215,14 +215,14 @@ class BASE_EXPORT ProcessMetrics { +@@ -218,14 +218,14 @@ class BASE_EXPORT ProcessMetrics { int GetOpenFdSoftLimit() const; #endif // defined(OS_POSIX) @@ -71,7 +71,7 @@ // Returns total memory usage of malloc. size_t GetMallocUsage(); -@@ -234,7 +234,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -237,7 +237,7 @@ class BASE_EXPORT ProcessMetrics { ProcessMetrics(ProcessHandle process, PortProvider* port_provider); #endif // !defined(OS_MAC) @@ -80,7 +80,7 @@ defined(OS_AIX) int CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups); #endif -@@ -245,10 +245,10 @@ class BASE_EXPORT ProcessMetrics { +@@ -248,10 +248,10 @@ class BASE_EXPORT ProcessMetrics { uint64_t absolute_package_idle_wakeups); #endif @@ -93,7 +93,7 @@ // defined(OS_AIX) #if defined(OS_WIN) -@@ -270,7 +270,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -273,7 +273,7 @@ class BASE_EXPORT ProcessMetrics { // Number of bytes transferred to/from disk in bytes. uint64_t last_cumulative_disk_usage_ = 0; @@ -102,7 +102,7 @@ defined(OS_AIX) // Same thing for idle wakeups. TimeTicks last_idle_wakeups_time_; -@@ -314,7 +314,7 @@ BASE_EXPORT size_t GetHandleLimit(); +@@ -315,7 +315,7 @@ BASE_EXPORT size_t GetHandleLimit(); BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_descriptors); #endif // defined(OS_POSIX) @@ -111,7 +111,7 @@ defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_AIX) || \ defined(OS_FUCHSIA) // Data about system-wide memory consumption. Values are in KB. Available on -@@ -350,7 +350,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -351,7 +351,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { int avail_phys = 0; #endif @@ -120,7 +120,7 @@ defined(OS_AIX) // This provides an estimate of available memory as described here: // https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773 -@@ -365,7 +365,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -366,7 +366,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { int swap_free = 0; #endif @@ -129,7 +129,7 @@ defined(OS_AIX) || defined(OS_FUCHSIA) int buffers = 0; int cached = 0; -@@ -375,7 +375,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -376,7 +376,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { int inactive_file = 0; int dirty = 0; int reclaimable = 0; @@ -138,7 +138,7 @@ // defined(OS_AIX) defined(OS_FUCHSIA) #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) -@@ -398,11 +398,11 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -399,11 +399,11 @@ struct BASE_EXPORT SystemMemoryInfoKB { // Exposed for memory debugging widget. BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoKB* meminfo); @@ -152,7 +152,7 @@ defined(OS_AIX) // Parse the data found in /proc/<pid>/stat and return the sum of the // CPU-related ticks. Returns -1 on parse error. -@@ -478,7 +478,7 @@ BASE_EXPORT bool GetSystemDiskInfo(SystemDiskInfo* dis +@@ -479,7 +479,7 @@ BASE_EXPORT bool GetSystemDiskInfo(SystemDiskInfo* dis // Returns the amount of time spent in user space since boot across all CPUs. BASE_EXPORT TimeDelta GetUserCpuTimeSinceBoot(); @@ -161,7 +161,7 @@ // defined(OS_AIX) #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) -@@ -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_; diff --git a/www/chromium/files/patch-base_process_process__util__unittest.cc b/www/chromium/files/patch-base_process_process__util__unittest.cc index 9aa79d70ac60..b312c2876317 100644 --- a/www/chromium/files/patch-base_process_process__util__unittest.cc +++ b/www/chromium/files/patch-base_process_process__util__unittest.cc @@ -1,6 +1,6 @@ ---- base/process/process_util_unittest.cc.orig 2021-09-14 01:51:47 UTC +--- base/process/process_util_unittest.cc.orig 2021-12-14 11:44:55 UTC +++ base/process/process_util_unittest.cc -@@ -1336,11 +1336,11 @@ std::string TestLaunchProcess(const CommandLine& cmdli +@@ -1342,11 +1342,11 @@ std::string TestLaunchProcess(const CommandLine& cmdli options.fds_to_remap.emplace_back(fds[1], STDOUT_FILENO); #endif // defined(OS_WIN) diff --git a/www/chromium/files/patch-base_security__unittest.cc b/www/chromium/files/patch-base_security__unittest.cc index c8628452c1ee..75edbfea9696 100644 --- a/www/chromium/files/patch-base_security__unittest.cc +++ b/www/chromium/files/patch-base_security__unittest.cc @@ -1,4 +1,4 @@ ---- base/security_unittest.cc.orig 2021-04-14 18:40:48 UTC +--- base/security_unittest.cc.orig 2021-12-14 11:44:55 UTC +++ base/security_unittest.cc @@ -61,7 +61,7 @@ NOINLINE Type HideValueFromCompiler(volatile Type valu void OverflowTestsSoftExpectTrue(bool overflow_detected) { @@ -9,7 +9,7 @@ // Sadly, on Linux, Android, and OSX we don't have a good story yet. Don't // fail the test, but report. printf("Platform has overflow: %s\n", -@@ -123,7 +123,7 @@ TEST(SecurityTest, MAYBE_NewOverflow) { +@@ -121,7 +121,7 @@ TEST(SecurityTest, MAYBE_NewOverflow) { #endif // !defined(OS_WIN) || !defined(ARCH_CPU_64_BITS) } @@ -18,7 +18,7 @@ // Check if ptr1 and ptr2 are separated by less than size chars. bool ArePointersToSameArea(void* ptr1, void* ptr2, size_t size) { ptrdiff_t ptr_diff = reinterpret_cast<char*>(std::max(ptr1, ptr2)) - -@@ -177,6 +177,6 @@ TEST(SecurityTest, MALLOC_OVERFLOW_TEST(RandomMemoryAl +@@ -175,6 +175,6 @@ TEST(SecurityTest, MALLOC_OVERFLOW_TEST(RandomMemoryAl EXPECT_FALSE(impossible_random_address); } diff --git a/www/chromium/files/patch-base_synchronization_lock__impl.h b/www/chromium/files/patch-base_synchronization_lock__impl.h index e8f6b7219bfa..b64073a52629 100644 --- a/www/chromium/files/patch-base_synchronization_lock__impl.h +++ b/www/chromium/files/patch-base_synchronization_lock__impl.h @@ -1,15 +1,15 @@ ---- base/synchronization/lock_impl.h.orig 2021-04-14 18:40:48 UTC +--- base/synchronization/lock_impl.h.orig 2021-12-14 11:44:55 UTC +++ base/synchronization/lock_impl.h -@@ -105,6 +105,8 @@ void LockImpl::Unlock() { +@@ -107,6 +107,8 @@ void LockImpl::Unlock() { } #elif defined(OS_POSIX) || defined(OS_FUCHSIA) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wthread-safety-analysis" - bool LockImpl::Try() { - int rv = pthread_mutex_trylock(&native_handle_); -@@ -116,6 +118,7 @@ void LockImpl::Unlock() { + BASE_EXPORT std::string SystemErrorCodeToString(int error_code); + +@@ -121,6 +123,7 @@ void LockImpl::Unlock() { int rv = pthread_mutex_unlock(&native_handle_); DCHECK_EQ(rv, 0) << ". " << strerror(rv); } diff --git a/www/chromium/files/patch-base_syslog__logging.cc b/www/chromium/files/patch-base_syslog__logging.cc index b4460c41a14b..9c9bf076d52b 100644 --- a/www/chromium/files/patch-base_syslog__logging.cc +++ b/www/chromium/files/patch-base_syslog__logging.cc @@ -1,4 +1,4 @@ ---- base/syslog_logging.cc.orig 2021-04-14 18:40:48 UTC +--- base/syslog_logging.cc.orig 2021-12-31 00:57:18 UTC +++ base/syslog_logging.cc @@ -13,7 +13,7 @@ #include "base/strings/string_util.h" @@ -9,7 +9,7 @@ // <syslog.h> defines LOG_INFO, LOG_WARNING macros that could conflict with // base::LOG_INFO, base::LOG_WARNING. #include <syslog.h> -@@ -134,7 +134,7 @@ EventLogMessage::~EventLogMessage() { +@@ -145,7 +145,7 @@ EventLogMessage::~EventLogMessage() { if (user_sid != nullptr) ::LocalFree(user_sid); diff --git a/www/chromium/files/patch-base_system_sys__info.cc b/www/chromium/files/patch-base_system_sys__info.cc index 42f73e193cd3..ad07c1b750e5 100644 --- a/www/chromium/files/patch-base_system_sys__info.cc +++ b/www/chromium/files/patch-base_system_sys__info.cc @@ -1,6 +1,6 @@ ---- base/system/sys_info.cc.orig 2021-09-14 01:51:47 UTC +--- base/system/sys_info.cc.orig 2021-12-14 11:44:55 UTC +++ base/system/sys_info.cc -@@ -91,7 +91,7 @@ void SysInfo::GetHardwareInfo(base::OnceCallback<void( +@@ -92,7 +92,7 @@ void SysInfo::GetHardwareInfo(base::OnceCallback<void( #if defined(OS_WIN) || defined(OS_ANDROID) || defined(OS_APPLE) base::ThreadPool::PostTaskAndReplyWithResult( FROM_HERE, {}, base::BindOnce(&GetHardwareInfoSync), std::move(callback)); diff --git a/www/chromium/files/patch-base_system_sys__info__unittest.cc b/www/chromium/files/patch-base_system_sys__info__unittest.cc index d0e725d262d7..e266b5462fbe 100644 --- a/www/chromium/files/patch-base_system_sys__info__unittest.cc +++ b/www/chromium/files/patch-base_system_sys__info__unittest.cc @@ -1,6 +1,6 @@ ---- base/system/sys_info_unittest.cc.orig 2021-04-14 18:40:48 UTC +--- base/system/sys_info_unittest.cc.orig 2021-12-31 00:57:18 UTC +++ base/system/sys_info_unittest.cc -@@ -63,13 +63,13 @@ TEST_F(SysInfoTest, AmountOfMem) { +@@ -64,13 +64,13 @@ TEST_F(SysInfoTest, AmountOfMem) { EXPECT_GE(SysInfo::AmountOfVirtualMemory(), 0); } @@ -17,7 +17,7 @@ TEST_F(SysInfoTest, MAYBE_AmountOfAvailablePhysicalMemory) { // Note: info is in _K_bytes. SystemMemoryInfoKB info; -@@ -100,7 +100,7 @@ TEST_F(SysInfoTest, MAYBE_AmountOfAvailablePhysicalMem +@@ -101,7 +101,7 @@ TEST_F(SysInfoTest, MAYBE_AmountOfAvailablePhysicalMem EXPECT_GT(amount, static_cast<int64_t>(info.free) * 1024); EXPECT_LT(amount / 1024, info.total); } @@ -26,7 +26,7 @@ TEST_F(SysInfoTest, AmountOfFreeDiskSpace) { // We aren't actually testing that it's correct, just that it's sane. -@@ -150,7 +150,7 @@ TEST_F(SysInfoTest, NestedVolumesAmountOfTotalDiskSpac +@@ -141,7 +141,7 @@ TEST_F(SysInfoTest, NestedVolumesAmountOfTotalDiskSpac } #endif // defined(OS_FUCHSIA) @@ -35,7 +35,7 @@ defined(OS_CHROMEOS) || defined(OS_FUCHSIA) TEST_F(SysInfoTest, OperatingSystemVersionNumbers) { int32_t os_major_version = -1; -@@ -236,7 +236,7 @@ TEST_F(SysInfoTest, GetHardwareInfo) { +@@ -227,7 +227,7 @@ TEST_F(SysInfoTest, GetHardwareInfo) { EXPECT_TRUE(IsStringUTF8(hardware_info->model)); bool empty_result_expected = #if defined(OS_ANDROID) || defined(OS_APPLE) || defined(OS_WIN) || \ diff --git a/www/chromium/files/patch-base_test_launcher_test__launcher.cc b/www/chromium/files/patch-base_test_launcher_test__launcher.cc index e85c81a29ad7..13fb245637cf 100644 --- a/www/chromium/files/patch-base_test_launcher_test__launcher.cc +++ b/www/chromium/files/patch-base_test_launcher_test__launcher.cc @@ -1,6 +1,6 @@ ---- base/test/launcher/test_launcher.cc.orig 2021-09-14 01:51:47 UTC +--- base/test/launcher/test_launcher.cc.orig 2021-12-14 11:44:55 UTC +++ base/test/launcher/test_launcher.cc -@@ -61,6 +61,7 @@ +@@ -62,6 +62,7 @@ #include "testing/gtest/include/gtest/gtest.h" #if defined(OS_POSIX) @@ -8,7 +8,7 @@ #include <fcntl.h> #include "base/files/file_descriptor_watcher_posix.h" -@@ -607,7 +608,7 @@ ChildProcessResults DoLaunchChildTestProcess( +@@ -620,7 +621,7 @@ ChildProcessResults DoLaunchChildTestProcess( #if !defined(OS_FUCHSIA) options.new_process_group = true; #endif @@ -17,7 +17,7 @@ options.kill_on_parent_death = true; #endif -@@ -1529,7 +1530,7 @@ bool TestLauncher::Init(CommandLine* command_line) { +@@ -1571,7 +1572,7 @@ bool TestLauncher::Init(CommandLine* command_line) { results_tracker_.AddGlobalTag("OS_IOS"); #endif diff --git a/www/chromium/files/patch-base_test_test__suite.cc b/www/chromium/files/patch-base_test_test__suite.cc index 40cf54e73b22..511cfda2c7e8 100644 --- a/www/chromium/files/patch-base_test_test__suite.cc +++ b/www/chromium/files/patch-base_test_test__suite.cc @@ -1,15 +1,6 @@ ---- base/test/test_suite.cc.orig 2021-09-14 01:51:47 UTC +--- base/test/test_suite.cc.orig 2022-01-05 13:32:44 UTC +++ base/test/test_suite.cc -@@ -68,7 +68,7 @@ - #include "base/test/test_support_android.h" - #endif - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - #include "base/test/fontconfig_util_linux.h" - #endif - -@@ -217,7 +217,7 @@ class CheckForLeakedGlobals : public testing::EmptyTes +@@ -221,7 +221,7 @@ class CheckForLeakedGlobals : public testing::EmptyTes }; // base::Process is not available on iOS @@ -18,33 +9,7 @@ class CheckProcessPriority : public testing::EmptyTestEventListener { public: CheckProcessPriority() { CHECK(!IsProcessBackgrounded()); } -@@ -354,14 +354,14 @@ void TestSuite::PreInitialize() { - testing::GTEST_FLAG(catch_exceptions) = false; - #endif - EnableTerminationOnHeapCorruption(); --#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(USE_AURA) -+#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(USE_AURA) - // When calling native char conversion functions (e.g wrctomb) we need to - // have the locale set. In the absence of such a call the "C" locale is the - // default. In the gtk code (below) gtk_init() implicitly sets a locale. - setlocale(LC_ALL, ""); - // We still need number to string conversions to be locale insensitive. - setlocale(LC_NUMERIC, "C"); --#endif // (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(USE_AURA) -+#endif // (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(USE_AURA) - - // On Android, AtExitManager is created in - // testing/android/native_test_wrapper.cc before main() is called. -@@ -635,7 +635,7 @@ void TestSuite::Initialize() { - // TODO(jshin): Should we set the locale via an OS X locale API here? - i18n::SetICUDefaultLocale("en_US"); - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - SetUpFontconfig(); - #endif - -@@ -648,7 +648,7 @@ void TestSuite::Initialize() { +@@ -634,7 +634,7 @@ void TestSuite::Initialize() { if (check_for_leaked_globals_) listeners.Append(new CheckForLeakedGlobals); if (check_for_thread_and_process_priority_) { diff --git a/www/chromium/files/patch-base_threading_platform__thread.h b/www/chromium/files/patch-base_threading_platform__thread.h index bd9ca23b258a..bff55b7b82ca 100644 --- a/www/chromium/files/patch-base_threading_platform__thread.h +++ b/www/chromium/files/patch-base_threading_platform__thread.h @@ -1,7 +1,7 @@ ---- base/threading/platform_thread.h.orig 2021-09-24 04:25:56 UTC +--- base/threading/platform_thread.h.orig 2021-12-31 00:57:18 UTC +++ base/threading/platform_thread.h -@@ -240,7 +240,7 @@ class BASE_EXPORT PlatformThread { - // Returns a realtime period provided by |delegate|. +@@ -244,7 +244,7 @@ class BASE_EXPORT PlatformThread { + // Returns a realtime period provided by `delegate`. static TimeDelta GetRealtimePeriod(Delegate* delegate); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) diff --git a/www/chromium/files/patch-base_threading_platform__thread__internal__posix.h b/www/chromium/files/patch-base_threading_platform__thread__internal__posix.h index 6839b0e56713..3619f1d34e67 100644 --- a/www/chromium/files/patch-base_threading_platform__thread__internal__posix.h +++ b/www/chromium/files/patch-base_threading_platform__thread__internal__posix.h @@ -1,6 +1,6 @@ ---- base/threading/platform_thread_internal_posix.h.orig 2021-07-19 18:45:05 UTC +--- base/threading/platform_thread_internal_posix.h.orig 2021-12-31 00:57:18 UTC +++ base/threading/platform_thread_internal_posix.h -@@ -47,13 +47,13 @@ bool SetCurrentThreadPriorityForPlatform(ThreadPriorit +@@ -46,13 +46,13 @@ bool SetCurrentThreadPriorityForPlatform(ThreadPriorit // of CanIncreaseThreadPriority(). absl::optional<ThreadPriority> GetCurrentThreadPriorityForPlatform(); 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 823686b3b1ce..30b2a7a63b6e 100644 --- a/www/chromium/files/patch-base_threading_platform__thread__linux.cc +++ b/www/chromium/files/patch-base_threading_platform__thread__linux.cc @@ -1,4 +1,4 @@ ---- base/threading/platform_thread_linux.cc.orig 2021-10-01 01:36:37 UTC +--- base/threading/platform_thread_linux.cc.orig 2022-01-20 10:35:46 UTC +++ base/threading/platform_thread_linux.cc @@ -29,7 +29,9 @@ @@ -10,8 +10,21 @@ #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) +@@ -61,7 +63,7 @@ int g_scheduler_boost_adj; + int g_scheduler_limit_adj; + bool g_scheduler_use_latency_tune_adj; + +-#if !defined(OS_NACL) && !defined(OS_AIX) ++#if !defined(OS_NACL) && !defined(OS_AIX) && !defined(OS_BSD) + + // Defined by linux uclamp ABI of sched_setattr(). + const uint32_t kSchedulerUclampMin = 0; +@@ -129,10 +131,10 @@ int sched_setattr(pid_t pid, + unsigned int flags) { + return syscall(__NR_sched_setattr, pid, attr, flags); + } +-#endif // !defined(OS_NACL) && !defined(OS_AIX) ++#endif // !defined(OS_NACL) && !defined(OS_AIX) && !defined(OS_BSD) #endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) -#if !defined(OS_NACL) @@ -19,16 +32,25 @@ const FilePath::CharType kCgroupDirectory[] = FILE_PATH_LITERAL("/sys/fs/cgroup"); -@@ -300,7 +302,7 @@ const ThreadPriorityToNiceValuePair kThreadPriorityToN +@@ -286,7 +288,7 @@ void SetThreadCgroupsForThreadPriority(PlatformThreadI + namespace internal { + + namespace { +-#if !defined(OS_NACL) ++#if !defined(OS_NACL) && !defined(OS_BSD) + const struct sched_param kRealTimePrio = {8}; + #endif + } // namespace +@@ -299,7 +301,7 @@ const ThreadPriorityToNiceValuePair kThreadPriorityToN + }; - absl::optional<bool> CanIncreaseCurrentThreadPriorityForPlatform( - ThreadPriority priority) { + bool CanSetThreadPriorityToRealtimeAudio() { -#if !defined(OS_NACL) +#if !defined(OS_NACL) && !defined(OS_BSD) // A non-zero soft-limit on RLIMIT_RTPRIO is required to be allowed to invoke // pthread_setschedparam in SetCurrentThreadPriorityForPlatform(). struct rlimit rlim; -@@ -313,7 +315,7 @@ absl::optional<bool> CanIncreaseCurrentThreadPriorityF +@@ -310,7 +312,7 @@ bool CanSetThreadPriorityToRealtimeAudio() { } bool SetCurrentThreadPriorityForPlatform(ThreadPriority priority) { @@ -37,7 +59,16 @@ // For legacy schedtune interface SetThreadCgroupsForThreadPriority(PlatformThread::CurrentId(), priority); -@@ -350,7 +352,7 @@ absl::optional<ThreadPriority> GetCurrentThreadPriorit +@@ -328,7 +330,7 @@ bool SetCurrentThreadPriorityForPlatform(ThreadPriorit + } + + absl::optional<ThreadPriority> GetCurrentThreadPriorityForPlatform() { +-#if !defined(OS_NACL) ++#if !defined(OS_NACL) && !defined(OS_BSD) + int maybe_sched_rr = 0; + struct sched_param maybe_realtime_prio = {0}; + if (pthread_getschedparam(pthread_self(), &maybe_sched_rr, +@@ -347,7 +349,7 @@ absl::optional<ThreadPriority> GetCurrentThreadPriorit void PlatformThread::SetName(const std::string& name) { ThreadIdNameManager::GetInstance()->SetName(name); @@ -46,7 +77,16 @@ // 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 -@@ -380,8 +382,10 @@ void PlatformThread::SetThreadPriority(ProcessId proce +@@ -364,7 +366,7 @@ void PlatformThread::SetName(const std::string& name) + // We expect EPERM failures in sandboxed processes, just ignore those. + if (err < 0 && errno != EPERM) + DPLOG(ERROR) << "prctl(PR_SET_NAME)"; +-#endif // !defined(OS_NACL) && !defined(OS_AIX) ++#endif // !defined(OS_NACL) && !defined(OS_AIX) && !defined(OS_BSD) + } + + #if !defined(OS_NACL) && !defined(OS_AIX) +@@ -377,8 +379,10 @@ void PlatformThread::SetThreadPriority(ProcessId proce // priority. CHECK_NE(thread_id, process_id); @@ -57,7 +97,7 @@ #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) // For upstream uclamp interface. We try both legacy (schedtune, as done -@@ -438,7 +442,9 @@ void InitThreading() {} +@@ -435,7 +439,9 @@ void InitThreading() {} void TerminateOnThread() {} size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) { 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 e75f4b2de1b5..010ad62d6f9f 100644 --- a/www/chromium/files/patch-base_threading_platform__thread__posix.cc +++ b/www/chromium/files/patch-base_threading_platform__thread__posix.cc @@ -1,6 +1,6 @@ ---- base/threading/platform_thread_posix.cc.orig 2021-09-14 01:51:47 UTC +--- base/threading/platform_thread_posix.cc.orig 2021-12-14 11:44:55 UTC +++ base/threading/platform_thread_posix.cc -@@ -32,6 +32,10 @@ +@@ -33,6 +33,10 @@ #include <sys/syscall.h> #endif @@ -11,7 +11,7 @@ #if defined(OS_FUCHSIA) #include <zircon/process.h> #else -@@ -193,6 +197,8 @@ PlatformThreadId PlatformThread::CurrentId() { +@@ -194,6 +198,8 @@ PlatformThreadId PlatformThread::CurrentId() { // into the kernel. #if defined(OS_APPLE) return pthread_mach_thread_np(pthread_self()); diff --git a/www/chromium/files/patch-base_threading_platform__thread__unittest.cc b/www/chromium/files/patch-base_threading_platform__thread__unittest.cc index a784071e91e7..17d59aae5527 100644 --- a/www/chromium/files/patch-base_threading_platform__thread__unittest.cc +++ b/www/chromium/files/patch-base_threading_platform__thread__unittest.cc @@ -1,15 +1,15 @@ ---- base/threading/platform_thread_unittest.cc.orig 2021-09-14 01:51:47 UTC +--- base/threading/platform_thread_unittest.cc.orig 2022-01-20 10:35:46 UTC +++ base/threading/platform_thread_unittest.cc -@@ -313,7 +313,7 @@ TEST(PlatformThreadTest, +@@ -311,7 +311,7 @@ TEST(PlatformThreadTest, // and hardcodes what we know. Please inform scheduler-dev@chromium.org if this // proprerty changes for a given platform. - TEST(PlatformThreadTest, CanIncreaseThreadPriority) { + TEST(PlatformThreadTest, CanChangeThreadPriority) { -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_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; -@@ -404,9 +404,9 @@ TEST(PlatformThreadTest, SetHugeThreadName) { +@@ -409,9 +409,9 @@ TEST(PlatformThreadTest, SetHugeThreadName) { TEST(PlatformThreadTest, GetDefaultThreadStackSize) { size_t stack_size = PlatformThread::GetDefaultThreadStackSize(); diff --git a/www/chromium/files/patch-base_threading_scoped__blocking__call__unittest.cc b/www/chromium/files/patch-base_threading_scoped__blocking__call__unittest.cc index e90dcf410c0d..d51bf587bd36 100644 --- a/www/chromium/files/patch-base_threading_scoped__blocking__call__unittest.cc +++ b/www/chromium/files/patch-base_threading_scoped__blocking__call__unittest.cc @@ -1,6 +1,6 @@ ---- base/threading/scoped_blocking_call_unittest.cc.orig 2021-09-14 01:51:47 UTC +--- base/threading/scoped_blocking_call_unittest.cc.orig 2021-12-14 11:44:55 UTC +++ base/threading/scoped_blocking_call_unittest.cc -@@ -302,7 +302,7 @@ TEST_F(ScopedBlockingCallIOJankMonitoringTest, ManyInA +@@ -282,7 +282,7 @@ TEST_F(ScopedBlockingCallIOJankMonitoringTest, ManyInA } TEST_F(ScopedBlockingCallIOJankMonitoringTest, OverlappingMultipleWindows) { @@ -9,7 +9,7 @@ internal::IOJankMonitoringWindow::kMonitoringWindow * 3 + internal::IOJankMonitoringWindow::kIOJankInterval * 5; -@@ -559,7 +559,7 @@ TEST_F(ScopedBlockingCallIOJankMonitoringTest, MultiTh +@@ -538,7 +538,7 @@ TEST_F(ScopedBlockingCallIOJankMonitoringTest, MultiTh // First one starting at 10 seconds (can't start later than that or we'll trip // the kTimeDiscrepancyTimeout per TaskEnvironment's inability to RunUntilIdle() // with pending blocked tasks). diff --git a/www/chromium/files/patch-base_threading_thread__task__runner__handle.cc b/www/chromium/files/patch-base_threading_thread__task__runner__handle.cc index bc03e79e565a..821e6f66682f 100644 --- a/www/chromium/files/patch-base_threading_thread__task__runner__handle.cc +++ b/www/chromium/files/patch-base_threading_thread__task__runner__handle.cc @@ -1,4 +1,4 @@ ---- base/threading/thread_task_runner_handle.cc.orig 2021-04-14 18:40:48 UTC +--- base/threading/thread_task_runner_handle.cc.orig 2021-12-14 11:44:55 UTC +++ base/threading/thread_task_runner_handle.cc @@ -8,6 +8,7 @@ #include <utility> @@ -6,9 +6,9 @@ #include "base/bind.h" +#include "base/callback_helpers.h" #include "base/check_op.h" + #include "base/dcheck_is_on.h" #include "base/lazy_instance.h" - #include "base/run_loop.h" -@@ -33,6 +34,7 @@ const scoped_refptr<SingleThreadTaskRunner>& ThreadTas +@@ -40,6 +41,7 @@ const scoped_refptr<SingleThreadTaskRunner>& ThreadTas return current->task_runner_; } @@ -16,7 +16,7 @@ // static bool ThreadTaskRunnerHandle::IsSet() { return !!thread_task_runner_tls.Pointer()->Get(); -@@ -80,6 +82,7 @@ ThreadTaskRunnerHandleOverride::ThreadTaskRunnerHandle +@@ -87,6 +89,7 @@ ThreadTaskRunnerHandleOverride::ThreadTaskRunnerHandle if (!allow_nested_runloop) no_running_during_override_.emplace(); } diff --git a/www/chromium/files/patch-base_trace__event_heap__profiler__allocation__context__tracker.cc b/www/chromium/files/patch-base_trace__event_heap__profiler__allocation__context__tracker.cc index 0d931d1190e3..510fe325059f 100644 --- a/www/chromium/files/patch-base_trace__event_heap__profiler__allocation__context__tracker.cc +++ b/www/chromium/files/patch-base_trace__event_heap__profiler__allocation__context__tracker.cc @@ -1,4 +1,4 @@ ---- base/trace_event/heap_profiler_allocation_context_tracker.cc.orig 2021-07-19 18:45:05 UTC +--- base/trace_event/heap_profiler_allocation_context_tracker.cc.orig 2021-12-14 11:44:55 UTC +++ base/trace_event/heap_profiler_allocation_context_tracker.cc @@ -30,6 +30,10 @@ #include <sys/prctl.h> @@ -30,7 +30,7 @@ if (!err) { + return strdup(name); + } -+#elif defined(OS_BSD) && __FreeBSD__ >= 12 ++#elif defined(OS_BSD) + pthread_get_name_np(pthread_self(), name, kBufferLen); + if (*name != '\0') { return strdup(name); 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 fb2f57729c8b..0ccf72a1fbf6 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,4 +1,4 @@ ---- base/trace_event/malloc_dump_provider.cc.orig 2021-09-24 04:25:56 UTC +--- base/trace_event/malloc_dump_provider.cc.orig 2021-12-14 11:44:55 UTC +++ base/trace_event/malloc_dump_provider.cc @@ -23,6 +23,8 @@ @@ -9,7 +9,7 @@ #else #include <malloc.h> #endif -@@ -213,6 +215,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump +@@ -217,6 +219,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump &allocated_objects_count); #elif defined(OS_FUCHSIA) // TODO(fuchsia): Port, see https://crbug.com/706592. diff --git a/www/chromium/files/patch-build_config_BUILDCONFIG.gn b/www/chromium/files/patch-build_config_BUILDCONFIG.gn index a9ad6db86deb..3918db73189b 100644 --- a/www/chromium/files/patch-build_config_BUILDCONFIG.gn +++ b/www/chromium/files/patch-build_config_BUILDCONFIG.gn @@ -1,6 +1,6 @@ ---- build/config/BUILDCONFIG.gn.orig 2021-05-12 22:05:40 UTC +--- build/config/BUILDCONFIG.gn.orig 2021-12-31 00:57:18 UTC +++ build/config/BUILDCONFIG.gn -@@ -184,8 +184,8 @@ if (host_toolchain == "") { +@@ -189,8 +189,8 @@ if (host_toolchain == "") { # TODO(dpranke): Add some sort of assert here that verifies that # no toolchain omitted host_toolchain from its toolchain_args(). @@ -11,7 +11,7 @@ host_toolchain = "//build/toolchain/linux:clang_$host_cpu" } else if (is_clang) { host_toolchain = "//build/toolchain/linux:clang_$host_cpu" -@@ -222,7 +222,7 @@ if (target_os == "android") { +@@ -229,7 +229,7 @@ if (target_os == "android") { assert(host_os == "linux" || host_os == "mac", "Android builds are only supported on Linux and Mac hosts.") _default_toolchain = "//build/toolchain/android:android_clang_$target_cpu" @@ -20,7 +20,7 @@ # See comments in build/toolchain/cros/BUILD.gn about board compiles. if (is_clang) { _default_toolchain = "//build/toolchain/linux:clang_$target_cpu" -@@ -284,10 +284,11 @@ if (custom_toolchain != "") { +@@ -293,10 +293,11 @@ if (custom_toolchain != "") { # current_os value directly. is_android = current_os == "android" diff --git a/www/chromium/files/patch-build_config_compiler_BUILD.gn b/www/chromium/files/patch-build_config_compiler_BUILD.gn index b2581f2d38cb..a74be1cecbd7 100644 --- a/www/chromium/files/patch-build_config_compiler_BUILD.gn +++ b/www/chromium/files/patch-build_config_compiler_BUILD.gn @@ -1,6 +1,6 @@ ---- build/config/compiler/BUILD.gn.orig 2021-09-24 04:25:56 UTC +--- build/config/compiler/BUILD.gn.orig 2021-12-31 00:57:18 UTC +++ build/config/compiler/BUILD.gn -@@ -139,7 +139,7 @@ declare_args() { +@@ -140,7 +140,7 @@ declare_args() { # # TODO(crbug.com/1131993): Enabling this when 'is_android' is true breaks # content_shell_test_apk on both ARM and x86. @@ -9,7 +9,7 @@ # This argument is to control whether enabling text section splitting in the # final binary. When enabled, the separated text sections with prefix -@@ -238,7 +238,7 @@ config("default_include_dirs") { +@@ -241,7 +241,7 @@ config("default_include_dirs") { # Compiler instrumentation can introduce dependencies in DSOs to symbols in # the executable they are loaded into, so they are unresolved at link-time. config("no_unresolved_symbols") { @@ -18,25 +18,25 @@ (is_linux || is_chromeos || is_android || is_fuchsia)) { ldflags = [ "-Wl,-z,defs", -@@ -354,7 +354,7 @@ config("compiler") { +@@ -361,7 +361,7 @@ config("compiler") { } # Linker warnings. -- if (fatal_linker_warnings && !is_apple && current_os != "aix") { -+ if (fatal_linker_warnings && !is_apple && !is_bsd && current_os != "aix") { +- if (fatal_linker_warnings && !is_apple && current_os != "aix" && ++ if (fatal_linker_warnings && !is_apple && !is_bsd && current_os != "aix" && + current_os != "zos") { ldflags += [ "-Wl,--fatal-warnings" ] } - if (fatal_linker_warnings && is_apple) { -@@ -530,7 +530,7 @@ config("compiler") { +@@ -539,7 +539,7 @@ config("compiler") { ldflags += [ "-Wl,-z,keep-text-section-prefix" ] } -- if (is_clang && !is_nacl && !use_xcode_clang) { -+ if (is_clang && !is_nacl && !use_xcode_clang && !is_bsd) { +- if (is_clang && !is_nacl && !use_xcode_clang && current_os != "zos") { ++ if (is_clang && !is_nacl && !is_bsd && !use_xcode_clang && current_os != "zos") { cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ] # TODO(hans): Remove this once Clang generates better optimized debug info -@@ -680,7 +680,12 @@ config("compiler") { +@@ -682,7 +682,12 @@ config("compiler") { # and let it use all cores. # TODO(thakis): Check if '=0' (that is, number of cores, instead # of "all" which means number of hardware threads) is faster. @@ -50,7 +50,7 @@ if (is_mac) { ldflags += [ "-Wl,-cache_path_lto," + -@@ -879,7 +884,7 @@ config("compiler_cpu_abi") { +@@ -910,7 +915,7 @@ config("compiler_cpu_abi") { cflags += [ "-mtune=$arm_tune" ] } } else if (current_cpu == "arm64") { @@ -59,7 +59,7 @@ cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] } -@@ -1231,6 +1236,9 @@ config("compiler_deterministic") { +@@ -1266,6 +1271,9 @@ config("compiler_deterministic") { "-Xclang", ".", ] @@ -69,16 +69,16 @@ } else { # -ffile-compilation-dir is an alias for both -fdebug-compilation-dir= # and -fcoverage-compilation-dir=. -@@ -1610,7 +1618,7 @@ config("default_warnings") { +@@ -1519,7 +1527,7 @@ config("default_warnings") { cflags += [ "-Wno-null-pointer-subtraction" ] } - if (current_toolchain == host_toolchain || !use_xcode_clang) { + if ((current_toolchain == host_toolchain || !use_xcode_clang) && !is_bsd) { - # Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not - # recognize. + # Flags Xcode 9.2 (Clang clang-900.0.39.2) does not recognize. cflags += [ -@@ -1643,6 +1651,18 @@ config("default_warnings") { + "-Wenum-compare-conditional", +@@ -1549,6 +1557,18 @@ config("default_warnings") { cflags += [ "-Wmax-tokens" ] } } @@ -97,16 +97,16 @@ } } } -@@ -1781,7 +1801,7 @@ config("no_chromium_code") { +@@ -1684,7 +1704,7 @@ config("no_chromium_code") { # third-party libraries. "-Wno-c++11-narrowing", ] - if (!is_nacl && (current_toolchain == host_toolchain || !use_xcode_clang)) { + if (!is_nacl && (current_toolchain == host_toolchain || !use_xcode_clang) && !is_bsd) { cflags += [ - # TODO(https://crbug.com/1202159): Clean up and enable. - "-Wno-misleading-indentation", -@@ -1861,7 +1881,7 @@ config("thin_archive") { + # Disabled for similar reasons as -Wunused-variable. + "-Wno-unused-but-set-variable", +@@ -1767,7 +1787,7 @@ config("thin_archive") { # archives. # TODO(crbug.com/1221615): Enable on is_apple if use_lld once that no longer # confuses lldb. @@ -115,21 +115,25 @@ arflags = [ "-T" ] } else if (is_win && use_lld) { arflags = [ "/llvmlibthin" ] -@@ -2353,7 +2373,7 @@ config("symbols") { +@@ -2267,7 +2287,11 @@ config("symbols") { # flag, so we can use use -g1 for pnacl and nacl-clang compiles. # gcc nacl is is_nacl && !is_clang, pnacl and nacl-clang are && is_clang. - if (!is_nacl || is_clang) { + if ((!is_nacl || is_clang) && current_os != "zos") { - cflags += [ "-g2" ] -+ cflags += [ "-g0" ] ++ if (is_bsd) { ++ cflags += [ "-g0" ] ++ } else { ++ cflags += [ "-g2" ] ++ } } - if (is_apple) { -@@ -2378,7 +2398,7 @@ config("symbols") { + # Since only one of the build options -gdwarf-aranges and -fembed-bitcode +@@ -2307,7 +2331,7 @@ config("symbols") { # DWARF info may be corrupt; offsets in a range list entry are in different # sections" there. Maybe just a bug in nacl_switch_32.S. - if (!is_apple && !is_nacl && current_cpu != "x86" && -- (use_gold || use_lld)) { -+ (use_gold || use_lld) && !is_bsd) { - if (is_clang) { - # This flag enables the GNU-format pubnames and pubtypes sections, - # which lld needs in order to generate a correct GDB index. + _enable_gdb_index = +- symbol_level == 2 && !is_apple && !is_nacl && current_cpu != "x86" && ++ symbol_level == 2 && !is_apple && !is_nacl && !is_bsd && current_cpu != "x86" && + current_os != "zos" && (use_gold || use_lld) && + # Disable on non-fission 32-bit Android because it pushes + # libcomponents_unittests over the 4gb size limit. diff --git a/www/chromium/files/patch-build_config_compiler_compiler.gni b/www/chromium/files/patch-build_config_compiler_compiler.gni index 821a613e30c3..a0b6161c64d8 100644 --- a/www/chromium/files/patch-build_config_compiler_compiler.gni +++ b/www/chromium/files/patch-build_config_compiler_compiler.gni @@ -1,6 +1,6 @@ ---- build/config/compiler/compiler.gni.orig 2021-09-14 01:51:47 UTC +--- build/config/compiler/compiler.gni.orig 2021-12-31 00:57:18 UTC +++ build/config/compiler/compiler.gni -@@ -205,7 +205,7 @@ declare_args() { +@@ -219,7 +219,7 @@ declare_args() { declare_args() { # Whether to use the gold linker from binutils instead of lld or bfd. diff --git a/www/chromium/files/patch-build_config_ozone.gni b/www/chromium/files/patch-build_config_ozone.gni index 46330d6927de..bf85cab41c34 100644 --- a/www/chromium/files/patch-build_config_ozone.gni +++ b/www/chromium/files/patch-build_config_ozone.gni @@ -1,6 +1,6 @@ ---- build/config/ozone.gni.orig 2021-09-24 04:25:56 UTC +--- build/config/ozone.gni.orig 2021-12-14 11:44:55 UTC +++ build/config/ozone.gni -@@ -85,6 +85,9 @@ declare_args() { +@@ -91,6 +91,9 @@ declare_args() { } else if (is_chromeos_lacros) { ozone_platform = "wayland" ozone_platform_wayland = true diff --git a/www/chromium/files/patch-build_config_rust.gni b/www/chromium/files/patch-build_config_rust.gni new file mode 100644 index 000000000000..bdf651b6b961 --- /dev/null +++ b/www/chromium/files/patch-build_config_rust.gni @@ -0,0 +1,11 @@ +--- build/config/rust.gni.orig 2021-12-31 00:57:18 UTC ++++ build/config/rust.gni +@@ -67,7 +67,7 @@ toolchain_has_official_rust = + (!is_nacl && + (is_android && (current_cpu == "arm" || current_cpu == "arm64" || + current_cpu == "x64" || current_cpu == "x86"))) || +- (is_linux && current_cpu == "x64") ++ ((is_linux && !is_bsd) && current_cpu == "x64") + + toolchain_has_rust = enable_rust && (toolchain_has_official_rust || + use_unverified_rust_toolchain) diff --git a/www/chromium/files/patch-build_linux_unbundle_replace__gn__files.py b/www/chromium/files/patch-build_linux_unbundle_replace__gn__files.py index 7513f8ebb1fc..fe360f1a2deb 100644 --- a/www/chromium/files/patch-build_linux_unbundle_replace__gn__files.py +++ b/www/chromium/files/patch-build_linux_unbundle_replace__gn__files.py @@ -1,6 +1,6 @@ ---- build/linux/unbundle/replace_gn_files.py.orig 2021-04-14 18:40:48 UTC +--- build/linux/unbundle/replace_gn_files.py.orig 2021-12-14 11:44:55 UTC +++ build/linux/unbundle/replace_gn_files.py -@@ -27,6 +27,7 @@ REPLACEMENTS = { +@@ -25,6 +25,7 @@ REPLACEMENTS = { 'libevent': 'base/third_party/libevent/BUILD.gn', 'libjpeg': 'third_party/libjpeg.gni', 'libpng': 'third_party/libpng/BUILD.gn', diff --git a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni index f27a62b5d4f3..02a487657479 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 2021-09-14 01:51:47 UTC +--- build/toolchain/gcc_toolchain.gni.orig 2022-01-20 10:35:46 UTC +++ build/toolchain/gcc_toolchain.gni -@@ -48,6 +48,11 @@ if (enable_resource_allowlist_generation) { +@@ -49,6 +49,11 @@ if (enable_resource_allowlist_generation) { "enable_resource_allowlist_generation=true does not work for target_os=$target_os") } @@ -12,28 +12,15 @@ # This template defines a toolchain for something that works like gcc # (including clang). # -@@ -666,20 +671,32 @@ template("gcc_toolchain") { - # actually just be doing a native compile. The invoker can optionally override +@@ -731,13 +736,23 @@ template("gcc_toolchain") { # use_gold too. template("clang_toolchain") { -- if (defined(invoker.toolprefix)) { -- toolprefix = invoker.toolprefix -- } else { -- toolprefix = "" -+ if (!is_bsd) { -+ if (defined(invoker.toolprefix)) { -+ toolprefix = invoker.toolprefix -+ } else { -+ toolprefix = "" -+ } - } - gcc_toolchain(target_name) { - prefix = rebase_path("$clang_base_path/bin", root_build_dir) -- cc = "$prefix/clang" -- cxx = "$prefix/clang++" +- cc = "${prefix}/clang" +- cxx = "${prefix}/clang++" - ld = cxx -- readelf = "${toolprefix}readelf" +- readelf = "${prefix}/llvm-readelf" - ar = "${prefix}/llvm-ar" - nm = "${prefix}/llvm-nm" + if (is_bsd) { @@ -46,10 +33,10 @@ + nm = "${prefix}/nm" + } else { + prefix = rebase_path("$clang_base_path/bin", root_build_dir) -+ cc = "$prefix/clang" -+ cxx = "$prefix/clang++" ++ cc = "${prefix}/clang" ++ cxx = "${prefix}/clang++" + ld = cxx -+ readelf = "${toolprefix}readelf" ++ readelf = "${prefix}/llvm-readelf" + ar = "${prefix}/llvm-ar" + nm = "${prefix}/llvm-nm" + } diff --git a/www/chromium/files/patch-build_toolchain_linux_BUILD.gn b/www/chromium/files/patch-build_toolchain_linux_BUILD.gn deleted file mode 100644 index f4d88ae95db0..000000000000 --- a/www/chromium/files/patch-build_toolchain_linux_BUILD.gn +++ /dev/null @@ -1,21 +0,0 @@ ---- build/toolchain/linux/BUILD.gn.orig 2021-06-09 22:13:52 UTC -+++ build/toolchain/linux/BUILD.gn -@@ -15,7 +15,9 @@ clang_toolchain("clang_ppc64") { - } - - clang_toolchain("clang_arm") { -- toolprefix = "arm-linux-gnueabihf-" -+ if (!is_bsd) { -+ toolprefix = "arm-linux-gnueabihf-" -+ } - toolchain_args = { - current_cpu = "arm" - current_os = "linux" -@@ -23,7 +25,6 @@ clang_toolchain("clang_arm") { - } - - clang_toolchain("clang_arm64") { -- toolprefix = "aarch64-linux-gnu-" - toolchain_args = { - current_cpu = "arm64" - current_os = "linux" diff --git a/www/chromium/files/patch-cc_BUILD.gn b/www/chromium/files/patch-cc_BUILD.gn index 6016ad192eeb..880917f66c4e 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 2021-09-24 04:25:56 UTC +--- cc/BUILD.gn.orig 2021-12-31 00:57:18 UTC +++ cc/BUILD.gn -@@ -646,7 +646,7 @@ cc_test_static_library("test_support") { +@@ -655,7 +655,7 @@ cc_test_static_library("test_support") { if (enable_vulkan) { deps += [ "//gpu/vulkan/init" ] } @@ -9,7 +9,7 @@ data_deps = [ "//third_party/mesa_headers" ] } } -@@ -864,7 +864,6 @@ cc_test("cc_unittests") { +@@ -879,7 +879,6 @@ cc_test("cc_unittests") { ] data_deps = [ "//testing/buildbot/filters:cc_unittests_filters", diff --git a/www/chromium/files/patch-cc_layers_scrollbar__layer__impl__base.cc b/www/chromium/files/patch-cc_layers_scrollbar__layer__impl__base.cc index 9b6e8ccff5a8..e77f9cd02006 100644 --- a/www/chromium/files/patch-cc_layers_scrollbar__layer__impl__base.cc +++ b/www/chromium/files/patch-cc_layers_scrollbar__layer__impl__base.cc @@ -1,6 +1,6 @@ ---- cc/layers/scrollbar_layer_impl_base.cc.orig 2021-09-24 04:25:56 UTC +--- cc/layers/scrollbar_layer_impl_base.cc.orig 2021-12-14 11:44:55 UTC +++ cc/layers/scrollbar_layer_impl_base.cc -@@ -221,8 +221,8 @@ gfx::Rect ScrollbarLayerImplBase::ComputeThumbQuadRect +@@ -223,8 +223,8 @@ gfx::Rect ScrollbarLayerImplBase::ComputeThumbQuadRect int thumb_offset = TrackStart(); if (maximum > 0) { float ratio = clamped_current_pos / maximum; diff --git a/www/chromium/files/patch-cc_test_layer__tree__test.cc b/www/chromium/files/patch-cc_test_layer__tree__test.cc index 89c9b58cb212..67cf283f9328 100644 --- a/www/chromium/files/patch-cc_test_layer__tree__test.cc +++ b/www/chromium/files/patch-cc_test_layer__tree__test.cc @@ -1,6 +1,6 @@ ---- cc/test/layer_tree_test.cc.orig 2021-09-14 01:51:47 UTC +--- cc/test/layer_tree_test.cc.orig 2021-12-31 00:57:18 UTC +++ cc/test/layer_tree_test.cc -@@ -674,7 +674,7 @@ LayerTreeTest::LayerTreeTest(viz::RendererType rendere +@@ -681,7 +681,7 @@ LayerTreeTest::LayerTreeTest(viz::RendererType rendere init_vulkan = true; } else if (renderer_type_ == viz::RendererType::kSkiaDawn) { scoped_feature_list_.InitAndEnableFeature(features::kSkiaDawn); diff --git a/www/chromium/files/patch-cc_trees_property__tree.cc b/www/chromium/files/patch-cc_trees_property__tree.cc index 1211a5a74f8f..78ee286a558a 100644 --- a/www/chromium/files/patch-cc_trees_property__tree.cc +++ b/www/chromium/files/patch-cc_trees_property__tree.cc @@ -1,19 +1,19 @@ ---- cc/trees/property_tree.cc.orig 2021-04-14 18:40:48 UTC +--- cc/trees/property_tree.cc.orig 2021-12-14 11:44:55 UTC +++ cc/trees/property_tree.cc -@@ -1299,13 +1299,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro +@@ -1299,13 +1299,13 @@ gfx::Vector2dF ScrollTree::MaxScrollOffset(int scroll_ gfx::Size clip_layer_bounds = container_bounds(scroll_node->id); -- gfx::ScrollOffset max_offset( -+ gfx::ScrollOffset _max_offset( +- gfx::Vector2dF max_offset( ++ gfx::Vector2dF _max_offset( scaled_scroll_bounds.width() - clip_layer_bounds.width(), scaled_scroll_bounds.height() - clip_layer_bounds.height()); - max_offset.Scale(1 / scale_factor); -- max_offset.SetToMax(gfx::ScrollOffset()); +- max_offset.SetToMax(gfx::Vector2dF()); - return max_offset; + _max_offset.Scale(1 / scale_factor); -+ _max_offset.SetToMax(gfx::ScrollOffset()); ++ _max_offset.SetToMax(gfx::Vector2dF()); + return _max_offset; } diff --git a/www/chromium/files/patch-chrome_BUILD.gn b/www/chromium/files/patch-chrome_BUILD.gn index 783da8838ac7..cb38a1cd1657 100644 --- a/www/chromium/files/patch-chrome_BUILD.gn +++ b/www/chromium/files/patch-chrome_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/BUILD.gn.orig 2021-09-24 04:25:56 UTC +--- chrome/BUILD.gn.orig 2021-12-31 00:57:18 UTC +++ chrome/BUILD.gn -@@ -276,7 +276,9 @@ if (!is_android && !is_mac) { +@@ -283,7 +283,9 @@ if (!is_android && !is_mac) { ":xdg_mime", # Needs to be public for installer to consume files. ] @@ -11,7 +11,7 @@ } ldflags = [] -@@ -1366,7 +1368,7 @@ group("browser_dependencies") { +@@ -1392,7 +1394,7 @@ group("browser_dependencies") { ] } @@ -20,7 +20,7 @@ public_deps += [ "//components/crash/core/app" ] } -@@ -1686,7 +1688,7 @@ if (enable_resource_allowlist_generation) { +@@ -1715,7 +1717,7 @@ if (is_win && enable_resource_allowlist_generation) { } if (is_linux || is_chromeos) { diff --git a/www/chromium/files/patch-chrome_app_BUILD.gn b/www/chromium/files/patch-chrome_app_BUILD.gn index 978ee92ead87..dea4f40726e7 100644 --- a/www/chromium/files/patch-chrome_app_BUILD.gn +++ b/www/chromium/files/patch-chrome_app_BUILD.gn @@ -1,8 +1,8 @@ ---- chrome/app/BUILD.gn.orig 2021-09-24 04:25:56 UTC +--- chrome/app/BUILD.gn.orig 2021-12-31 00:57:19 UTC +++ chrome/app/BUILD.gn -@@ -154,7 +154,7 @@ static_library("test_support") { - "//v8:v8_headers", +@@ -184,7 +184,7 @@ static_library("test_support") { ] + public_deps = [] - if (!is_fuchsia) { + if (!is_fuchsia && !is_bsd) { 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 ff6ba275fcfe..41fbdee1f6d1 100644 --- a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc +++ b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2021-10-01 01:36:38 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2021-12-31 00:57:19 UTC +++ chrome/app/chrome_main_delegate.cc -@@ -153,15 +153,17 @@ +@@ -155,15 +155,17 @@ #include "v8/include/v8.h" #endif @@ -20,7 +20,7 @@ #if BUILDFLAG(ENABLE_NACL) #include "components/nacl/common/nacl_switches.h" -@@ -265,7 +267,7 @@ void SetUpExtendedCrashReporting(bool is_browser_proce +@@ -267,7 +269,7 @@ void SetUpExtendedCrashReporting(bool is_browser_proce #endif // defined(OS_WIN) @@ -29,7 +29,7 @@ void AdjustLinuxOOMScore(const std::string& process_type) { int score = -1; -@@ -300,7 +302,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty +@@ -302,7 +304,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty if (score > -1) base::AdjustOOMScore(base::GetCurrentProcId(), score); } @@ -38,7 +38,7 @@ // Returns true if this subprocess type needs the ResourceBundle initialized // and resources loaded. -@@ -346,7 +348,7 @@ bool HandleVersionSwitches(const base::CommandLine& co +@@ -348,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. @@ -47,7 +47,7 @@ // Show the man page if --help or -h is on the command line. void HandleHelpSwitches(const base::CommandLine& command_line) { if (command_line.HasSwitch(switches::kHelp) || -@@ -356,7 +358,7 @@ void HandleHelpSwitches(const base::CommandLine& comma +@@ -358,7 +360,7 @@ void HandleHelpSwitches(const base::CommandLine& comma PLOG(FATAL) << "execlp failed"; } } @@ -56,7 +56,7 @@ #if !defined(OS_MAC) && !defined(OS_ANDROID) void SIGTERMProfilingShutdown(int signal) { -@@ -410,7 +412,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -412,7 +414,7 @@ void InitializeUserDataDir(base::CommandLine* command_ std::string process_type = command_line->GetSwitchValueASCII(switches::kProcessType); @@ -65,7 +65,7 @@ // On Linux, Chrome does not support running multiple copies under different // DISPLAYs, so the profile directory can be specified in the environment to // support the virtual desktop use-case. -@@ -422,7 +424,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -424,7 +426,7 @@ void InitializeUserDataDir(base::CommandLine* command_ user_data_dir = base::FilePath::FromUTF8Unsafe(user_data_dir_string); } } @@ -74,7 +74,7 @@ #if defined(OS_MAC) policy::path_parser::CheckUserDataDirPolicy(&user_data_dir); #endif // OS_MAC -@@ -493,7 +495,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat +@@ -495,7 +497,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat startup_metric_utils::RecordApplicationStartTime(now); #endif @@ -83,7 +83,7 @@ defined(OS_CHROMEOS) // Record the startup process creation time on supported platforms. On Android // this is recorded in ChromeMainDelegateAndroid. -@@ -673,6 +675,8 @@ void ChromeMainDelegate::PostFieldTrialInitialization( +@@ -679,6 +681,8 @@ void ChromeMainDelegate::PostFieldTrialInitialization( // not always enabled on Linux/ChromeOS. #if defined(OS_LINUX) || defined(OS_CHROMEOS) bool enable_gwp_asan = crash_reporter::IsCrashpadEnabled(); @@ -92,7 +92,7 @@ #else bool enable_gwp_asan = true; #endif -@@ -781,7 +785,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -790,7 +794,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi v8_crashpad_support::SetUp(); #endif @@ -101,7 +101,7 @@ if (!crash_reporter::IsCrashpadEnabled()) { breakpad::SetFirstChanceExceptionHandler(v8::TryHandleWebAssemblyTrapPosix); } -@@ -794,7 +798,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -803,7 +807,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi } // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -110,7 +110,7 @@ // This will directly exit if the user asked for help. HandleHelpSwitches(command_line); #endif -@@ -1005,7 +1009,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1014,7 +1018,7 @@ void ChromeMainDelegate::PreSandboxStartup() { crash_reporter::InitializeCrashKeys(); @@ -119,7 +119,7 @@ ChromeCrashReporterClient::Create(); #endif -@@ -1018,7 +1022,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1027,7 +1031,7 @@ void ChromeMainDelegate::PreSandboxStartup() { child_process_logging::Init(); #endif #if defined(ARCH_CPU_ARM_FAMILY) && \ @@ -128,7 +128,7 @@ // Create an instance of the CPU class to parse /proc/cpuinfo and cache // cpu_brand info. base::CPU cpu_info; -@@ -1136,7 +1140,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1148,7 +1152,7 @@ void ChromeMainDelegate::PreSandboxStartup() { locale; } @@ -137,7 +137,7 @@ // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess) { #if defined(OS_ANDROID) -@@ -1157,7 +1161,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1169,7 +1173,7 @@ void ChromeMainDelegate::PreSandboxStartup() { } #endif // defined(OS_ANDROID) } @@ -146,7 +146,7 @@ #if defined(OS_ANDROID) CHECK_EQ(base::android::GetLibraryProcessType(), -@@ -1177,7 +1181,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1189,7 +1193,7 @@ void ChromeMainDelegate::PreSandboxStartup() { void ChromeMainDelegate::SandboxInitialized(const std::string& process_type) { // Note: If you are adding a new process type below, be sure to adjust the // AdjustLinuxOOMScore function too. @@ -155,7 +155,7 @@ AdjustLinuxOOMScore(process_type); #endif #if defined(OS_WIN) -@@ -1219,7 +1223,7 @@ int ChromeMainDelegate::RunProcess( +@@ -1231,7 +1235,7 @@ int ChromeMainDelegate::RunProcess( // This entry is not needed on Linux, where the NaCl loader // process is launched via nacl_helper instead. @@ -164,7 +164,7 @@ {switches::kNaClLoaderProcess, NaClMain}, #else {"<invalid>", nullptr}, // To avoid constant array of size 0 -@@ -1247,7 +1251,7 @@ void ChromeMainDelegate::ProcessExiting(const std::str +@@ -1259,7 +1263,7 @@ void ChromeMainDelegate::ProcessExiting(const std::str #endif // !defined(OS_ANDROID) } @@ -173,7 +173,7 @@ void ChromeMainDelegate::ZygoteStarting( std::vector<std::unique_ptr<content::ZygoteForkDelegate>>* delegates) { #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -1284,7 +1288,7 @@ void ChromeMainDelegate::ZygoteForked() { +@@ -1296,7 +1300,7 @@ void ChromeMainDelegate::ZygoteForked() { crash_keys::SetCrashKeysFromCommandLine(*command_line); } diff --git a/www/chromium/files/patch-chrome_app_chromium__strings.grd b/www/chromium/files/patch-chrome_app_chromium__strings.grd index 04962e0934d7..c5e07629feed 100644 --- a/www/chromium/files/patch-chrome_app_chromium__strings.grd +++ b/www/chromium/files/patch-chrome_app_chromium__strings.grd @@ -1,15 +1,15 @@ ---- chrome/app/chromium_strings.grd.orig 2021-09-14 01:51:48 UTC +--- chrome/app/chromium_strings.grd.orig 2021-12-31 00:57:19 UTC +++ chrome/app/chromium_strings.grd -@@ -722,7 +722,7 @@ Chromium is unable to recover your settings. +@@ -802,7 +802,7 @@ Chromium is unable to recover your settings. </if> <!-- about:browser-switch strings --> -- <if expr="is_win or is_macosx or (is_linux and not chromeos)"> -+ <if expr="is_win or is_macosx or (is_posix and not chromeos)"> +- <if expr="is_win or is_macosx or is_fuchsia or (is_linux and not chromeos)"> ++ <if expr="is_win or is_macosx or is_fuchsia or (is_linux and not chromeos) or is_bsd"> <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> -@@ -846,7 +846,7 @@ Chromium is unable to recover your settings. +@@ -926,7 +926,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 8ad7bfd4f70f..ac8ca571afb5 100644 --- a/www/chromium/files/patch-chrome_app_generated__resources.grd +++ b/www/chromium/files/patch-chrome_app_generated__resources.grd @@ -1,24 +1,24 @@ ---- chrome/app/generated_resources.grd.orig 2021-09-24 04:25:56 UTC +--- chrome/app/generated_resources.grd.orig 2021-12-31 00:57:19 UTC +++ chrome/app/generated_resources.grd -@@ -296,7 +296,7 @@ are declared in tools/grit/grit_rule.gni. - <if expr="not is_android"> - <part file="protocol_handler_intent_picker_strings.grdp" /> - </if> +@@ -293,7 +293,7 @@ are declared in tools/grit/grit_rule.gni. + <part file="profiles_strings.grdp" /> + + <!-- Web app intent picker strings --> - <if expr="is_win or is_macosx or is_linux"> -+ <if expr="is_win or is_macosx or is_linux or is_posix"> ++ <if expr="is_win or is_macosx or is_linux or is_bsd"> <part file="url_handler_intent_picker_strings.grdp" /> </if> -@@ -5453,7 +5453,7 @@ Keep your key file in a safe place. You will need it t +@@ -5524,7 +5524,7 @@ Keep your key file in a safe place. You will need it t </if> <!-- chrome://browser-switch strings --> -- <if expr="is_win or is_macosx or (is_linux and not chromeos)"> -+ <if expr="is_win or is_macosx or (is_posix and not chromeos)"> +- <if expr="is_win or is_macosx or is_fuchsia or (is_linux and not chromeos)"> ++ <if expr="is_win or is_macosx or is_fuchsia or (is_linux and not chromeos) or is_bsd"> <message name="IDS_ABOUT_BROWSER_SWITCH_TITLE" desc="about:browser-switch page title"> Legacy Browser Support </message> -@@ -7731,7 +7731,7 @@ Keep your key file in a safe place. You will need it t +@@ -7921,7 +7921,7 @@ Keep your key file in a safe place. You will need it t Google Pay </message> @@ -27,7 +27,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> -@@ -8795,7 +8795,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -8995,7 +8995,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 1ffb5c52bc32..4386e5d9abb7 100644 --- a/www/chromium/files/patch-chrome_app_google__chrome__strings.grd +++ b/www/chromium/files/patch-chrome_app_google__chrome__strings.grd @@ -1,15 +1,15 @@ ---- chrome/app/google_chrome_strings.grd.orig 2021-09-14 01:51:48 UTC +--- chrome/app/google_chrome_strings.grd.orig 2021-12-31 00:57:19 UTC +++ chrome/app/google_chrome_strings.grd -@@ -730,7 +730,7 @@ Google Chrome is unable to recover your settings. +@@ -810,7 +810,7 @@ Google Chrome is unable to recover your settings. </if> <!-- about:browser-switch strings --> -- <if expr="is_win or is_macosx or (is_linux and not chromeos)"> -+ <if expr="is_win or is_macosx or (is_posix and not chromeos)"> +- <if expr="is_win or is_macosx or is_fuchsia or (is_linux and not chromeos)"> ++ <if expr="is_win or is_macosx or is_fuchsia or (is_linux and not chromeos) or is_bsd"> <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> -@@ -854,7 +854,7 @@ Google Chrome is unable to recover your settings. +@@ -934,7 +934,7 @@ Google Chrome is unable to recover your settings. </message> <!-- ProcessSingleton --> diff --git a/www/chromium/files/patch-chrome_browser_BUILD.gn b/www/chromium/files/patch-chrome_browser_BUILD.gn index 8f33e4de17c7..e7ff81b2f74d 100644 --- a/www/chromium/files/patch-chrome_browser_BUILD.gn +++ b/www/chromium/files/patch-chrome_browser_BUILD.gn @@ -1,8 +1,8 @@ ---- chrome/browser/BUILD.gn.orig 2021-09-24 04:25:57 UTC +--- chrome/browser/BUILD.gn.orig 2021-12-31 00:57:21 UTC +++ chrome/browser/BUILD.gn -@@ -2458,9 +2458,18 @@ static_library("browser") { - deps += [ "//chromeos/services/libassistant/public/mojom" ] - } +@@ -2520,9 +2520,18 @@ static_library("browser") { + "policy/messaging_layer/util/heartbeat_event_factory.h", + ] } - if (is_linux || is_chromeos) { + if ((is_linux || is_chromeos) && !is_bsd) { @@ -20,7 +20,16 @@ if (use_ozone) { deps += [ "//ui/events/ozone", -@@ -5515,6 +5524,17 @@ static_library("browser") { +@@ -5702,7 +5711,7 @@ static_library("browser") { + } + } + +- if (is_linux && use_dbus) { ++ if ((is_linux && !is_bsd) && use_dbus) { + sources += [ + "dbus_memory_pressure_evaluator_linux.cc", + "dbus_memory_pressure_evaluator_linux.h", +@@ -5801,6 +5810,17 @@ static_library("browser") { ] } @@ -38,8 +47,8 @@ if (is_posix) { sources += [ "shutdown_signal_handlers_posix.cc", -@@ -5675,7 +5695,7 @@ static_library("browser") { - ] +@@ -5966,7 +5986,7 @@ static_library("browser") { + deps += [ "//chromeos/ui/base" ] } - if (is_posix && !is_mac) { diff --git a/www/chromium/files/patch-chrome_browser_about__flags.cc b/www/chromium/files/patch-chrome_browser_about__flags.cc index d077386236b6..9ab37bae1638 100644 --- a/www/chromium/files/patch-chrome_browser_about__flags.cc +++ b/www/chromium/files/patch-chrome_browser_about__flags.cc @@ -1,16 +1,38 @@ ---- chrome/browser/about_flags.cc.orig 2021-09-24 04:25:57 UTC +--- chrome/browser/about_flags.cc.orig 2021-12-31 00:57:21 UTC +++ chrome/browser/about_flags.cc -@@ -195,7 +195,7 @@ - #include "ui/gl/gl_switches.h" +@@ -204,7 +204,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) #include "base/allocator/buildflags.h" #endif -@@ -966,7 +966,7 @@ const FeatureEntry::FeatureVariation kMemoriesVariatio - base::size(kMemoryVariationRemote), nullptr}, +@@ -272,10 +272,10 @@ + #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) + #include "ui/ozone/buildflags.h" + #include "ui/ozone/public/ozone_switches.h" +-#endif // OS_LINUX || BUILDFLAG(IS_CHROMEOS_ASH) ++#endif // OS_LINUX || BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_BSD) + + #if defined(OS_WIN) + #include "base/win/windows_version.h" +@@ -385,7 +385,7 @@ const FeatureEntry::Choice kUseAngleChoicesMac[] = { + gl::kANGLEImplementationMetalName}}; + #endif + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = { + {flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""}, + {flag_descriptions::kOzonePlatformHintChoiceAuto, +@@ -985,7 +985,7 @@ const FeatureEntry::FeatureVariation kPageContentAnnot + base::size(kPageContentAnnotationsTitleParams), nullptr}, }; -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ @@ -18,7 +40,7 @@ defined(OS_WIN) const FeatureEntry::FeatureParam kOmniboxDocumentProviderServerScoring[] = { {"DocumentUseServerScore", "true"}, -@@ -1164,7 +1164,7 @@ const FeatureEntry::FeatureVariation kOmniboxBookmarkP +@@ -1193,7 +1193,7 @@ const FeatureEntry::FeatureVariation kOmniboxBookmarkP {"Dynamic Replace URL (Title - Path|URL)", kOmniboxBookmarkPathsDynamicReplaceUrl, base::size(kOmniboxBookmarkPathsDynamicReplaceUrl), nullptr}}; @@ -27,8 +49,8 @@ // defined(OS_WIN) const FeatureEntry::FeatureVariation -@@ -3131,7 +3131,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(media::kDeprecateLowUsageCodecs)}, +@@ -3296,7 +3296,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(chromeos::kLacrosTtsSupport)}, #endif // defined(OS_CHROMEOS) -#if defined(OS_LINUX) @@ -36,7 +58,7 @@ { "enable-accelerated-video-decode", flag_descriptions::kAcceleratedVideoDecodeName, -@@ -3149,7 +3149,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3314,7 +3314,7 @@ const FeatureEntry kFeatureEntries[] = { kOsMac | kOsWin | kOsCrOS | kOsAndroid | kOsLinux, SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode), }, @@ -45,7 +67,7 @@ { "disable-accelerated-video-encode", flag_descriptions::kAcceleratedVideoEncodeName, -@@ -3511,7 +3511,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3685,7 +3685,7 @@ const FeatureEntry kFeatureEntries[] = { {"enable-login-detection", flag_descriptions::kEnableLoginDetectionName, flag_descriptions::kEnableLoginDetectionDescription, kOsAll, FEATURE_VALUE_TYPE(login_detection::kLoginDetection)}, @@ -54,16 +76,25 @@ {"enable-save-data", flag_descriptions::kEnableSaveDataName, flag_descriptions::kEnableSaveDataDescription, kOsCrOS | kOsLinux, SINGLE_VALUE_TYPE( -@@ -3521,7 +3521,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3695,7 +3695,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kEnableNavigationPredictorDescription, kOsCrOS | kOsLinux, FEATURE_VALUE_TYPE(blink::features::kNavigationPredictor)}, --#endif // BUILDFLAG(IS_CHROMEOS_ASH) || OS_LINUX -+#endif // BUILDFLAG(IS_CHROMEOS_ASH) || OS_LINUX || OS_BSD +-#endif // BUILDFLAG(IS_CHROMEOS) || OS_LINUX ++#endif // BUILDFLAG(IS_CHROMEOS) || OS_LINUX || OS_BSD {"enable-preconnect-to-search", flag_descriptions::kEnablePreconnectToSearchName, flag_descriptions::kEnablePreconnectToSearchDescription, kOsAll, -@@ -4326,7 +4326,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3873,7 +3873,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(features::kWebShare)}, + #endif // BUILDFLAG(IS_CHROMEOS_ASH) || OS_WIN || OS_MAC + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + {"ozone-platform-hint", flag_descriptions::kOzonePlatformHintName, + flag_descriptions::kOzonePlatformHintDescription, kOsLinux, + MULTI_VALUE_TYPE(kOzonePlatformHintRuntimeChoices)}, +@@ -4567,7 +4567,7 @@ const FeatureEntry kFeatureEntries[] = { kOsAll, FEATURE_VALUE_TYPE(omnibox::kOmniboxTrendingZeroPrefixSuggestionsOnNTP)}, @@ -72,7 +103,7 @@ defined(OS_WIN) {"omnibox-experimental-keyword-mode", flag_descriptions::kOmniboxExperimentalKeywordModeName, -@@ -4438,7 +4438,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4676,7 +4676,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kOmniboxPreserveLongerShortcutsTextName, flag_descriptions::kOmniboxPreserveLongerShortcutsTextDescription, kOsDesktop, FEATURE_VALUE_TYPE(omnibox::kPreserveLongerShortcutsText)}, @@ -81,7 +112,7 @@ // defined(OS_WIN) #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -4707,12 +4707,12 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4952,12 +4952,12 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(chrome::android::kReaderModeInCCT)}, #endif // !defined(OS_ANDROID) @@ -96,7 +127,7 @@ // defined(OS_CHROMEOS) #if !defined(OS_ANDROID) -@@ -5322,7 +5322,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5577,7 +5577,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kSharingSendViaSyncDescription, kOsAll, FEATURE_VALUE_TYPE(kSharingSendViaSync)}, @@ -105,7 +136,7 @@ {"sharing-hub-desktop-app-menu", flag_descriptions::kSharingHubDesktopAppMenuName, flag_descriptions::kSharingHubDesktopAppMenuDescription, kOsDesktop, -@@ -5331,7 +5331,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5586,7 +5586,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kSharingHubDesktopOmniboxName, flag_descriptions::kSharingHubDesktopOmniboxDescription, kOsDesktop, FEATURE_VALUE_TYPE(sharing_hub::kSharingHubDesktopOmnibox)}, @@ -114,26 +145,25 @@ #if BUILDFLAG(IS_CHROMEOS_ASH) {"ash-enable-pip-rounded-corners", -@@ -5805,7 +5805,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6011,14 +6011,14 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kMouseSubframeNoImplicitCaptureDescription, kOsAll, FEATURE_VALUE_TYPE(features::kMouseSubframeNoImplicitCapture)}, -#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) - {"global-media-controls", flag_descriptions::kGlobalMediaControlsName, - flag_descriptions::kGlobalMediaControlsDescription, -@@ -5846,7 +5846,7 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kGlobalMediaControlsOverlayControlsDescription, - kOsWin | kOsMac | kOsLinux, - FEATURE_VALUE_TYPE(media::kGlobalMediaControlsOverlayControls)}, + {"global-media-controls-modern-ui", + flag_descriptions::kGlobalMediaControlsModernUIName, + flag_descriptions::kGlobalMediaControlsModernUIDescription, + kOsWin | kOsMac | kOsLinux | kOsCrOS, + FEATURE_VALUE_TYPE(media::kGlobalMediaControlsModernUI)}, -#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || +#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || // defined(OS_CHROMEOS) {"safety-tips", flag_descriptions::kSafetyTipName, -@@ -6648,7 +6648,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(features::kIncognitoReauthenticationForAndroid)}, +@@ -6734,7 +6734,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(chrome::android::kIncognitoReauthenticationForAndroid)}, #endif -#if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || \ @@ -141,7 +171,7 @@ defined(OS_CHROMEOS) || defined(OS_FUCHSIA) {"incognito-brand-consistency-for-desktop", flag_descriptions::kIncognitoBrandConsistencyForDesktopName, -@@ -6667,7 +6667,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6753,7 +6753,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kInheritNativeThemeFromParentWidgetDescription, kOsDesktop, FEATURE_VALUE_TYPE(views::features::kInheritNativeThemeFromParentWidget)}, @@ -149,8 +179,8 @@ +#endif // defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || // defined(OS_CHROMEOS) || defined(OS_FUCHSIA) - {"content-settings-redesign", -@@ -6778,7 +6778,7 @@ const FeatureEntry kFeatureEntries[] = { + {"consolidated-site-storage-controls", +@@ -6867,7 +6867,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(language::kForceAppLanguagePrompt)}, #endif @@ -159,36 +189,16 @@ {"commander", flag_descriptions::kCommanderName, flag_descriptions::kCommanderDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kCommander)}, -@@ -6805,8 +6805,8 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kSyncAutofillWalletOfferDataDescription, kOsAll, - FEATURE_VALUE_TYPE(switches::kSyncAutofillWalletOfferData)}, - --#if (defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ -- defined(OS_CHROMEOS)) && \ -+#if (defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ -+ defined(OS_CHROMEOS)) && \ - BUILDFLAG(ENABLE_PRINTING) - {"enable-oop-print-drivers", flag_descriptions::kEnableOopPrintDriversName, - flag_descriptions::kEnableOopPrintDriversDescription, kOsDesktop, -@@ -7091,7 +7091,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(media::kVaapiVp9kSVCHWEncoding)}, - #endif // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS_ASH) +@@ -7121,7 +7121,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kVp9kSVCHWDecodingDescription, kOsAll, + FEATURE_VALUE_TYPE(media::kVp9kSVCHWDecoding)}, -#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) || \ defined(OS_MAC) { "ui-debug-tools", -@@ -7181,7 +7181,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(metrics::structured::kBluetoothSessionizedMetrics)}, - #endif - --#if defined(OS_LINUX) && defined(USE_OZONE) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_OZONE) - {"use-ozone-platform", flag_descriptions::kUseOzonePlatformName, - flag_descriptions::kUseOzonePlatformDescription, kOsLinux, - FEATURE_VALUE_TYPE(features::kUseOzonePlatform)}, -@@ -7224,7 +7224,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7259,7 +7259,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(chromeos::features::kLauncherAppSort)}, #endif @@ -197,12 +207,3 @@ {"enable-desktop-pwas-app-icon-shortcuts-menu-ui", flag_descriptions::kDesktopPWAsAppIconShortcutsMenuUIName, flag_descriptions::kDesktopPWAsAppIconShortcutsMenuUIDescription, -@@ -7487,7 +7487,7 @@ const FeatureEntry kFeatureEntries[] = { - ash::features::kHoldingSpaceInProgressDownloadsIntegration)}, - #endif - --#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) || \ - defined(OS_MAC) || (defined(OS_ANDROID)) - {"omnibox-updated-connection-security-indicators", - flag_descriptions::kOmniboxUpdatedConnectionSecurityIndicatorsName, 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 698a0924e098..aa6b0eb0a710 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,4 +1,4 @@ ---- chrome/browser/after_startup_task_utils.cc.orig 2021-07-19 18:45:07 UTC +--- chrome/browser/after_startup_task_utils.cc.orig 2021-12-31 00:57:21 UTC +++ chrome/browser/after_startup_task_utils.cc @@ -22,7 +22,7 @@ @@ -9,7 +9,7 @@ #include "ui/views/linux_ui/linux_ui.h" #endif -@@ -103,7 +103,7 @@ void SetBrowserStartupIsComplete() { +@@ -107,7 +107,7 @@ void SetBrowserStartupIsComplete() { return; g_startup_complete_flag.Get().Set(); @@ -18,7 +18,7 @@ defined(OS_CHROMEOS) // Process::Current().CreationTime() is not available on all platforms. const base::Time process_creation_time = -@@ -112,7 +112,7 @@ void SetBrowserStartupIsComplete() { +@@ -116,7 +116,7 @@ void SetBrowserStartupIsComplete() { UMA_HISTOGRAM_LONG_TIMES("Startup.AfterStartupTaskDelayedUntilTime", base::Time::Now() - process_creation_time); } @@ -27,7 +27,7 @@ // defined(OS_CHROMEOS) UMA_HISTOGRAM_COUNTS_10000("Startup.AfterStartupTaskCount", g_after_startup_tasks.Get().size()); -@@ -123,7 +123,7 @@ void SetBrowserStartupIsComplete() { +@@ -127,7 +127,7 @@ void SetBrowserStartupIsComplete() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_media__galleries_media__galleries__apitest.cc b/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_media__galleries_media__galleries__apitest.cc index dc4902fe60fa..2d7ab149c160 100644 --- a/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_media__galleries_media__galleries__apitest.cc +++ b/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_media__galleries_media__galleries__apitest.cc @@ -1,6 +1,6 @@ ---- chrome/browser/apps/platform_apps/api/media_galleries/media_galleries_apitest.cc.orig 2021-05-12 22:05:43 UTC +--- chrome/browser/apps/platform_apps/api/media_galleries/media_galleries_apitest.cc.orig 2021-12-31 00:57:21 UTC +++ chrome/browser/apps/platform_apps/api/media_galleries/media_galleries_apitest.cc -@@ -299,7 +299,7 @@ IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppPpapiT +@@ -298,7 +298,7 @@ IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppPpapiT // Test is flaky, it fails on certain bots, namely WinXP Tests(1) and Linux // (dbg)(1)(32). See crbug.com/354425. @@ -9,7 +9,7 @@ #define MAYBE_MediaGalleriesNoAccess DISABLED_MediaGalleriesNoAccess #else #define MAYBE_MediaGalleriesNoAccess MediaGalleriesNoAccess -@@ -337,7 +337,7 @@ IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowse +@@ -336,7 +336,7 @@ IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowse // Test is flaky, it fails on certain bots, namely WinXP Tests(1) and Linux // (dbg)(1)(32). See crbug.com/354425. diff --git a/www/chromium/files/patch-chrome_browser_browsing__data_chrome__browsing__data__remover__delegate.cc b/www/chromium/files/patch-chrome_browser_browsing__data_chrome__browsing__data__remover__delegate.cc index 770f3922ba00..f6252798c469 100644 --- a/www/chromium/files/patch-chrome_browser_browsing__data_chrome__browsing__data__remover__delegate.cc +++ b/www/chromium/files/patch-chrome_browser_browsing__data_chrome__browsing__data__remover__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc.orig 2021-09-24 04:25:58 UTC +--- chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc.orig 2021-12-14 11:44:57 UTC +++ chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc -@@ -639,7 +639,9 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedder +@@ -608,7 +608,9 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedder } #endif 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 50d4d685654f..16af14dc97bb 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,7 +1,16 @@ ---- chrome/browser/chrome_browser_interface_binders.cc.orig 2021-09-24 04:25:58 UTC +--- chrome/browser/chrome_browser_interface_binders.cc.orig 2021-12-31 00:57:22 UTC +++ chrome/browser/chrome_browser_interface_binders.cc -@@ -155,7 +155,7 @@ - #include "ui/webui/resources/cr_components/most_visited/most_visited.mojom.h" +@@ -94,7 +94,7 @@ + #include "chrome/browser/ui/webui/reset_password/reset_password_ui.h" + #endif // BUILDFLAG(FULL_SAFE_BROWSING) + +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ + BUILDFLAG(IS_CHROMEOS_ASH) + #include "chrome/browser/ui/webui/connectors_internals/connectors_internals.mojom.h" + #include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h" +@@ -159,7 +159,7 @@ + #include "ui/webui/resources/js/browser_command/browser_command.mojom.h" #endif // defined(OS_ANDROID) -#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ @@ -9,15 +18,16 @@ defined(OS_CHROMEOS) #include "chrome/browser/ui/webui/discards/discards.mojom.h" #include "chrome/browser/ui/webui/discards/discards_ui.h" -@@ -637,14 +637,14 @@ void PopulateChromeFrameBinders( +@@ -648,7 +648,7 @@ void PopulateChromeFrameBinders( base::BindRepeating(&BindSpeechRecognitionRecognizerClientHandler)); #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 defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) if (!render_frame_host->GetParent()) { map->Add<chrome::mojom::DraggableRegions>( - base::BindRepeating(&DraggableRegionsHostImpl::CreateIfAllowed)); +@@ -656,7 +656,7 @@ void PopulateChromeFrameBinders( } #endif @@ -26,7 +36,16 @@ defined(OS_WIN) if (base::FeatureList::IsEnabled(blink::features::kDesktopPWAsSubApps) && !render_frame_host->GetParent()) { -@@ -952,7 +952,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -691,7 +691,7 @@ void PopulateChromeWebUIFrameBinders( + RegisterWebUIControllerInterfaceBinder<federated_learning::mojom::PageHandler, + FlocInternalsUI>(map); + +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ + BUILDFLAG(IS_CHROMEOS_ASH) + RegisterWebUIControllerInterfaceBinder< + connectors_internals::mojom::PageHandler, +@@ -981,7 +981,7 @@ void PopulateChromeWebUIFrameBinders( } #endif 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 ff6af844c16f..1a6abd9da1e9 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_main.cc.orig 2021-09-24 04:25:58 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2021-12-14 11:44:57 UTC +++ chrome/browser/chrome_browser_main.cc -@@ -260,7 +260,7 @@ +@@ -261,7 +261,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) || \ @@ -9,7 +9,7 @@ #include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h" #include "chrome/browser/metrics/desktop_session_duration/touch_mode_stats_tracker.h" #include "chrome/browser/profiles/profile_activity_metrics_recorder.h" -@@ -942,7 +942,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -951,7 +951,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { AddFirstRunNewTabs(browser_creator_.get(), master_prefs_->new_tabs); } @@ -18,7 +18,7 @@ // Create directory for user-level Native Messaging manifest files. This // makes it less likely that the directory will be created by third-party // software with incorrect owner or permission. See crbug.com/725513 . -@@ -951,7 +951,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -960,7 +960,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { &user_native_messaging_dir)); if (!base::PathExists(user_native_messaging_dir)) base::CreateDirectory(user_native_messaging_dir); @@ -27,7 +27,7 @@ } #endif // !defined(OS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH) -@@ -976,7 +976,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -985,7 +985,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) || \ @@ -36,15 +36,15 @@ metrics::DesktopSessionDurationTracker::Initialize(); ProfileActivityMetricsRecorder::Initialize(); TouchModeStatsTracker::Initialize( -@@ -1146,6 +1146,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { - base::TimeDelta::FromMinutes(1)); +@@ -1177,6 +1177,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { + base::Minutes(1)); #if !defined(OS_ANDROID) +#if !defined(OS_BSD) if (base::FeatureList::IsEnabled(features::kWebUsb)) { web_usb_detector_ = std::make_unique<WebUsbDetector>(); content::GetUIThreadTaskRunner({base::TaskPriority::BEST_EFFORT}) -@@ -1153,6 +1154,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { +@@ -1184,6 +1185,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { base::BindOnce(&WebUsbDetector::Initialize, base::Unretained(web_usb_detector_.get()))); } 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 new file mode 100644 index 000000000000..c32fc3dbf5dd --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main__extra__parts__linux.cc @@ -0,0 +1,20 @@ +--- chrome/browser/chrome_browser_main_extra_parts_linux.cc.orig 2022-01-21 13:07:37 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) + // On the desktop, we fix the platform name if necessary. + // See https://crbug.com/1246928. + auto* const command_line = base::CommandLine::ForCurrentProcess(); +@@ -132,7 +132,7 @@ void ChromeBrowserMainExtraPartsLinux::PreEarlyInitial + switches::kOzonePlatform, MaybeFixPlatformName(ozone_platform_hint)); + } + } +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + ChromeBrowserMainExtraPartsOzone::PreEarlyInitialization(); + } 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 53817dc3e649..45816bbd09d5 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,15 +1,30 @@ ---- chrome/browser/chrome_browser_main_linux.cc.orig 2021-07-19 18:45:08 UTC +--- chrome/browser/chrome_browser_main_linux.cc.orig 2022-01-20 10:35:49 UTC +++ chrome/browser/chrome_browser_main_linux.cc -@@ -47,7 +47,7 @@ ChromeBrowserMainPartsLinux::~ChromeBrowserMainPartsLi - } +@@ -30,7 +30,7 @@ + #include "chrome/installer/util/google_update_settings.h" + #endif + +-#if defined(USE_DBUS) && !defined(OS_CHROMEOS) ++#if defined(USE_DBUS) && !defined(OS_CHROMEOS) && !defined(OS_BSD) + #include "chrome/browser/dbus_memory_pressure_evaluator_linux.h" + #endif + +@@ -54,12 +54,14 @@ ChromeBrowserMainPartsLinux::~ChromeBrowserMainPartsLi void ChromeBrowserMainPartsLinux::PreProfileInit() { --#if !BUILDFLAG(IS_CHROMEOS_ASH) -+#if !BUILDFLAG(IS_CHROMEOS_ASH) && !defined(OS_BSD) + #if !BUILDFLAG(IS_CHROMEOS_ASH) ++#if !defined(OS_BSD) // Needs to be called after we have chrome::DIR_USER_DATA and // g_browser_process. This happens in PreCreateThreads. // base::GetLinuxDistro() will initialize its value if needed. -@@ -78,7 +78,7 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() { + base::ThreadPool::PostTask( + FROM_HERE, {base::MayBlock(), base::TaskPriority::BEST_EFFORT}, + base::BindOnce(base::IgnoreResult(&base::GetLinuxDistro))); ++#endif + + // Set up crypt config. This should be kept in sync with the OSCrypt parts of + // SystemNetworkContextManager::OnNetworkServiceCreated. +@@ -82,14 +84,14 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() { } void ChromeBrowserMainPartsLinux::PostCreateMainMessageLoop() { @@ -18,9 +33,17 @@ bluez::BluezDBusManager::Initialize(nullptr /* system_bus */); #endif -@@ -86,7 +86,7 @@ void ChromeBrowserMainPartsLinux::PostCreateMainMessag + ChromeBrowserMainPartsPosix::PostCreateMainMessageLoop(); } +-#if defined(USE_DBUS) && !defined(OS_CHROMEOS) ++#if defined(USE_DBUS) && !defined(OS_CHROMEOS) && !defined(OS_BSD) + void ChromeBrowserMainPartsLinux::PostBrowserStart() { + // static_cast is safe because this is the only implementation of + // MemoryPressureMonitor. +@@ -108,7 +110,7 @@ void ChromeBrowserMainPartsLinux::PostBrowserStart() { + #endif + void ChromeBrowserMainPartsLinux::PostDestroyThreads() { -#if !BUILDFLAG(IS_CHROMEOS_ASH) +#if !BUILDFLAG(IS_CHROMEOS_ASH) && !defined(OS_BSD) diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.h b/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.h new file mode 100644 index 000000000000..54db44854aa0 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.h @@ -0,0 +1,11 @@ +--- chrome/browser/chrome_browser_main_linux.h.orig 2022-01-04 12:26:19 UTC ++++ chrome/browser/chrome_browser_main_linux.h +@@ -25,7 +25,7 @@ class ChromeBrowserMainPartsLinux : public ChromeBrows + // ChromeBrowserMainParts overrides. + void PreProfileInit() override; + void PostCreateMainMessageLoop() override; +-#if defined(USE_DBUS) && !defined(OS_CHROMEOS) ++#if defined(USE_DBUS) && !defined(OS_CHROMEOS) && !defined(OS_BSD) + // Only needed for native Linux, to set up the low-memory-monitor-based memory + // monitoring (which depends on D-Bus). + void PostBrowserStart() override; 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 2badd2d02b9e..2120e9f3b806 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,6 +1,6 @@ ---- chrome/browser/chrome_browser_main_posix.cc.orig 2021-04-14 18:40:52 UTC +--- chrome/browser/chrome_browser_main_posix.cc.orig 2021-12-14 11:44:57 UTC +++ chrome/browser/chrome_browser_main_posix.cc -@@ -72,7 +72,7 @@ void ExitHandler::ExitWhenPossibleOnUIThread(int signa +@@ -73,7 +73,7 @@ void ExitHandler::ExitWhenPossibleOnUIThread(int signa } else { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc index 56adce70da10..96b5f8e3768a 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2021-09-24 04:25:58 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2022-01-20 10:35:49 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -361,7 +361,7 @@ +@@ -368,7 +368,7 @@ #include "components/user_manager/user_manager.h" #include "services/service_manager/public/mojom/interface_provider_spec.mojom.h" #include "storage/browser/file_system/external_mount_points.h" @@ -9,7 +9,7 @@ #include "chrome/browser/chrome_browser_main_linux.h" #elif defined(OS_ANDROID) #include "base/android/application_status_listener.h" -@@ -425,7 +425,7 @@ +@@ -432,7 +432,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) || \ @@ -18,7 +18,7 @@ #include "chrome/browser/browser_switcher/browser_switcher_navigation_throttle.h" #endif -@@ -442,10 +442,10 @@ +@@ -449,10 +449,10 @@ #include "components/crash/content/browser/crash_handler_host_linux.h" #endif @@ -31,7 +31,7 @@ // BUILDFLAG(IS_CHROMEOS_ASH) // TODO(crbug.com/939205): Once the upcoming App Service is available, use a -@@ -464,7 +464,7 @@ +@@ -471,11 +471,11 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -40,7 +40,12 @@ #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h" #endif -@@ -860,11 +860,13 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHos +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_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" +@@ -875,11 +875,13 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHos } int GetCrashSignalFD(const base::CommandLine& command_line) { @@ -54,7 +59,7 @@ // Extensions have the same process type as renderers. if (command_line.HasSwitch(extensions::switches::kExtensionProcess)) { -@@ -1255,7 +1257,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( +@@ -1349,7 +1351,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( #elif BUILDFLAG(IS_CHROMEOS_LACROS) main_parts = std::make_unique<ChromeBrowserMainPartsLacros>(parameters, &startup_data_); @@ -63,7 +68,7 @@ main_parts = std::make_unique<ChromeBrowserMainPartsLinux>(parameters, &startup_data_); #elif defined(OS_ANDROID) -@@ -1289,7 +1291,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( +@@ -1383,7 +1385,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( std::make_unique<ChromeBrowserMainExtraPartsViewsLacros>()); // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -72,7 +77,16 @@ main_parts->AddParts( std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>()); #else -@@ -2058,7 +2060,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -1400,7 +1402,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( + main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLacros>()); + #endif + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>()); + #elif defined(USE_OZONE) + main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>()); +@@ -2176,7 +2178,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin command_line->AppendSwitchASCII(switches::kMetricsClientID, client_info->client_id); } @@ -81,7 +95,7 @@ #if defined(OS_ANDROID) bool enable_crash_reporter = true; #else -@@ -3649,7 +3651,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst +@@ -3834,7 +3836,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst } } @@ -90,7 +104,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -3684,7 +3686,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFi +@@ -3869,7 +3871,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFi mappings->Share(kCrashDumpSignal, crash_signal_fd); } } @@ -99,7 +113,7 @@ #if defined(OS_WIN) std::wstring ChromeContentBrowserClient::GetAppContainerSidForSandboxType( -@@ -4067,12 +4069,12 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -4242,12 +4244,12 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati &throttles); } @@ -114,7 +128,7 @@ // BUILDFLAG(IS_CHROMEOS_ASH) #if !defined(OS_ANDROID) -@@ -4101,7 +4103,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -4277,7 +4279,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) || \ 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 4ca2096c798c..45dad5690887 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h +++ b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.h.orig 2021-09-24 04:25:58 UTC +--- chrome/browser/chrome_content_browser_client.h.orig 2021-12-31 00:57:22 UTC +++ chrome/browser/chrome_content_browser_client.h -@@ -402,12 +402,12 @@ class ChromeContentBrowserClient : public content::Con +@@ -405,12 +405,12 @@ class ChromeContentBrowserClient : public content::Con void OverridePageVisibilityState( content::RenderFrameHost* render_frame_host, content::PageVisibilityState* visibility_state) override; @@ -14,4 +14,4 @@ +#endif // defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_BSD) #if defined(OS_WIN) bool PreSpawnChild(sandbox::TargetPolicy* policy, - sandbox::policy::SandboxType sandbox_type, + sandbox::mojom::Sandbox sandbox_type, diff --git a/www/chromium/files/patch-chrome_browser_defaults.cc b/www/chromium/files/patch-chrome_browser_defaults.cc index 36b4139448f3..8ccc3075788f 100644 --- a/www/chromium/files/patch-chrome_browser_defaults.cc +++ b/www/chromium/files/patch-chrome_browser_defaults.cc @@ -1,6 +1,6 @@ ---- chrome/browser/defaults.cc.orig 2021-04-14 18:40:53 UTC +--- chrome/browser/defaults.cc.orig 2021-12-14 11:44:58 UTC +++ chrome/browser/defaults.cc -@@ -46,7 +46,7 @@ const bool kSyncAutoStarts = false; +@@ -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. 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 ca0cd92dda81..760429d26258 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 2021-09-14 01:51:50 UTC +--- chrome/browser/device_identity/device_oauth2_token_service_factory.cc.orig 2021-12-31 00:57:22 UTC +++ chrome/browser/device_identity/device_oauth2_token_service_factory.cc -@@ -29,7 +29,7 @@ std::unique_ptr<DeviceOAuth2TokenStore> CreatePlatform +@@ -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_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) + (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) - DCHECK( - base::FeatureList::IsEnabled(policy::features::kCBCMPolicyInvalidations)); 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 d7dafc8bb5ce..74f4a680a644 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,6 +1,6 @@ ---- chrome/browser/devtools/devtools_eye_dropper.cc.orig 2021-09-14 01:51:50 UTC +--- chrome/browser/devtools/devtools_eye_dropper.cc.orig 2021-12-14 11:44:58 UTC +++ chrome/browser/devtools/devtools_eye_dropper.cc -@@ -188,7 +188,7 @@ void DevToolsEyeDropper::UpdateCursor() { +@@ -187,7 +187,7 @@ void DevToolsEyeDropper::UpdateCursor() { // magnified projection only with centered hotspot. // Mac Retina requires cursor to be > 120px in order to render smoothly. 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 b7baf030713a..6a9fdc99e09c 100644 --- a/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc +++ b/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2021-09-24 04:25:58 UTC +--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2021-12-31 00:57:22 UTC +++ chrome/browser/download/chrome_download_manager_delegate.cc -@@ -1395,7 +1395,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1540,7 +1540,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe target_info->is_filetype_handled_safely) DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true); @@ -9,7 +9,7 @@ if (item->GetOriginalMimeType() == "application/x-x509-user-cert") DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true); #endif -@@ -1450,7 +1450,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1608,7 +1608,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile( const base::FilePath& path) { @@ -18,7 +18,7 @@ defined(OS_MAC) if (path.MatchesExtension(FILE_PATH_LITERAL(".pdf"))) { return !download_prefs_->ShouldOpenPdfInSystemReader(); -@@ -1554,7 +1554,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow +@@ -1716,7 +1716,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow bool content_initiated, content::CheckDownloadAllowedCallback check_download_allowed_cb) { DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -27,7 +27,7 @@ defined(OS_MAC) // 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. -@@ -1596,7 +1596,7 @@ ChromeDownloadManagerDelegate::GetQuarantineConnection +@@ -1758,7 +1758,7 @@ ChromeDownloadManagerDelegate::GetQuarantineConnection std::unique_ptr<download::DownloadItemRenameHandler> ChromeDownloadManagerDelegate::GetRenameHandlerForDownload( download::DownloadItem* download_item) { @@ -36,3 +36,12 @@ defined(OS_MAC) return enterprise_connectors::FileSystemRenameHandler::CreateIfNeeded( download_item); +@@ -1774,7 +1774,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl + DCHECK(download_item); + DCHECK(download_item->IsSavePackageDownload()); + +-#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_MAC) + if (!base::FeatureList::IsEnabled( + download::features::kAllowSavePackageScanning)) { 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 8134355b8df0..2302b7710b16 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__commands.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__commands.cc @@ -1,4 +1,4 @@ ---- chrome/browser/download/download_commands.cc.orig 2021-09-24 04:25:58 UTC +--- chrome/browser/download/download_commands.cc.orig 2021-12-14 11:44:58 UTC +++ chrome/browser/download/download_commands.cc @@ -27,7 +27,7 @@ #include "net/base/url_util.h" @@ -9,7 +9,7 @@ defined(OS_MAC) || defined(OS_FUCHSIA) #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" -@@ -165,7 +165,7 @@ void DownloadCommands::ExecuteCommand(Command command) +@@ -168,7 +168,7 @@ void DownloadCommands::ExecuteCommand(Command command) model_->ExecuteCommand(this, command); } @@ -18,7 +18,7 @@ defined(OS_CHROMEOS) || defined(OS_FUCHSIA) Browser* DownloadCommands::GetBrowser() const { -@@ -200,7 +200,7 @@ bool DownloadCommands::CanOpenPdfInSystemViewer() cons +@@ -203,7 +203,7 @@ bool DownloadCommands::CanOpenPdfInSystemViewer() cons #endif } 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 564dd56e41a8..93ddcbb5d39d 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__commands.h +++ b/www/chromium/files/patch-chrome_browser_download_download__commands.h @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_commands.h.orig 2021-09-24 04:25:58 UTC +--- chrome/browser/download/download_commands.h.orig 2021-12-14 11:44:58 UTC +++ chrome/browser/download/download_commands.h -@@ -48,7 +48,7 @@ class DownloadCommands { +@@ -53,7 +53,7 @@ class DownloadCommands { bool IsCommandVisible(Command command) const; void ExecuteCommand(Command command); 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 dbee5ca7b579..7bacadd02603 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__item__model.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__item__model.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_item_model.cc.orig 2021-09-24 04:25:58 UTC +--- chrome/browser/download/download_item_model.cc.orig 2021-12-14 11:44:58 UTC +++ chrome/browser/download/download_item_model.cc -@@ -625,7 +625,7 @@ bool DownloadItemModel::IsCommandChecked( +@@ -634,7 +634,7 @@ bool DownloadItemModel::IsCommandChecked( return download_->GetOpenWhenComplete() || download_crx_util::IsExtensionDownload(*download_); case DownloadCommands::ALWAYS_OPEN_TYPE: @@ -9,7 +9,7 @@ defined(OS_MAC) if (download_commands->CanOpenPdfInSystemViewer()) { DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile()); -@@ -666,7 +666,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand +@@ -675,7 +675,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand bool is_checked = IsCommandChecked(download_commands, DownloadCommands::ALWAYS_OPEN_TYPE); DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile()); 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 f5bf90bb75ac..2cef52697eaf 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 2021-09-14 01:51:50 UTC +--- chrome/browser/download/download_prefs.cc.orig 2021-12-31 00:57:22 UTC +++ chrome/browser/download/download_prefs.cc @@ -70,7 +70,7 @@ namespace { // Consider downloads 'dangerous' if they go to the home directory on Linux and @@ -9,7 +9,7 @@ base::FilePath home_dir = base::GetHomeDir(); if (download_path == home_dir) { return true; -@@ -175,7 +175,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi +@@ -167,7 +167,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi GetDefaultDownloadDirectoryForProfile())); #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -18,7 +18,7 @@ defined(OS_MAC) should_open_pdf_in_system_reader_ = prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader); -@@ -294,7 +294,7 @@ void DownloadPrefs::RegisterProfilePrefs( +@@ -286,7 +286,7 @@ void DownloadPrefs::RegisterProfilePrefs( default_download_path); registry->RegisterFilePathPref(prefs::kSaveFileDefaultDirectory, default_download_path); @@ -27,7 +27,7 @@ defined(OS_MAC) registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false); #endif -@@ -428,7 +428,7 @@ bool DownloadPrefs::IsDownloadPathManaged() const { +@@ -420,7 +420,7 @@ bool DownloadPrefs::IsDownloadPathManaged() const { } bool DownloadPrefs::IsAutoOpenByUserUsed() const { @@ -36,7 +36,7 @@ defined(OS_MAC) if (ShouldOpenPdfInSystemReader()) return true; -@@ -443,7 +443,7 @@ bool DownloadPrefs::IsAutoOpenEnabled(const GURL& url, +@@ -435,7 +435,7 @@ bool DownloadPrefs::IsAutoOpenEnabled(const GURL& url, return false; DCHECK(extension[0] == base::FilePath::kExtensionSeparator); extension.erase(0, 1); @@ -45,7 +45,7 @@ defined(OS_MAC) if (base::FilePath::CompareEqualIgnoreCase(extension, FILE_PATH_LITERAL("pdf")) && -@@ -498,7 +498,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens +@@ -490,7 +490,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens SaveAutoOpenState(); } @@ -54,7 +54,7 @@ defined(OS_MAC) void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) { if (should_open_pdf_in_system_reader_ == should_open) -@@ -520,7 +520,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons +@@ -512,7 +512,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons #endif void DownloadPrefs::ResetAutoOpenByUser() { 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 26ce4d0b2163..faa6eac8d943 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__prefs.h +++ b/www/chromium/files/patch-chrome_browser_download_download__prefs.h @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_prefs.h.orig 2021-04-14 18:40:53 UTC +--- chrome/browser/download/download_prefs.h.orig 2021-12-14 11:44:58 UTC +++ chrome/browser/download/download_prefs.h -@@ -117,7 +117,7 @@ class DownloadPrefs { +@@ -121,7 +121,7 @@ class DownloadPrefs { // Disables auto-open based on file extension. void DisableAutoOpenByUserBasedOnExtension(const base::FilePath& file_name); @@ -9,7 +9,7 @@ defined(OS_MAC) // 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. -@@ -176,7 +176,7 @@ class DownloadPrefs { +@@ -180,7 +180,7 @@ class DownloadPrefs { std::unique_ptr<policy::URLBlocklist> auto_open_allowed_by_urls_; 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 e7574450bceb..4bf0cdd60ffa 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,14 +1,14 @@ ---- chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc.orig 2021-09-24 18:20:01 UTC +--- chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc.orig 2021-12-31 00:57:22 UTC +++ chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc -@@ -13,9 +13,9 @@ - #include "components/keyed_service/content/browser_context_dependency_manager.h" - #include "components/keyed_service/core/keyed_service.h" +@@ -19,9 +19,9 @@ + #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) #include "chrome/browser/enterprise/connectors/device_trust/attestation/desktop/desktop_attestation_service.h" -#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) +#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) + #if BUILDFLAG(IS_CHROMEOS_ASH) #include "chrome/browser/enterprise/connectors/device_trust/attestation/ash/ash_attestation_service.h" - #endif // BUILDFLAG(IS_CHROMEOS_ASH) 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 new file mode 100644 index 000000000000..bdaa9bca00f1 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_core_persistence_key__persistence__delegate__factory.cc @@ -0,0 +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 +@@ -13,7 +13,7 @@ + #include "chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/win_key_persistence_delegate.h" + #elif defined(OS_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) + #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) + return std::make_unique<MacKeyPersistenceDelegate>(); +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_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 new file mode 100644 index 000000000000..471209b13549 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc @@ -0,0 +1,38 @@ +--- chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc.orig 2021-12-31 00:57:22 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) + #include "base/check.h" + #include "chrome/browser/enterprise/connectors/device_trust/signals/decorators/browser/browser_signals_decorator.h" + #include "chrome/browser/enterprise/signals/device_info_fetcher.h" +@@ -22,7 +22,7 @@ + #include "components/enterprise/browser/controller/browser_dm_token_storage.h" + #include "components/policy/core/common/cloud/machine_level_user_cloud_policy_manager.h" + #include "components/policy/core/common/cloud/machine_level_user_cloud_policy_store.h" +-#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) ++#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) + + #if BUILDFLAG(IS_CHROMEOS_ASH) + #include "chrome/browser/browser_process_platform_part.h" +@@ -45,7 +45,7 @@ std::unique_ptr<SignalsService> CreateSignalsService( + 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) + policy::ChromeBrowserPolicyConnector* browser_policy_connector = + g_browser_process->browser_policy_connector(); + DCHECK(browser_policy_connector); +@@ -55,7 +55,7 @@ std::unique_ptr<SignalsService> CreateSignalsService( + browser_policy_connector->machine_level_user_cloud_policy_manager() + ->store(), + enterprise_signals::DeviceInfoFetcher::CreateInstance())); +-#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) ++#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) + + #if BUILDFLAG(IS_CHROMEOS_ASH) + decorators.push_back(std::make_unique<AshSignalsDecorator>( 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 3aae5efa9501..6052197aa254 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,4 +1,4 @@ ---- chrome/browser/enterprise/signals/device_info_fetcher.cc.orig 2021-07-19 18:45:08 UTC +--- chrome/browser/enterprise/signals/device_info_fetcher.cc.orig 2021-12-14 11:44:58 UTC +++ chrome/browser/enterprise/signals/device_info_fetcher.cc @@ -12,6 +12,8 @@ #include "chrome/browser/enterprise/signals/device_info_fetcher_win.h" @@ -9,7 +9,7 @@ #endif namespace enterprise_signals { -@@ -61,6 +63,8 @@ std::unique_ptr<DeviceInfoFetcher> DeviceInfoFetcher:: +@@ -71,6 +73,8 @@ std::unique_ptr<DeviceInfoFetcher> DeviceInfoFetcher:: return std::make_unique<DeviceInfoFetcherWin>(); #elif defined(OS_LINUX) || defined(OS_CHROMEOS) return std::make_unique<DeviceInfoFetcherLinux>(); diff --git a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn index 459e555bb959..bc2d5ef27b84 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 2021-09-24 04:25:58 UTC +--- chrome/browser/extensions/BUILD.gn.orig 2021-12-31 00:57:22 UTC +++ chrome/browser/extensions/BUILD.gn -@@ -1275,6 +1275,12 @@ static_library("extensions") { +@@ -1301,6 +1301,12 @@ static_library("extensions") { deps += [ "//chrome/services/printing/public/mojom" ] } diff --git a/www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc b/www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc index 89d76d4d8d34..d45b06b9174e 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc @@ -1,8 +1,8 @@ ---- chrome/browser/extensions/activity_log/activity_log.cc.orig 2021-04-14 18:40:53 UTC +--- chrome/browser/extensions/activity_log/activity_log.cc.orig 2021-12-14 11:44:58 UTC +++ chrome/browser/extensions/activity_log/activity_log.cc -@@ -49,7 +49,11 @@ - #include "extensions/common/extension.h" - #include "extensions/common/extension_messages.h" +@@ -51,7 +51,11 @@ + #include "extensions/common/features/feature_provider.h" + #include "extensions/common/hashed_extension_id.h" #include "extensions/common/mojom/renderer.mojom.h" +#if defined(OS_BSD) +#include <re2/re2.h> 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 4c28d0ef9da6..f7b9fd392a90 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,6 +1,6 @@ ---- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig 2021-09-24 18:21:22 UTC +--- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig 2021-12-14 11:44:58 UTC +++ chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc -@@ -154,7 +154,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction:: +@@ -155,7 +155,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction:: // getPersistentSecret @@ -9,7 +9,7 @@ EnterpriseReportingPrivateGetPersistentSecretFunction:: EnterpriseReportingPrivateGetPersistentSecretFunction() = default; -@@ -206,7 +206,7 @@ void EnterpriseReportingPrivateGetPersistentSecretFunc +@@ -207,7 +207,7 @@ void EnterpriseReportingPrivateGetPersistentSecretFunc } } 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 e087aff0c7b2..c394f956615e 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,7 +1,7 @@ ---- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.h.orig 2021-09-24 18:21:41 UTC +--- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.h.orig 2021-12-14 11:44:58 UTC +++ chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.h -@@ -41,7 +41,7 @@ class EnterpriseReportingPrivateGetDeviceIdFunction : - DISALLOW_COPY_AND_ASSIGN(EnterpriseReportingPrivateGetDeviceIdFunction); +@@ -45,7 +45,7 @@ class EnterpriseReportingPrivateGetDeviceIdFunction : + ~EnterpriseReportingPrivateGetDeviceIdFunction() override; }; -#if !defined(OS_LINUX) @@ -9,7 +9,7 @@ class EnterpriseReportingPrivateGetPersistentSecretFunction : public ExtensionFunction { -@@ -69,7 +69,7 @@ class EnterpriseReportingPrivateGetPersistentSecretFun +@@ -73,7 +73,7 @@ class EnterpriseReportingPrivateGetPersistentSecretFun void SendResponse(const std::string& data, long int status); }; diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_erp_chrome_desktop_report_request_helper.cc b/www/chromium/files/patch-chrome_browser_extensions_api_erp_chrome_desktop_report_request_helper.cc index 16db51be7492..0926c13c01eb 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_erp_chrome_desktop_report_request_helper.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_erp_chrome_desktop_report_request_helper.cc @@ -1,4 +1,4 @@ ---- chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc.orig 2021-10-08 06:25:39 UTC +--- chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc.orig 2022-01-20 10:35:49 UTC +++ chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc @@ -23,7 +23,7 @@ #include "base/win/registry.h" diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_extension__action_browser__action__interactive__test.cc b/www/chromium/files/patch-chrome_browser_extensions_api_extension__action_browser__action__interactive__test.cc index 183a9b196f60..e5177c543202 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_extension__action_browser__action__interactive__test.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_extension__action_browser__action__interactive__test.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc.orig 2021-09-24 04:25:58 UTC +--- chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc.orig 2021-12-14 11:44:58 UTC +++ chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc -@@ -286,7 +286,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionInteractiveTest, T +@@ -305,7 +305,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionInteractiveTest, T frame_observer.Wait(); // Non-Aura Linux uses a singleton for the popup, so it looks like all windows // have popups if there is any popup open. 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 f5a7b5e6388a..d844066914d5 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,4 +1,4 @@ ---- chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc.orig 2021-09-14 01:51:50 UTC +--- chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc.orig 2021-12-31 00:57:22 UTC +++ chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc @@ -30,7 +30,7 @@ #include "extensions/browser/process_manager.h" @@ -18,7 +18,7 @@ if (extension) { enabled_by_permissions = extension->permissions_data()->active_permissions().HasAPIPermission( -@@ -579,7 +579,7 @@ void WebrtcLoggingPrivateStartEventLoggingFunction::Fi +@@ -580,7 +580,7 @@ void WebrtcLoggingPrivateStartEventLoggingFunction::Fi ExtensionFunction::ResponseAction WebrtcLoggingPrivateGetLogsDirectoryFunction::Run() { @@ -27,7 +27,7 @@ // 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 -@@ -602,9 +602,9 @@ WebrtcLoggingPrivateGetLogsDirectoryFunction::Run() { +@@ -603,9 +603,9 @@ WebrtcLoggingPrivateGetLogsDirectoryFunction::Run() { &WebrtcLoggingPrivateGetLogsDirectoryFunction::FireErrorCallback, this)); return RespondLater(); 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 23768dc6f847..b585f5523df0 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,6 +1,6 @@ ---- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2021-04-14 18:40:53 UTC +--- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2022-01-20 10:35:49 UTC +++ chrome/browser/extensions/browser_context_keyed_service_factories.cc -@@ -54,7 +54,7 @@ +@@ -53,11 +53,11 @@ #include "extensions/browser/api/networking_private/networking_private_delegate_factory.h" #include "ppapi/buildflags/buildflags.h" @@ -9,3 +9,17 @@ #include "chrome/browser/extensions/api/input_ime/input_ime_api.h" #endif +-#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) ++#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || defined(OS_BSD) + #include "chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.h" + #endif + +@@ -129,7 +129,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) + 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 d3949de1b593..86b053abf380 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/external_provider_impl.cc.orig 2021-09-24 04:25:58 UTC +--- chrome/browser/extensions/external_provider_impl.cc.orig 2021-12-31 00:57:22 UTC +++ chrome/browser/extensions/external_provider_impl.cc -@@ -796,7 +796,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -814,7 +814,7 @@ void ExternalProviderImpl::CreateExternalProviders( if (!profile->GetPrefs()->GetBoolean(pref_names::kBlockExternalExtensions)) { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ provider_list->push_back(std::make_unique<ExternalProviderImpl>( service, base::MakeRefCounted<ExternalPrefLoader>( -@@ -824,7 +824,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -842,7 +842,7 @@ void ExternalProviderImpl::CreateExternalProviders( bundled_extension_creation_flags)); // Define a per-user source of external extensions. diff --git a/www/chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc b/www/chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc index 7ce17b797387..10d7ff849c99 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,4 +1,4 @@ ---- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2021-09-24 04:25:58 UTC +--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2021-12-31 00:57:23 UTC +++ chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc @@ -213,7 +213,7 @@ const struct { {base::DIR_HOME, FILE_PATH_LITERAL("Library/Mobile Documents"), diff --git a/www/chromium/files/patch-chrome_browser_first__run_first__run__internal__posix.cc b/www/chromium/files/patch-chrome_browser_first__run_first__run__internal__posix.cc index d21752e932dc..e202ed32fae2 100644 --- a/www/chromium/files/patch-chrome_browser_first__run_first__run__internal__posix.cc +++ b/www/chromium/files/patch-chrome_browser_first__run_first__run__internal__posix.cc @@ -1,6 +1,6 @@ ---- chrome/browser/first_run/first_run_internal_posix.cc.orig 2021-09-24 04:25:58 UTC +--- chrome/browser/first_run/first_run_internal_posix.cc.orig 2021-12-14 11:44:58 UTC +++ chrome/browser/first_run/first_run_internal_posix.cc -@@ -37,7 +37,7 @@ enum class ForcedShowDialogState { +@@ -36,7 +36,7 @@ enum class ForcedShowDialogState { ForcedShowDialogState g_forced_show_dialog_state = ForcedShowDialogState::kNotForced; @@ -9,7 +9,7 @@ // Returns whether the first run dialog should be shown. This is only true for // certain builds, and only if the user has not already set preferences. In a // real, official-build first run, initializes the default metrics reporting if -@@ -82,7 +82,7 @@ void ForceFirstRunDialogShownForTesting(bool shown) { +@@ -81,7 +81,7 @@ void ForceFirstRunDialogShownForTesting(bool shown) { } void DoPostImportPlatformSpecificTasks(Profile* profile) { diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc index bb3950a4f798..c1a0861a4091 100644 --- a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc @@ -1,6 +1,6 @@ ---- chrome/browser/flag_descriptions.cc.orig 2021-09-24 04:25:58 UTC +--- chrome/browser/flag_descriptions.cc.orig 2022-01-20 10:35:49 UTC +++ chrome/browser/flag_descriptions.cc -@@ -5110,7 +5110,7 @@ const char kDownloadShelfWebUIDescription[] = +@@ -5258,7 +5258,7 @@ const char kDownloadShelfWebUIDescription[] = // Random platform combinations ----------------------------------------------- @@ -8,8 +8,8 @@ +#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) || defined(OS_FUCHSIA) - const char kEnableOopPrintDriversName[] = -@@ -5134,10 +5134,10 @@ const char kSettingsLandingPageRedesignDescription[] = + const char kWebUIBrandingUpdateName[] = "WebUI Branding Update"; +@@ -5276,10 +5276,10 @@ const char kSettingsLandingPageRedesignDescription[] = "Changes the layout of the chrome://settings page to only show one section " "at a time."; @@ -22,7 +22,7 @@ const char kCommanderName[] = "Commander"; const char kCommanderDescription[] = -@@ -5153,7 +5153,7 @@ const char kDesktopDetailedLanguageSettingsName[] = +@@ -5295,7 +5295,7 @@ const char kDesktopDetailedLanguageSettingsName[] = const char kDesktopDetailedLanguageSettingsDescription[] = "Enable the new detailed language settings page"; @@ -31,21 +31,25 @@ #if defined(OS_CHROMEOS) || defined(OS_LINUX) #if BUILDFLAG(USE_TCMALLOC) -@@ -5178,11 +5178,11 @@ const char kWebShareDescription[] = +@@ -5320,7 +5320,7 @@ const char kWebShareDescription[] = "platforms."; - #endif // defined(OS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_MAC) + #endif // defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_MAC) --#if defined(OS_LINUX) && defined(USE_OZONE) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_OZONE) - const char kUseOzonePlatformName[] = "Use ozone."; - const char kUseOzonePlatformDescription[] = - "Use the Ozone/X11 platform implementation on X11."; --#endif // defined(OS_LINUX) && defined(USE_OZONE) -+#endif // (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_OZONE) +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + const char kOzonePlatformHintChoiceDefault[] = "Default"; + const char kOzonePlatformHintChoiceAuto[] = "Auto"; + const char kOzonePlatformHintChoiceX11[] = "X11"; +@@ -5330,7 +5330,7 @@ const char kOzonePlatformHintName[] = "Preferred Ozone + const char kOzonePlatformHintDescription[] = + "Selects the preferred platform backend used on Linux. The default one is " + "\"X11\". \"Auto\" selects Wayland if possible, X11 otherwise. "; +-#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) // Feature flags -------------------------------------------------------------- -@@ -5249,7 +5249,7 @@ const char kAutofillCreditCardUploadDescription[] = +@@ -5422,7 +5422,7 @@ const char kAutofillCreditCardUploadDescription[] = #endif // defined(TOOLKIT_VIEWS) || defined(OS_ANDROID) @@ -54,7 +58,7 @@ const char kSendWebUIJavaScriptErrorReportsName[] = "Send WebUI JavaScript Error Reports"; const char kSendWebUIJavaScriptErrorReportsDescription[] = -@@ -5264,7 +5264,7 @@ const char kElasticOverscrollDescription[] = +@@ -5437,7 +5437,7 @@ const char kElasticOverscrollDescription[] = "Enables Elastic Overscrolling on touchscreens and precision touchpads."; #endif // defined(OS_WIN) || defined(OS_ANDROID) diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.h b/www/chromium/files/patch-chrome_browser_flag__descriptions.h index 7870c80884ec..dcd7f258f7f1 100644 --- a/www/chromium/files/patch-chrome_browser_flag__descriptions.h +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.h @@ -1,4 +1,4 @@ ---- chrome/browser/flag_descriptions.h.orig 2021-09-24 04:25:58 UTC +--- chrome/browser/flag_descriptions.h.orig 2022-01-20 10:35:49 UTC +++ chrome/browser/flag_descriptions.h @@ -22,9 +22,9 @@ #include "printing/buildflags/buildflags.h" @@ -12,7 +12,7 @@ // This file declares strings used in chrome://flags. These messages are not // translated, because instead of end-users they target Chromium developers and -@@ -2954,7 +2954,7 @@ extern const char kDownloadShelfWebUIDescription[]; +@@ -3045,7 +3045,7 @@ extern const char kDownloadShelfWebUIDescription[]; // Random platform combinations ----------------------------------------------- @@ -20,8 +20,8 @@ +#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) || defined(OS_FUCHSIA) - extern const char kEnableOopPrintDriversName[]; -@@ -2969,10 +2969,10 @@ extern const char kWebuiFeedbackDescription[]; + extern const char kWebUIBrandingUpdateName[]; +@@ -3057,10 +3057,10 @@ extern const char kWebuiFeedbackDescription[]; extern const char kSettingsLandingPageRedesignName[]; extern const char kSettingsLandingPageRedesignDescription[]; @@ -34,7 +34,7 @@ extern const char kCommanderName[]; extern const char kCommanderDescription[]; -@@ -2983,7 +2983,7 @@ extern const char kDesktopRestructuredLanguageSettings +@@ -3071,7 +3071,7 @@ extern const char kDesktopRestructuredLanguageSettings extern const char kDesktopDetailedLanguageSettingsName[]; extern const char kDesktopDetailedLanguageSettingsDescription[]; @@ -43,20 +43,16 @@ #if defined(OS_CHROMEOS) || defined(OS_LINUX) #if BUILDFLAG(USE_TCMALLOC) -@@ -3002,10 +3002,10 @@ extern const char kWebShareName[]; +@@ -3090,7 +3090,7 @@ extern const char kWebShareName[]; extern const char kWebShareDescription[]; - #endif // defined(OS_WIN) || BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_MAC) - --#if defined(OS_LINUX) && defined(USE_OZONE) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_OZONE) - extern const char kUseOzonePlatformName[]; - extern const char kUseOzonePlatformDescription[]; --#endif // defined(OS_LINUX) && defined(USE_OZONE) -+#endif // (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_OZONE) - - // Feature flags -------------------------------------------------------------- - -@@ -3061,7 +3061,7 @@ extern const char kElasticOverscrollName[]; + #endif // defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_MAC) + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + extern const char kOzonePlatformHintChoiceDefault[]; + extern const char kOzonePlatformHintChoiceAuto[]; + extern const char kOzonePlatformHintChoiceX11[]; +@@ -3171,7 +3171,7 @@ extern const char kElasticOverscrollName[]; extern const char kElasticOverscrollDescription[]; #endif // defined(OS_WIN) || defined(OS_ANDROID) 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 170ea4aa48d5..a24df5e3ff18 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,4 +1,4 @@ ---- chrome/browser/headless/headless_mode_util.cc.orig 2021-09-24 18:22:53 UTC +--- chrome/browser/headless/headless_mode_util.cc.orig 2021-12-14 11:44:58 UTC +++ chrome/browser/headless/headless_mode_util.cc @@ -9,7 +9,7 @@ // Native headless is currently available only on Linux platform. More @@ -9,7 +9,7 @@ #include <cstdlib> #include <vector> -@@ -100,7 +100,7 @@ void SetHeadlessDisplayBounds() { +@@ -59,7 +59,7 @@ void SetUpCommandLine(const base::CommandLine* command } // namespace headless @@ -18,7 +18,7 @@ namespace headless { -@@ -114,4 +114,4 @@ void SetHeadlessDisplayBounds() {} +@@ -71,4 +71,4 @@ void SetUpCommandLine(const base::CommandLine* command } // namespace headless 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 c5f578d2b173..4f59f0a7b1f8 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 2021-05-12 22:05:44 UTC +--- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2021-12-14 11:44:58 UTC +++ chrome/browser/media_galleries/media_file_system_registry.cc -@@ -736,7 +736,10 @@ class MediaFileSystemRegistry::MediaFileSystemContextI +@@ -743,7 +743,10 @@ 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_webrtc_webrtc__logging__controller.cc b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc index 5c35f14f9e0a..ce1a69947c1d 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,4 +1,4 @@ ---- chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig 2021-05-12 22:05:44 UTC +--- chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig 2021-12-14 11:44:58 UTC +++ chrome/browser/media/webrtc/webrtc_logging_controller.cc @@ -24,10 +24,10 @@ #include "content/public/browser/browser_context.h" @@ -13,7 +13,7 @@ using webrtc_event_logging::WebRtcEventLogManager; -@@ -273,7 +273,7 @@ void WebRtcLoggingController::StartEventLogging( +@@ -281,7 +281,7 @@ void WebRtcLoggingController::StartEventLogging( web_app_id, callback); } @@ -22,7 +22,7 @@ void WebRtcLoggingController::GetLogsDirectory( LogsDirectoryCallback callback, LogsDirectoryErrorCallback error_callback) { -@@ -319,7 +319,7 @@ void WebRtcLoggingController::GrantLogsDirectoryAccess +@@ -327,7 +327,7 @@ void WebRtcLoggingController::GrantLogsDirectoryAccess FROM_HERE, base::BindOnce(std::move(callback), file_system.id(), registered_name)); } diff --git a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.h b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.h index 8423490e074c..8c81500fc7d9 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,6 +1,6 @@ ---- chrome/browser/media/webrtc/webrtc_logging_controller.h.orig 2021-04-14 18:40:53 UTC +--- chrome/browser/media/webrtc/webrtc_logging_controller.h.orig 2021-12-14 11:44:58 UTC +++ chrome/browser/media/webrtc/webrtc_logging_controller.h -@@ -129,13 +129,13 @@ class WebRtcLoggingController +@@ -132,13 +132,13 @@ class WebRtcLoggingController size_t web_app_id, const StartEventLoggingCallback& callback); @@ -16,7 +16,7 @@ // chrome::mojom::WebRtcLoggingClient methods: void OnAddMessages( -@@ -188,7 +188,7 @@ class WebRtcLoggingController +@@ -191,7 +191,7 @@ class WebRtcLoggingController bool success, const std::string& error_message); @@ -25,7 +25,7 @@ // 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| -@@ -196,7 +196,7 @@ class WebRtcLoggingController +@@ -199,7 +199,7 @@ class WebRtcLoggingController void GrantLogsDirectoryAccess(LogsDirectoryCallback callback, LogsDirectoryErrorCallback error_callback, const base::FilePath& logs_path); diff --git a/www/chromium/files/patch-chrome_browser_memory__details.cc b/www/chromium/files/patch-chrome_browser_memory__details.cc index 733c455f8a0f..f89d5faa9ab3 100644 --- a/www/chromium/files/patch-chrome_browser_memory__details.cc +++ b/www/chromium/files/patch-chrome_browser_memory__details.cc @@ -1,6 +1,6 @@ ---- chrome/browser/memory_details.cc.orig 2021-05-12 22:05:44 UTC +--- chrome/browser/memory_details.cc.orig 2021-12-31 00:57:23 UTC +++ chrome/browser/memory_details.cc -@@ -39,7 +39,7 @@ +@@ -37,7 +37,7 @@ #include "services/resource_coordinator/public/cpp/memory_instrumentation/memory_instrumentation.h" #include "ui/base/l10n/l10n_util.h" @@ -9,8 +9,8 @@ #include "content/public/browser/zygote_host/zygote_host_linux.h" #endif -@@ -347,7 +347,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() { - process.titles.push_back(title); +@@ -325,7 +325,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() { + std::ref(process))); } -#if defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_ANDROID) 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 eff2a50b8eea..c1cac5c12b4d 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,6 +1,6 @@ ---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2021-10-01 01:36:40 UTC +--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2021-12-31 00:57:23 UTC +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc -@@ -62,7 +62,9 @@ +@@ -63,12 +63,14 @@ // of lacros-chrome is complete. #if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) #include <gnu/libc-version.h> @@ -10,26 +10,23 @@ #include "base/linux_util.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" -@@ -71,7 +73,7 @@ - #include "ui/base/ui_base_features.h" - #include "ui/base/x/x11_util.h" - #endif + #include "base/version.h" -#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) - #if defined(USE_OZONE) || defined(USE_X11) + #if defined(USE_OZONE) #include "ui/events/devices/device_data_manager.h" -@@ -224,11 +226,13 @@ void RecordStartupMetrics() { +@@ -223,11 +225,13 @@ void RecordStartupMetrics() { base::UmaHistogramBoolean("Windows.ApplockerRunning", IsApplockerRunning()); #endif // defined(OS_WIN) +#if !defined(OS_BSD) // TODO(crbug.com/1216328) Remove logging. - LOG(ERROR) << "crbug.com/1216328: Checking Bluetooth availability started. " - "Please report if there is no report that this ends."; + LOG(ERROR) << "START: ReportBluetoothAvailability(). " + "If you don't see the END: message, this is crbug.com/1216328."; bluetooth_utility::ReportBluetoothAvailability(); - LOG(ERROR) << "crbug.com/1216328: Checking Bluetooth availability ended."; + LOG(ERROR) << "END: ReportBluetoothAvailability()"; +#endif // Record whether Chrome is the default browser or not. - LOG(ERROR) << "crbug.com/1216328: Checking default browser status started. " + // Disabled on Linux due to hanging browser tests, see crbug.com/1216328. 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 311f1bc92fa9..77d90093041d 100644 --- a/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc +++ b/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2021-09-24 04:25:58 UTC +--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2021-12-31 00:57:23 UTC +++ chrome/browser/metrics/chrome_metrics_service_client.cc -@@ -721,10 +721,10 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -742,10 +742,10 @@ 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) || \ @@ -13,7 +13,7 @@ // BUILDFLAG(IS_CHROMEOS_LACROS)) #if BUILDFLAG(ENABLE_PLUGINS) -@@ -819,10 +819,10 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -837,10 +837,10 @@ void ChromeMetricsServiceClient::RegisterMetricsServic std::make_unique<PowerMetricsProvider>()); #endif @@ -26,7 +26,7 @@ } void ChromeMetricsServiceClient::RegisterUKMProviders() { -@@ -996,7 +996,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve +@@ -1014,7 +1014,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if defined(OS_WIN) || defined(OS_MAC) || \ diff --git a/www/chromium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc b/www/chromium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc index b60c3bc0578c..98a6affb51d0 100644 --- a/www/chromium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc +++ b/www/chromium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/process_memory_metrics_emitter.cc.orig 2021-09-24 04:25:58 UTC +--- chrome/browser/metrics/process_memory_metrics_emitter.cc.orig 2021-12-14 11:44:58 UTC +++ chrome/browser/metrics/process_memory_metrics_emitter.cc -@@ -546,7 +546,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc +@@ -550,7 +550,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc builder->SetPrivateMemoryFootprint(pmd.os_dump().private_footprint_kb / kKiB); builder->SetSharedMemoryFootprint(pmd.os_dump().shared_footprint_kb / kKiB); @@ -9,7 +9,7 @@ builder->SetPrivateSwapFootprint(pmd.os_dump().private_footprint_swap_kb / kKiB); #endif -@@ -569,7 +569,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc +@@ -573,7 +573,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc MEMORY_METRICS_HISTOGRAM_MB(std::string(kMemoryHistogramPrefix) + process_name + ".SharedMemoryFootprint", pmd.os_dump().shared_footprint_kb / kKiB); 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 45a3617f8533..5bcb8e554eb6 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,6 +1,6 @@ ---- chrome/browser/net/system_network_context_manager.cc.orig 2021-09-24 04:25:58 UTC +--- chrome/browser/net/system_network_context_manager.cc.orig 2021-12-31 00:57:23 UTC +++ chrome/browser/net/system_network_context_manager.cc -@@ -82,11 +82,11 @@ +@@ -83,11 +83,11 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -14,7 +14,7 @@ #if BUILDFLAG(ENABLE_EXTENSIONS) #include "extensions/common/constants.h" -@@ -147,10 +147,10 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -134,10 +134,10 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut auth_dynamic_params->basic_over_http_enabled = local_state->GetBoolean(prefs::kBasicAuthOverHttpEnabled); @@ -27,7 +27,7 @@ #if defined(OS_POSIX) auth_dynamic_params->ntlm_v2_enabled = -@@ -376,10 +376,10 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -365,10 +365,10 @@ SystemNetworkContextManager::SystemNetworkContextManag pref_change_registrar_.Add(prefs::kBasicAuthOverHttpEnabled, auth_pref_callback); @@ -40,7 +40,7 @@ #if defined(OS_POSIX) pref_change_registrar_.Add(prefs::kNtlmV2Enabled, auth_pref_callback); -@@ -434,10 +434,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -423,10 +423,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe registry->RegisterStringPref(prefs::kAuthServerAllowlist, std::string()); registry->RegisterStringPref(prefs::kAuthNegotiateDelegateAllowlist, std::string()); @@ -53,7 +53,7 @@ #if defined(OS_POSIX) registry->RegisterBooleanPref( -@@ -566,7 +566,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea +@@ -559,7 +559,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc b/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc index 27109ef36102..3993957f3fea 100644 --- a/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc +++ b/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc @@ -1,4 +1,4 @@ ---- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2021-09-24 04:25:58 UTC +--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2021-12-14 11:44:58 UTC +++ chrome/browser/password_manager/chrome_password_manager_client.cc @@ -9,6 +9,10 @@ #include <string> @@ -11,7 +11,7 @@ #include "base/bind.h" #include "base/callback_helpers.h" #include "base/command_line.h" -@@ -105,8 +109,11 @@ +@@ -104,8 +108,11 @@ #include "net/cert/cert_status_flags.h" #include "services/metrics/public/cpp/ukm_recorder.h" #include "services/network/public/cpp/is_potentially_trustworthy.h" 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 73a91fc0622a..04db9b54dfa1 100644 --- a/www/chromium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc +++ b/www/chromium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/password_manager/password_reuse_manager_factory.cc.orig 2021-09-24 18:25:48 UTC +--- chrome/browser/password_manager/password_reuse_manager_factory.cc.orig 2021-12-14 11:44:58 UTC +++ chrome/browser/password_manager/password_reuse_manager_factory.cc -@@ -92,7 +92,7 @@ KeyedService* PasswordReuseManagerFactory::BuildServic +@@ -93,7 +93,7 @@ KeyedService* PasswordReuseManagerFactory::BuildServic // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_pdf_pdf__extension__test.cc b/www/chromium/files/patch-chrome_browser_pdf_pdf__extension__test.cc index 5d6e0198e124..b0bfa7676da5 100644 --- a/www/chromium/files/patch-chrome_browser_pdf_pdf__extension__test.cc +++ b/www/chromium/files/patch-chrome_browser_pdf_pdf__extension__test.cc @@ -1,6 +1,6 @@ ---- chrome/browser/pdf/pdf_extension_test.cc.orig 2021-09-24 04:25:58 UTC +--- chrome/browser/pdf/pdf_extension_test.cc.orig 2021-12-31 00:57:23 UTC +++ chrome/browser/pdf/pdf_extension_test.cc -@@ -812,11 +812,11 @@ IN_PROC_BROWSER_TEST_P(PDFPluginDisabledTest, DirectNa +@@ -920,11 +920,11 @@ IN_PROC_BROWSER_TEST_P(PDFPluginDisabledTest, DirectNa } // TODO(crbug.com/1201401): fix flakiness and reenable @@ -14,7 +14,7 @@ IN_PROC_BROWSER_TEST_P(PDFPluginDisabledTest, MAYBE_EmbedPdfPlaceholderWithCSP) { // Navigate to a page with CSP that uses <embed> to embed a PDF as a plugin. -@@ -2404,7 +2404,7 @@ IN_PROC_BROWSER_TEST_F(PDFExtensionClipboardTest, +@@ -3004,7 +3004,7 @@ IN_PROC_BROWSER_TEST_P(PDFExtensionClipboardTest, } // Flaky on Linux (https://crbug.com/1121446) 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 0f4aabc3e5a5..66375e3e21b2 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,6 +1,6 @@ ---- chrome/browser/performance_monitor/process_monitor.cc.orig 2021-09-14 01:51:50 UTC +--- chrome/browser/performance_monitor/process_monitor.cc.orig 2021-12-14 11:44:58 UTC +++ chrome/browser/performance_monitor/process_monitor.cc -@@ -76,7 +76,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me +@@ -75,7 +75,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me const ProcessMonitor::Metrics& rhs) { lhs.cpu_usage += rhs.cpu_usage; 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 c56c4121294c..72d43ea7de65 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,6 +1,6 @@ ---- chrome/browser/performance_monitor/process_monitor.h.orig 2021-09-24 04:25:58 UTC +--- chrome/browser/performance_monitor/process_monitor.h.orig 2021-12-14 11:44:58 UTC +++ chrome/browser/performance_monitor/process_monitor.h -@@ -57,7 +57,7 @@ class ProcessMonitor { +@@ -56,7 +56,7 @@ class ProcessMonitor { // can exceed 100% in multi-thread processes running on multi-core systems. double cpu_usage = 0.0; 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 7e41060c1186..69471e9770ac 100644 --- a/www/chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc +++ b/www/chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc @@ -1,6 +1,6 @@ ---- chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc.orig 2021-09-24 04:25:59 UTC +--- chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc.orig 2021-12-31 00:57:23 UTC +++ chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc -@@ -44,9 +44,9 @@ +@@ -46,9 +46,9 @@ #include "chrome/browser/policy/browser_dm_token_storage_mac.h" #endif // defined(OS_MAC) @@ -12,7 +12,7 @@ #if defined(OS_WIN) #include "chrome/browser/policy/browser_dm_token_storage_win.h" -@@ -80,7 +80,7 @@ void ChromeBrowserCloudManagementControllerDesktop:: +@@ -82,7 +82,7 @@ void ChromeBrowserCloudManagementControllerDesktop:: #if defined(OS_MAC) storage_delegate = std::make_unique<BrowserDMTokenStorageMac>(); 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 794797236560..e406d9f92fbe 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,6 +1,6 @@ ---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2021-09-24 04:25:59 UTC +--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2021-12-31 00:57:23 UTC +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -1363,11 +1363,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1416,11 +1416,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // !defined(OS_MAC) && !defined(OS_CHROMEOS) @@ -14,7 +14,16 @@ #if !defined(OS_MAC) { key::kFullscreenAllowed, -@@ -1728,7 +1728,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -1531,7 +1531,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + base::Value::Type::INTEGER }, + #endif + +-#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)) + { key::kChromeAppsEnabled, + extensions::pref_names::kChromeAppsEnabled, + base::Value::Type::BOOLEAN }, +@@ -1801,7 +1801,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH SimpleSchemaValidatingPolicyHandler::MANDATORY_ALLOWED)); #endif // defined(OS_ANDROID) @@ -23,7 +32,7 @@ defined(OS_CHROMEOS) || defined(OS_FUCHSIA) handlers->AddHandler( std::make_unique< -@@ -1736,7 +1736,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -1809,7 +1809,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH key::kContextAwareAccessSignalsAllowlist, enterprise_connectors::kContextAwareAccessSignalsAllowlistPref, chrome_schema)); @@ -32,7 +41,7 @@ // defined(OS_CHROMEOS) || defined(OS_FUCHSIA) #if defined(OS_CHROMEOS) -@@ -2091,14 +2091,14 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2166,14 +2166,14 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH SimpleSchemaValidatingPolicyHandler::RECOMMENDED_PROHIBITED, SimpleSchemaValidatingPolicyHandler::MANDATORY_ALLOWED)); @@ -49,7 +58,7 @@ // defined(OS_FUCHSIA) #endif // BUILDFLAG(ENABLE_EXTENSIONS) -@@ -2119,7 +2119,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2198,7 +2198,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH policy::key::kSpellcheckLanguageBlocklist)); #endif // BUILDFLAG(ENABLE_SPELLCHECK) @@ -58,7 +67,7 @@ handlers->AddHandler(std::make_unique<SimpleDeprecatingPolicyHandler>( std::make_unique<SimplePolicyHandler>(key::kAllowNativeNotifications, prefs::kAllowNativeNotifications, -@@ -2127,7 +2127,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2206,7 +2206,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH std::make_unique<SimplePolicyHandler>(key::kAllowSystemNotifications, prefs::kAllowSystemNotifications, base::Value::Type::BOOLEAN))); 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 93f24890d4a0..957158812095 100644 --- a/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc +++ b/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc @@ -1,12 +1,12 @@ ---- chrome/browser/prefs/browser_prefs.cc.orig 2021-09-24 04:25:59 UTC +--- chrome/browser/prefs/browser_prefs.cc.orig 2021-12-31 00:57:23 UTC +++ chrome/browser/prefs/browser_prefs.cc -@@ -405,14 +405,14 @@ +@@ -412,14 +412,14 @@ #endif #if defined(OS_WIN) || defined(OS_MAC) || \ - (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) + (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) - #include "chrome/browser/web_applications/components/url_handler_prefs.h" + #include "chrome/browser/web_applications/url_handler_prefs.h" #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch @@ -17,7 +17,25 @@ #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" #endif -@@ -1012,10 +1012,10 @@ void RegisterLocalState(PrefRegistrySimple* registry) +@@ -493,7 +493,7 @@ const char kLocalDiscoveryNotificationsEnabled[] = + #endif + + // Deprecated 11/2020 +-#if defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST) ++#if (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) || defined(OS_BSD) + const char kMigrationToLoginDBStep[] = "profile.migration_to_logindb_step"; + #endif + +@@ -755,7 +755,7 @@ void RegisterProfilePrefsForMigration( + + registry->RegisterBooleanPref(prefs::kWebAppsUserDisplayModeCleanedUp, false); + +-#if defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST) ++#if (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) || defined(OS_BSD) + registry->RegisterIntegerPref(kMigrationToLoginDBStep, 0); + #endif + +@@ -1079,10 +1079,10 @@ void RegisterLocalState(PrefRegistrySimple* registry) // TODO(crbug/1169547) Remove `BUILDFLAG(IS_CHROMEOS_LACROS)` once the // migration is complete. @@ -30,7 +48,7 @@ #if defined(OS_MAC) confirm_quit::RegisterLocalState(registry); -@@ -1043,7 +1043,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) +@@ -1112,7 +1112,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) #endif // defined(OS_WIN) #if defined(OS_WIN) || defined(OS_MAC) || \ @@ -39,7 +57,7 @@ web_app::url_handler_prefs::RegisterLocalStatePrefs(registry); #endif -@@ -1335,7 +1335,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync +@@ -1405,7 +1405,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) || \ @@ -48,3 +66,12 @@ browser_switcher::BrowserSwitcherPrefs::RegisterProfilePrefs(registry); #endif +@@ -1554,7 +1554,7 @@ void MigrateObsoleteProfilePrefs(Profile* profile) { + profile_prefs); + + // Added 11/2020 +-#if defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST) ++#if (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) || defined(OS_BSD) + profile_prefs->ClearPref(kMigrationToLoginDBStep); + #endif + 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 25092969a07b..fd8af4d6fbc3 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,6 +1,6 @@ ---- chrome/browser/printing/print_job_worker.cc.orig 2021-09-14 01:51:50 UTC +--- chrome/browser/printing/print_job_worker.cc.orig 2021-12-14 11:44:58 UTC +++ chrome/browser/printing/print_job_worker.cc -@@ -224,7 +224,7 @@ void PrintJobWorker::UpdatePrintSettings(base::Value n +@@ -287,7 +287,7 @@ void PrintJobWorker::UpdatePrintSettings(base::Value n crash_key = std::make_unique<crash_keys::ScopedPrinterInfo>( print_backend->GetPrinterDriverInfo(printer_name)); @@ -9,7 +9,7 @@ PrinterBasicInfo basic_info; if (print_backend->GetPrinterBasicInfo(printer_name, &basic_info) == mojom::ResultCode::kSuccess) { -@@ -235,7 +235,7 @@ void PrintJobWorker::UpdatePrintSettings(base::Value n +@@ -298,7 +298,7 @@ void PrintJobWorker::UpdatePrintSettings(base::Value n new_settings.SetKey(kSettingAdvancedSettings, std::move(advanced_settings)); } @@ -17,4 +17,4 @@ +#endif // (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_CUPS) } - PrintingContext::Result result; + mojom::ResultCode result; 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 12561beaa09d..13496fa7614a 100644 --- a/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc +++ b/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc @@ -1,6 +1,6 @@ ---- chrome/browser/process_singleton_posix.cc.orig 2021-05-12 22:05:44 UTC +--- chrome/browser/process_singleton_posix.cc.orig 2021-12-14 11:44:58 UTC +++ chrome/browser/process_singleton_posix.cc -@@ -95,12 +95,12 @@ +@@ -97,12 +97,12 @@ #include "net/base/network_interfaces.h" #include "ui/base/l10n/l10n_util.h" @@ -15,7 +15,7 @@ #include "ui/views/linux_ui/linux_ui.h" #endif -@@ -297,7 +297,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo +@@ -356,7 +356,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo if (g_disable_prompt) return g_user_opted_unlock_in_use_profile; @@ -24,7 +24,7 @@ std::u16string relaunch_button_text = l10n_util::GetStringUTF16(IDS_PROFILE_IN_USE_LINUX_RELAUNCH); return ShowProcessSingletonDialog(error, relaunch_button_text); -@@ -874,7 +874,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::Notif +@@ -935,7 +935,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::Notif return PROCESS_NONE; } else if (strncmp(buf, kACKToken, base::size(kACKToken) - 1) == 0) { #if defined(TOOLKIT_VIEWS) && \ 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 f433ff0e7fe8..5a77b6f4c787 100644 --- a/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc +++ b/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc @@ -1,6 +1,6 @@ ---- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2021-09-24 04:25:59 UTC +--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2021-12-31 00:57:23 UTC +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -358,7 +358,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -376,7 +376,7 @@ void ChromeBrowserMainExtraPartsProfiles:: // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if defined(OS_WIN) || defined(OS_MAC) || \ 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 c8453b69e997..9f3c21b1f39e 100644 --- a/www/chromium/files/patch-chrome_browser_profiles_profiles__state.cc +++ b/www/chromium/files/patch-chrome_browser_profiles_profiles__state.cc @@ -1,6 +1,6 @@ ---- chrome/browser/profiles/profiles_state.cc.orig 2021-09-14 01:51:50 UTC +--- chrome/browser/profiles/profiles_state.cc.orig 2021-12-14 11:44:58 UTC +++ chrome/browser/profiles/profiles_state.cc -@@ -180,7 +180,7 @@ bool IsRegularOrGuestSession(Browser* browser) { +@@ -181,7 +181,7 @@ bool IsRegularOrGuestSession(Browser* browser) { bool IsGuestModeRequested(const base::CommandLine& command_line, PrefService* local_state, bool show_warning) { diff --git a/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc b/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc index 7576af363f36..589edb86073b 100644 --- a/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc +++ b/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc @@ -1,24 +1,6 @@ ---- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig 2021-09-24 04:25:59 UTC +--- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig 2021-12-31 00:57:23 UTC +++ chrome/browser/renderer_context_menu/render_view_context_menu.cc -@@ -229,7 +229,7 @@ - #include "ui/base/resource/resource_bundle.h" - #endif - --#if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) - #include "chrome/browser/lens/region_search/lens_region_search_controller.h" - #endif - -@@ -982,7 +982,7 @@ void RenderViewContextMenu::InitMenu() { - AppendCurrentExtensionItems(); - } - --#if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) - if (content_type_->SupportsGroup( - ContextMenuContentType::ITEM_GROUP_LENS_REGION_SEARCH)) { - if (IsLensRegionSearchEnabled()) { -@@ -2339,7 +2339,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) +@@ -2399,7 +2399,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) case IDC_CHECK_SPELLING_WHILE_TYPING: return prefs->GetBoolean(spellcheck::prefs::kSpellCheckEnable); @@ -27,12 +9,3 @@ // TODO(suzhe): this should not be enabled for password fields. case IDC_INPUT_METHODS_MENU: return true; -@@ -3298,7 +3298,7 @@ void RenderViewContextMenu::ExecSearchLensForImage() { - } - - void RenderViewContextMenu::ExecLensRegionSearch() { --#if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) - if (!lens_region_search_controller_) - lens_region_search_controller_ = - std::make_unique<lens::LensRegionSearchController>( diff --git a/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.h b/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.h deleted file mode 100644 index a08298e804c3..000000000000 --- a/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.h +++ /dev/null @@ -1,20 +0,0 @@ ---- chrome/browser/renderer_context_menu/render_view_context_menu.h.orig 2021-09-24 18:28:06 UTC -+++ chrome/browser/renderer_context_menu/render_view_context_menu.h -@@ -32,7 +32,7 @@ - #include "ui/base/window_open_disposition.h" - #include "ui/gfx/geometry/vector2d.h" - --#if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) - #include "chrome/browser/lens/region_search/lens_region_search_controller.h" - #endif - -@@ -359,7 +359,7 @@ class RenderViewContextMenu : public RenderViewContext - // The type of system app (if any) associated with the WebContents we're in. - absl::optional<web_app::SystemAppType> system_app_type_; - --#if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) - // Controller for Lens Region Search feature. This controller will be - // destroyed as soon as the RenderViewContextMenu object is destroyed. The - // RenderViewContextMenu is reset every time it is shown, but persists between 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 c37f51bb9b2c..24bc27fff067 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,6 +1,6 @@ ---- chrome/browser/resources/settings/appearance_page/appearance_page.ts.orig 2021-09-24 17:30:23 UTC +--- chrome/browser/resources/settings/appearance_page/appearance_page.ts.orig 2021-12-14 11:44:59 UTC +++ chrome/browser/resources/settings/appearance_page/appearance_page.ts -@@ -149,7 +149,7 @@ class SettingsAppearancePageElement extends SettingsAp +@@ -144,7 +144,7 @@ class SettingsAppearancePageElement extends SettingsAp 'prefs.autogenerated.theme.policy.color.controlledBy)', }, @@ -9,7 +9,7 @@ /** * Whether to show the "Custom Chrome Frame" setting. */ -@@ -171,7 +171,7 @@ class SettingsAppearancePageElement extends SettingsAp +@@ -166,7 +166,7 @@ class SettingsAppearancePageElement extends SettingsAp 'themeChanged_(' + 'prefs.extensions.theme.id.value, useSystemTheme_, isForcedTheme_)', @@ -18,7 +18,7 @@ // NOTE: this pref only exists on Linux. 'useSystemThemePrefChanged_(prefs.extensions.theme.use_system.value)', // </if> -@@ -190,7 +190,7 @@ class SettingsAppearancePageElement extends SettingsAp +@@ -185,7 +185,7 @@ class SettingsAppearancePageElement extends SettingsAp private showReaderModeOption_: boolean; private isForcedTheme_: boolean; @@ -27,7 +27,7 @@ private showCustomChromeFrame_: boolean; // </if> -@@ -268,7 +268,7 @@ class SettingsAppearancePageElement extends SettingsAp +@@ -263,7 +263,7 @@ class SettingsAppearancePageElement extends SettingsAp this.appearanceBrowserProxy_.useDefaultTheme(); } @@ -36,7 +36,7 @@ private useSystemThemePrefChanged_(useSystemTheme: boolean) { this.useSystemTheme_ = useSystemTheme; } -@@ -329,10 +329,10 @@ class SettingsAppearancePageElement extends SettingsAp +@@ -324,10 +324,10 @@ class SettingsAppearancePageElement extends SettingsAp } let 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 2c4c2b72475e..63b198564393 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 2021-06-11 09:29:24 UTC +--- chrome/browser/resources/settings/autofill_page/passwords_shared_css.html.orig 2021-12-31 00:57:24 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 is_linux"> -+<if expr="chromeos or is_posix"> +-<if expr="chromeos or lacros or is_linux"> ++<if expr="chromeos or lacros or is_linux or is_bsd"> font-family: 'DejaVu Sans Mono', monospace; </if> <if expr="is_win"> diff --git a/www/chromium/files/patch-chrome_browser_resources_settings_route.js b/www/chromium/files/patch-chrome_browser_resources_settings_route.js deleted file mode 100644 index 4f8d83b68083..000000000000 --- a/www/chromium/files/patch-chrome_browser_resources_settings_route.js +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/resources/settings/route.js.orig 2021-09-24 04:25:59 UTC -+++ chrome/browser/resources/settings/route.js -@@ -185,7 +185,7 @@ function createBrowserSettingsRoutes() { - - r.ACCESSIBILITY = r.ADVANCED.createSection('/accessibility', 'a11y'); - -- // <if expr="chromeos or is_linux"> -+ // <if expr="chromeos or is_posix"> - r.CAPTIONS = r.ACCESSIBILITY.createChild('/captions'); - // </if> - diff --git a/www/chromium/files/patch-chrome_browser_safe__browsing_BUILD.gn b/www/chromium/files/patch-chrome_browser_safe__browsing_BUILD.gn new file mode 100644 index 000000000000..c6e4a9f79b11 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_safe__browsing_BUILD.gn @@ -0,0 +1,20 @@ +--- chrome/browser/safe_browsing/BUILD.gn.orig 2021-12-31 00:57:24 UTC ++++ chrome/browser/safe_browsing/BUILD.gn +@@ -299,7 +299,7 @@ static_library("safe_browsing") { + ] + } + +- if (is_linux || is_win) { ++ if ((is_linux || is_win) && !is_bsd) { + sources += [ + "download_protection/document_analysis_service.cc", + "download_protection/document_analysis_service.h", +@@ -345,7 +345,7 @@ static_library("safe_browsing") { + "//chrome/common:version_header", + ] + } +- if (is_linux || is_win) { ++ if ((is_linux || is_win) && !is_bsd) { + deps += [ + "//chrome/common/safe_browsing:document_analyzer_results", + "//chrome/services/file_util/public/mojom", 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 11c23a9331f6..952901aa7e70 100644 --- a/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc +++ b/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig 2021-05-12 22:05:45 UTC +--- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig 2021-12-31 00:57:24 UTC +++ chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc -@@ -709,7 +709,7 @@ void IncidentReportingService::OnEnvironmentDataCollec +@@ -708,7 +708,7 @@ void IncidentReportingService::OnEnvironmentDataCollec environment_collection_pending_ = false; // Process::Current().CreationTime() is missing on some platforms. diff --git a/www/chromium/files/patch-chrome_browser_search_search__suggest_search__suggest__service.cc b/www/chromium/files/patch-chrome_browser_search_search__suggest_search__suggest__service.cc deleted file mode 100644 index dccdc2005f17..000000000000 --- a/www/chromium/files/patch-chrome_browser_search_search__suggest_search__suggest__service.cc +++ /dev/null @@ -1,14 +0,0 @@ ---- chrome/browser/search/search_suggest/search_suggest_service.cc.orig 2021-04-14 18:40:55 UTC -+++ chrome/browser/search/search_suggest/search_suggest_service.cc -@@ -21,7 +21,11 @@ - #include "components/search/ntp_features.h" - #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h" - #include "components/signin/public/identity_manager/identity_manager.h" -+#if defined(OS_BSD) -+#include <re2/re2.h> -+#else - #include "third_party/re2/src/re2/re2.h" -+#endif - - namespace { - 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 28b378680835..3fd5b3ec55c5 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,7 +1,7 @@ ---- chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc.orig 2021-09-24 04:25:59 UTC +--- chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc.orig 2021-12-14 11:44:59 UTC +++ chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc -@@ -13,7 +13,7 @@ - #include "chrome/browser/send_tab_to_self/receiving_ui_handler.h" +@@ -15,7 +15,7 @@ + #include "chrome/browser/share/share_features.h" #include "components/send_tab_to_self/features.h" -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ @@ -9,7 +9,7 @@ defined(OS_WIN) #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" -@@ -36,7 +36,7 @@ ReceivingUiHandlerRegistry* ReceivingUiHandlerRegistry +@@ -38,7 +38,7 @@ ReceivingUiHandlerRegistry* ReceivingUiHandlerRegistry // Instantiates all the handlers relevant to this platform. void ReceivingUiHandlerRegistry::InstantiatePlatformSpecificHandlers( Profile* profile) { @@ -18,7 +18,7 @@ defined(OS_WIN) // If STTS 2.0 is enabled the handler will be created when the toolbar -@@ -55,7 +55,7 @@ void ReceivingUiHandlerRegistry::InstantiatePlatformSp +@@ -58,7 +58,7 @@ void ReceivingUiHandlerRegistry::InstantiatePlatformSp SendTabToSelfToolbarIconController* ReceivingUiHandlerRegistry::GetToolbarButtonControllerForProfile( Profile* profile) { 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 a05062afed6c..78c1b30fc474 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,6 +1,6 @@ ---- chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc.orig 2021-09-24 04:25:59 UTC +--- chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc.orig 2021-12-14 11:44:59 UTC +++ chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc -@@ -15,7 +15,7 @@ +@@ -16,7 +16,7 @@ #include "components/send_tab_to_self/features.h" #include "components/send_tab_to_self/send_tab_to_self_model.h" @@ -9,7 +9,7 @@ defined(OS_WIN) #include "chrome/browser/ui/send_tab_to_self/send_tab_to_self_toolbar_icon_controller.h" #endif -@@ -46,7 +46,7 @@ void SendTabToSelfClientService::SendTabToSelfModelLoa +@@ -50,7 +50,7 @@ void SendTabToSelfClientService::SendTabToSelfModelLoa void SendTabToSelfClientService::EntriesAddedRemotely( const std::vector<const SendTabToSelfEntry*>& new_entries) { for (const std::unique_ptr<ReceivingUiHandler>& handler : GetHandlers()) { diff --git a/www/chromium/files/patch-chrome_browser_service__sandbox__type.h b/www/chromium/files/patch-chrome_browser_service__sandbox__type.h deleted file mode 100644 index e7e42db2ff6f..000000000000 --- a/www/chromium/files/patch-chrome_browser_service__sandbox__type.h +++ /dev/null @@ -1,33 +0,0 @@ ---- chrome/browser/service_sandbox_type.h.orig 2021-09-14 01:51:51 UTC -+++ chrome/browser/service_sandbox_type.h -@@ -11,8 +11,8 @@ - #include "printing/buildflags/buildflags.h" - #include "sandbox/policy/sandbox_type.h" - --#if (defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ -- defined(OS_CHROMEOS)) && \ -+#if (defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ -+ defined(OS_CHROMEOS)) && \ - BUILDFLAG(ENABLE_PRINTING) - #include "chrome/browser/printing/print_backend_service_manager.h" - #endif -@@ -173,8 +173,8 @@ content::GetServiceSandboxType<printing::mojom::Printi - #endif // BUILDFLAG(ENABLE_PRINT_PREVIEW) - - // printing::mojom::PrintBackendService --#if (defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ -- defined(OS_CHROMEOS)) && \ -+#if (defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ -+ defined(OS_CHROMEOS)) && \ - BUILDFLAG(ENABLE_PRINTING) - namespace printing { - namespace mojom { -@@ -190,7 +190,7 @@ content::GetServiceSandboxType<printing::mojom::PrintB - ? sandbox::policy::SandboxType::kPrintBackend - : sandbox::policy::SandboxType::kNoSandbox; - } --#endif // (defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || -+#endif // (defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || - // defined(OS_CHROMEOS)) && - // BUILDFLAG(ENABLE_PRINTING) - 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 72e863f69fda..2379988c552f 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,6 +1,6 @@ ---- chrome/browser/sharing/sharing_device_registration.cc.orig 2021-07-19 18:45:09 UTC +--- chrome/browser/sharing/sharing_device_registration.cc.orig 2021-12-14 11:44:59 UTC +++ chrome/browser/sharing/sharing_device_registration.cc -@@ -321,7 +321,7 @@ bool SharingDeviceRegistration::IsSmsFetcherSupported( +@@ -326,7 +326,7 @@ bool SharingDeviceRegistration::IsSmsFetcherSupported( } bool SharingDeviceRegistration::IsRemoteCopySupported() const { 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 e4a2e7c328c7..9792faddf570 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,6 +1,6 @@ ---- chrome/browser/sharing/sharing_handler_registry_impl.cc.orig 2021-05-12 22:05:45 UTC +--- chrome/browser/sharing/sharing_handler_registry_impl.cc.orig 2021-12-14 11:44:59 UTC +++ chrome/browser/sharing/sharing_handler_registry_impl.cc -@@ -21,10 +21,10 @@ +@@ -23,10 +23,10 @@ #include "chrome/browser/sharing/shared_clipboard/shared_clipboard_message_handler_desktop.h" #endif // defined(OS_ANDROID) @@ -13,7 +13,7 @@ // BUILDFLAG(IS_CHROMEOS_LACROS)) defined(OS_CHROMEOS) SharingHandlerRegistryImpl::SharingHandlerRegistryImpl( -@@ -67,14 +67,14 @@ SharingHandlerRegistryImpl::SharingHandlerRegistryImpl +@@ -76,14 +76,14 @@ SharingHandlerRegistryImpl::SharingHandlerRegistryImpl {chrome_browser_sharing::SharingMessage::kSharedClipboardMessage}); } diff --git a/www/chromium/files/patch-chrome_browser_shutdown__signal__handlers__posix.cc b/www/chromium/files/patch-chrome_browser_shutdown__signal__handlers__posix.cc index 31ae26238090..093cc0ca8661 100644 --- a/www/chromium/files/patch-chrome_browser_shutdown__signal__handlers__posix.cc +++ b/www/chromium/files/patch-chrome_browser_shutdown__signal__handlers__posix.cc @@ -1,6 +1,6 @@ ---- chrome/browser/shutdown_signal_handlers_posix.cc.orig 2021-10-07 15:08:14 UTC +--- chrome/browser/shutdown_signal_handlers_posix.cc.orig 2021-12-14 11:44:59 UTC +++ chrome/browser/shutdown_signal_handlers_posix.cc -@@ -186,7 +186,11 @@ void InstallShutdownSignalHandlers( +@@ -188,7 +188,11 @@ void InstallShutdownSignalHandlers( g_pipe_pid = getpid(); g_shutdown_pipe_read_fd = pipefd[0]; g_shutdown_pipe_write_fd = pipefd[1]; 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 6240aa591798..f2c634f2b024 100644 --- a/www/chromium/files/patch-chrome_browser_signin_signin__util.cc +++ b/www/chromium/files/patch-chrome_browser_signin_signin__util.cc @@ -1,6 +1,6 @@ ---- chrome/browser/signin/signin_util.cc.orig 2021-09-24 04:25:59 UTC +--- chrome/browser/signin/signin_util.cc.orig 2021-12-31 00:57:24 UTC +++ chrome/browser/signin/signin_util.cc -@@ -37,7 +37,7 @@ +@@ -38,7 +38,7 @@ #include "google_apis/gaia/gaia_auth_util.h" #include "ui/base/l10n/l10n_util.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 2f3312e22189..aa5834d1c526 100644 --- a/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc +++ b/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/sync/chrome_sync_client.cc.orig 2021-09-24 04:25:59 UTC +--- chrome/browser/sync/chrome_sync_client.cc.orig 2021-12-14 11:44:59 UTC +++ chrome/browser/sync/chrome_sync_client.cc -@@ -465,7 +465,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy +@@ -461,7 +461,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy // Chrome prefers OS provided spell checkers where they exist. So only sync the // custom dictionary on platforms that typically don't provide one. @@ -9,7 +9,7 @@ // Dictionary sync is enabled by default. if (!disabled_types.Has(syncer::DICTIONARY) && GetPrefService()->GetBoolean(spellcheck::prefs::kSpellCheckEnable)) { -@@ -474,7 +474,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy +@@ -470,7 +470,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy syncer::DICTIONARY, model_type_store_factory, GetSyncableServiceForType(syncer::DICTIONARY), dump_stack)); } diff --git a/www/chromium/files/patch-chrome_browser_sync_sync__service__factory.cc b/www/chromium/files/patch-chrome_browser_sync_sync__service__factory.cc index c6ef51928130..3d7cf945d9a5 100644 --- a/www/chromium/files/patch-chrome_browser_sync_sync__service__factory.cc +++ b/www/chromium/files/patch-chrome_browser_sync_sync__service__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/sync/sync_service_factory.cc.orig 2021-09-24 18:28:51 UTC +--- chrome/browser/sync/sync_service_factory.cc.orig 2021-12-14 11:44:59 UTC +++ chrome/browser/sync/sync_service_factory.cc -@@ -110,7 +110,7 @@ std::unique_ptr<KeyedService> BuildSyncService( +@@ -106,7 +106,7 @@ std::unique_ptr<KeyedService> BuildSyncService( // in lacros-chrome once build flag switch of lacros-chrome is // complete. #if defined(OS_WIN) || defined(OS_MAC) || \ @@ -9,7 +9,7 @@ syncer::SyncPrefs prefs(profile->GetPrefs()); local_sync_backend_enabled = prefs.IsLocalSyncEnabled(); UMA_HISTOGRAM_BOOLEAN("Sync.Local.Enabled", local_sync_backend_enabled); -@@ -128,7 +128,7 @@ std::unique_ptr<KeyedService> BuildSyncService( +@@ -124,7 +124,7 @@ std::unique_ptr<KeyedService> BuildSyncService( init_params.start_behavior = syncer::SyncServiceImpl::AUTO_START; } 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 4427d816e1ee..59c335039718 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,6 +1,6 @@ ---- chrome/browser/task_manager/sampling/task_group.cc.orig 2021-07-19 18:45:09 UTC +--- chrome/browser/task_manager/sampling/task_group.cc.orig 2021-12-14 11:44:59 UTC +++ chrome/browser/task_manager/sampling/task_group.cc -@@ -38,9 +38,9 @@ const int kBackgroundRefreshTypesMask = +@@ -37,9 +37,9 @@ const int kBackgroundRefreshTypesMask = #if defined(OS_WIN) REFRESH_TYPE_START_TIME | REFRESH_TYPE_CPU_TIME | #endif // defined(OS_WIN) @@ -12,7 +12,7 @@ #if BUILDFLAG(ENABLE_NACL) REFRESH_TYPE_NACL | #endif // BUILDFLAG(ENABLE_NACL) -@@ -123,9 +123,9 @@ TaskGroup::TaskGroup( +@@ -122,9 +122,9 @@ TaskGroup::TaskGroup( #if BUILDFLAG(ENABLE_NACL) nacl_debug_stub_port_(nacl::kGdbDebugStubPortUnknown), #endif // BUILDFLAG(ENABLE_NACL) @@ -24,7 +24,7 @@ idle_wakeups_per_second_(-1), gpu_memory_has_duplicates_(false), is_backgrounded_(false) { -@@ -142,10 +142,10 @@ TaskGroup::TaskGroup( +@@ -141,10 +141,10 @@ TaskGroup::TaskGroup( weak_ptr_factory_.GetWeakPtr()), base::BindRepeating(&TaskGroup::OnIdleWakeupsRefreshDone, weak_ptr_factory_.GetWeakPtr()), @@ -37,7 +37,7 @@ base::BindRepeating(&TaskGroup::OnProcessPriorityDone, weak_ptr_factory_.GetWeakPtr())); -@@ -329,14 +329,14 @@ void TaskGroup::OnRefreshNaClDebugStubPortDone(int nac +@@ -321,14 +321,14 @@ void TaskGroup::OnRefreshNaClDebugStubPortDone(int nac } #endif // BUILDFLAG(ENABLE_NACL) 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 35fc615debb8..94747ad7907d 100644 --- a/www/chromium/files/patch-chrome_browser_themes_theme__helper.cc +++ b/www/chromium/files/patch-chrome_browser_themes_theme__helper.cc @@ -1,6 +1,6 @@ ---- chrome/browser/themes/theme_helper.cc.orig 2021-05-12 22:05:45 UTC +--- chrome/browser/themes/theme_helper.cc.orig 2021-12-14 11:44:59 UTC +++ chrome/browser/themes/theme_helper.cc -@@ -289,7 +289,7 @@ bool ThemeHelper::ShouldUseIncreasedContrastThemeSuppl +@@ -341,7 +341,7 @@ bool ThemeHelper::ShouldUseIncreasedContrastThemeSuppl ui::NativeTheme* native_theme) const { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc b/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc deleted file mode 100644 index eceadff1a6a9..000000000000 --- a/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/tracing/crash_service_uploader.cc.orig 2021-09-24 04:25:59 UTC -+++ chrome/browser/tracing/crash_service_uploader.cc -@@ -164,6 +164,8 @@ void TraceCrashServiceUploader::DoCompressOnBackground - const char product[] = "Chrome_Android"; - #elif defined(OS_FUCHSIA) - const char product[] = "Chrome_Fuchsia"; -+#elif defined(OS_FREEBSD) -+ const char product[] = "Chrome_FreeBSD"; - #else - #error Platform not supported. - #endif diff --git a/www/chromium/files/patch-chrome_browser_ui_BUILD.gn b/www/chromium/files/patch-chrome_browser_ui_BUILD.gn index 9642e893b410..4462868751dd 100644 --- a/www/chromium/files/patch-chrome_browser_ui_BUILD.gn +++ b/www/chromium/files/patch-chrome_browser_ui_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/browser/ui/BUILD.gn.orig 2021-09-24 04:25:59 UTC +--- chrome/browser/ui/BUILD.gn.orig 2021-12-31 00:57:24 UTC +++ chrome/browser/ui/BUILD.gn -@@ -642,10 +642,20 @@ static_library("ui") { +@@ -682,10 +682,20 @@ static_library("ui") { ] } @@ -22,7 +22,7 @@ if (is_android) { sources += [ "android/android_about_app_info.cc", -@@ -3530,7 +3540,7 @@ static_library("ui") { +@@ -3617,7 +3627,7 @@ static_library("ui") { } } @@ -31,3 +31,25 @@ # The first run dialog shows only on Linux and macOS. sources += [ "views/first_run_dialog.cc", +@@ -3723,6 +3733,12 @@ static_library("ui") { + deps += [ "//third_party/fontconfig" ] + } + } ++ if (is_bsd) { ++ sources -= [ ++ "webui/webui_js_error/webui_js_error_ui.cc", ++ "webui/webui_js_error/webui_js_error_ui.h", ++ ] ++ } + + if (toolkit_views) { + sources += [ +@@ -4739,7 +4755,7 @@ static_library("ui") { + ] + } + +- if (is_win || is_linux) { ++ if ((is_win || is_linux) && !is_bsd) { + sources += [ + "views/bluetooth_device_credentials_view.cc", + "views/bluetooth_device_credentials_view.h", 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 686e764c158b..fe54480a0185 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,4 +1,4 @@ ---- chrome/browser/ui/browser_command_controller.cc.orig 2021-09-24 04:26:00 UTC +--- chrome/browser/ui/browser_command_controller.cc.orig 2021-12-31 00:57:25 UTC +++ chrome/browser/ui/browser_command_controller.cc @@ -89,7 +89,7 @@ @@ -9,7 +9,7 @@ #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" #endif -@@ -257,7 +257,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( +@@ -275,7 +275,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -18,7 +18,7 @@ // If this key was registered by the user as a content editing hotkey, then // it is not reserved. ui::TextEditKeyBindingsDelegateAuraLinux* delegate = -@@ -493,7 +493,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -511,7 +511,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -27,7 +27,7 @@ case IDC_MINIMIZE_WINDOW: browser_->window()->Minimize(); break; -@@ -1009,7 +1009,7 @@ void BrowserCommandController::InitCommandState() { +@@ -1027,7 +1027,7 @@ void BrowserCommandController::InitCommandState() { #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__dialogs.h b/www/chromium/files/patch-chrome_browser_ui_browser__dialogs.h index c65710e00e03..1125dee4ec76 100644 --- a/www/chromium/files/patch-chrome_browser_ui_browser__dialogs.h +++ b/www/chromium/files/patch-chrome_browser_ui_browser__dialogs.h @@ -1,15 +1,15 @@ ---- chrome/browser/ui/browser_dialogs.h.orig 2021-09-24 04:26:00 UTC +--- chrome/browser/ui/browser_dialogs.h.orig 2021-12-31 00:57:25 UTC +++ chrome/browser/ui/browser_dialogs.h -@@ -24,7 +24,7 @@ +@@ -27,7 +27,7 @@ #include "ui/gfx/native_widget_types.h" #if defined(OS_WIN) || defined(OS_MAC) || \ - (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) + (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) - #include "chrome/browser/web_applications/components/web_app_id.h" + #include "chrome/browser/web_applications/web_app_id.h" #endif -@@ -78,7 +78,7 @@ struct SelectedFileInfo; +@@ -81,7 +81,7 @@ struct SelectedFileInfo; } // namespace ui #if defined(OS_WIN) || defined(OS_MAC) || \ @@ -18,7 +18,7 @@ namespace web_app { struct UrlHandlerLaunchParams; } -@@ -175,7 +175,7 @@ void ShowWebAppProtocolHandlerIntentPicker( +@@ -208,7 +208,7 @@ void ShowWebAppFileLaunchDialog(const std::vector<base #endif // !defined(OS_ANDROID) #if defined(OS_WIN) || defined(OS_MAC) || \ 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 1a61c40ea0a7..172a367a5f45 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,6 +1,6 @@ ---- chrome/browser/ui/browser_view_prefs.cc.orig 2021-09-24 04:26:00 UTC +--- chrome/browser/ui/browser_view_prefs.cc.orig 2021-12-31 00:57:25 UTC +++ chrome/browser/ui/browser_view_prefs.cc -@@ -29,7 +29,7 @@ const char kTabStripLayoutType[] = "tab_strip_layout_t +@@ -17,7 +17,7 @@ namespace { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -8,8 +8,8 @@ +#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) bool GetCustomFramePrefDefault() { #if defined(USE_OZONE) - if (features::IsUsingOzonePlatform()) { -@@ -57,10 +57,10 @@ void RegisterBrowserViewProfilePrefs( + return ui::OzonePlatform::GetInstance() +@@ -35,9 +35,9 @@ void RegisterBrowserViewProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -21,4 +21,3 @@ +#endif // (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) && // defined(!OS_CHROMEOS) } - 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 53b628078d55..b18a0d311dfa 100644 --- a/www/chromium/files/patch-chrome_browser_ui_signin__view__controller.cc +++ b/www/chromium/files/patch-chrome_browser_ui_signin__view__controller.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/signin_view_controller.cc.orig 2021-09-24 18:29:46 UTC +--- chrome/browser/ui/signin_view_controller.cc.orig 2021-12-14 11:44:59 UTC +++ chrome/browser/ui/signin_view_controller.cc -@@ -240,7 +240,7 @@ void SigninViewController::ShowModalEnterpriseConfirma +@@ -241,7 +241,7 @@ void SigninViewController::ShowModalEnterpriseConfirma const AccountInfo& account_info, SkColor profile_color, base::OnceCallback<void(bool)> callback) { 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 217bebcde702..b532595cbe05 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,6 +1,6 @@ ---- chrome/browser/ui/signin/dice_web_signin_interceptor_delegate.cc.orig 2021-09-24 18:30:02 UTC +--- chrome/browser/ui/signin/dice_web_signin_interceptor_delegate.cc.orig 2021-12-14 11:44:59 UTC +++ chrome/browser/ui/signin/dice_web_signin_interceptor_delegate.cc -@@ -56,7 +56,7 @@ class ForcedEnterpriseSigninInterceptionHandle +@@ -57,7 +57,7 @@ class ForcedEnterpriseSigninInterceptionHandle private: void ShowEnterpriseProfileInterceptionDialog(const AccountInfo& account_info, SkColor profile_color) { 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 c9d71112cfd4..9eff51aaf55b 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,7 +1,7 @@ ---- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2021-09-24 04:26:00 UTC +--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2021-12-31 00:57:25 UTC +++ chrome/browser/ui/startup/startup_browser_creator.cc -@@ -131,7 +131,7 @@ - #include "chrome/browser/ui/startup/web_app_protocol_handling_startup_utils.h" +@@ -125,7 +125,7 @@ + #endif // defined(OS_WIN) #if defined(OS_WIN) || defined(OS_MAC) || \ - (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) @@ -9,7 +9,7 @@ #include "chrome/browser/ui/startup/web_app_url_handling_startup_utils.h" #endif -@@ -470,7 +470,7 @@ bool MaybeLaunchApplication( +@@ -402,7 +402,7 @@ bool MaybeLaunchAppShortcutWindow(const base::CommandL return false; } @@ -18,7 +18,7 @@ bool MaybeLaunchUrlHandlerWebAppFromCmd( const base::CommandLine& command_line, const base::FilePath& cur_dir, -@@ -1103,7 +1103,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -1025,7 +1025,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( if (command_line.HasSwitch(switches::kAppId)) { std::string app_id = command_line.GetSwitchValueASCII(switches::kAppId); @@ -27,12 +27,12 @@ // 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)) -@@ -1175,7 +1175,7 @@ bool StartupBrowserCreator::StartupLaunchAfterProtocol - } +@@ -1061,7 +1061,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( + web_app::startup::MaybeHandleWebAppLaunch(command_line, cur_dir, + privacy_safe_profile); - // Web app URL handling. -#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 (MaybeLaunchUrlHandlerWebAppFromCmd(command_line, cur_dir, process_startup, - last_used_profile, - last_opened_profiles)) { + 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 dac872633e2d..af92edc33ac9 100644 --- a/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc +++ b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc @@ -1,15 +1,15 @@ ---- chrome/browser/ui/tab_helpers.cc.orig 2021-09-24 04:26:00 UTC +--- chrome/browser/ui/tab_helpers.cc.orig 2022-01-20 10:35:51 UTC +++ chrome/browser/ui/tab_helpers.cc -@@ -158,7 +158,7 @@ - #include "chrome/browser/lacros/web_contents_can_go_back_observer.h" +@@ -170,7 +170,7 @@ + #include "chrome/browser/chromeos/policy/dlp/dlp_content_tab_helper.h" #endif -#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) || defined(OS_FUCHSIA) #include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h" - #include "chrome/browser/ui/hats/hats_helper.h" -@@ -426,11 +426,11 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con + #include "chrome/browser/ui/browser_finder.h" +@@ -459,11 +459,11 @@ 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) || \ @@ -23,3 +23,12 @@ defined(OS_CHROMEOS) if (base::FeatureList::IsEnabled( features::kHappinessTrackingSurveysForDesktopDemo) || +@@ -474,7 +474,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con + } + #endif + +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + if (Browser* browser = chrome::FindBrowserWithProfile(profile)) { + SharedHighlightingPromo::CreateForWebContents(web_contents, browser); diff --git a/www/chromium/files/patch-chrome_browser_ui_test_test__browser__dialog.cc b/www/chromium/files/patch-chrome_browser_ui_test_test__browser__dialog.cc index f0759553cff7..9567eb019bc4 100644 --- a/www/chromium/files/patch-chrome_browser_ui_test_test__browser__dialog.cc +++ b/www/chromium/files/patch-chrome_browser_ui_test_test__browser__dialog.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/test/test_browser_dialog.cc.orig 2021-09-14 01:51:51 UTC +--- chrome/browser/ui/test/test_browser_dialog.cc.orig 2021-12-14 11:44:59 UTC +++ chrome/browser/ui/test/test_browser_dialog.cc -@@ -116,7 +116,7 @@ bool TestBrowserDialog::VerifyUi() { +@@ -117,7 +117,7 @@ bool TestBrowserDialog::VerifyUi() { // TODO(https://crbug.com/958242) support Mac for pixel tests. // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_ui_test_test__browser__ui.cc b/www/chromium/files/patch-chrome_browser_ui_test_test__browser__ui.cc index 5792b307fd2b..d65f35288c8c 100644 --- a/www/chromium/files/patch-chrome_browser_ui_test_test__browser__ui.cc +++ b/www/chromium/files/patch-chrome_browser_ui_test_test__browser__ui.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/test/test_browser_ui.cc.orig 2021-09-24 04:26:00 UTC +--- chrome/browser/ui/test/test_browser_ui.cc.orig 2021-12-14 11:44:59 UTC +++ chrome/browser/ui/test/test_browser_ui.cc -@@ -17,7 +17,7 @@ +@@ -16,7 +16,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) || \ @@ -9,7 +9,7 @@ #include "chrome/test/pixel/browser_skia_gold_pixel_diff.h" #include "ui/base/test/skia_gold_matching_algorithm.h" #include "ui/compositor/test/draw_waiter_for_test.h" -@@ -38,7 +38,7 @@ std::string NameFromTestCase() { +@@ -37,7 +37,7 @@ std::string NameFromTestCase() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -18,7 +18,7 @@ void InstallUIControlsAura() { #if defined(OS_WIN) ui_controls::InstallUIControlsAura(aura::test::CreateUIControlsAura(nullptr)); -@@ -59,7 +59,7 @@ void InstallUIControlsAura() { +@@ -55,7 +55,7 @@ void InstallUIControlsAura() { TestBrowserUi::TestBrowserUi() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -27,7 +27,7 @@ // Default to fuzzy diff. The magic number is chosen based on // past experiments. SetPixelMatchAlgorithm( -@@ -72,7 +72,7 @@ TestBrowserUi::~TestBrowserUi() = default; +@@ -68,7 +68,7 @@ TestBrowserUi::~TestBrowserUi() = default; // TODO(https://crbug.com/958242) support Mac for pixel tests. // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_ui_test_test__browser__ui.h b/www/chromium/files/patch-chrome_browser_ui_test_test__browser__ui.h index 30e5170b9bc9..887bd0b79f63 100644 --- a/www/chromium/files/patch-chrome_browser_ui_test_test__browser__ui.h +++ b/www/chromium/files/patch-chrome_browser_ui_test_test__browser__ui.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/test/test_browser_ui.h.orig 2021-09-24 18:31:01 UTC +--- chrome/browser/ui/test/test_browser_ui.h.orig 2021-12-14 11:44:59 UTC +++ chrome/browser/ui/test/test_browser_ui.h -@@ -95,7 +95,7 @@ class TestBrowserUi { +@@ -100,7 +100,7 @@ class TestBrowserUi { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ // Can be called by VerifyUi() to ensure pixel correctness. bool VerifyPixelUi(views::Widget* widget, const std::string& screenshot_prefix, -@@ -132,7 +132,7 @@ class TestBrowserUi { +@@ -137,7 +137,7 @@ class TestBrowserUi { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if defined(OS_WIN) || defined(OS_MAC) || \ @@ -17,4 +17,4 @@ + (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) std::unique_ptr<ui::test::SkiaGoldMatchingAlgorithm> algorithm_; #endif - + }; 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 dcec6207d8fc..26e48fed58ea 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,4 +1,4 @@ ---- chrome/browser/ui/views/accelerator_table.cc.orig 2021-07-19 18:45:10 UTC +--- chrome/browser/ui/views/accelerator_table.cc.orig 2021-12-14 11:44:59 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}, @@ -27,7 +27,7 @@ {ui::VKEY_B, ui::EF_SHIFT_DOWN | ui::EF_PLATFORM_ACCELERATOR, IDC_SHOW_BOOKMARK_BAR}, {ui::VKEY_OEM_MINUS, ui::EF_PLATFORM_ACCELERATOR, IDC_ZOOM_MINUS}, -@@ -138,14 +138,14 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -139,14 +139,14 @@ const AcceleratorMapping kAcceleratorMap[] = { IDC_SHOW_AVATAR_MENU}, // Platform-specific key maps. diff --git a/www/chromium/files/patch-chrome_browser_ui_views_bookmarks_bookmark__bar__view__test.cc b/www/chromium/files/patch-chrome_browser_ui_views_bookmarks_bookmark__bar__view__test.cc index 314880b84275..3eb09181abcf 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_bookmarks_bookmark__bar__view__test.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_bookmarks_bookmark__bar__view__test.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc.orig 2021-09-24 04:26:00 UTC +--- chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc.orig 2021-12-14 11:44:59 UTC +++ chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc -@@ -1857,7 +1857,7 @@ class BookmarkBarViewTest20 : public BookmarkBarViewEv +@@ -1865,7 +1865,7 @@ class BookmarkBarViewTest20 : public BookmarkBarViewEv } void Step3() { 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 c2c5d6242702..f6120a88efe2 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,6 +1,6 @@ ---- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig 2021-09-24 04:26:00 UTC +--- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig 2021-12-14 11:44:59 UTC +++ chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc -@@ -43,7 +43,7 @@ +@@ -41,7 +41,7 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ #include <sys/stat.h> #include <sys/types.h> #include <unistd.h> -@@ -53,7 +53,7 @@ +@@ -51,7 +51,7 @@ #include "chrome/grit/generated_resources.h" #include "content/public/common/content_switches.h" #include "ui/base/l10n/l10n_util.h" @@ -18,7 +18,7 @@ namespace { -@@ -140,7 +140,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( +@@ -136,7 +136,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -27,7 +27,7 @@ // 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. -@@ -171,7 +171,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( +@@ -167,7 +167,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( base::RunLoop().RunUntilIdle(); exit(EXIT_FAILURE); 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 898eb598376a..de13c062b051 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h +++ b/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/chrome_views_delegate.h.orig 2021-04-14 18:40:55 UTC +--- chrome/browser/ui/views/chrome_views_delegate.h.orig 2021-12-14 11:44:59 UTC +++ chrome/browser/ui/views/chrome_views_delegate.h -@@ -50,7 +50,7 @@ class ChromeViewsDelegate : public views::ViewsDelegat +@@ -54,7 +54,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. 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 1d78425ca27e..1cfff9372258 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,6 +1,6 @@ ---- chrome/browser/ui/views/download/download_item_view.cc.orig 2021-09-24 04:26:00 UTC +--- chrome/browser/ui/views/download/download_item_view.cc.orig 2021-12-14 11:44:59 UTC +++ chrome/browser/ui/views/download/download_item_view.cc -@@ -195,7 +195,7 @@ bool UseNewWarnings() { +@@ -194,7 +194,7 @@ bool UseNewWarnings() { } int GetFilenameStyle(const views::Label& label) { @@ -9,7 +9,7 @@ if (UseNewWarnings()) return STYLE_EMPHASIZED; #endif -@@ -203,7 +203,7 @@ int GetFilenameStyle(const views::Label& label) { +@@ -202,7 +202,7 @@ int GetFilenameStyle(const views::Label& label) { } int GetFilenameStyle(const views::StyledLabel& label) { 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 4f908a6a5eea..191bd562054b 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,6 +1,6 @@ ---- chrome/browser/ui/views/eye_dropper/eye_dropper_view.cc.orig 2021-09-24 04:26:00 UTC +--- chrome/browser/ui/views/eye_dropper/eye_dropper_view.cc.orig 2021-12-14 11:44:59 UTC +++ chrome/browser/ui/views/eye_dropper/eye_dropper_view.cc -@@ -146,7 +146,7 @@ EyeDropperView::EyeDropperView(content::RenderFrameHos +@@ -154,7 +154,7 @@ EyeDropperView::EyeDropperView(content::RenderFrameHos // EyeDropper/WidgetDelegate. set_owned_by_client(); SetPreferredSize(GetSize()); 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 78b0b1fc76b1..2c7c99a09176 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,6 +1,6 @@ ---- chrome/browser/ui/views/eye_dropper/eye_dropper_view_aura.cc.orig 2021-09-24 04:26:00 UTC +--- chrome/browser/ui/views/eye_dropper/eye_dropper_view_aura.cc.orig 2021-12-14 11:44:59 UTC +++ chrome/browser/ui/views/eye_dropper/eye_dropper_view_aura.cc -@@ -79,7 +79,7 @@ void EyeDropperView::MoveViewToFront() { +@@ -80,7 +80,7 @@ void EyeDropperView::MoveViewToFront() { } void EyeDropperView::CaptureInputIfNeeded() { 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 617e2f0f66b2..bcaa7dd2ebca 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,6 +1,6 @@ ---- chrome/browser/ui/views/frame/browser_desktop_window_tree_host_linux.cc.orig 2021-09-24 18:31:35 UTC +--- chrome/browser/ui/views/frame/browser_desktop_window_tree_host_linux.cc.orig 2021-12-14 11:44:59 UTC +++ chrome/browser/ui/views/frame/browser_desktop_window_tree_host_linux.cc -@@ -146,7 +146,7 @@ bool BrowserDesktopWindowTreeHostLinux::SupportsClient +@@ -147,7 +147,7 @@ bool BrowserDesktopWindowTreeHostLinux::SupportsClient } void BrowserDesktopWindowTreeHostLinux::UpdateFrameHints() { 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 62900cd38192..209261bd53db 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,6 +1,6 @@ ---- chrome/browser/ui/views/frame/browser_desktop_window_tree_host_linux.h.orig 2021-09-24 18:31:52 UTC +--- chrome/browser/ui/views/frame/browser_desktop_window_tree_host_linux.h.orig 2021-12-14 11:44:59 UTC +++ chrome/browser/ui/views/frame/browser_desktop_window_tree_host_linux.h -@@ -76,7 +76,7 @@ class BrowserDesktopWindowTreeHostLinux +@@ -96,7 +96,7 @@ class BrowserDesktopWindowTreeHostLinux // browser_desktop_window_tree_host_lacros.cc. #if BUILDFLAG(IS_CHROMEOS_LACROS) using DesktopBrowserFrameAuraPlatform = DesktopBrowserFrameLacros; 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 8f1d1c536e1b..359cbcd74f69 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,6 +1,6 @@ ---- chrome/browser/ui/views/frame/browser_frame.cc.orig 2021-09-24 04:26:00 UTC +--- chrome/browser/ui/views/frame/browser_frame.cc.orig 2021-12-14 11:44:59 UTC +++ chrome/browser/ui/views/frame/browser_frame.cc -@@ -44,11 +44,11 @@ +@@ -48,11 +48,11 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -14,7 +14,7 @@ #include "ui/views/linux_ui/linux_ui.h" #endif -@@ -57,7 +57,7 @@ namespace { +@@ -61,7 +61,7 @@ namespace { bool IsUsingGtkTheme(Profile* profile) { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -23,7 +23,7 @@ return ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme(); #else return false; -@@ -244,7 +244,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() { +@@ -263,7 +263,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() { IsVisibleOnAllWorkspaces()); // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -32,7 +32,7 @@ // If the window was sent to a different workspace, prioritize it if // it was sent to the current workspace and deprioritize it // otherwise. This is done by MoveBrowsersInWorkspaceToFront() -@@ -365,7 +365,7 @@ void BrowserFrame::SelectNativeTheme() { +@@ -386,7 +386,7 @@ void BrowserFrame::SelectNativeTheme() { } } @@ -41,7 +41,7 @@ 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 -@@ -384,7 +384,7 @@ bool BrowserFrame::RegenerateFrameOnThemeChange( +@@ -405,7 +405,7 @@ bool BrowserFrame::RegenerateFrameOnThemeChange( bool need_regenerate = false; // TODO(crbug.com/1052397): Revisit the macro expression once build flag // switch of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc index d934e538ef4d..1c36b5278920 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc.orig 2021-09-24 04:26:00 UTC +--- 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 @@ -15,7 +15,7 @@ #include "chrome/browser/ui/views/frame/glass_browser_frame_view.h" @@ -9,7 +9,7 @@ #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" -@@ -32,7 +32,7 @@ namespace { +@@ -33,7 +33,7 @@ namespace { std::unique_ptr<OpaqueBrowserFrameView> CreateOpaqueBrowserFrameView( BrowserFrame* frame, BrowserView* browser_view) { 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 913678ee46e5..110d65307d6c 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/browser_view.cc.orig 2021-09-24 04:26:00 UTC +--- chrome/browser/ui/views/frame/browser_view.cc.orig 2021-12-31 00:57:25 UTC +++ chrome/browser/ui/views/frame/browser_view.cc -@@ -1601,7 +1601,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra +@@ -1766,7 +1766,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra // CrOS cleanup is done. // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc index e8514d54aa84..4482d5e06b63 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,4 +1,4 @@ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2021-09-24 04:26:00 UTC +--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2021-12-31 00:57:25 UTC +++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc @@ -53,7 +53,7 @@ #include "ui/views/window/vector_icons/vector_icons.h" @@ -9,7 +9,7 @@ #include "ui/views/controls/menu/menu_runner.h" #endif -@@ -516,7 +516,7 @@ OpaqueBrowserFrameView::FrameButtonStyle +@@ -541,7 +541,7 @@ OpaqueBrowserFrameView::FrameButtonStyle OpaqueBrowserFrameView::GetFrameButtonStyle() const { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -18,7 +18,7 @@ return FrameButtonStyle::kMdButton; #else return FrameButtonStyle::kImageButton; -@@ -726,7 +726,7 @@ gfx::Rect OpaqueBrowserFrameView::GetIconBounds() cons +@@ -751,7 +751,7 @@ gfx::Rect OpaqueBrowserFrameView::GetIconBounds() cons } void OpaqueBrowserFrameView::WindowIconPressed() { 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 63db0fc98a23..3aed313ec4c6 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,6 +1,6 @@ ---- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2021-09-24 04:26:00 UTC +--- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2021-12-14 11:44:59 UTC +++ chrome/browser/ui/views/frame/system_menu_model_builder.cc -@@ -111,7 +111,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser +@@ -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. @@ -9,7 +9,7 @@ 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); -@@ -128,7 +128,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser +@@ -93,7 +93,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser } // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -18,7 +18,7 @@ model->AddSeparator(ui::NORMAL_SEPARATOR); bool supports_server_side_decorations = true; #if defined(USE_OZONE) && \ -@@ -185,7 +185,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo +@@ -148,7 +148,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo } // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc index de9c0c6fa37e..93ffd454516c 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,6 +1,6 @@ ---- chrome/browser/ui/views/frame/system_menu_model_delegate.cc.orig 2021-09-24 04:26:00 UTC +--- 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 -@@ -30,7 +30,7 @@ +@@ -23,7 +23,7 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ #include "chrome/common/pref_names.h" #include "components/prefs/pref_service.h" #endif -@@ -61,7 +61,7 @@ SystemMenuModelDelegate::~SystemMenuModelDelegate() {} +@@ -40,7 +40,7 @@ SystemMenuModelDelegate::~SystemMenuModelDelegate() {} bool SystemMenuModelDelegate::IsCommandIdChecked(int command_id) const { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -18,7 +18,7 @@ if (command_id == IDC_USE_SYSTEM_TITLE_BAR) { PrefService* prefs = browser_->profile()->GetPrefs(); return !prefs->GetBoolean(prefs::kUseCustomChromeFrame); -@@ -81,7 +81,7 @@ bool SystemMenuModelDelegate::IsCommandIdEnabled(int c +@@ -62,7 +62,7 @@ bool SystemMenuModelDelegate::IsCommandIdEnabled(int c bool SystemMenuModelDelegate::IsCommandIdVisible(int command_id) const { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc index 055568693ddc..145e9541b4c5 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/hung_renderer_view.cc.orig 2021-05-12 22:05:46 UTC +--- chrome/browser/ui/views/hung_renderer_view.cc.orig 2021-12-31 00:57:25 UTC +++ chrome/browser/ui/views/hung_renderer_view.cc -@@ -413,7 +413,7 @@ void HungRendererDialogView::ForceCrashHungRenderer() +@@ -402,7 +402,7 @@ void HungRendererDialogView::ForceCrashHungRenderer() content::RenderProcessHost* rph = hung_pages_table_model_->GetRenderWidgetHost()->GetProcess(); if (rph) { diff --git a/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc b/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc index 787ec3fc554e..343748fefb82 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,6 +1,6 @@ ---- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig 2021-09-14 01:51:51 UTC +--- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig 2021-12-14 11:45:00 UTC +++ chrome/browser/ui/views/profiles/profile_menu_view_base.cc -@@ -599,7 +599,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo( +@@ -611,7 +611,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo( // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. 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 ff3c69bf2922..c929fd5ff64d 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,6 +1,6 @@ ---- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h.orig 2021-09-24 18:32:31 UTC +--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h.orig 2021-12-14 11:45:00 UTC +++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h -@@ -62,7 +62,7 @@ class SigninViewControllerDelegateViews +@@ -63,7 +63,7 @@ class SigninViewControllerDelegateViews Browser* browser, signin_metrics::ReauthAccessPoint); 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 e2189fa95fd6..778a83ee2768 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/new_tab_button.cc.orig 2021-04-14 18:40:56 UTC +--- 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 -@@ -58,7 +58,7 @@ NewTabButton::NewTabButton(TabStrip* tab_strip, Presse +@@ -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. 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 65ce7a9ee668..d61757d7b3e3 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,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/tab.cc.orig 2021-09-24 04:26:00 UTC +--- chrome/browser/ui/views/tabs/tab.cc.orig 2021-12-31 00:57:25 UTC +++ chrome/browser/ui/views/tabs/tab.cc -@@ -580,7 +580,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& +@@ -575,7 +575,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& if (mouse_hovered_ || !GetWidget()->IsMouseEventsEnabled()) return; 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 e11300a7ff75..b9f346668851 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,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2021-09-24 04:26:00 UTC +--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2021-12-31 00:57:25 UTC +++ chrome/browser/ui/views/tabs/tab_drag_controller.cc -@@ -453,7 +453,7 @@ void TabDragController::Init(TabDragContext* source_co +@@ -440,7 +440,7 @@ void TabDragController::Init(TabDragContext* source_co // synchronous on desktop Linux, so use that. // - Chrome OS // Releasing capture on Ash cancels gestures so avoid it. @@ -9,7 +9,7 @@ can_release_capture_ = false; #endif start_point_in_screen_ = gfx::Point(source_view_offset, mouse_offset.y()); -@@ -919,7 +919,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon +@@ -888,7 +888,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -18,7 +18,7 @@ // EndMoveLoop is going to snap the window back to its original location. // Hide it so users don't see this. Hiding a window in Linux aura causes // it to lose capture so skip it. -@@ -2214,7 +2214,7 @@ TabDragController::Liveness TabDragController::GetLoca +@@ -2097,7 +2097,7 @@ TabDragController::Liveness TabDragController::GetLoca } // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__controller.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__controller.cc index 24414ee3a226..927244e7d97b 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,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/tab_hover_card_controller.cc.orig 2021-09-24 18:34:37 UTC +--- chrome/browser/ui/views/tabs/tab_hover_card_controller.cc.orig 2021-12-14 11:45:00 UTC +++ chrome/browser/ui/views/tabs/tab_hover_card_controller.cc -@@ -298,7 +298,7 @@ void TabHoverCardController::ShowHoverCard(bool is_ini +@@ -302,7 +302,7 @@ void TabHoverCardController::ShowHoverCard(bool is_ini slide_animator_->UpdateTargetBounds(); MaybeStartThumbnailObservation(target_tab_, is_initial); 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 ce9224c83e22..dc5334dfd2b0 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,6 +1,6 @@ ---- chrome/browser/ui/webui/about_ui.cc.orig 2021-09-24 04:26:00 UTC +--- chrome/browser/ui/webui/about_ui.cc.orig 2021-12-31 00:57:25 UTC +++ chrome/browser/ui/webui/about_ui.cc -@@ -574,7 +574,7 @@ std::string ChromeURLs() { +@@ -553,7 +553,7 @@ std::string ChromeURLs() { return html; } @@ -8,8 +8,8 @@ +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) std::string AboutLinuxProxyConfig() { std::string data; - AppendHeader(&data, 0, -@@ -630,7 +630,7 @@ void AboutUIHTMLSource::StartDataRequest( + AppendHeader(&data, +@@ -609,7 +609,7 @@ void AboutUIHTMLSource::StartDataRequest( response = ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(idr); } 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 eaaac5bc0159..417941c15c95 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,4 +1,4 @@ ---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2021-09-24 04:26:00 UTC +--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2021-12-31 00:57:25 UTC +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc @@ -30,7 +30,9 @@ #include "chrome/browser/ui/webui/bluetooth_internals/bluetooth_internals_ui.h" @@ -10,7 +10,7 @@ #include "chrome/browser/ui/webui/device_log_ui.h" #include "chrome/browser/ui/webui/domain_reliability_internals_ui.h" #include "chrome/browser/ui/webui/download_internals/download_internals_ui.h" -@@ -288,12 +290,12 @@ +@@ -294,17 +296,17 @@ #include "chrome/browser/ui/webui/conflicts/conflicts_ui.h" #endif @@ -25,7 +25,13 @@ defined(OS_ANDROID) #include "chrome/browser/ui/webui/sandbox/sandbox_internals_ui.h" #endif -@@ -540,7 +542,7 @@ bool IsAboutUI(const GURL& url) { + +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ + BUILDFLAG(IS_CHROMEOS_ASH) + #include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h" + #endif +@@ -568,7 +570,7 @@ bool IsAboutUI(const GURL& url) { #if !defined(OS_ANDROID) || url.host_piece() == chrome::kChromeUITermsHost #endif @@ -34,7 +40,7 @@ || url.host_piece() == chrome::kChromeUILinuxProxyConfigHost #endif #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -589,8 +591,10 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -617,8 +619,10 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we return &NewWebUI<ComponentsUI>; if (url.spec() == chrome::kChromeUIConstrainedHTMLTestURL) return &NewWebUI<ConstrainedWebDialogUI>; @@ -45,7 +51,7 @@ if (url.host_piece() == chrome::kChromeUIDeviceLogHost) return &NewWebUI<chromeos::DeviceLogUI>; if (url.host_piece() == chrome::kChromeUIDomainReliabilityInternalsHost) -@@ -994,7 +998,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -1027,7 +1031,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we if (url.host_piece() == chrome::kChromeUINaClHost) return &NewWebUI<NaClUI>; #endif @@ -54,7 +60,7 @@ defined(USE_AURA) if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost) return &NewWebUI<ConstrainedWebDialogUI>; -@@ -1048,13 +1052,13 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -1081,23 +1085,23 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we return &NewWebUI<media_router::MediaRouterInternalsUI>; } #endif @@ -67,19 +73,22 @@ #endif -#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ + BUILDFLAG(IS_CHROMEOS_ASH) + if (url.host_piece() == chrome::kChromeUIConnectorsInternalsHost) + return &NewWebUI<enterprise_connectors::ConnectorsInternalsUI>; + #endif +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) if (url.host_piece() == chrome::kChromeUIDiscardsHost) return &NewWebUI<DiscardsUI>; -@@ -1062,7 +1066,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we - // 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) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+ (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) + #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 (url.host_piece() == chrome::kChromeUIBrowserSwitchHost) return &NewWebUI<BrowserSwitchUI>; #endif -@@ -1255,8 +1259,10 @@ base::RefCountedMemory* ChromeWebUIControllerFactory:: +@@ -1290,8 +1294,10 @@ base::RefCountedMemory* ChromeWebUIControllerFactory:: return ConflictsUI::GetFaviconResourceBytes(scale_factor); #endif 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 09463de2475a..49486d92850f 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc @@ -1,6 +1,24 @@ ---- chrome/browser/ui/webui/ntp/app_launcher_handler.cc.orig 2021-09-24 04:26:00 UTC +--- chrome/browser/ui/webui/ntp/app_launcher_handler.cc.orig 2021-12-31 00:57:25 UTC +++ chrome/browser/ui/webui/ntp/app_launcher_handler.cc -@@ -1337,7 +1337,7 @@ void AppLauncherHandler::InstallOsHooks(const web_app: +@@ -314,7 +314,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) + is_deprecated_app = extensions::IsExtensionUnsupportedDeprecatedApp( + extension_service_->GetBrowserContext(), extension->id()); + #endif +@@ -764,7 +764,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 (extensions::IsExtensionUnsupportedDeprecatedApp(profile, extension_id)) { + // TODO(crbug.com/1225779): Show the deprecated apps dialog. + return; +@@ -1363,7 +1363,7 @@ void AppLauncherHandler::InstallOsHooks(const web_app: options.os_hooks[web_app::OsHookType::kRunOnOsLogin] = false; options.os_hooks[web_app::OsHookType::kUninstallationViaOsSettings] = true; #if defined(OS_WIN) || defined(OS_MAC) || \ 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 d37d0e9cf89f..47b9927f456c 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,4 +1,4 @@ ---- chrome/browser/ui/webui/settings/appearance_handler.cc.orig 2021-04-14 18:40:56 UTC +--- chrome/browser/ui/webui/settings/appearance_handler.cc.orig 2021-12-14 11:45:00 UTC +++ chrome/browser/ui/webui/settings/appearance_handler.cc @@ -31,7 +31,7 @@ void AppearanceHandler::RegisterMessages() { base::Unretained(this))); @@ -6,7 +6,7 @@ // of lacros-chrome is complete. -#if defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS) +#if (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) - web_ui()->RegisterMessageCallback( + web_ui()->RegisterDeprecatedMessageCallback( "useSystemTheme", base::BindRepeating(&AppearanceHandler::HandleUseSystemTheme, @@ -45,7 +45,7 @@ void AppearanceHandler::HandleUseDefaultTheme(const ba 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 d70b17869e24..ffa2618e1a8e 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,6 +1,6 @@ ---- chrome/browser/ui/webui/settings/appearance_handler.h.orig 2021-04-14 18:40:56 UTC +--- chrome/browser/ui/webui/settings/appearance_handler.h.orig 2021-12-14 11:45:00 UTC +++ chrome/browser/ui/webui/settings/appearance_handler.h -@@ -39,7 +39,7 @@ class AppearanceHandler : public SettingsPageUIHandler +@@ -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. 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 d11e9f19061f..ce657d252339 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,7 +1,7 @@ ---- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2021-10-08 06:25:42 UTC +--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2021-12-31 00:57:25 UTC +++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -112,7 +112,7 @@ - #include "ui/accessibility/accessibility_features.h" +@@ -117,7 +117,7 @@ + #include "chrome/browser/ui/webui/settings/chromeos/constants/routes.mojom.h" #endif -#if defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS) @@ -9,7 +9,16 @@ #include "ui/display/screen.h" #endif -@@ -361,7 +361,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -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) + #include "ui/ozone/public/ozone_platform.h" + #endif + +@@ -365,7 +365,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. @@ -18,7 +27,7 @@ {"systemTheme", IDS_SETTINGS_SYSTEM_THEME}, {"useSystemTheme", IDS_SETTINGS_USE_SYSTEM_THEME}, {"classicTheme", IDS_SETTINGS_CLASSIC_THEME}, -@@ -369,7 +369,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -373,7 +373,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht #else {"resetToDefaultTheme", IDS_SETTINGS_RESET_TO_DEFAULT_THEME}, #endif @@ -27,12 +36,12 @@ {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS}, #endif #if defined(OS_MAC) -@@ -390,7 +390,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -394,7 +394,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) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) - #if defined(USE_OZONE) - const bool show_custom_chrome_frame = - features::IsUsingOzonePlatform() && + 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 c9711d8665a3..3037b5d13f0f 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 2021-09-24 18:36:14 UTC +--- chrome/browser/ui/webui/settings/settings_ui.cc.orig 2021-12-31 00:57:25 UTC +++ chrome/browser/ui/webui/settings/settings_ui.cc -@@ -139,7 +139,7 @@ +@@ -138,7 +138,7 @@ #endif // defined(USE_NSS_CERTS) #if defined(OS_WIN) || defined(OS_MAC) || \ - (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) + (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) #include "chrome/browser/ui/webui/settings/url_handlers_handler.h" - #include "chrome/browser/web_applications/components/url_handler_prefs.h" #endif -@@ -253,7 +253,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui) + +@@ -239,7 +239,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui) #endif // defined(OS_WIN) #if defined(OS_WIN) || defined(OS_MAC) || \ - (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) + (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) AddSettingsPageUIHandler(std::make_unique<UrlHandlersHandler>( - g_browser_process->local_state(), profile, - &GetRegistrarForProfile(profile))); + g_browser_process->local_state(), profile)); + #endif diff --git a/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__file__handler__registration.h b/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__file__handler__registration.h deleted file mode 100644 index dfc1142c6d68..000000000000 --- a/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__file__handler__registration.h +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/web_applications/components/web_app_file_handler_registration.h.orig 2021-09-24 04:26:00 UTC -+++ chrome/browser/web_applications/components/web_app_file_handler_registration.h -@@ -40,7 +40,7 @@ void UnregisterFileHandlersWithOs(const AppId& app_id, - Profile* profile, - base::OnceCallback<void(bool)> callback); - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - using RegisterMimeTypesOnLinuxCallback = - base::OnceCallback<bool(base::FilePath profile_path, - std::string file_contents)>; diff --git a/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__shortcut.cc b/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__shortcut.cc deleted file mode 100644 index acd9d0f8c713..000000000000 --- a/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__shortcut.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/web_applications/components/web_app_shortcut.cc.orig 2021-09-14 01:51:52 UTC -+++ chrome/browser/web_applications/components/web_app_shortcut.cc -@@ -34,7 +34,7 @@ namespace { - - #if defined(OS_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) - // 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}; diff --git a/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__shortcut.h b/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__shortcut.h deleted file mode 100644 index e0324196c5a9..000000000000 --- a/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__shortcut.h +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/web_applications/components/web_app_shortcut.h.orig 2021-09-24 18:36:37 UTC -+++ chrome/browser/web_applications/components/web_app_shortcut.h -@@ -39,7 +39,7 @@ struct ShortcutOverrideForTesting { - base::FilePath startup; - #elif defined(OS_MAC) - base::FilePath chrome_apps_folder; --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) - base::FilePath desktop; - #else - #endif 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 da21038387c5..104dc578455a 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc +++ b/www/chromium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc @@ -1,4 +1,4 @@ ---- chrome/browser/web_applications/extensions/extension_status_utils.cc.orig 2021-09-24 18:37:10 UTC +--- chrome/browser/web_applications/extensions/extension_status_utils.cc.orig 2021-12-31 00:57:25 UTC +++ chrome/browser/web_applications/extensions/extension_status_utils.cc @@ -75,7 +75,7 @@ bool IsExternalExtensionUninstalled(content::BrowserCo return prefs && prefs->IsExternalExtensionUninstalled(extension_id); @@ -8,4 +8,4 @@ +#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) bool IsExtensionUnsupportedDeprecatedApp(content::BrowserContext* context, const std::string& extension_id) { - auto* registry = ExtensionRegistry::Get(context); + 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 93e13cc8ded5..e75b92c9f2c4 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,6 +1,6 @@ ---- chrome/browser/web_applications/externally_managed_app_install_task.cc.orig 2021-09-24 04:26:00 UTC +--- chrome/browser/web_applications/externally_managed_app_install_task.cc.orig 2021-12-31 00:57:25 UTC +++ chrome/browser/web_applications/externally_managed_app_install_task.cc -@@ -320,7 +320,7 @@ void ExternallyManagedAppInstallTask::OnWebAppInstalle +@@ -307,7 +307,7 @@ void ExternallyManagedAppInstallTask::OnWebAppInstalle options.os_hooks[OsHookType::kProtocolHandlers] = true; options.os_hooks[OsHookType::kUninstallationViaOsSettings] = true; #if defined(OS_WIN) || defined(OS_MAC) || \ 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 new file mode 100644 index 000000000000..7e5687a24676 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_web__applications_web__app__file__handler__registration.h @@ -0,0 +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 +@@ -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) + // 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 15077643344e..f6cac1cba002 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,6 +1,6 @@ ---- chrome/browser/web_applications/web_app_install_task.cc.orig 2021-09-24 04:26:00 UTC +--- chrome/browser/web_applications/web_app_install_task.cc.orig 2021-12-31 00:57:25 UTC +++ chrome/browser/web_applications/web_app_install_task.cc -@@ -853,7 +853,7 @@ void WebAppInstallTask::OnInstallFinalizedCreateShortc +@@ -863,7 +863,7 @@ void WebAppInstallTask::OnInstallFinalizedCreateShortc options.os_hooks[OsHookType::kProtocolHandlers] = true; options.os_hooks[OsHookType::kUninstallationViaOsSettings] = true; #if defined(OS_WIN) || defined(OS_MAC) || \ 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 64b4e4a35fdf..f985e829fcc1 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_web__app__provider.cc +++ b/www/chromium/files/patch-chrome_browser_web__applications_web__app__provider.cc @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/web_app_provider.cc.orig 2021-09-24 04:26:00 UTC +--- chrome/browser/web_applications/web_app_provider.cc.orig 2021-12-31 00:57:25 UTC +++ chrome/browser/web_applications/web_app_provider.cc -@@ -273,7 +273,7 @@ void WebAppProvider::CreateWebAppsSubsystems(Profile* +@@ -267,7 +267,7 @@ void WebAppProvider::CreateSubsystems(Profile* profile std::unique_ptr<UrlHandlerManager> url_handler_manager; #if defined(OS_WIN) || defined(OS_MAC) || \ 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 new file mode 100644 index 000000000000..f424227c6be2 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_web__applications_web__app__shortcut.cc @@ -0,0 +1,38 @@ +--- chrome/browser/web_applications/web_app_shortcut.cc.orig 2021-12-31 00:57:25 UTC ++++ chrome/browser/web_applications/web_app_shortcut.cc +@@ -39,7 +39,7 @@ namespace { + + #if defined(OS_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) + // 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}; +@@ -119,7 +119,7 @@ ScopedShortcutOverrideForTesting::~ScopedShortcutOverr + } + } + } +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + directories = {&desktop}; + #endif + for (base::ScopedTempDir* dir : directories) { +@@ -160,7 +160,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) + bool success = + scoped_override->desktop.CreateUniqueTempDirUnderPath(base_path); + DCHECK(success); +@@ -178,7 +178,7 @@ std::unique_ptr<ScopedShortcutOverrideForTesting> Over + #elif defined(OS_MAC) + bool success = scoped_override->chrome_apps_folder.CreateUniqueTempDir(); + DCHECK(success); +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_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 new file mode 100644 index 000000000000..743f17a7d0e5 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_web__applications_web__app__shortcut.h @@ -0,0 +1,35 @@ +--- chrome/browser/web_applications/web_app_shortcut.h.orig 2021-12-31 00:57:25 UTC ++++ chrome/browser/web_applications/web_app_shortcut.h +@@ -19,9 +19,9 @@ + #include "ui/gfx/image/image_family.h" + #include "url/gurl.h" + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "chrome/browser/web_applications/web_app_shortcut_linux.h" +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + namespace base { + class TaskRunner; +@@ -47,7 +47,7 @@ struct ScopedShortcutOverrideForTesting { + base::ScopedTempDir startup; + #elif defined(OS_MAC) + base::ScopedTempDir chrome_apps_folder; +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + base::ScopedTempDir desktop; + #endif + }; +@@ -89,9 +89,9 @@ struct ShortcutInfo { + 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) + std::set<DesktopActionInfo> actions; +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + // An app is multi-profile if there is a single shortcut and single app shim + // for all profiles. The app itself has a profile switcher that may be used 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 new file mode 100644 index 000000000000..32160d81eb74 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_web__applications_web__app__shortcut__manager.cc @@ -0,0 +1,33 @@ +--- chrome/browser/web_applications/web_app_shortcut_manager.cc.orig 2021-12-16 14:52:50 UTC ++++ chrome/browser/web_applications/web_app_shortcut_manager.cc +@@ -35,10 +35,10 @@ namespace web_app { + + namespace { + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Aligns with other platform implementations that only support 10 items. + constexpr int kMaxApplicationDockMenuItems = 10; +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + // UMA metric name for shortcuts creation result. + constexpr const char* kCreationResultMetric = +@@ -383,7 +383,7 @@ std::unique_ptr<ShortcutInfo> WebAppShortcutManager::B + } + } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + const std::vector<WebApplicationShortcutsMenuItemInfo>& + shortcuts_menu_item_infos = app->shortcuts_menu_item_infos(); + int num_entries = std::min(static_cast<int>(shortcuts_menu_item_infos.size()), +@@ -401,7 +401,7 @@ std::unique_ptr<ShortcutInfo> WebAppShortcutManager::B + shortcuts_menu_item_info.url); + } + } +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + return shortcut_info; + } diff --git a/www/chromium/files/patch-chrome_browser_web__applications_web__app__utils.cc b/www/chromium/files/patch-chrome_browser_web__applications_web__app__utils.cc index d40e8f016404..cee86048a25c 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_web__app__utils.cc +++ b/www/chromium/files/patch-chrome_browser_web__applications_web__app__utils.cc @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/web_app_utils.cc.orig 2021-09-24 18:37:27 UTC +--- chrome/browser/web_applications/web_app_utils.cc.orig 2022-01-20 10:35:51 UTC +++ chrome/browser/web_applications/web_app_utils.cc -@@ -212,13 +212,13 @@ std::u16string GetFileTypeAssociationsHandledByWebApps +@@ -236,13 +236,13 @@ std::u16string GetFileTypeAssociationsHandledByWebApps const apps::FileHandlers file_handlers = GetFileHandlersForAllWebAppsWithOrigin(profile, url); std::vector<std::string> associations; @@ -16,7 +16,34 @@ std::set<std::string> extensions_set = apps::GetFileExtensionsFromFileHandlers(file_handlers); associations.reserve(extensions_set.size()); -@@ -229,7 +229,7 @@ std::u16string GetFileTypeAssociationsHandledByWebApps +@@ -253,7 +253,7 @@ std::u16string GetFileTypeAssociationsHandledByWebApps + [](const std::string& extension) { + return base::ToUpperASCII(extension.substr(1)); + }); +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + if (found_multiple) + *found_multiple = associations.size() > 1; +@@ -275,7 +275,7 @@ std::u16string GetFileTypeAssociationsHandledByWebAppF + provider->registrar().GetAppFileHandlers(app_id); + + std::vector<std::string> associations; +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // TODO(estade): on Linux both the MIME type and extension must match. Should + // we just show the extensions like on other platforms? + std::set<std::string> mime_types_set = +@@ -283,7 +283,7 @@ std::u16string GetFileTypeAssociationsHandledByWebAppF + associations.reserve(mime_types_set.size()); + associations.insert(associations.end(), mime_types_set.begin(), + mime_types_set.end()); +-#else // !defined(OS_LINUX) ++#else // !defined(OS_LINUX) || defined(OS_BSD) + std::set<std::string> extensions_set = + apps::GetFileExtensionsFromFileHandlers(*file_handlers); + associations.reserve(extensions_set.size()); +@@ -294,7 +294,7 @@ std::u16string GetFileTypeAssociationsHandledByWebAppF [](const std::string& extension) { return base::ToUpperASCII(extension.substr(1)); }); diff --git a/www/chromium/files/patch-chrome_common_BUILD.gn b/www/chromium/files/patch-chrome_common_BUILD.gn index 53a6cac1f902..d7b2a29120f5 100644 --- a/www/chromium/files/patch-chrome_common_BUILD.gn +++ b/www/chromium/files/patch-chrome_common_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/common/BUILD.gn.orig 2021-09-24 04:26:00 UTC +--- chrome/common/BUILD.gn.orig 2021-12-31 00:57:25 UTC +++ chrome/common/BUILD.gn -@@ -333,7 +333,7 @@ static_library("common") { +@@ -329,7 +329,7 @@ static_library("common") { ] } @@ -9,7 +9,7 @@ deps += [ "//components/crash/core/app" ] } -@@ -493,13 +493,21 @@ static_library("common") { +@@ -490,13 +490,21 @@ static_library("common") { public_deps += [ "//chrome/common/safe_browsing" ] } diff --git a/www/chromium/files/patch-chrome_common_channel__info.h b/www/chromium/files/patch-chrome_common_channel__info.h index a9da537a2e69..db63e5cdfff8 100644 --- a/www/chromium/files/patch-chrome_common_channel__info.h +++ b/www/chromium/files/patch-chrome_common_channel__info.h @@ -1,6 +1,6 @@ ---- chrome/common/channel_info.h.orig 2021-09-14 01:51:52 UTC +--- chrome/common/channel_info.h.orig 2021-12-14 11:45:00 UTC +++ chrome/common/channel_info.h -@@ -101,7 +101,7 @@ std::string GetChannelSuffixForDataDir(); +@@ -107,7 +107,7 @@ std::string GetChannelSuffixForDataDir(); // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_common_chrome__features.cc b/www/chromium/files/patch-chrome_common_chrome__features.cc index 9739070de6d9..631d7dce7d05 100644 --- a/www/chromium/files/patch-chrome_common_chrome__features.cc +++ b/www/chromium/files/patch-chrome_common_chrome__features.cc @@ -1,9 +1,18 @@ ---- chrome/common/chrome_features.cc.orig 2021-09-24 04:26:00 UTC +--- chrome/common/chrome_features.cc.orig 2022-01-20 10:35:51 UTC +++ chrome/common/chrome_features.cc -@@ -82,13 +82,13 @@ const base::Feature kAsyncDns { +@@ -101,7 +101,7 @@ const base::Feature kAsyncDns { #endif }; +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) || defined(OS_FUCHSIA) + // Enables or disables the Autofill survey triggered by opening a prompt to + // save address info. +@@ -117,13 +117,13 @@ 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) // Enables the Restart background mode optimization. When all Chrome UI is @@ -16,7 +25,7 @@ #if BUILDFLAG(IS_CHROMEOS_ASH) // Enable Borealis on Chrome OS. -@@ -99,13 +99,13 @@ const base::Feature kBorealis{"Borealis", base::FEATUR +@@ -134,13 +134,13 @@ const base::Feature kBorealis{"Borealis", base::FEATUR const base::Feature kChangePictureVideoMode{"ChangePictureVideoMode", base::FEATURE_ENABLED_BY_DEFAULT}; @@ -30,9 +39,9 @@ -#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) +#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) - #if defined(OS_WIN) - const base::Feature kChromeCleanupScanCompletedNotification{ -@@ -216,12 +216,12 @@ const base::Feature kDefaultPinnedAppsUpdate2021Q2{ + const base::Feature kClientStorageAccessContextAuditing{ + "ClientStorageAccessContextAuditing", base::FEATURE_DISABLED_BY_DEFAULT}; +@@ -245,7 +245,7 @@ const base::Feature kDefaultPinnedAppsUpdate2021Q2{ "DefaultPinnedAppsUpdate2021Q2", base::FEATURE_ENABLED_BY_DEFAULT}; #endif @@ -41,13 +50,16 @@ // Enables Desktop PWAs shortcuts menu to be visible and executable in ChromeOS, // MacOS and Linux. const base::Feature kDesktopPWAsAppIconShortcutsMenuUI{ - "DesktopPWAsAppIconShortcutsMenuUI", --#if defined(OS_MAC) || defined(OS_LINUX) -+#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) - base::FEATURE_DISABLED_BY_DEFAULT - #else +@@ -277,7 +277,7 @@ const base::Feature kDesktopPWAsElidedExtensionsMenu{ + // Handling API. + const base::Feature kDesktopPWAsFileHandlingSettingsGated{ + "DesktopPWAsFileHandlingSettingsGated", +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) || defined(OS_BSD) base::FEATURE_ENABLED_BY_DEFAULT -@@ -273,7 +273,7 @@ const base::Feature kDesktopPWAsNotificationIconAndTit + #else + base::FEATURE_DISABLED_BY_DEFAULT +@@ -304,7 +304,7 @@ const base::Feature kDesktopPWAsNotificationIconAndTit // Enables or disables Desktop PWAs to be auto-started on OS login. const base::Feature kDesktopPWAsRunOnOsLogin { "DesktopPWAsRunOnOsLogin", @@ -56,7 +68,25 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -558,7 +558,7 @@ const base::Feature kIncognitoReauthenticationForAndro +@@ -334,7 +334,7 @@ const base::Feature kDesktopPWAsWebBundles{"DesktopPWA + 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) + base::FEATURE_ENABLED_BY_DEFAULT + #else + base::FEATURE_DISABLED_BY_DEFAULT +@@ -356,7 +356,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) + true + #else + false +@@ -628,7 +628,7 @@ const base::Feature kIncognitoBrandConsistencyForAndro const base::Feature kIncognitoNtpRevamp{"IncognitoNtpRevamp", base::FEATURE_DISABLED_BY_DEFAULT}; diff --git a/www/chromium/files/patch-chrome_common_chrome__features.h b/www/chromium/files/patch-chrome_common_chrome__features.h index 31ee2dd97448..7246dedfb8ae 100644 --- a/www/chromium/files/patch-chrome_common_chrome__features.h +++ b/www/chromium/files/patch-chrome_common_chrome__features.h @@ -1,9 +1,18 @@ ---- chrome/common/chrome_features.h.orig 2021-09-24 04:26:00 UTC +--- chrome/common/chrome_features.h.orig 2021-12-31 00:57:25 UTC +++ chrome/common/chrome_features.h -@@ -67,10 +67,10 @@ extern const base::Feature kAppShimNewCloseBehavior; +@@ -84,7 +84,7 @@ extern const base::Feature kAppShimNewCloseBehavior; COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kAsyncDns; +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) || defined(OS_FUCHSIA) + COMPONENT_EXPORT(CHROME_FEATURES) + extern const base::Feature kAutofillAddressSurvey; +@@ -94,10 +94,10 @@ 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) COMPONENT_EXPORT(CHROME_FEATURES) @@ -13,7 +22,7 @@ #if BUILDFLAG(IS_CHROMEOS_ASH) COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kBorealis; -@@ -79,7 +79,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::F +@@ -111,7 +111,7 @@ extern const base::Feature kBrowserAppInstanceTracking COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kChangePictureVideoMode; @@ -22,7 +31,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kChromeAppsDeprecation; #endif -@@ -158,7 +158,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) +@@ -175,7 +175,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kDefaultPinnedAppsUpdate2021Q2; #endif @@ -31,7 +40,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kDesktopPWAsAppIconShortcutsMenuUI; #endif -@@ -367,7 +367,7 @@ extern const base::Feature kIncognitoReauthenticationF +@@ -410,7 +410,7 @@ extern const base::Feature kIncognitoBrandConsistencyF COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kIncognitoNtpRevamp; diff --git a/www/chromium/files/patch-chrome_common_chrome__paths.cc b/www/chromium/files/patch-chrome_common_chrome__paths.cc index 32db03041d0d..7069cec0caff 100644 --- a/www/chromium/files/patch-chrome_common_chrome__paths.cc +++ b/www/chromium/files/patch-chrome_common_chrome__paths.cc @@ -1,6 +1,6 @@ ---- chrome/common/chrome_paths.cc.orig 2021-09-24 04:26:00 UTC +--- chrome/common/chrome_paths.cc.orig 2021-12-31 00:57:25 UTC +++ chrome/common/chrome_paths.cc -@@ -43,17 +43,25 @@ +@@ -44,17 +44,25 @@ namespace { @@ -28,7 +28,7 @@ #if BUILDFLAG(ENABLE_WIDEVINE) // The name of the hint file that tells the latest component updated Widevine -@@ -172,7 +180,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -179,7 +187,7 @@ bool PathProvider(int key, base::FilePath* result) { return false; break; case chrome::DIR_DEFAULT_DOWNLOADS_SAFE: @@ -37,7 +37,7 @@ if (!GetUserDownloadsDirectorySafe(&cur)) return false; break; -@@ -415,6 +423,9 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -416,6 +424,9 @@ bool PathProvider(int key, base::FilePath* result) { case chrome::DIR_POLICY_FILES: { #if BUILDFLAG(GOOGLE_CHROME_BRANDING) cur = base::FilePath(FILE_PATH_LITERAL("/etc/opt/chrome/policies")); @@ -47,7 +47,7 @@ #else cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies")); #endif -@@ -426,7 +437,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -427,7 +438,7 @@ bool PathProvider(int key, base::FilePath* result) { #if BUILDFLAG(IS_CHROMEOS_ASH) || \ ((defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ BUILDFLAG(CHROMIUM_BRANDING)) || \ @@ -56,7 +56,7 @@ case chrome::DIR_USER_EXTERNAL_EXTENSIONS: { if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) return false; -@@ -434,7 +445,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -435,7 +446,7 @@ bool PathProvider(int key, base::FilePath* result) { break; } #endif @@ -65,16 +65,16 @@ case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: { cur = base::FilePath(kFilepathSinglePrefExtensions); break; -@@ -469,7 +480,7 @@ bool PathProvider(int key, base::FilePath* result) { - #endif +@@ -480,7 +491,7 @@ bool PathProvider(int key, base::FilePath* result) { 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) case chrome::DIR_NATIVE_MESSAGING: #if defined(OS_MAC) #if BUILDFLAG(GOOGLE_CHROME_BRANDING) -@@ -483,6 +494,9 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -494,6 +505,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")); @@ -84,7 +84,7 @@ #else cur = base::FilePath(FILE_PATH_LITERAL( "/etc/chromium/native-messaging-hosts")); -@@ -495,7 +509,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -506,7 +520,7 @@ bool PathProvider(int key, base::FilePath* result) { return false; cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts")); break; diff --git a/www/chromium/files/patch-chrome_common_chrome__paths.h b/www/chromium/files/patch-chrome_common_chrome__paths.h index 927894223b5e..51ee7f8f0395 100644 --- a/www/chromium/files/patch-chrome_common_chrome__paths.h +++ b/www/chromium/files/patch-chrome_common_chrome__paths.h @@ -1,6 +1,6 @@ ---- chrome/common/chrome_paths.h.orig 2021-07-19 18:45:10 UTC +--- chrome/common/chrome_paths.h.orig 2021-12-31 00:57:25 UTC +++ chrome/common/chrome_paths.h -@@ -57,7 +57,7 @@ enum { +@@ -56,7 +56,7 @@ enum { #if BUILDFLAG(IS_CHROMEOS_ASH) || \ ((defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ BUILDFLAG(CHROMIUM_BRANDING)) || \ @@ -9,7 +9,7 @@ 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 -@@ -65,7 +65,7 @@ enum { +@@ -64,7 +64,7 @@ enum { // create it. #endif @@ -18,7 +18,7 @@ DIR_STANDALONE_EXTERNAL_EXTENSIONS, // Directory for 'per-extension' // definition manifest files that // describe extensions which are to be -@@ -109,7 +109,7 @@ enum { +@@ -105,7 +105,7 @@ enum { DIR_CHROMEOS_CUSTOM_WALLPAPERS, // Directory where custom wallpapers // reside. #endif diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.cc b/www/chromium/files/patch-chrome_common_chrome__switches.cc index b65c4fbe3f86..1d0a4aa1728f 100644 --- a/www/chromium/files/patch-chrome_common_chrome__switches.cc +++ b/www/chromium/files/patch-chrome_common_chrome__switches.cc @@ -1,6 +1,6 @@ ---- chrome/common/chrome_switches.cc.orig 2021-09-24 04:26:00 UTC +--- chrome/common/chrome_switches.cc.orig 2021-12-31 00:57:25 UTC +++ chrome/common/chrome_switches.cc -@@ -796,7 +796,7 @@ const char kAllowNaClFileHandleAPI[] = "allow-n +@@ -793,7 +793,7 @@ const char kAllowNaClFileHandleAPI[] = "allow-n const char kAllowNaClSocketAPI[] = "allow-nacl-socket-api"; #endif diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.h b/www/chromium/files/patch-chrome_common_chrome__switches.h index 11a31aeaae6d..3aaeabc9d5c4 100644 --- a/www/chromium/files/patch-chrome_common_chrome__switches.h +++ b/www/chromium/files/patch-chrome_common_chrome__switches.h @@ -1,6 +1,6 @@ ---- chrome/common/chrome_switches.h.orig 2021-09-24 04:26:00 UTC +--- chrome/common/chrome_switches.h.orig 2021-12-31 00:57:25 UTC +++ chrome/common/chrome_switches.h -@@ -250,7 +250,7 @@ extern const char kAllowNaClFileHandleAPI[]; +@@ -247,7 +247,7 @@ extern const char kAllowNaClFileHandleAPI[]; extern const char kAllowNaClSocketAPI[]; #endif diff --git a/www/chromium/files/patch-chrome_common_pref__names.cc b/www/chromium/files/patch-chrome_common_pref__names.cc index 09f936e1807c..b98f2812d054 100644 --- a/www/chromium/files/patch-chrome_common_pref__names.cc +++ b/www/chromium/files/patch-chrome_common_pref__names.cc @@ -1,6 +1,6 @@ ---- chrome/common/pref_names.cc.orig 2021-09-24 04:26:00 UTC +--- chrome/common/pref_names.cc.orig 2021-12-31 00:57:26 UTC +++ chrome/common/pref_names.cc -@@ -1131,7 +1131,7 @@ const char kAllowedDomainsForApps[] = "settings.allowe +@@ -1170,7 +1170,7 @@ const char kUseAshProxy[] = "lacros.proxy.use_ash_prox // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ // Linux specific preference on whether we should match the system theme. const char kUsesSystemTheme[] = "extensions.theme.use_system"; #endif -@@ -1234,7 +1234,7 @@ const char kShowUpdatePromotionInfoBar[] = +@@ -1273,7 +1273,7 @@ const char kShowUpdatePromotionInfoBar[] = // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -18,7 +18,7 @@ // Boolean that is false if we should show window manager decorations. If // true, we draw a custom chrome frame (thicker title bar and blue border). const char kUseCustomChromeFrame[] = "browser.custom_chrome_frame"; -@@ -1700,7 +1700,7 @@ const char kDownloadDefaultDirectory[] = "download.def +@@ -1742,7 +1742,7 @@ const char kDownloadDefaultDirectory[] = "download.def // upgrade a unsafe location to a safe location. const char kDownloadDirUpgraded[] = "download.directory_upgrade"; @@ -27,7 +27,7 @@ defined(OS_MAC) const char kOpenPdfDownloadInSystemReader[] = "download.open_pdf_in_system_reader"; -@@ -1979,7 +1979,7 @@ const char kWebAppsPreferences[] = "web_apps.web_app_i +@@ -2035,7 +2035,7 @@ const char kWebAppsPreferences[] = "web_apps.web_app_i const char kWebAppsIsolationState[] = "web_apps.isolation_state"; #if defined(OS_WIN) || defined(OS_MAC) || \ @@ -36,7 +36,7 @@ // Dictionary that maps origins to web apps that can act as URL handlers. const char kWebAppsUrlHandlerInfo[] = "web_apps.url_handler_info"; #endif -@@ -2101,12 +2101,12 @@ const char kAmbientAuthenticationInPrivateModesEnabled +@@ -2162,12 +2162,12 @@ const char kAmbientAuthenticationInPrivateModesEnabled // requests. const char kBasicAuthOverHttpEnabled[] = "auth.basic_over_http_enabled"; @@ -51,16 +51,16 @@ #if defined(OS_POSIX) || defined(OS_FUCHSIA) // Boolean that specifies whether NTLMv2 is enabled. -@@ -3059,7 +3059,7 @@ const char kAutoplayWhitelist[] = "media.autoplay_whit - const char kBlockAutoplayEnabled[] = "media.block_autoplay"; - #endif // !defined(OS_ANDROID) +@@ -3135,7 +3135,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) // 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"; -@@ -3067,7 +3067,7 @@ const char kAllowNativeNotifications[] = "native_notif +@@ -3143,7 +3143,7 @@ const char kAllowNativeNotifications[] = "native_notif // Boolean that indicates if system notifications are allowed to be used in // place of Chrome notifications. const char kAllowSystemNotifications[] = "system_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 e4a79f5de08e..27695b902b43 100644 --- a/www/chromium/files/patch-chrome_common_pref__names.h +++ b/www/chromium/files/patch-chrome_common_pref__names.h @@ -1,7 +1,7 @@ ---- chrome/common/pref_names.h.orig 2021-09-24 04:26:00 UTC +--- chrome/common/pref_names.h.orig 2021-12-31 00:57:26 UTC +++ chrome/common/pref_names.h -@@ -361,7 +361,7 @@ extern const char kForceYouTubeRestrict[]; - extern const char kAllowedDomainsForApps[]; +@@ -371,7 +371,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) @@ -9,7 +9,7 @@ extern const char kUsesSystemTheme[]; #endif extern const char kCurrentThemePackFilename[]; -@@ -390,7 +390,7 @@ extern const char kShowUpdatePromotionInfoBar[]; +@@ -400,7 +400,7 @@ extern const char kShowUpdatePromotionInfoBar[]; #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -18,7 +18,7 @@ extern const char kUseCustomChromeFrame[]; #endif #if BUILDFLAG(ENABLE_PLUGINS) -@@ -571,7 +571,7 @@ extern const char kDownloadExtensionsToOpen[]; +@@ -582,7 +582,7 @@ extern const char kDownloadExtensionsToOpen[]; extern const char kDownloadExtensionsToOpenByPolicy[]; extern const char kDownloadAllowedURLsForOpenByPolicy[]; extern const char kDownloadDirUpgraded[]; @@ -27,7 +27,7 @@ defined(OS_MAC) extern const char kOpenPdfDownloadInSystemReader[]; #endif -@@ -676,7 +676,7 @@ extern const char kWebAppsPreferences[]; +@@ -691,7 +691,7 @@ extern const char kWebAppsPreferences[]; extern const char kWebAppsIsolationState[]; #if defined(OS_WIN) || defined(OS_MAC) || \ @@ -36,7 +36,7 @@ extern const char kWebAppsUrlHandlerInfo[]; #endif -@@ -818,9 +818,9 @@ extern const char kGloballyScopeHTTPAuthCacheEnabled[] +@@ -831,9 +831,9 @@ extern const char kGloballyScopeHTTPAuthCacheEnabled[] extern const char kAmbientAuthenticationInPrivateModesEnabled[]; extern const char kBasicAuthOverHttpEnabled[]; @@ -48,9 +48,9 @@ #if defined(OS_POSIX) || defined(OS_FUCHSIA) extern const char kNtlmV2Enabled[]; -@@ -1060,7 +1060,7 @@ extern const char kAutoplayWhitelist[]; - extern const char kBlockAutoplayEnabled[]; +@@ -1079,7 +1079,7 @@ extern const char kBlockAutoplayEnabled[]; #endif + extern const char kSandboxExternalProtocolBlocked[]; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) diff --git a/www/chromium/files/patch-chrome_common_safe__browsing_BUILD.gn b/www/chromium/files/patch-chrome_common_safe__browsing_BUILD.gn new file mode 100644 index 000000000000..3c4a874364f8 --- /dev/null +++ b/www/chromium/files/patch-chrome_common_safe__browsing_BUILD.gn @@ -0,0 +1,38 @@ +--- chrome/common/safe_browsing/BUILD.gn.orig 2021-12-17 11:44:29 UTC ++++ chrome/common/safe_browsing/BUILD.gn +@@ -30,7 +30,7 @@ if (safe_browsing_mode == 1) { + public_deps = [ "//components/safe_browsing/core/common/proto:csd_proto" ] + } + +- if (is_linux || is_win) { ++ if ((is_linux || is_win) && !is_bsd) { + source_set("document_analyzer_results") { + sources = [ + "document_analyzer_results.cc", +@@ -91,7 +91,7 @@ if (safe_browsing_mode == 1) { + public_deps = [ "//components/safe_browsing/core/common/proto:csd_proto" ] + } + +- if (is_linux || is_win) { ++ if ((is_linux || is_win) && !is_bsd) { + source_set("document_analyzer") { + sources = [ + "document_analyzer.cc", +@@ -193,7 +193,7 @@ source_set("safe_browsing") { + "//components/safe_browsing/core/common", + ] + +- if (is_linux) { ++ if (is_linux && !is_bsd) { + deps += [ ":document_analyzer" ] + } + +@@ -207,7 +207,7 @@ source_set("safe_browsing") { + "//third_party/zlib/google:zip", + ] + +- if (is_linux || is_win) { ++ if ((is_linux || is_win) && !is_bsd) { + public_deps += [ + ":document_analyzer_results", + ] 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 fd685308f678..27a3cbcb2b20 100644 --- a/www/chromium/files/patch-chrome_common_webui__url__constants.cc +++ b/www/chromium/files/patch-chrome_common_webui__url__constants.cc @@ -1,13 +1,13 @@ ---- chrome/common/webui_url_constants.cc.orig 2021-09-24 04:26:00 UTC +--- chrome/common/webui_url_constants.cc.orig 2021-12-31 00:57:26 UTC +++ chrome/common/webui_url_constants.cc -@@ -372,12 +372,12 @@ const char kChromeUIOSSettingsHost[] = "os-settings"; - const char kChromeUIOSSettingsURL[] = "chrome://os-settings/"; +@@ -385,12 +385,12 @@ const char kChromeUIWebUIJsErrorHost[] = "webuijserror + const char kChromeUIWebUIJsErrorURL[] = "chrome://webuijserror/"; #endif --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - const char kChromeUIWebUIJsErrorHost[] = "webuijserror"; - const char kChromeUIWebUIJsErrorURL[] = "chrome://webuijserror/"; +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + const char kChromeUIConnectorsInternalsHost[] = "connectors-internals"; #endif -#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ @@ -15,7 +15,7 @@ defined(OS_CHROMEOS) const char kChromeUIDiscardsHost[] = "discards"; const char kChromeUIDiscardsURL[] = "chrome://discards/"; -@@ -392,7 +392,7 @@ const char kChromeUINearbyShareURL[] = "chrome://nearb +@@ -405,7 +405,7 @@ const char kChromeUINearbyShareURL[] = "chrome://nearb const char kChromeUILinuxProxyConfigHost[] = "linux-proxy-config"; #endif @@ -24,7 +24,7 @@ defined(OS_ANDROID) const char kChromeUISandboxHost[] = "sandbox"; #endif -@@ -400,7 +400,7 @@ const char kChromeUISandboxHost[] = "sandbox"; +@@ -413,7 +413,7 @@ const char kChromeUISandboxHost[] = "sandbox"; // 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) || \ @@ -33,7 +33,7 @@ const char kChromeUIBrowserSwitchHost[] = "browser-switch"; const char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/"; const char kChromeUIEnterpriseProfileWelcomeHost[] = -@@ -415,7 +415,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro +@@ -428,7 +428,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro const char kChromeUIProfilePickerStartupQuery[] = "startup"; #endif @@ -42,13 +42,18 @@ defined(USE_AURA) const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog"; #endif -@@ -601,14 +601,14 @@ const char* const kChromeHostURLs[] = { +@@ -615,18 +615,18 @@ const char* const kChromeHostURLs[] = { kChromeUIInternetDetailDialogHost, kChromeUIAssistantOptInHost, #endif -#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) + kChromeUIConnectorsInternalsHost, + #endif +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) kChromeUIDiscardsHost, #endif #if defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_ANDROID) @@ -59,12 +64,3 @@ defined(OS_ANDROID) kChromeUISandboxHost, #endif -@@ -671,7 +671,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) - 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 768d04c34712..9933f0bea340 100644 --- a/www/chromium/files/patch-chrome_common_webui__url__constants.h +++ b/www/chromium/files/patch-chrome_common_webui__url__constants.h @@ -1,13 +1,13 @@ ---- chrome/common/webui_url_constants.h.orig 2021-09-24 04:26:00 UTC +--- chrome/common/webui_url_constants.h.orig 2021-12-14 11:45:00 UTC +++ chrome/common/webui_url_constants.h -@@ -316,12 +316,12 @@ extern const char kChromeUIOSSettingsHost[]; - extern const char kChromeUIOSSettingsURL[]; +@@ -329,12 +329,12 @@ extern const char kChromeUIWebUIJsErrorHost[]; + extern const char kChromeUIWebUIJsErrorURL[]; #endif --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - extern const char kChromeUIWebUIJsErrorHost[]; - extern const char kChromeUIWebUIJsErrorURL[]; +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + extern const char kChromeUIConnectorsInternalsHost[]; #endif -#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ @@ -15,7 +15,7 @@ defined(OS_CHROMEOS) || defined(OS_FUCHSIA) extern const char kChromeUIDiscardsHost[]; extern const char kChromeUIDiscardsURL[]; -@@ -336,7 +336,7 @@ extern const char kChromeUINearbyShareURL[]; +@@ -349,7 +349,7 @@ extern const char kChromeUINearbyShareURL[]; extern const char kChromeUILinuxProxyConfigHost[]; #endif @@ -24,7 +24,7 @@ defined(OS_ANDROID) extern const char kChromeUISandboxHost[]; #endif -@@ -344,7 +344,7 @@ extern const char kChromeUISandboxHost[]; +@@ -357,7 +357,7 @@ extern const char kChromeUISandboxHost[]; // 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) || \ @@ -33,7 +33,7 @@ extern const char kChromeUIBrowserSwitchHost[]; extern const char kChromeUIBrowserSwitchURL[]; extern const char kChromeUIEnterpriseProfileWelcomeHost[]; -@@ -356,7 +356,7 @@ extern const char kChromeUIProfilePickerUrl[]; +@@ -369,7 +369,7 @@ extern const char kChromeUIProfilePickerUrl[]; extern const char kChromeUIProfilePickerStartupQuery[]; #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 db7474a1363f..f8f72f960a37 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 2021-09-24 18:38:51 UTC +--- chrome/renderer/chrome_render_frame_observer.cc.orig 2021-12-31 00:57:26 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) -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) // 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.h b/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.h index f6fce9bc492c..89e705c66a7a 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,4 +1,4 @@ ---- chrome/renderer/pepper/pepper_flash_font_file_host.h.orig 2021-04-14 18:40:56 UTC +--- chrome/renderer/pepper/pepper_flash_font_file_host.h.orig 2021-12-14 11:45:00 UTC +++ chrome/renderer/pepper/pepper_flash_font_file_host.h @@ -14,7 +14,7 @@ #include "ppapi/c/private/pp_private_font_charset.h" @@ -9,7 +9,7 @@ #include "base/files/file.h" #elif defined(OS_WIN) #include "third_party/skia/include/core/SkRefCnt.h" -@@ -50,7 +50,7 @@ class PepperFlashFontFileHost : public ppapi::host::Re +@@ -54,7 +54,7 @@ class PepperFlashFontFileHost : public ppapi::host::Re uint32_t table); bool GetFontData(uint32_t table, void* buffer, size_t* length); diff --git a/www/chromium/files/patch-chrome_services_file__util_BUILD.gn b/www/chromium/files/patch-chrome_services_file__util_BUILD.gn new file mode 100644 index 000000000000..aec14c29f0d1 --- /dev/null +++ b/www/chromium/files/patch-chrome_services_file__util_BUILD.gn @@ -0,0 +1,20 @@ +--- chrome/services/file_util/BUILD.gn.orig 2021-12-17 12:04:10 UTC ++++ chrome/services/file_util/BUILD.gn +@@ -48,7 +48,7 @@ source_set("file_util") { + "safe_archive_analyzer.h", + ] + +- if (is_linux || is_win) { ++ if ((is_linux || is_win) && !is_bsd) { + sources += [ + "document_analysis_service.cc", + "document_analysis_service.h", +@@ -63,7 +63,7 @@ source_set("file_util") { + "//chrome/common/safe_browsing:rar_analyzer", + ] + +- if (is_linux || is_win) { ++ if ((is_linux || is_win) && !is_bsd) { + deps += [ + "//chrome/common/safe_browsing:document_analyzer", + "//chrome/common/safe_browsing:document_analyzer_results", diff --git a/www/chromium/files/patch-chrome_services_file__util_public_cpp_BUILD.gn b/www/chromium/files/patch-chrome_services_file__util_public_cpp_BUILD.gn new file mode 100644 index 000000000000..6c82ac03aa34 --- /dev/null +++ b/www/chromium/files/patch-chrome_services_file__util_public_cpp_BUILD.gn @@ -0,0 +1,20 @@ +--- chrome/services/file_util/public/cpp/BUILD.gn.orig 2021-12-17 12:05:27 UTC ++++ chrome/services/file_util/public/cpp/BUILD.gn +@@ -31,7 +31,7 @@ source_set("cpp") { + ] + } + +- if (is_linux || is_win) { ++ if ((is_linux || is_win) && !is_bsd) { + sources += [ + "sandboxed_document_analyzer.cc", + "sandboxed_document_analyzer.h", +@@ -78,7 +78,7 @@ if (safe_browsing_mode == 1) { + "//testing/gtest", + ] + +- if (is_linux || is_win) { ++ if ((is_linux || is_win) && !is_bsd) { + deps += [ "//chrome/common/safe_browsing:document_analyzer_results" ] + } + } diff --git a/www/chromium/files/patch-chrome_services_file__util_public_features.gni b/www/chromium/files/patch-chrome_services_file__util_public_features.gni new file mode 100644 index 000000000000..6982594069b6 --- /dev/null +++ b/www/chromium/files/patch-chrome_services_file__util_public_features.gni @@ -0,0 +1,9 @@ +--- chrome/services/file_util/public/features.gni.orig 2022-01-03 16:49:41 UTC ++++ chrome/services/file_util/public/features.gni +@@ -11,5 +11,5 @@ declare_args() { + enable_xz_extractor = enable_extensions + + # Enables analysis of Office documents for malicious macros +- enable_maldoca = is_linux || is_win ++ enable_maldoca = (is_linux || is_win) && !is_bsd + } 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 new file mode 100644 index 000000000000..69344368a2fa --- /dev/null +++ b/www/chromium/files/patch-chrome_services_file__util_public_mojom_safe__document__analyzer__mojom__traits.h @@ -0,0 +1,13 @@ +--- chrome/services/file_util/public/mojom/safe_document_analyzer_mojom_traits.h.orig 2021-12-16 14:56:45 UTC ++++ chrome/services/file_util/public/mojom/safe_document_analyzer_mojom_traits.h +@@ -14,8 +14,8 @@ + #include "mojo/public/cpp/bindings/enum_traits.h" + #include "mojo/public/cpp/bindings/struct_traits.h" + +-#if !BUILDFLAG(FULL_SAFE_BROWSING) || (!defined(OS_LINUX) && !defined(OS_WIN)) +-#error BUILDFLAG(FULL_SAFE_BROWSING) should be set and either OS_LINUX or OS_WIN defined. ++#if !BUILDFLAG(FULL_SAFE_BROWSING) || (!defined(OS_LINUX) && !defined(OS_WIN) && !defined(OS_BSD)) ++#error BUILDFLAG(FULL_SAFE_BROWSING) should be set and either OS_LINUX, OS_BSD or OS_WIN defined. + #endif + + namespace mojo { 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 new file mode 100644 index 000000000000..becdc4372d7c --- /dev/null +++ b/www/chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc @@ -0,0 +1,20 @@ +--- chrome/services/printing/print_backend_service_impl.cc.orig 2021-12-16 14:57:02 UTC ++++ chrome/services/printing/print_backend_service_impl.cc +@@ -327,7 +327,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) + // Try to fill in advanced settings based upon basic info options. + PrinterBasicInfo basic_info; + if (print_backend_->GetPrinterBasicInfo(printer_name, &basic_info) == +@@ -338,7 +338,7 @@ void PrintBackendServiceImpl::UpdatePrintSettings( + + job_settings[kSettingAdvancedSettings] = std::move(advanced_settings); + } +-#endif // defined(OS_LINUX) && defined(USE_CUPS) ++#endif // (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_CUPS) + + // Use a one-time `PrintingContext` to do the update to print settings. + // Intentionally do not cache this context here since the process model does diff --git a/www/chromium/files/patch-chrome_test_BUILD.gn b/www/chromium/files/patch-chrome_test_BUILD.gn index f9fac3fa7f02..87ccf30cbaf9 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 2021-10-08 06:25:42 UTC +--- chrome/test/BUILD.gn.orig 2021-12-31 00:57:26 UTC +++ chrome/test/BUILD.gn -@@ -536,7 +536,7 @@ static_library("test_support") { +@@ -538,7 +538,7 @@ static_library("test_support") { ] } @@ -9,8 +9,8 @@ public_deps += [ "//components/crash/core/app" ] } -@@ -2119,7 +2119,7 @@ if (!is_android && !is_fuchsia) { - ] +@@ -2191,7 +2191,7 @@ if (!is_android && !is_fuchsia) { + sources += [ "../browser/ui/views/frame/desktop_browser_frame_aura_linux_browsertest.cc" ] } - if (is_linux || is_chromeos) { @@ -18,7 +18,7 @@ sources += [ "../browser/error_reporting/webui_js_error_reporting_browsertest.cc", ] -@@ -6353,7 +6353,7 @@ test("unit_tests") { +@@ -6604,7 +6604,7 @@ test("unit_tests") { ] } @@ -27,7 +27,7 @@ deps += [ "//chrome/browser/error_reporting:unit_test" ] } -@@ -8445,7 +8445,7 @@ test("chrome_app_unittests") { +@@ -8765,7 +8765,7 @@ test("chrome_app_unittests") { "//components/safe_browsing:buildflags", "//pdf:pdf_ppapi", ] diff --git a/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc b/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc index 01b8bf0cceee..9c9f5f8c5efb 100644 --- a/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc +++ b/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc @@ -1,4 +1,4 @@ ---- chrome/test/base/in_process_browser_test.cc.orig 2021-09-14 01:51:52 UTC +--- chrome/test/base/in_process_browser_test.cc.orig 2021-12-14 11:45:00 UTC +++ chrome/test/base/in_process_browser_test.cc @@ -82,6 +82,10 @@ #include "services/device/public/cpp/test/fake_geolocation_manager.h" @@ -11,7 +11,7 @@ #if defined(OS_WIN) #include "base/win/scoped_com_initializer.h" #include "base/win/windows_version.h" -@@ -348,7 +352,7 @@ void InProcessBrowserTest::SetUp() { +@@ -345,7 +349,7 @@ void InProcessBrowserTest::SetUp() { // Cookies). Without this on Mac and Linux, many tests will hang waiting for a // user to approve KeyChain/kwallet access. On Windows this is not needed as // OS APIs never block. @@ -20,7 +20,7 @@ OSCryptMocker::SetUp(); #endif -@@ -417,7 +421,7 @@ void InProcessBrowserTest::TearDown() { +@@ -418,7 +422,7 @@ void InProcessBrowserTest::TearDown() { com_initializer_.reset(); #endif BrowserTestBase::TearDown(); diff --git a/www/chromium/files/patch-chrome_test_base_interactive__ui__tests__main.cc b/www/chromium/files/patch-chrome_test_base_interactive__ui__tests__main.cc deleted file mode 100644 index e4dcf52752f9..000000000000 --- a/www/chromium/files/patch-chrome_test_base_interactive__ui__tests__main.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- chrome/test/base/interactive_ui_tests_main.cc.orig 2021-07-19 18:45:11 UTC -+++ chrome/test/base/interactive_ui_tests_main.cc -@@ -19,7 +19,7 @@ - #if defined(USE_AURA) - #include "ui/aura/test/ui_controls_factory_aura.h" - #include "ui/base/test/ui_controls_aura.h" --#if defined(USE_OZONE) && (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+#if defined(USE_OZONE) && (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) - #include "ui/base/ui_base_features.h" - #include "ui/ozone/public/ozone_platform.h" - #include "ui/platform_window/common/platform_window_defaults.h" -@@ -57,7 +57,7 @@ class InteractiveUITestSuite : public ChromeTestSuite - com_initializer_ = std::make_unique<base::win::ScopedCOMInitializer>(); - ui_controls::InstallUIControlsAura( - aura::test::CreateUIControlsAura(nullptr)); --#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) - #if defined(USE_OZONE) - if (features::IsUsingOzonePlatform()) { - // Notifies the platform that test config is needed. For Wayland, for diff --git a/www/chromium/files/patch-chrome_test_base_test__browser__window.h b/www/chromium/files/patch-chrome_test_base_test__browser__window.h index 2152ae1a795e..6f8d78eb6396 100644 --- a/www/chromium/files/patch-chrome_test_base_test__browser__window.h +++ b/www/chromium/files/patch-chrome_test_base_test__browser__window.h @@ -1,6 +1,6 @@ ---- chrome/test/base/test_browser_window.h.orig 2021-09-24 04:26:00 UTC +--- chrome/test/base/test_browser_window.h.orig 2021-12-31 00:57:26 UTC +++ chrome/test/base/test_browser_window.h -@@ -197,7 +197,7 @@ class TestBrowserWindow : public BrowserWindow { +@@ -199,7 +199,7 @@ class TestBrowserWindow : public BrowserWindow { void MaybeShowProfileSwitchIPH() override {} #if defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_WIN) || \ diff --git a/www/chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc b/www/chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc index d0f4a018acbe..e12743541ce6 100644 --- a/www/chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc +++ b/www/chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc @@ -1,7 +1,7 @@ ---- chrome/test/chromedriver/chrome_launcher.cc.orig 2021-04-14 18:40:56 UTC +--- chrome/test/chromedriver/chrome_launcher.cc.orig 2021-12-14 11:45:00 UTC +++ chrome/test/chromedriver/chrome_launcher.cc -@@ -71,6 +71,10 @@ - #include "chrome/test/chromedriver/keycode_text_conversion.h" +@@ -73,6 +73,10 @@ + #include <windows.h> #endif +#if defined(OS_BSD) diff --git a/www/chromium/files/patch-chrome_test_chromedriver_server_chromedriver__server.cc b/www/chromium/files/patch-chrome_test_chromedriver_server_chromedriver__server.cc index ce360bb00fd3..67bee8264321 100644 --- a/www/chromium/files/patch-chrome_test_chromedriver_server_chromedriver__server.cc +++ b/www/chromium/files/patch-chrome_test_chromedriver_server_chromedriver__server.cc @@ -1,6 +1,6 @@ ---- chrome/test/chromedriver/server/chromedriver_server.cc.orig 2021-04-14 18:40:56 UTC +--- chrome/test/chromedriver/server/chromedriver_server.cc.orig 2021-12-14 11:45:00 UTC +++ chrome/test/chromedriver/server/chromedriver_server.cc -@@ -286,7 +286,7 @@ int main(int argc, char *argv[]) { +@@ -291,7 +291,7 @@ int main(int argc, char *argv[]) { base::AtExitManager at_exit; base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); 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 53bea66f92f2..735a1c6e504f 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,6 +1,6 @@ ---- chrome/updater/device_management/cloud_policy_util.cc.orig 2021-09-24 18:39:26 UTC +--- chrome/updater/device_management/cloud_policy_util.cc.orig 2021-12-14 11:45:01 UTC +++ chrome/updater/device_management/cloud_policy_util.cc -@@ -21,7 +21,7 @@ +@@ -22,7 +22,7 @@ #include <wincred.h> #endif @@ -9,7 +9,7 @@ #include <pwd.h> #include <sys/types.h> #include <unistd.h> -@@ -35,7 +35,7 @@ +@@ -36,7 +36,7 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -18,7 +18,7 @@ #include <limits.h> // For HOST_NAME_MAX #endif -@@ -62,7 +62,7 @@ +@@ -63,7 +63,7 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -27,7 +27,7 @@ #include "base/system/sys_info.h" #endif -@@ -115,6 +115,11 @@ std::string GetMachineName() { +@@ -116,6 +116,11 @@ std::string GetMachineName() { if (gethostname(hostname, HOST_NAME_MAX) == 0) // Success. return hostname; return std::string(); @@ -39,7 +39,7 @@ #elif defined(OS_MAC) // Do not use NSHost currentHost, as it's very slow. http://crbug.com/138570 SCDynamicStoreContext context = {0, NULL, NULL, NULL}; -@@ -160,7 +165,7 @@ std::string GetMachineName() { +@@ -161,7 +166,7 @@ std::string GetMachineName() { } std::string GetOSVersion() { diff --git a/www/chromium/files/patch-chrome_utility_services.cc b/www/chromium/files/patch-chrome_utility_services.cc deleted file mode 100644 index 26c32aa2a4c0..000000000000 --- a/www/chromium/files/patch-chrome_utility_services.cc +++ /dev/null @@ -1,29 +0,0 @@ ---- chrome/utility/services.cc.orig 2021-09-14 01:51:53 UTC -+++ chrome/utility/services.cc -@@ -81,7 +81,7 @@ - #endif - - #if BUILDFLAG(ENABLE_PRINTING) --#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ - defined(OS_CHROMEOS) - #include "chrome/services/printing/print_backend_service_impl.h" - #include "chrome/services/printing/public/mojom/print_backend_service.mojom.h" -@@ -247,7 +247,7 @@ auto RunPaintPreviewCompositor( - #endif // BUILDFLAG(ENABLE_PAINT_PREVIEW) - - #if BUILDFLAG(ENABLE_PRINTING) --#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ - defined(OS_CHROMEOS) - auto RunPrintBackendService( - mojo::PendingReceiver<printing::mojom::PrintBackendService> receiver) { -@@ -367,7 +367,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& - #endif - - #if BUILDFLAG(ENABLE_PRINTING) --#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ - defined(OS_CHROMEOS) - services.Add(RunPrintBackendService); - #endif diff --git a/www/chromium/files/patch-chromecast_app_cast__main__delegate.cc b/www/chromium/files/patch-chromecast_app_cast__main__delegate.cc index e4dc6bc208f4..91f0c15a906f 100644 --- a/www/chromium/files/patch-chromecast_app_cast__main__delegate.cc +++ b/www/chromium/files/patch-chromecast_app_cast__main__delegate.cc @@ -1,6 +1,6 @@ ---- chromecast/app/cast_main_delegate.cc.orig 2021-04-14 18:40:58 UTC +--- chromecast/app/cast_main_delegate.cc.orig 2021-12-31 00:57:27 UTC +++ chromecast/app/cast_main_delegate.cc -@@ -136,7 +136,7 @@ bool CastMainDelegate::BasicStartupComplete(int* exit_ +@@ -162,7 +162,7 @@ bool CastMainDelegate::BasicStartupComplete(int* exit_ void CastMainDelegate::PreSandboxStartup() { #if defined(ARCH_CPU_ARM_FAMILY) && \ 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 159debd029b5..8436ca7265fb 100644 --- a/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc +++ b/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc @@ -1,4 +1,4 @@ ---- chromecast/browser/cast_browser_main_parts.cc.orig 2021-09-24 04:26:02 UTC +--- chromecast/browser/cast_browser_main_parts.cc.orig 2021-12-14 11:45:02 UTC +++ chromecast/browser/cast_browser_main_parts.cc @@ -78,7 +78,7 @@ #include "ui/base/ui_base_switches.h" @@ -18,7 +18,7 @@ #include "chromecast/browser/exo/wayland_server_controller.h" #endif -@@ -275,7 +275,7 @@ class CastViewsDelegate : public views::ViewsDelegate +@@ -276,7 +276,7 @@ class CastViewsDelegate : public views::ViewsDelegate #endif // defined(USE_AURA) @@ -27,7 +27,7 @@ base::FilePath GetApplicationFontsDir() { std::unique_ptr<base::Environment> env(base::Environment::Create()); -@@ -291,7 +291,7 @@ base::FilePath GetApplicationFontsDir() { +@@ -293,7 +293,7 @@ base::FilePath GetApplicationFontsDir() { } } @@ -36,7 +36,7 @@ } // namespace -@@ -320,7 +320,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { +@@ -322,7 +322,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { {cc::switches::kDisableThreadedAnimation, ""}, #endif // defined(OS_ANDROID) #endif // BUILDFLAG(IS_CAST_AUDIO_ONLY) @@ -45,7 +45,7 @@ #if defined(ARCH_CPU_X86_FAMILY) // This is needed for now to enable the x11 Ozone platform to work with // current Linux/NVidia OpenGL drivers. -@@ -330,7 +330,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { +@@ -332,7 +332,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { {switches::kEnableHardwareOverlays, "cast"}, #endif #endif @@ -54,7 +54,7 @@ // It's better to start GPU process on demand. For example, for TV platforms // cast starts in background and can't render until TV switches to cast // input. -@@ -492,7 +492,7 @@ void CastBrowserMainParts::ToolkitInitialized() { +@@ -491,7 +491,7 @@ void CastBrowserMainParts::ToolkitInitialized() { views_delegate_ = std::make_unique<CastViewsDelegate>(); #endif // defined(USE_AURA) diff --git a/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.h b/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.h index 3ce699f183e0..95e4e2e79c97 100644 --- a/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.h +++ b/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.h @@ -1,6 +1,6 @@ ---- chromecast/browser/cast_browser_main_parts.h.orig 2021-09-24 04:26:02 UTC +--- chromecast/browser/cast_browser_main_parts.h.orig 2021-12-14 11:45:02 UTC +++ chromecast/browser/cast_browser_main_parts.h -@@ -142,7 +142,7 @@ class CastBrowserMainParts : public content::BrowserMa +@@ -146,7 +146,7 @@ class CastBrowserMainParts : public content::BrowserMa std::unique_ptr<PrefService> user_pref_service_; #endif 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 89b48c3c3116..4d88b05fdf7a 100644 --- a/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc +++ b/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc @@ -1,6 +1,6 @@ ---- chromecast/browser/cast_content_browser_client.cc.orig 2021-09-24 04:26:02 UTC +--- chromecast/browser/cast_content_browser_client.cc.orig 2021-12-31 00:57:27 UTC +++ chromecast/browser/cast_content_browser_client.cc -@@ -128,9 +128,9 @@ +@@ -130,9 +130,9 @@ #include "extensions/common/constants.h" // nogncheck #endif @@ -11,8 +11,8 @@ +#endif // (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(USE_OZONE) #if BUILDFLAG(ENABLE_CAST_RENDERER) - #include "base/sequenced_task_runner.h" -@@ -476,7 +476,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS + #include "base/task/sequenced_task_runner.h" +@@ -478,7 +478,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS switches::kAudioOutputChannels)); } } else if (process_type == switches::kGpuProcess) { @@ -21,7 +21,7 @@ // 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. -@@ -868,12 +868,12 @@ CastContentBrowserClient::CreateThrottlesForNavigation +@@ -870,12 +870,12 @@ CastContentBrowserClient::CreateThrottlesForNavigation handle, general_audience_browsing_service_.get())); } diff --git a/www/chromium/files/patch-chromecast_browser_metrics_cast__browser__metrics.h b/www/chromium/files/patch-chromecast_browser_metrics_cast__browser__metrics.h index d3bf16944430..3e8ac7f414aa 100644 --- a/www/chromium/files/patch-chromecast_browser_metrics_cast__browser__metrics.h +++ b/www/chromium/files/patch-chromecast_browser_metrics_cast__browser__metrics.h @@ -1,6 +1,6 @@ ---- chromecast/browser/metrics/cast_browser_metrics.h.orig 2021-04-14 18:40:58 UTC +--- chromecast/browser/metrics/cast_browser_metrics.h.orig 2021-12-14 11:45:02 UTC +++ chromecast/browser/metrics/cast_browser_metrics.h -@@ -38,10 +38,10 @@ class CastBrowserMetrics { +@@ -42,10 +42,10 @@ class CastBrowserMetrics { private: std::unique_ptr<CastMetricsServiceClient> metrics_service_client_; @@ -10,6 +10,6 @@ ExternalMetrics* platform_metrics_ = nullptr; -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - - DISALLOW_COPY_AND_ASSIGN(CastBrowserMetrics); }; + + } // namespace metrics diff --git a/www/chromium/files/patch-chromecast_external__mojo_public_cpp_external__mojo__broker.cc b/www/chromium/files/patch-chromecast_external__mojo_public_cpp_external__mojo__broker.cc index f995845eb622..9381d99fc64f 100644 --- a/www/chromium/files/patch-chromecast_external__mojo_public_cpp_external__mojo__broker.cc +++ b/www/chromium/files/patch-chromecast_external__mojo_public_cpp_external__mojo__broker.cc @@ -1,4 +1,4 @@ ---- chromecast/external_mojo/public/cpp/external_mojo_broker.cc.orig 2021-04-14 18:40:58 UTC +--- chromecast/external_mojo/public/cpp/external_mojo_broker.cc.orig 2021-12-14 11:45:02 UTC +++ chromecast/external_mojo/public/cpp/external_mojo_broker.cc @@ -8,7 +8,7 @@ #include <set> @@ -9,7 +9,7 @@ #include <sys/stat.h> #endif -@@ -424,7 +424,7 @@ ExternalMojoBroker::ExternalMojoBroker(const std::stri +@@ -427,7 +427,7 @@ ExternalMojoBroker::ExternalMojoBroker(const std::stri named_channel.TakeServerEndpoint(); DCHECK(server_endpoint.is_valid()); 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 b341d3cd7f67..1005e093c47b 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,6 +1,6 @@ ---- chromecast/renderer/cast_content_renderer_client.cc.orig 2021-09-14 01:51:53 UTC +--- chromecast/renderer/cast_content_renderer_client.cc.orig 2021-12-31 00:57:27 UTC +++ chromecast/renderer/cast_content_renderer_client.cc -@@ -205,7 +205,7 @@ void CastContentRendererClient::RenderFrameCreated( +@@ -206,7 +206,7 @@ void CastContentRendererClient::RenderFrameCreated( dispatcher->OnRenderFrameCreated(render_frame); #endif diff --git a/www/chromium/files/patch-components_BUILD.gn b/www/chromium/files/patch-components_BUILD.gn index dbd576ce1d43..3c5524ac143a 100644 --- a/www/chromium/files/patch-components_BUILD.gn +++ b/www/chromium/files/patch-components_BUILD.gn @@ -1,6 +1,6 @@ ---- components/BUILD.gn.orig 2021-09-24 04:26:02 UTC +--- components/BUILD.gn.orig 2021-12-31 00:57:28 UTC +++ components/BUILD.gn -@@ -360,6 +360,13 @@ test("components_unittests") { +@@ -369,6 +369,13 @@ test("components_unittests") { ] } 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 12b31f8a1ee9..1bd6fadb64fd 100644 --- a/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc +++ b/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc @@ -1,6 +1,6 @@ ---- components/autofill/core/browser/personal_data_manager.cc.orig 2021-09-24 04:26:02 UTC +--- components/autofill/core/browser/personal_data_manager.cc.orig 2021-12-31 00:57:28 UTC +++ components/autofill/core/browser/personal_data_manager.cc -@@ -2071,7 +2071,7 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp +@@ -2107,7 +2107,7 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp // The feature is only for Linux, Windows and Mac. // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ defined(OS_APPLE) // This option should only be shown for users that have not enabled the Sync // Feature and that have server credit cards available. -@@ -2095,7 +2095,7 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp +@@ -2129,7 +2129,7 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp return !is_opted_in; #else return false; 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 8179057ed3dc..cec0ab69a6f4 100644 --- a/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc +++ b/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc @@ -1,6 +1,6 @@ ---- components/autofill/core/common/autofill_payments_features.cc.orig 2021-09-14 01:51:54 UTC +--- components/autofill/core/common/autofill_payments_features.cc.orig 2021-12-31 00:57:28 UTC +++ components/autofill/core/common/autofill_payments_features.cc -@@ -178,7 +178,7 @@ bool ShouldShowImprovedUserConsentForCreditCardSave() +@@ -184,7 +184,7 @@ 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) || \ diff --git a/www/chromium/files/patch-components_download_internal_common_download__utils.cc b/www/chromium/files/patch-components_download_internal_common_download__utils.cc new file mode 100644 index 000000000000..ebcc7d0c85af --- /dev/null +++ b/www/chromium/files/patch-components_download_internal_common_download__utils.cc @@ -0,0 +1,11 @@ +--- components/download/internal/common/download_utils.cc.orig 2021-12-16 14:59:11 UTC ++++ components/download/internal/common/download_utils.cc +@@ -55,7 +55,7 @@ const int kDefaultDownloadExpiredTimeInDays = 90; + const int kDefaultOverwrittenDownloadExpiredTimeInDays = 90; + + // Default buffer size in bytes to write to the download file. +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) + const int kDefaultDownloadFileBufferSize = 524288; // Desktop uses 512 KB. + #else + const int kDefaultDownloadFileBufferSize = 4096; diff --git a/www/chromium/files/patch-components_download_public_common_download__features.cc b/www/chromium/files/patch-components_download_public_common_download__features.cc new file mode 100644 index 000000000000..5e7774a3dca3 --- /dev/null +++ b/www/chromium/files/patch-components_download_public_common_download__features.cc @@ -0,0 +1,11 @@ +--- components/download/public/common/download_features.cc.orig 2021-12-31 00:57:29 UTC ++++ components/download/public/common/download_features.cc +@@ -68,7 +68,7 @@ const base::Feature kDeleteOverwrittenDownloads{ + + const base::Feature kAllowFileBufferSizeControl{ + "AllowFileBufferSizeControl", +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) + base::FEATURE_ENABLED_BY_DEFAULT + #else + base::FEATURE_DISABLED_BY_DEFAULT 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 db87ddab12be..92f5f84d5c6c 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,4 +1,4 @@ ---- components/feature_engagement/public/event_constants.cc.orig 2021-09-24 04:26:03 UTC +--- components/feature_engagement/public/event_constants.cc.orig 2021-12-31 00:57:29 UTC +++ components/feature_engagement/public/event_constants.cc @@ -10,7 +10,7 @@ namespace feature_engagement { @@ -9,9 +9,9 @@ defined(OS_CHROMEOS) || defined(OS_FUCHSIA) const char kNewTabOpened[] = "new_tab_opened"; const char kSixthTabOpened[] = "sixth_tab_opened"; -@@ -39,7 +39,7 @@ const char kDesktopPwaInstalled[] = "desktop_pwa_insta - const char kUpdatedConnectionSecurityIndicatorDisplayed[] = - "updated_connection_security_indicator_displayed"; +@@ -47,7 +47,7 @@ const char kFocusHelpBubbleAcceleratorPressed[] = + const char kFocusHelpBubbleAcceleratorPromoRead[] = + "focus_help_bubble_accelerator_promo_read"; -#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || +#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || 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 ea16ccdbaa27..99f20f667ff6 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,4 +1,4 @@ ---- components/feature_engagement/public/event_constants.h.orig 2021-09-24 04:26:03 UTC +--- components/feature_engagement/public/event_constants.h.orig 2021-12-31 00:57:29 UTC +++ components/feature_engagement/public/event_constants.h @@ -12,7 +12,7 @@ namespace feature_engagement { namespace events { @@ -9,9 +9,9 @@ defined(OS_CHROMEOS) || defined(OS_FUCHSIA) // The user has explicitly opened a new tab via an entry point from inside of // Chrome. -@@ -65,7 +65,7 @@ extern const char kDesktopPwaInstalled[]; - // Omnibox displayed the updated connection security indicator. - extern const char kUpdatedConnectionSecurityIndicatorDisplayed[]; +@@ -75,7 +75,7 @@ extern const char kFocusHelpBubbleAcceleratorPressed[] + // the user. + extern const char kFocusHelpBubbleAcceleratorPromoRead[]; -#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || +#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || 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 b49649b481ad..4595f8f47898 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,4 +1,4 @@ ---- components/feature_engagement/public/feature_configurations.cc.orig 2021-07-19 18:45:13 UTC +--- components/feature_engagement/public/feature_configurations.cc.orig 2021-12-31 00:57:29 UTC +++ components/feature_engagement/public/feature_configurations.cc @@ -12,7 +12,7 @@ namespace feature_engagement { @@ -9,8 +9,8 @@ defined(OS_CHROMEOS) if (kIPHPasswordsAccountStorageFeature.name == feature->name) { absl::optional<FeatureConfig> config = FeatureConfig(); -@@ -41,7 +41,7 @@ absl::optional<FeatureConfig> GetClientSideFeatureConf - EventConfig("profile_menu_shown", Comparator(EQUAL, 0), 360, 360); +@@ -87,7 +87,7 @@ absl::optional<FeatureConfig> GetClientSideFeatureConf + Comparator(EQUAL, 0), 7, 360)); return config; } -#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || 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 97befdeff889..e7a5f9d92524 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,16 +1,16 @@ ---- components/feature_engagement/public/feature_constants.cc.orig 2021-09-24 04:26:03 UTC +--- components/feature_engagement/public/feature_constants.cc.orig 2021-12-31 00:57:29 UTC +++ components/feature_engagement/public/feature_constants.cc -@@ -12,7 +12,7 @@ const base::Feature kIPHSnooze{"IPH_Snooze", base::FEA +@@ -19,7 +19,7 @@ const base::Feature kUseClientConfigIPH{"UseClientConf const base::Feature kIPHDummyFeature{"IPH_Dummy", base::FEATURE_DISABLED_BY_DEFAULT}; -#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_FUCHSIA) - const base::Feature kIPHDesktopTabGroupsNewGroupFeature{ - "IPH_DesktopTabGroupsNewGroup", base::FEATURE_DISABLED_BY_DEFAULT}; -@@ -40,7 +40,7 @@ const base::Feature kIPHDesktopPwaInstallFeature{ - "IPH_DesktopPwaInstall", base::FEATURE_DISABLED_BY_DEFAULT}; + const base::Feature kIPHDesktopSharedHighlightingFeature{ + "IPH_DesktopSharedHighlighting", base::FEATURE_DISABLED_BY_DEFAULT}; +@@ -53,7 +53,7 @@ const base::Feature kIPHDesktopPwaInstallFeature{ + "IPH_DesktopPwaInstall", base::FEATURE_ENABLED_BY_DEFAULT}; const base::Feature kIPHProfileSwitchFeature{"IPH_ProfileSwitch", base::FEATURE_ENABLED_BY_DEFAULT}; -#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || @@ -18,7 +18,7 @@ // defined(OS_CHROMEOS) || defined(OS_FUCHSIA) #if defined(OS_ANDROID) -@@ -203,12 +203,12 @@ const base::Feature kIPHDiscoverFeedHeaderFeature{ +@@ -232,12 +232,12 @@ const base::Feature kIPHDiscoverFeedHeaderFeature{ "IPH_DiscoverFeedHeaderMenu", base::FEATURE_DISABLED_BY_DEFAULT}; #endif // defined(OS_IOS) 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 9dab6a50b115..52e9e13a5765 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,15 +1,15 @@ ---- components/feature_engagement/public/feature_constants.h.orig 2021-09-24 04:26:03 UTC +--- components/feature_engagement/public/feature_constants.h.orig 2021-12-31 00:57:29 UTC +++ components/feature_engagement/public/feature_constants.h -@@ -19,7 +19,7 @@ extern const base::Feature kIPHSnooze; +@@ -29,7 +29,7 @@ extern const base::Feature kUseClientConfigIPH; // A feature to ensure all arrays can contain at least one feature. extern const base::Feature kIPHDummyFeature; -#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_FUCHSIA) + extern const base::Feature kIPHDesktopSharedHighlightingFeature; extern const base::Feature kIPHDesktopTabGroupsNewGroupFeature; - extern const base::Feature kIPHFocusModeFeature; -@@ -35,7 +35,7 @@ extern const base::Feature kIPHDesktopSnoozeFeature; +@@ -48,7 +48,7 @@ extern const base::Feature kIPHDesktopSnoozeFeature; extern const base::Feature kIPHDesktopPwaInstallFeature; extern const base::Feature kIPHProfileSwitchFeature; extern const base::Feature kIPHUpdatedConnectionSecurityIndicatorsFeature; @@ -18,7 +18,7 @@ // defined(OS_CHROMEOS) || defined(OS_FUCHSIA) // All the features declared for Android below that are also used in Java, -@@ -126,7 +126,7 @@ extern const base::Feature kIPHBadgedTranslateManualTr +@@ -147,7 +147,7 @@ extern const base::Feature kIPHBadgedTranslateManualTr extern const base::Feature kIPHDiscoverFeedHeaderFeature; #endif // defined(OS_IOS) 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 b618be6453ce..7d99f329f48d 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,20 +1,20 @@ ---- components/feature_engagement/public/feature_list.cc.orig 2021-09-14 01:51:54 UTC +--- components/feature_engagement/public/feature_list.cc.orig 2021-12-31 00:57:29 UTC +++ components/feature_engagement/public/feature_list.cc -@@ -94,7 +94,7 @@ const base::Feature* const kAllFeatures[] = { +@@ -102,7 +102,7 @@ const base::Feature* const kAllFeatures[] = { &kIPHBadgedTranslateManualTriggerFeature, &kIPHDiscoverFeedHeaderFeature, #endif // defined(OS_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_CHROMEOS) || defined(OS_FUCHSIA) &kIPHDesktopTabGroupsNewGroupFeature, - &kIPHFocusModeFeature, -@@ -109,7 +109,7 @@ const base::Feature* const kAllFeatures[] = { - &kIPHDesktopPwaInstallFeature, + &kIPHFocusHelpBubbleScreenReaderPromoFeature, +@@ -120,7 +120,7 @@ const base::Feature* const kAllFeatures[] = { &kIPHProfileSwitchFeature, &kIPHUpdatedConnectionSecurityIndicatorsFeature, + &kIPHDesktopSharedHighlightingFeature, -#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || +#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || - // defined(OS_CHROMEOS) + // defined(OS_CHROMEOS) || defined(OS_FUCHSIA) }; } // namespace 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 f5aa6a725727..624f57ff14cf 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__list.h +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__list.h @@ -1,6 +1,6 @@ ---- components/feature_engagement/public/feature_list.h.orig 2021-09-24 04:26:03 UTC +--- components/feature_engagement/public/feature_list.h.orig 2021-12-31 00:57:29 UTC +++ components/feature_engagement/public/feature_list.h -@@ -176,7 +176,7 @@ DEFINE_VARIATION_PARAM(kIPHDiscoverFeedHeaderFeature, +@@ -189,7 +189,7 @@ DEFINE_VARIATION_PARAM(kIPHDiscoverFeedHeaderFeature, "IPH_DiscoverFeedHeaderMenu"); #endif // defined(OS_IOS) @@ -9,16 +9,16 @@ defined(OS_CHROMEOS) || defined(OS_FUCHSIA) DEFINE_VARIATION_PARAM(kIPHDesktopTabGroupsNewGroupFeature, "IPH_DesktopTabGroupsNewGroup"); -@@ -196,7 +196,7 @@ DEFINE_VARIATION_PARAM(kIPHDesktopPwaInstallFeature, " - DEFINE_VARIATION_PARAM(kIPHProfileSwitchFeature, "IPH_ProfileSwitch"); - DEFINE_VARIATION_PARAM(kIPHUpdatedConnectionSecurityIndicatorsFeature, +@@ -215,7 +215,7 @@ DEFINE_VARIATION_PARAM(kIPHUpdatedConnectionSecurityIn "IPH_UpdatedConnectionSecurityIndicators"); + DEFINE_VARIATION_PARAM(kIPHDesktopSharedHighlightingFeature, + "IPH_DesktopSharedHighlighting"); -#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || +#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || // defined(OS_CHROMEOS) || defined(OS_FUCHSIA) } // namespace -@@ -284,7 +284,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation +@@ -311,7 +311,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation VARIATION_ENTRY(kIPHReadingListMessagesFeature), VARIATION_ENTRY(kIPHBadgedTranslateManualTriggerFeature), VARIATION_ENTRY(kIPHDiscoverFeedHeaderFeature), @@ -27,10 +27,10 @@ defined(OS_CHROMEOS) || defined(OS_FUCHSIA) VARIATION_ENTRY(kIPHDesktopTabGroupsNewGroupFeature), VARIATION_ENTRY(kIPHFocusModeFeature), -@@ -299,7 +299,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation - VARIATION_ENTRY(kIPHDesktopPwaInstallFeature), +@@ -330,7 +330,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation VARIATION_ENTRY(kIPHProfileSwitchFeature), VARIATION_ENTRY(kIPHUpdatedConnectionSecurityIndicatorsFeature), + VARIATION_ENTRY(kIPHDesktopSharedHighlightingFeature), -#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || +#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || // defined(OS_CHROMEOS) || defined(OS_FUCHSIA) 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 bc64aed3596e..cd037b923b9e 100644 --- a/www/chromium/files/patch-components_feed_core_v2_proto__util.cc +++ b/www/chromium/files/patch-components_feed_core_v2_proto__util.cc @@ -1,6 +1,6 @@ ---- components/feed/core/v2/proto_util.cc.orig 2021-09-24 04:26:03 UTC +--- components/feed/core/v2/proto_util.cc.orig 2021-12-14 11:45:03 UTC +++ components/feed/core/v2/proto_util.cc -@@ -85,8 +85,8 @@ feedwire::Version GetPlatformVersionMessage() { +@@ -86,8 +86,8 @@ feedwire::Version GetPlatformVersionMessage() { int32_t major, minor, revision; base::SysInfo::OperatingSystemVersionNumbers(&major, &minor, &revision); @@ -11,7 +11,7 @@ result.set_revision(revision); #if defined(OS_ANDROID) result.set_api_version(base::android::BuildInfo::GetInstance()->sdk_int()); -@@ -101,8 +101,8 @@ feedwire::Version GetAppVersionMessage(const ChromeInf +@@ -102,8 +102,8 @@ feedwire::Version GetAppVersionMessage(const ChromeInf // Chrome's version is in the format: MAJOR,MINOR,BUILD,PATCH. const std::vector<uint32_t>& numbers = chrome_info.version.components(); if (numbers.size() > 3) { diff --git a/www/chromium/files/patch-components_flags__ui_flags__state.cc b/www/chromium/files/patch-components_flags__ui_flags__state.cc index 0199df983cb0..c78293356fad 100644 --- a/www/chromium/files/patch-components_flags__ui_flags__state.cc +++ b/www/chromium/files/patch-components_flags__ui_flags__state.cc @@ -1,6 +1,6 @@ ---- components/flags_ui/flags_state.cc.orig 2021-09-24 04:26:03 UTC +--- components/flags_ui/flags_state.cc.orig 2021-12-31 00:57:29 UTC +++ components/flags_ui/flags_state.cc -@@ -642,7 +642,7 @@ unsigned short FlagsState::GetCurrentPlatform() { +@@ -653,7 +653,7 @@ unsigned short FlagsState::GetCurrentPlatform() { return kOsWin; #elif BUILDFLAG(IS_CHROMEOS_ASH) return kOsCrOS; diff --git a/www/chromium/files/patch-components_metrics_BUILD.gn b/www/chromium/files/patch-components_metrics_BUILD.gn index 89f147134233..1b10b303cd69 100644 --- a/www/chromium/files/patch-components_metrics_BUILD.gn +++ b/www/chromium/files/patch-components_metrics_BUILD.gn @@ -1,6 +1,6 @@ ---- components/metrics/BUILD.gn.orig 2021-09-24 04:26:03 UTC +--- components/metrics/BUILD.gn.orig 2021-12-31 00:57:29 UTC +++ components/metrics/BUILD.gn -@@ -180,6 +180,11 @@ static_library("metrics") { +@@ -187,6 +187,11 @@ static_library("metrics") { if (is_fuchsia) { sources += [ "drive_metrics_provider_fuchsia.cc" ] } diff --git a/www/chromium/files/patch-components_metrics_metrics__log.cc b/www/chromium/files/patch-components_metrics_metrics__log.cc index 69117a782987..f22e7b0964a3 100644 --- a/www/chromium/files/patch-components_metrics_metrics__log.cc +++ b/www/chromium/files/patch-components_metrics_metrics__log.cc @@ -1,6 +1,6 @@ ---- components/metrics/metrics_log.cc.orig 2021-09-14 01:51:54 UTC +--- components/metrics/metrics_log.cc.orig 2021-12-31 00:57:29 UTC +++ components/metrics/metrics_log.cc -@@ -265,7 +265,7 @@ void MetricsLog::RecordCoreSystemProfile( +@@ -342,7 +342,7 @@ void MetricsLog::RecordCoreSystemProfile( // OperatingSystemVersion refers to the ChromeOS release version. #if BUILDFLAG(IS_CHROMEOS_ASH) os->set_kernel_version(base::SysInfo::KernelVersion()); diff --git a/www/chromium/files/patch-components_neterror_resources_neterror.js b/www/chromium/files/patch-components_neterror_resources_neterror.js index 0220981ee19d..eaf8aa01bb6b 100644 --- a/www/chromium/files/patch-components_neterror_resources_neterror.js +++ b/www/chromium/files/patch-components_neterror_resources_neterror.js @@ -1,6 +1,6 @@ ---- components/neterror/resources/neterror.js.orig 2021-09-14 01:51:54 UTC +--- components/neterror/resources/neterror.js.orig 2021-12-14 11:45:03 UTC +++ components/neterror/resources/neterror.js -@@ -123,7 +123,7 @@ function detailsButtonClick() { +@@ -129,7 +129,7 @@ function detailsButtonClick() { } let primaryControlOnLeft = true; 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 5eba4062f5f9..6c74963e299c 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,6 +1,6 @@ ---- components/network_session_configurator/browser/network_session_configurator.cc.orig 2021-09-24 04:26:03 UTC +--- 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 -@@ -789,7 +789,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C +@@ -782,7 +782,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C } #endif // #if !defined(OS_ANDROID) diff --git a/www/chromium/files/patch-components_new__or__sad__tab__strings.grdp b/www/chromium/files/patch-components_new__or__sad__tab__strings.grdp index 01b9b0328add..cea7edadf5b3 100644 --- a/www/chromium/files/patch-components_new__or__sad__tab__strings.grdp +++ b/www/chromium/files/patch-components_new__or__sad__tab__strings.grdp @@ -1,11 +1,11 @@ ---- components/new_or_sad_tab_strings.grdp.orig 2021-04-14 18:40:59 UTC +--- components/new_or_sad_tab_strings.grdp.orig 2021-12-14 11:45:03 UTC +++ components/new_or_sad_tab_strings.grdp @@ -51,7 +51,7 @@ Open page in a new Incognito window (⇧⌘N) </message> </if> -- <if expr="is_win or is_linux or chromeos"> -+ <if expr="is_win or is_posix or chromeos"> +- <if expr="is_win or is_linux or is_fuchsia or chromeos"> ++ <if expr="is_win or is_linux or is_fuchsia or chromeos or is_bsd"> <message name="IDS_SAD_TAB_RELOAD_INCOGNITO" desc="One of the bullet points displayed on the web page if a reload failed to fix the issue, advising the user to open the web page in Chrome's Incognito mode."> Open page in a new Incognito window (Ctrl-Shift-N) </message> @@ -31,8 +31,8 @@ Restart Chromium </message> </if> -- <if expr="is_win or is_linux or is_macosx or chromeos"> -+ <if expr="is_win or is_posix or is_macosx or chromeos"> +- <if expr="is_win or is_linux or is_macosx or is_fuchsia or chromeos"> ++ <if expr="is_win or is_linux or is_macosx or is_fuchsia or chromeos or is_bsd"> <message name="IDS_SAD_TAB_RELOAD_RESTART_DEVICE" desc="One of the bullet points displayed on the web page if a reload failed to fix the issue, advising the user to restart their computer."> Restart your computer </message> @@ -40,8 +40,8 @@ Learn more </message> </if> -- <if expr="is_win or is_linux or is_macosx or chromeos"> -+ <if expr="is_win or is_posix or is_macosx or chromeos"> +- <if expr="is_win or is_linux or is_macosx or is_fuchsia or chromeos"> ++ <if expr="is_win or is_linux or is_macosx or is_fuchsia or chromeos or is_bsd"> <message name="IDS_SAD_TAB_ERROR_CODE" desc="The message displayed on the crashed web page indicating the type of the crash."> Error code: <ph name="ERROR_CODE">$1<ex>STATUS_ACCESS_VIOLATION</ex></ph> </message> 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 9280628e7a8a..d50931d7c7c3 100644 --- a/www/chromium/files/patch-components_os__crypt_os__crypt.h +++ b/www/chromium/files/patch-components_os__crypt_os__crypt.h @@ -1,4 +1,4 @@ ---- components/os_crypt/os_crypt.h.orig 2021-05-12 22:05:50 UTC +--- components/os_crypt/os_crypt.h.orig 2021-12-14 11:45:03 UTC +++ components/os_crypt/os_crypt.h @@ -17,9 +17,9 @@ @@ -12,8 +12,8 @@ #if defined(OS_WIN) || defined(OS_MAC) class PrefRegistrySimple; -@@ -38,16 +38,16 @@ class OSCrypt { - public: +@@ -42,16 +42,16 @@ 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) @@ -32,7 +32,7 @@ // On Linux returns true iff the real secret key (not hardcoded one) is // available. On MacOS returns true if Keychain is available (for mock // Keychain it returns true if not using locked Keychain, false if using -@@ -141,7 +141,7 @@ class OSCrypt { +@@ -142,7 +142,7 @@ class OSCrypt { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -41,7 +41,7 @@ // 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. -@@ -156,6 +156,6 @@ void UseMockKeyStorageForTesting( +@@ -157,6 +157,6 @@ void UseMockKeyStorageForTesting( // Clears any caching and most lazy initialisations performed by the production // code. Should be used after any test which required a password. COMPONENT_EXPORT(OS_CRYPT) void ClearCacheForTesting(); diff --git a/www/chromium/files/patch-components_paint__preview_browser_paint__preview__client.cc b/www/chromium/files/patch-components_paint__preview_browser_paint__preview__client.cc index 317c6fa98a5d..d81f0a3b2eb7 100644 --- a/www/chromium/files/patch-components_paint__preview_browser_paint__preview__client.cc +++ b/www/chromium/files/patch-components_paint__preview_browser_paint__preview__client.cc @@ -1,6 +1,6 @@ ---- components/paint_preview/browser/paint_preview_client.cc.orig 2021-09-14 01:51:55 UTC +--- components/paint_preview/browser/paint_preview_client.cc.orig 2021-12-14 11:45:03 UTC +++ components/paint_preview/browser/paint_preview_client.cc -@@ -309,8 +309,8 @@ void PaintPreviewClient::CapturePaintPreview( +@@ -312,8 +312,8 @@ void PaintPreviewClient::CapturePaintPreview( metadata->set_url(url.spec()); metadata->set_version(kPaintPreviewVersion); auto* chromeVersion = metadata->mutable_chrome_version(); diff --git a/www/chromium/files/patch-components_paint__preview_common_proto_paint__preview.proto b/www/chromium/files/patch-components_paint__preview_common_proto_paint__preview.proto index 3c588fa7028d..7c3f6367e147 100644 --- a/www/chromium/files/patch-components_paint__preview_common_proto_paint__preview.proto +++ b/www/chromium/files/patch-components_paint__preview_common_proto_paint__preview.proto @@ -1,6 +1,6 @@ ---- components/paint_preview/common/proto/paint_preview.proto.orig 2021-04-27 07:39:47 UTC +--- components/paint_preview/common/proto/paint_preview.proto.orig 2021-12-14 11:45:03 UTC +++ components/paint_preview/common/proto/paint_preview.proto -@@ -78,8 +78,8 @@ message PaintPreviewFrameProto { +@@ -82,8 +82,8 @@ message PaintPreviewFrameProto { // Stores Chrome version. // NEXT_TAG = 5 message ChromeVersionProto { diff --git a/www/chromium/files/patch-components_performance__manager_features.cc b/www/chromium/files/patch-components_performance__manager_features.cc index 888271e08bc7..5611bc3c9490 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-09-14 01:51:55 UTC +--- components/performance_manager/features.cc.orig 2021-12-14 11:45:03 UTC +++ components/performance_manager/features.cc -@@ -56,7 +56,7 @@ const base::Feature kUrgentDiscardingFromPerformanceMa +@@ -22,7 +22,7 @@ const base::Feature kUrgentDiscardingFromPerformanceMa "UrgentDiscardingFromPerformanceManager", - // Chrome OS uses memory pressure evaluator instead of performance manager to + // Ash Chrome uses memory pressure evaluator instead of performance manager to // discard tabs. --#if defined(OS_CHROMEOS) || defined(OS_LINUX) -+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_LINUX) || defined(OS_BSD) base::FEATURE_DISABLED_BY_DEFAULT #else base::FEATURE_ENABLED_BY_DEFAULT diff --git a/www/chromium/files/patch-components_performance__manager_graph_process__node__impl__describer.cc b/www/chromium/files/patch-components_performance__manager_graph_process__node__impl__describer.cc index d994e6d0ef2a..b39a35983621 100644 --- a/www/chromium/files/patch-components_performance__manager_graph_process__node__impl__describer.cc +++ b/www/chromium/files/patch-components_performance__manager_graph_process__node__impl__describer.cc @@ -1,6 +1,6 @@ ---- components/performance_manager/graph/process_node_impl_describer.cc.orig 2021-04-23 20:25:11 UTC +--- components/performance_manager/graph/process_node_impl_describer.cc.orig 2021-12-14 11:45:03 UTC +++ components/performance_manager/graph/process_node_impl_describer.cc -@@ -58,7 +58,7 @@ base::Value GetProcessValueDict(const base::Process& p +@@ -84,7 +84,7 @@ base::Value GetProcessValueDict(const base::Process& p if (process.IsValid()) { // These properties can only be accessed for valid processes. ret.SetIntKey("os_priority", process.GetPriority()); 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 75ee4156731e..d9499071cf50 100644 --- a/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc +++ b/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc @@ -1,6 +1,6 @@ ---- components/policy/core/common/cloud/cloud_policy_client.cc.orig 2021-09-24 04:26:04 UTC +--- components/policy/core/common/cloud/cloud_policy_client.cc.orig 2021-12-14 11:45:03 UTC +++ components/policy/core/common/cloud/cloud_policy_client.cc -@@ -405,7 +405,7 @@ void CloudPolicyClient::FetchPolicy() { +@@ -393,7 +393,7 @@ void CloudPolicyClient::FetchPolicy() { fetch_request->set_invalidation_payload(invalidation_payload_); } } 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 ac8188e50f3b..975f84791e06 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,4 +1,4 @@ ---- components/policy/core/common/cloud/cloud_policy_util.cc.orig 2021-09-14 01:51:55 UTC +--- components/policy/core/common/cloud/cloud_policy_util.cc.orig 2021-12-31 00:57:30 UTC +++ components/policy/core/common/cloud/cloud_policy_util.cc @@ -18,7 +18,7 @@ #include <wincred.h> @@ -27,7 +27,7 @@ #include "base/system/sys_info.h" #endif -@@ -102,6 +102,10 @@ std::string GetMachineName() { +@@ -85,6 +85,10 @@ std::string GetMachineName() { if (gethostname(hostname, HOST_NAME_MAX) == 0) // Success. return hostname; return std::string(); @@ -38,16 +38,16 @@ #elif defined(OS_IOS) // Use the Vendor ID as the machine name. return ios::device_util::GetVendorId(); -@@ -152,7 +156,7 @@ std::string GetMachineName() { +@@ -137,7 +141,7 @@ std::string GetMachineName() { } std::string GetOSVersion() { --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_APPLE) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_APPLE) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_APPLE) || \ ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_APPLE) || defined(OS_BSD) || \ + defined(OS_ANDROID) || defined(OS_FUCHSIA) return base::SysInfo::OperatingSystemVersion(); #elif defined(OS_WIN) - base::win::OSInfo::VersionNumber version_number = -@@ -177,7 +181,7 @@ std::string GetOSArchitecture() { +@@ -161,7 +165,7 @@ std::string GetOSArchitecture() { } std::string GetOSUsername() { 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 e88b3c7113ed..35f589ffdff6 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 2021-09-24 04:26:04 UTC +--- components/policy/resources/policy_templates.json.orig 2021-12-31 00:57:30 UTC +++ components/policy/resources/policy_templates.json -@@ -1272,7 +1272,7 @@ +@@ -1312,7 +1312,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], 'type': 'string', 'schema': { 'type': 'string' }, @@ -9,7 +9,7 @@ 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -1298,7 +1298,7 @@ +@@ -1338,7 +1338,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -18,7 +18,7 @@ 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -1329,7 +1329,7 @@ +@@ -1369,7 +1369,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'okalitova@chromium.org'], 'type': 'string', 'schema': { 'type': 'string' }, @@ -27,7 +27,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': True, -@@ -4705,7 +4705,7 @@ +@@ -5233,7 +5233,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], 'type': 'string', 'schema': { 'type': 'string' }, @@ -36,7 +36,7 @@ 'features': { 'dynamic_refresh': False, 'per_profile': False, -@@ -4761,7 +4761,7 @@ +@@ -5299,7 +5299,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, -@@ -9320,7 +9320,7 @@ +@@ -10052,7 +10052,7 @@ 'owners': ['file://net/cert/OWNERS', 'rsleevi@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -54,7 +54,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -11161,7 +11161,7 @@ +@@ -12058,7 +12058,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -63,7 +63,7 @@ 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -12008,7 +12008,7 @@ +@@ -12905,7 +12905,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, 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 new file mode 100644 index 000000000000..a7179c0c5c51 --- /dev/null +++ b/www/chromium/files/patch-components_safe__browsing_core_browser_db_v4__protocol__manager__util.cc @@ -0,0 +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 +@@ -115,7 +115,7 @@ std::ostream& operator<<(std::ostream& os, const ListI + PlatformType GetCurrentPlatformType() { + #if defined(OS_WIN) + return WINDOWS_PLATFORM; +-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) ++#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + return LINUX_PLATFORM; + #elif defined(OS_IOS) + return IOS_PLATFORM; diff --git a/www/chromium/files/patch-components_safe__browsing_core_common_features.cc b/www/chromium/files/patch-components_safe__browsing_core_common_features.cc deleted file mode 100644 index a67a3cb09fcb..000000000000 --- a/www/chromium/files/patch-components_safe__browsing_core_common_features.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- components/safe_browsing/core/common/features.cc.orig 2021-09-24 18:43:25 UTC -+++ components/safe_browsing/core/common/features.cc -@@ -113,7 +113,7 @@ const base::Feature - - const base::Feature kSafeBrowsingSeparateNetworkContexts { - "SafeBrowsingSeparateNetworkContexts", --#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) - base::FEATURE_ENABLED_BY_DEFAULT - #else - base::FEATURE_DISABLED_BY_DEFAULT -@@ -122,7 +122,7 @@ const base::Feature kSafeBrowsingSeparateNetworkContex - - const base::Feature kSafeBrowsingRemoveCookies { - "SafeBrowsingRemoveCookies", --#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) - base::FEATURE_ENABLED_BY_DEFAULT - #else - base::FEATURE_DISABLED_BY_DEFAULT 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 e9dfc4eb8cae..1328c8669cb3 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,4 +1,4 @@ ---- components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.cc.orig 2021-07-19 18:45:14 UTC +--- components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.cc.orig 2021-12-14 11:45:04 UTC +++ components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.cc @@ -17,7 +17,7 @@ @@ -9,7 +9,7 @@ #include "components/services/font/public/cpp/font_loader.h" #endif -@@ -56,7 +56,7 @@ PaintPreviewCompositorCollectionImpl::PaintPreviewComp +@@ -51,7 +51,7 @@ PaintPreviewCompositorCollectionImpl::PaintPreviewComp // Initialize font access for Skia. #if defined(OS_WIN) content::InitializeDWriteFontProxy(); @@ -18,7 +18,7 @@ mojo::PendingRemote<font_service::mojom::FontService> font_service; content::UtilityThread::Get()->BindHostReceiver( font_service.InitWithNewPipeAndPassReceiver()); -@@ -75,7 +75,7 @@ PaintPreviewCompositorCollectionImpl::PaintPreviewComp +@@ -70,7 +70,7 @@ PaintPreviewCompositorCollectionImpl::PaintPreviewComp // encoding to PNG or we could provide our own codec implementations. // Sanity check that fonts are working. 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 b18645f0be13..aba923668165 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,6 +1,6 @@ ---- components/translate/core/browser/translate_prefs.cc.orig 2021-09-24 18:43:51 UTC +--- components/translate/core/browser/translate_prefs.cc.orig 2021-12-31 00:57:31 UTC +++ components/translate/core/browser/translate_prefs.cc -@@ -839,7 +839,7 @@ bool TranslatePrefs::CanTranslateLanguage( +@@ -842,7 +842,7 @@ bool TranslatePrefs::CanTranslateLanguage( bool TranslatePrefs::IsDetailedLanguageSettingsEnabled() { #if defined(OS_ANDROID) return base::FeatureList::IsEnabled(language::kDetailedLanguageSettings); 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 new file mode 100644 index 000000000000..c0d738cd357b --- /dev/null +++ b/www/chromium/files/patch-components_translate_core_common_translate__util.cc @@ -0,0 +1,15 @@ +--- components/translate/core/common/translate_util.cc.orig 2022-01-21 13:24:45 UTC ++++ components/translate/core/common/translate_util.cc +@@ -28,10 +28,10 @@ const base::Feature kTranslateSubFrames{"TranslateSubF + + const base::Feature kTFLiteLanguageDetectionEnabled{ + "TFLiteLanguageDetectionEnabled", +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || \ ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_BSD) || \ + defined(OS_MAC) + base::FEATURE_ENABLED_BY_DEFAULT +-#else // !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_WIN) && ++#else // !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_WIN) && !defined(OS_BSD) && + // !defined(OS_MAC) + base::FEATURE_DISABLED_BY_DEFAULT + #endif diff --git a/www/chromium/files/patch-components_viz_common_features.cc b/www/chromium/files/patch-components_viz_common_features.cc index a6685fd18c75..b0b010279bfe 100644 --- a/www/chromium/files/patch-components_viz_common_features.cc +++ b/www/chromium/files/patch-components_viz_common_features.cc @@ -1,6 +1,6 @@ ---- components/viz/common/features.cc.orig 2021-09-24 04:26:05 UTC +--- components/viz/common/features.cc.orig 2021-12-14 11:45:04 UTC +++ components/viz/common/features.cc -@@ -46,7 +46,7 @@ const base::Feature kSimpleFrameRateThrottling{ +@@ -54,7 +54,7 @@ const base::Feature kSimpleFrameRateThrottling{ const base::Feature kUseSkiaRenderer { "UseSkiaRenderer", #if defined(OS_WIN) || defined(OS_ANDROID) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ 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 f67f61fc0f8c..4aae1fbeb95c 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,6 +1,6 @@ ---- components/viz/host/host_display_client.h.orig 2021-09-24 04:26:05 UTC +--- components/viz/host/host_display_client.h.orig 2021-12-14 11:45:04 UTC +++ components/viz/host/host_display_client.h -@@ -45,7 +45,7 @@ class VIZ_HOST_EXPORT HostDisplayClient : public mojom +@@ -49,7 +49,7 @@ class VIZ_HOST_EXPORT HostDisplayClient : public mojom // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-components_viz_host_renderer__settings__creation.cc b/www/chromium/files/patch-components_viz_host_renderer__settings__creation.cc index 621479f36b72..c188aa4199ae 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,6 +1,6 @@ ---- components/viz/host/renderer_settings_creation.cc.orig 2021-07-28 07:54:43 UTC +--- components/viz/host/renderer_settings_creation.cc.orig 2021-12-14 11:45:04 UTC +++ components/viz/host/renderer_settings_creation.cc -@@ -57,7 +57,7 @@ RendererSettings CreateRendererSettings() { +@@ -56,7 +56,7 @@ RendererSettings CreateRendererSettings() { renderer_settings.partial_swap_enabled = !command_line->HasSwitch(switches::kUIDisablePartialSwap); 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 2c877e0400cc..bf63fe2c3cc1 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,6 +1,6 @@ ---- components/viz/service/display_embedder/software_output_surface.h.orig 2021-04-14 18:41:02 UTC +--- components/viz/service/display_embedder/software_output_surface.h.orig 2021-12-14 11:45:05 UTC +++ components/viz/service/display_embedder/software_output_surface.h -@@ -51,7 +51,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi +@@ -55,7 +55,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. @@ -9,7 +9,7 @@ void SetNeedsSwapSizeNotifications( bool needs_swap_size_notifications) override; #endif -@@ -73,7 +73,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi +@@ -77,7 +77,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-components_viz_service_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 c0ff09735e62..83a0f4f10036 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,4 +1,4 @@ ---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2021-09-14 01:51:56 UTC +--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2021-12-31 00:57:31 UTC +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc @@ -60,7 +60,7 @@ RootCompositorFrameSinkImpl::Create( @@ -9,7 +9,7 @@ // For X11, we need notify client about swap completion after resizing, so the // client can use it for synchronize with X11 WM. output_surface->SetNeedsSwapSizeNotifications(true); -@@ -495,7 +495,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw +@@ -521,7 +521,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw display_client_->DidCompleteSwapWithSize(pixel_size); // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/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 b9f41ebb1c2f..de79acc14ebe 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,6 +1,6 @@ ---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2021-07-19 18:45:15 UTC +--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2021-12-31 00:57:31 UTC +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h -@@ -177,7 +177,7 @@ class RootCompositorFrameSinkImpl : public mojom::Comp +@@ -188,7 +188,7 @@ class VIZ_SERVICE_EXPORT RootCompositorFrameSinkImpl // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-components_viz_test_mock__display__client.h b/www/chromium/files/patch-components_viz_test_mock__display__client.h index ff51e42ff434..56af2128edd5 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,6 +1,6 @@ ---- components/viz/test/mock_display_client.h.orig 2021-07-19 18:45:15 UTC +--- components/viz/test/mock_display_client.h.orig 2021-12-14 11:45:05 UTC +++ components/viz/test/mock_display_client.h -@@ -40,7 +40,7 @@ class MockDisplayClient : public mojom::DisplayClient +@@ -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. diff --git a/www/chromium/files/patch-components_zucchini_main__utils.cc b/www/chromium/files/patch-components_zucchini_main__utils.cc index 0fcf64400867..e9f205acc7aa 100644 --- a/www/chromium/files/patch-components_zucchini_main__utils.cc +++ b/www/chromium/files/patch-components_zucchini_main__utils.cc @@ -1,6 +1,6 @@ ---- components/zucchini/main_utils.cc.orig 2021-07-28 07:55:17 UTC +--- components/zucchini/main_utils.cc.orig 2021-12-31 00:57:31 UTC +++ components/zucchini/main_utils.cc -@@ -78,7 +78,7 @@ constexpr Command kCommands[] = { +@@ -80,7 +80,7 @@ constexpr Command kCommands[] = { /******** GetPeakMemoryMetrics ********/ @@ -9,7 +9,7 @@ // Linux does not have an exact mapping to the values used on Windows so use a // close approximation: // peak_virtual_memory ~= peak_page_file_usage -@@ -120,7 +120,7 @@ void GetPeakMemoryMetrics(size_t* peak_virtual_memory, +@@ -122,7 +122,7 @@ void GetPeakMemoryMetrics(size_t* peak_virtual_memory, } } } @@ -18,7 +18,7 @@ #if defined(OS_WIN) // On failure the input values will be set to 0. -@@ -145,17 +145,17 @@ class ScopedResourceUsageTracker { +@@ -147,17 +147,17 @@ class ScopedResourceUsageTracker { ScopedResourceUsageTracker() { start_time_ = base::TimeTicks::Now(); @@ -39,7 +39,7 @@ size_t cur_peak_page_file_usage = 0; size_t cur_peak_working_set_size = 0; GetPeakMemoryMetrics(&cur_peak_page_file_usage, &cur_peak_working_set_size); -@@ -171,7 +171,7 @@ class ScopedResourceUsageTracker { +@@ -173,7 +173,7 @@ class ScopedResourceUsageTracker { << (cur_peak_working_set_size - start_peak_working_set_size_) / 1024 << " KiB"; @@ -48,7 +48,7 @@ LOG(INFO) << "Zucchini.TotalTime " << (end_time - start_time_).InSecondsF() << " s"; -@@ -179,10 +179,10 @@ class ScopedResourceUsageTracker { +@@ -181,10 +181,10 @@ class ScopedResourceUsageTracker { private: base::TimeTicks start_time_; 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 a96328f8a01f..557207448e40 100644 --- a/www/chromium/files/patch-content_app_content__main__runner__impl.cc +++ b/www/chromium/files/patch-content_app_content__main__runner__impl.cc @@ -1,6 +1,6 @@ ---- content/app/content_main_runner_impl.cc.orig 2021-09-24 04:26:05 UTC +--- content/app/content_main_runner_impl.cc.orig 2021-12-31 00:57:31 UTC +++ content/app/content_main_runner_impl.cc -@@ -136,7 +136,7 @@ +@@ -137,7 +137,7 @@ #endif // OS_POSIX || OS_FUCHSIA @@ -9,7 +9,7 @@ #include "base/native_library.h" #include "base/rand_util.h" #include "content/public/common/zygote/sandbox_support_linux.h" -@@ -156,7 +156,7 @@ +@@ -157,7 +157,7 @@ #include "content/public/common/content_client.h" #endif @@ -18,7 +18,7 @@ #if BUILDFLAG(USE_ZYGOTE_HANDLE) #include "base/stack_canary_linux.h" -@@ -311,7 +311,7 @@ void InitializeZygoteSandboxForBrowserProcess( +@@ -344,7 +344,7 @@ void InitializeZygoteSandboxForBrowserProcess( } #endif // BUILDFLAG(USE_ZYGOTE_HANDLE) @@ -27,7 +27,7 @@ #if BUILDFLAG(ENABLE_PLUGINS) // Loads the (native) libraries but does not initialize them (i.e., does not -@@ -399,7 +399,7 @@ void PreSandboxInit() { +@@ -432,7 +432,7 @@ void PreSandboxInit() { } #endif // BUILDFLAG(USE_ZYGOTE_HANDLE) @@ -36,7 +36,7 @@ mojo::ScopedMessagePipeHandle MaybeAcceptMojoInvitation() { const auto& command_line = *base::CommandLine::ForCurrentProcess(); -@@ -532,7 +532,7 @@ int NO_STACK_PROTECTOR RunZygote(ContentMainDelegate* +@@ -565,7 +565,7 @@ int NO_STACK_PROTECTOR RunZygote(ContentMainDelegate* delegate->ZygoteStarting(&zygote_fork_delegates); media::InitializeMediaLibrary(); @@ -45,7 +45,7 @@ PreSandboxInit(); #endif -@@ -943,7 +943,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run(bool +@@ -976,7 +976,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run(bool mojo::core::InitFeatures(); } @@ -54,7 +54,7 @@ // If dynamic Mojo Core is being used, ensure that it's loaded very early in // the child/zygote process, before any sandbox is initialized. The library // is not fully initialized with IPC support until a ChildProcess is later -@@ -953,7 +953,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run(bool +@@ -986,7 +986,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run(bool CHECK_EQ(mojo::LoadCoreLibrary(GetMojoCoreSharedLibraryPath()), MOJO_RESULT_OK); } diff --git a/www/chromium/files/patch-content_browser_BUILD.gn b/www/chromium/files/patch-content_browser_BUILD.gn index 0f4082027c51..6bbe8159cddc 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 2021-09-24 04:26:05 UTC +--- content/browser/BUILD.gn.orig 2021-12-31 00:57:31 UTC +++ content/browser/BUILD.gn -@@ -2311,6 +2311,17 @@ source_set("browser") { +@@ -2318,6 +2318,17 @@ source_set("browser") { deps += [ "//third_party/speech-dispatcher" ] } 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 ca64a129dc71..9991ccbf7bae 100644 --- a/www/chromium/files/patch-content_browser_browser__main__loop.cc +++ b/www/chromium/files/patch-content_browser_browser__main__loop.cc @@ -1,6 +1,6 @@ ---- content/browser/browser_main_loop.cc.orig 2021-09-24 04:26:05 UTC +--- content/browser/browser_main_loop.cc.orig 2021-12-31 00:57:32 UTC +++ content/browser/browser_main_loop.cc -@@ -547,7 +547,7 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -552,7 +552,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). @@ -9,7 +9,7 @@ if (base::FeatureList::IsEnabled( features::kBrowserUseDisplayThreadPriority) && base::PlatformThread::GetCurrentThreadPriority() < -@@ -557,7 +557,7 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -562,7 +562,7 @@ int BrowserMainLoop::EarlyInitialization() { } #endif // !defined(OS_MAC) @@ -18,7 +18,7 @@ defined(OS_ANDROID) // 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. -@@ -567,7 +567,7 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -572,7 +572,7 @@ int BrowserMainLoop::EarlyInitialization() { // users can easily hit this limit with many open tabs. Bump up the limit to // an arbitrarily high number. See https://crbug.com/539567 base::IncreaseFdLimitTo(8192); 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 299cead766bb..f854b560474c 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 2021-09-24 04:26:05 UTC +--- content/browser/devtools/protocol/system_info_handler.cc.orig 2021-12-14 11:45:05 UTC +++ content/browser/devtools/protocol/system_info_handler.cc @@ -53,7 +53,7 @@ std::unique_ptr<SystemInfo::Size> GfxSizeToSystemInfoS + // 1046598, and 1153667. // Windows builds need more time -- see Issue 873112 and 1004472. // Mac builds need more time - see Issue angleproject:6182. - // ASAN builds need more time -- see Issue 1167875. -#if ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(NDEBUG)) || \ -+#if ((defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && !defined(NDEBUG)) || \ - defined(OS_WIN) || defined(OS_MAC) || defined(ADDRESS_SANITIZER) || \ - defined(USE_OZONE) - const int kGPUInfoWatchdogTimeoutMs = 30000; ++#if ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(NDEBUG)) || defined(OS_BSD) || \ + defined(OS_WIN) || defined(OS_MAC) || defined(USE_OZONE) + static constexpr int kGPUInfoWatchdogTimeoutMultiplierOS = 3; + #else 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 cd44c7c40a10..fff5dd258fc5 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,6 +1,6 @@ ---- content/browser/download/download_manager_impl.cc.orig 2021-07-19 18:45:15 UTC +--- content/browser/download/download_manager_impl.cc.orig 2021-12-31 00:57:32 UTC +++ content/browser/download/download_manager_impl.cc -@@ -82,7 +82,7 @@ +@@ -85,7 +85,7 @@ #include "third_party/blink/public/common/loader/referrer_utils.h" #include "third_party/blink/public/common/loader/throttling_url_loader.h" @@ -9,7 +9,7 @@ #include "base/nix/xdg_util.h" #endif -@@ -228,7 +228,7 @@ class DownloadItemFactoryImpl : public download::Downl +@@ -231,7 +231,7 @@ class DownloadItemFactoryImpl : public download::Downl } }; @@ -18,7 +18,7 @@ base::FilePath GetTemporaryDownloadDirectory() { std::unique_ptr<base::Environment> env(base::Environment::Create()); return base::nix::GetXDGDirectory(env.get(), "XDG_DATA_HOME", ".local/share"); -@@ -568,7 +568,7 @@ bool DownloadManagerImpl::InterceptDownload( +@@ -585,7 +585,7 @@ bool DownloadManagerImpl::InterceptDownload( base::FilePath DownloadManagerImpl::GetDefaultDownloadDirectory() { base::FilePath default_download_directory; 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 e033d81a5338..20abaf953ed7 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,6 +1,6 @@ ---- content/browser/font_access/font_enumeration_cache.h.orig 2021-09-24 04:26:05 UTC +--- content/browser/font_access/font_enumeration_cache.h.orig 2021-12-14 11:45:05 UTC +++ content/browser/font_access/font_enumeration_cache.h -@@ -22,7 +22,7 @@ +@@ -23,7 +23,7 @@ #include "third_party/blink/public/common/font_access/font_enumeration_table.pb.h" #include "third_party/blink/public/mojom/font_access/font_access.mojom.h" 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 82481861ee3d..130ce4606253 100644 --- a/www/chromium/files/patch-content_browser_gpu_compositor__util.cc +++ b/www/chromium/files/patch-content_browser_gpu_compositor__util.cc @@ -1,6 +1,6 @@ ---- content/browser/gpu/compositor_util.cc.orig 2021-09-24 04:26:05 UTC +--- content/browser/gpu/compositor_util.cc.orig 2021-12-14 11:45:05 UTC +++ content/browser/gpu/compositor_util.cc -@@ -127,11 +127,11 @@ const GpuFeatureData GetGpuFeatureData( +@@ -145,11 +145,11 @@ const GpuFeatureData GetGpuFeatureData( {"video_decode", SafeGetFeatureStatus(gpu_feature_info, gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE), 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 b6d300575103..7f9c49f8d0cc 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 2021-09-24 18:45:00 UTC +--- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2021-12-31 00:57:32 UTC +++ content/browser/gpu/gpu_data_manager_impl_private.cc -@@ -1346,7 +1346,7 @@ void GpuDataManagerImplPrivate::AppendGpuCommandLine( +@@ -1298,7 +1298,7 @@ void GpuDataManagerImplPrivate::AppendGpuCommandLine( break; case gpu::GpuMode::SWIFTSHADER: { bool legacy_software_gl = true; --#if (defined(OS_LINUX) && !defined(USE_OZONE)) || defined(OS_WIN) -+#if ((defined(OS_LINUX) || defined(OS_BSD)) && !defined(USE_OZONE)) || defined(OS_WIN) +-#if defined(OS_LINUX) || defined(OS_WIN) ++#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_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 d5193290c324..5abdf81bcf34 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,6 +1,15 @@ ---- content/browser/gpu/gpu_process_host.cc.orig 2021-09-24 04:26:05 UTC +--- content/browser/gpu/gpu_process_host.cc.orig 2022-01-20 10:35:56 UTC +++ content/browser/gpu/gpu_process_host.cc -@@ -231,8 +231,8 @@ static const char* const kSwitchNames[] = { +@@ -98,7 +98,7 @@ + #include "ui/ozone/public/ozone_switches.h" + #endif + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "ui/gfx/switches.h" + #endif + +@@ -233,8 +233,8 @@ static const char* const kSwitchNames[] = { sandbox::policy::switches::kNoSandbox, // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -11,7 +20,16 @@ switches::kDisableDevShmUsage, #endif #if defined(OS_WIN) -@@ -1130,7 +1130,7 @@ bool GpuProcessHost::LaunchGpuProcess() { +@@ -295,7 +295,7 @@ static const char* const kSwitchNames[] = { + switches::kOzoneDumpFile, + switches::kDisableBufferBWCompression, + #endif +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + switches::kX11Display, + switches::kNoXshm, + #endif +@@ -1135,7 +1135,7 @@ bool GpuProcessHost::LaunchGpuProcess() { std::unique_ptr<base::CommandLine> cmd_line = std::make_unique<base::CommandLine>(base::CommandLine::NO_PROGRAM); #else diff --git a/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc b/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc index 42520b6c2554..0445d8d84e9f 100644 --- a/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc +++ b/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc @@ -1,6 +1,6 @@ ---- content/browser/ppapi_plugin_process_host.cc.orig 2021-05-12 22:05:52 UTC +--- content/browser/ppapi_plugin_process_host.cc.orig 2021-12-14 11:45:05 UTC +++ content/browser/ppapi_plugin_process_host.cc -@@ -302,7 +302,7 @@ bool PpapiPluginProcessHost::Init(const PepperPluginIn +@@ -305,7 +305,7 @@ bool PpapiPluginProcessHost::Init(const PepperPluginIn base::CommandLine::StringType plugin_launcher = browser_command_line.GetSwitchValueNative(switches::kPpapiPluginLauncher); 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 10a885767b44..8029abd39d54 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,6 +1,6 @@ ---- content/browser/renderer_host/pepper/pepper_file_io_host.cc.orig 2021-07-19 18:45:15 UTC +--- 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 -@@ -480,7 +480,7 @@ void PepperFileIOHost::OnLocalFileOpened( +@@ -456,7 +456,7 @@ void PepperFileIOHost::OnLocalFileOpened( ppapi::host::ReplyMessageContext reply_context, const base::FilePath& path, base::File::Error error_code) { @@ -9,7 +9,7 @@ // 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) { -@@ -514,7 +514,7 @@ void PepperFileIOHost::OnLocalFileOpened( +@@ -490,7 +490,7 @@ void PepperFileIOHost::OnLocalFileOpened( #endif } 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 686e3d66bcac..080e12ac43ac 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,6 +1,6 @@ ---- content/browser/renderer_host/render_message_filter.h.orig 2021-09-14 01:51:56 UTC +--- content/browser/renderer_host/render_message_filter.h.orig 2021-12-31 00:57:32 UTC +++ content/browser/renderer_host/render_message_filter.h -@@ -75,14 +75,14 @@ class CONTENT_EXPORT RenderMessageFilter +@@ -78,14 +78,14 @@ class CONTENT_EXPORT RenderMessageFilter void GenerateRoutingID(GenerateRoutingIDCallback routing_id) override; void GenerateFrameRoutingID(GenerateFrameRoutingIDCallback callback) override; void HasGpuProcess(HasGpuProcessCallback callback) override; 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 79ca79045d32..f50e5de8dc3f 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,15 +1,15 @@ ---- content/browser/renderer_host/render_process_host_impl.cc.orig 2021-10-01 01:36:48 UTC +--- content/browser/renderer_host/render_process_host_impl.cc.orig 2021-12-31 00:57:32 UTC +++ content/browser/renderer_host/render_process_host_impl.cc -@@ -231,7 +231,7 @@ +@@ -196,7 +196,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) #include <sys/resource.h> - #include <sys/time.h> -@@ -1376,7 +1376,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = + #include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck +@@ -1327,7 +1327,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = // to indicate failure and std::numeric_limits<size_t>::max() to indicate // unlimited. size_t GetPlatformProcessLimit() { @@ -18,7 +18,7 @@ struct rlimit limit; if (getrlimit(RLIMIT_NPROC, &limit) != 0) return kUnknownPlatformProcessLimit; -@@ -1387,7 +1387,7 @@ size_t GetPlatformProcessLimit() { +@@ -1338,7 +1338,7 @@ size_t GetPlatformProcessLimit() { #else // TODO(https://crbug.com/104689): Implement on other platforms. return kUnknownPlatformProcessLimit; @@ -27,7 +27,7 @@ } #endif // !defined(OS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH) -@@ -1463,7 +1463,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public +@@ -1414,7 +1414,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public return; } @@ -36,7 +36,7 @@ if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) { ConnectToFontService(std::move(font_receiver)); return; -@@ -1915,7 +1915,7 @@ bool RenderProcessHostImpl::Init() { +@@ -1843,7 +1843,7 @@ bool RenderProcessHostImpl::Init() { renderer_prefix = browser_command_line.GetSwitchValueNative(switches::kRendererCmdPrefix); @@ -45,7 +45,7 @@ int flags = renderer_prefix.empty() ? ChildProcessHost::CHILD_ALLOW_SELF : ChildProcessHost::CHILD_NORMAL; #elif defined(OS_MAC) -@@ -3370,8 +3370,8 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin +@@ -3353,8 +3353,8 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin switches::kDisableInProcessStackTraces, sandbox::policy::switches::kDisableSeccompFilterSandbox, sandbox::policy::switches::kNoSandbox, @@ -56,7 +56,7 @@ switches::kDisableDevShmUsage, #endif #if defined(OS_MAC) -@@ -5041,6 +5041,8 @@ void RenderProcessHostImpl::OnProcessLaunched() { +@@ -5019,6 +5019,8 @@ void RenderProcessHostImpl::OnProcessLaunched() { // TODO(https://crbug.com/875933): Fix initial priority on Android to // reflect |priority_.is_background()|. DCHECK_EQ(blink::kLaunchingProcessIsBackgrounded, !priority_.visible); 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 95a1c28070c9..26a17ee5fb52 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,6 +1,6 @@ ---- content/browser/renderer_host/render_view_host_impl.cc.orig 2021-09-14 01:51:56 UTC +--- 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 -@@ -256,7 +256,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs( +@@ -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); 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 08f2c2117c3b..51c20c1adb79 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,6 +1,6 @@ ---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2021-09-24 04:26:05 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2021-12-31 00:57:32 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.cc -@@ -111,7 +111,7 @@ +@@ -112,7 +112,7 @@ #include "ui/gfx/gdi_util.h" #endif @@ -9,7 +9,7 @@ #include "content/browser/accessibility/browser_accessibility_auralinux.h" #include "ui/base/ime/linux/text_edit_command_auralinux.h" #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" -@@ -463,7 +463,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge +@@ -479,7 +479,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge if (manager) return ToBrowserAccessibilityWin(manager->GetRoot())->GetCOM(); @@ -18,7 +18,16 @@ BrowserAccessibilityManager* manager = host()->GetOrCreateRootBrowserAccessibilityManager(); if (manager && manager->GetRoot()) -@@ -2272,7 +2272,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { +@@ -1530,7 +1530,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) + bool RenderWidgetHostViewAura::SetCompositionFromExistingText( + const gfx::Range& range, + const std::vector<ui::ImeTextSpan>& ui_ime_text_spans) { +@@ -2343,7 +2343,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { } bool RenderWidgetHostViewAura::NeedsMouseCapture() { @@ -27,7 +36,7 @@ return NeedsInputGrab(); #else return false; -@@ -2438,7 +2438,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit +@@ -2520,7 +2520,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit if (!target_host) return; 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 new file mode 100644 index 000000000000..a6cc240e02f8 --- /dev/null +++ b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h @@ -0,0 +1,11 @@ +--- content/browser/renderer_host/render_widget_host_view_aura.h.orig 2021-12-16 15:02:50 UTC ++++ content/browser/renderer_host/render_widget_host_view_aura.h +@@ -236,7 +236,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) + 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 cb32c161c110..9c833031ba3a 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,6 +1,6 @@ ---- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig 2021-09-14 01:51:56 UTC +--- 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 -@@ -596,7 +596,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand +@@ -600,7 +600,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand if (event->type() == ui::ET_MOUSE_EXITED) { if (mouse_locked || selection_popup) return false; 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 d40609313f5f..e5b853173d0c 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,6 +1,6 @@ ---- content/browser/scheduler/responsiveness/jank_monitor_impl.cc.orig 2021-05-12 22:05:52 UTC +--- content/browser/scheduler/responsiveness/jank_monitor_impl.cc.orig 2021-12-14 11:45:05 UTC +++ content/browser/scheduler/responsiveness/jank_monitor_impl.cc -@@ -334,7 +334,7 @@ void JankMonitorImpl::ThreadExecutionState::DidRunTask +@@ -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. 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 1c8a018538f0..3bd36f5e9e80 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,4 +1,4 @@ ---- content/browser/scheduler/responsiveness/native_event_observer.h.orig 2021-09-14 01:51:56 UTC +--- content/browser/scheduler/responsiveness/native_event_observer.h.orig 2021-12-14 11:45:05 UTC +++ content/browser/scheduler/responsiveness/native_event_observer.h @@ -16,7 +16,7 @@ #include "content/public/browser/native_event_processor_observer_mac.h" @@ -24,10 +24,10 @@ -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - ~NativeEventObserver() override; - #else - virtual ~NativeEventObserver(); -@@ -70,7 +70,7 @@ class CONTENT_EXPORT NativeEventObserver + + NativeEventObserver(const NativeEventObserver&) = delete; + NativeEventObserver& operator=(const NativeEventObserver&) = delete; +@@ -74,7 +74,7 @@ class CONTENT_EXPORT NativeEventObserver // Exposed for tests. void WillRunNativeEvent(const void* opaque_identifier) override; void DidRunNativeEvent(const void* opaque_identifier) override; @@ -36,7 +36,7 @@ // aura::WindowEventDispatcherObserver overrides: void OnWindowEventDispatcherStartedProcessing( aura::WindowEventDispatcher* dispatcher, -@@ -87,7 +87,7 @@ class CONTENT_EXPORT NativeEventObserver +@@ -91,7 +91,7 @@ class CONTENT_EXPORT NativeEventObserver void RegisterObserver(); void DeregisterObserver(); diff --git a/www/chromium/files/patch-content_browser_utility__process__host.cc b/www/chromium/files/patch-content_browser_utility__process__host.cc index e95d5120dcaf..4c500a668f4d 100644 --- a/www/chromium/files/patch-content_browser_utility__process__host.cc +++ b/www/chromium/files/patch-content_browser_utility__process__host.cc @@ -1,15 +1,15 @@ ---- content/browser/utility_process_host.cc.orig 2021-09-24 04:26:05 UTC +--- content/browser/utility_process_host.cc.orig 2021-12-31 00:57:32 UTC +++ content/browser/utility_process_host.cc -@@ -68,7 +68,7 @@ UtilityProcessHost::UtilityProcessHost() +@@ -69,7 +69,7 @@ UtilityProcessHost::UtilityProcessHost() UtilityProcessHost::UtilityProcessHost(std::unique_ptr<Client> client) - : sandbox_type_(sandbox::policy::SandboxType::kUtility), + : sandbox_type_(sandbox::mojom::Sandbox::kUtility), -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) child_flags_(ChildProcessHost::CHILD_ALLOW_SELF), #else child_flags_(ChildProcessHost::CHILD_NORMAL), -@@ -233,8 +233,8 @@ bool UtilityProcessHost::StartProcess() { +@@ -229,8 +229,8 @@ bool UtilityProcessHost::StartProcess() { sandbox::policy::switches::kNoSandbox, // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-content_browser_v8__snapshot__files.cc b/www/chromium/files/patch-content_browser_v8__snapshot__files.cc index ed5d88548c7f..bf6171165df9 100644 --- a/www/chromium/files/patch-content_browser_v8__snapshot__files.cc +++ b/www/chromium/files/patch-content_browser_v8__snapshot__files.cc @@ -1,9 +1,9 @@ ---- content/browser/v8_snapshot_files.cc.orig 2021-04-14 18:41:02 UTC +--- content/browser/v8_snapshot_files.cc.orig 2021-12-31 00:57:32 UTC +++ content/browser/v8_snapshot_files.cc -@@ -10,7 +10,7 @@ - namespace content { +@@ -15,7 +15,7 @@ namespace content { - std::map<std::string, base::FilePath> GetV8SnapshotFilesToPreload() { + 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) #if defined(USE_V8_CONTEXT_SNAPSHOT) 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 1116ab01fae9..a53eb82cdfa0 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,7 +1,7 @@ ---- content/browser/web_contents/web_contents_view_aura.cc.orig 2021-09-14 01:51:56 UTC +--- content/browser/web_contents/web_contents_view_aura.cc.orig 2021-12-31 00:57:32 UTC +++ content/browser/web_contents/web_contents_view_aura.cc -@@ -157,7 +157,7 @@ class WebDragSourceAura : public content::WebContentsO - DISALLOW_COPY_AND_ASSIGN(WebDragSourceAura); +@@ -159,7 +159,7 @@ class WebDragSourceAura : public content::WebContentsO + aura::Window* window_; }; -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) @@ -9,7 +9,7 @@ // Fill out the OSExchangeData with a file contents, synthesizing a name if // necessary. void PrepareDragForFileContents(const DropData& drop_data, -@@ -240,7 +240,7 @@ void PrepareDragData(const DropData& drop_data, +@@ -242,7 +242,7 @@ void PrepareDragData(const DropData& drop_data, if (!drop_data.download_metadata.empty()) PrepareDragForDownload(drop_data, provider, web_contents); #endif @@ -18,7 +18,7 @@ // We set the file contents before the URL because the URL also sets file // contents (to a .URL shortcut). We want to prefer file content data over // a shortcut so we add it first. -@@ -1210,7 +1210,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent* +@@ -1304,7 +1304,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent* // Linux window managers like to handle raise-on-click themselves. If we // raise-on-click manually, this may override user settings that prevent // focus-stealing. diff --git a/www/chromium/files/patch-content_common_BUILD.gn b/www/chromium/files/patch-content_common_BUILD.gn index 7bb9a2039ab4..243a258164a8 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 2021-09-24 04:26:05 UTC +--- content/common/BUILD.gn.orig 2021-12-31 00:57:32 UTC +++ content/common/BUILD.gn -@@ -333,7 +333,7 @@ source_set("common") { +@@ -342,7 +342,7 @@ source_set("common") { sources -= [ "cursors/webcursor_aura.cc" ] } @@ -9,7 +9,7 @@ sources += [ "sandbox_init_linux.cc", "zygote/sandbox_support_linux.cc", -@@ -348,6 +348,12 @@ source_set("common") { +@@ -357,6 +357,12 @@ source_set("common") { ] } @@ -22,7 +22,7 @@ if (use_zygote_handle) { sources += [ "zygote/zygote_handle_impl_linux.h", -@@ -397,7 +403,7 @@ source_set("common") { +@@ -406,7 +412,7 @@ source_set("common") { } } diff --git a/www/chromium/files/patch-content_gpu_BUILD.gn b/www/chromium/files/patch-content_gpu_BUILD.gn index cb219b9e75c0..0d5a7a8fa912 100644 --- a/www/chromium/files/patch-content_gpu_BUILD.gn +++ b/www/chromium/files/patch-content_gpu_BUILD.gn @@ -1,6 +1,6 @@ ---- content/gpu/BUILD.gn.orig 2021-09-14 01:51:56 UTC +--- content/gpu/BUILD.gn.orig 2021-12-31 00:57:32 UTC +++ content/gpu/BUILD.gn -@@ -136,7 +136,7 @@ target(link_target_type, "gpu_sources") { +@@ -128,7 +128,7 @@ target(link_target_type, "gpu_sources") { # Use DRI on desktop Linux builds. if (current_cpu != "s390x" && current_cpu != "ppc64" && is_linux && diff --git a/www/chromium/files/patch-content_gpu_gpu__main.cc b/www/chromium/files/patch-content_gpu_gpu__main.cc index 56356738d1ee..26a2ecf40168 100644 --- a/www/chromium/files/patch-content_gpu_gpu__main.cc +++ b/www/chromium/files/patch-content_gpu_gpu__main.cc @@ -1,20 +1,56 @@ ---- content/gpu/gpu_main.cc.orig 2021-07-19 18:45:15 UTC +--- content/gpu/gpu_main.cc.orig 2021-12-31 00:57:32 UTC +++ content/gpu/gpu_main.cc -@@ -86,7 +86,7 @@ - #include "ui/gfx/x/x11_switches.h" // nogncheck +@@ -89,6 +89,11 @@ + #include "sandbox/policy/sandbox_type.h" #endif --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - #include "content/gpu/gpu_sandbox_hook_linux.h" - #include "content/public/common/sandbox_init.h" - #include "sandbox/policy/linux/sandbox_linux.h" -@@ -282,7 +282,7 @@ int GpuMain(const MainFunctionParams& parameters) { ++#if defined(OS_FREEBSD) ++#include "content/public/common/sandbox_init.h" ++#include "sandbox/policy/freebsd/sandbox_freebsd.h" ++#endif ++ + #if defined(OS_MAC) + #include "base/message_loop/message_pump_mac.h" + #include "components/metal_util/device_removal.h" +@@ -109,6 +114,8 @@ namespace { + bool StartSandboxLinux(gpu::GpuWatchdogThread*, + const gpu::GPUInfo*, + const gpu::GpuPreferences&); ++#elif defined(OS_FREEBSD) ++bool StartSandboxFreeBSD(); + #elif defined(OS_WIN) + bool StartSandboxWindows(const sandbox::SandboxInterfaceInfo*); + #endif +@@ -169,6 +176,8 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel + const gpu::GpuPreferences& gpu_prefs) override { + #if defined(OS_LINUX) || defined(OS_CHROMEOS) + return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs); ++#elif defined(OS_BSD) ++ return StartSandboxFreeBSD(); + #elif defined(OS_WIN) + return StartSandboxWindows(sandbox_info_); + #elif defined(OS_MAC) +@@ -263,7 +272,7 @@ int GpuMain(const MainFunctionParams& parameters) { + std::make_unique<base::SingleThreadTaskExecutor>( gpu_preferences.message_pump_type); } - #endif -#elif defined(OS_LINUX) || defined(OS_CHROMEOS) +#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #error "Unsupported Linux platform." #elif defined(OS_MAC) // Cross-process CoreAnimation requires a CFRunLoop to function at all, and +@@ -446,6 +455,14 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo + return res; + } + #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++ ++#if defined(OS_FREEBSD) ++bool StartSandboxFreeBSD() { ++ return sandbox::policy::SandboxFreeBSD::GetInstance()->InitializeSandbox( ++ sandbox::policy::SandboxTypeFromCommandLine( ++ *base::CommandLine::ForCurrentProcess())); ++} ++#endif // defined(OS_FREEBSD) + + #if defined(OS_WIN) + bool StartSandboxWindows(const sandbox::SandboxInterfaceInfo* sandbox_info) { 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 a3633d6288e2..25321df57de9 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 2021-10-01 01:36:48 UTC +--- content/gpu/gpu_sandbox_hook_linux.cc.orig 2021-12-31 00:57:32 UTC +++ content/gpu/gpu_sandbox_hook_linux.cc @@ -89,6 +89,12 @@ static const char kLibTegraPath[] = "/usr/lib64/libteg static const char kLibV4l2Path[] = "/usr/lib64/libv4l2.so"; @@ -13,7 +13,7 @@ #else static const char kLibGlesPath[] = "/usr/lib/libGLESv2.so.2"; static const char kLibEglPath[] = "/usr/lib/libEGL.so.1"; -@@ -384,6 +390,7 @@ std::vector<BrokerFilePermission> FilePermissionsForGp +@@ -401,6 +407,7 @@ std::vector<BrokerFilePermission> FilePermissionsForGp } void LoadArmGpuLibraries() { @@ -21,7 +21,7 @@ // Preload the Mali library. if (UseChromecastSandboxAllowlist()) { for (const char* path : kAllowedChromecastPaths) { -@@ -416,6 +423,7 @@ void LoadArmGpuLibraries() { +@@ -433,6 +440,7 @@ void LoadArmGpuLibraries() { dlopen(driver_paths[i], dlopen_flag); } } 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 b258a8bb2f08..9f08c443149f 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,4 +1,4 @@ ---- content/ppapi_plugin/ppapi_blink_platform_impl.h.orig 2021-04-14 18:41:03 UTC +--- content/ppapi_plugin/ppapi_blink_platform_impl.h.orig 2021-12-14 11:45:05 UTC +++ content/ppapi_plugin/ppapi_blink_platform_impl.h @@ -13,7 +13,7 @@ #include "build/build_config.h" @@ -9,7 +9,7 @@ #include "components/services/font/public/cpp/font_loader.h" #include "third_party/skia/include/core/SkRefCnt.h" #endif -@@ -36,11 +36,11 @@ class PpapiBlinkPlatformImpl : public BlinkPlatformImp +@@ -40,11 +40,11 @@ class PpapiBlinkPlatformImpl : public BlinkPlatformImp blink::WebThemeEngine* ThemeEngine() override; private: @@ -22,4 +22,4 @@ +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_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 be9b238c7fd5..1d3352e38e0d 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,8 +1,8 @@ ---- content/ppapi_plugin/ppapi_plugin_main.cc.orig 2021-07-19 18:45:15 UTC +--- content/ppapi_plugin/ppapi_plugin_main.cc.orig 2021-12-31 00:57:32 UTC +++ content/ppapi_plugin/ppapi_plugin_main.cc -@@ -49,6 +49,10 @@ - #include "content/public/common/sandbox_init.h" +@@ -50,6 +50,10 @@ #include "sandbox/policy/linux/sandbox_linux.h" + #include "sandbox/policy/sandbox_type.h" #endif +#if defined(OS_FREEBSD) +#include "content/public/common/sandbox_init.h" @@ -11,7 +11,7 @@ #ifdef V8_USE_EXTERNAL_STARTUP_DATA #include "gin/v8_initializer.h" -@@ -140,6 +144,9 @@ int PpapiPluginMain(const MainFunctionParams& paramete +@@ -141,6 +145,9 @@ int PpapiPluginMain(const MainFunctionParams& paramete sandbox::policy::SandboxTypeFromCommandLine(command_line), sandbox::policy::SandboxLinux::PreSandboxHook(), sandbox::policy::SandboxLinux::Options()); diff --git a/www/chromium/files/patch-content_public_common_content__constants.cc b/www/chromium/files/patch-content_public_common_content__constants.cc index 4aa5e61ca183..c5c4202b74b8 100644 --- a/www/chromium/files/patch-content_public_common_content__constants.cc +++ b/www/chromium/files/patch-content_public_common_content__constants.cc @@ -1,6 +1,6 @@ ---- content/public/common/content_constants.cc.orig 2021-04-14 18:41:03 UTC +--- content/public/common/content_constants.cc.orig 2021-12-31 00:57:32 UTC +++ content/public/common/content_constants.cc -@@ -50,7 +50,7 @@ std::string GetCorsExemptRequestedWithHeaderName() { +@@ -48,7 +48,7 @@ std::string GetCorsExemptRequestedWithHeaderName() { return base::JoinString(pieces, "-"); } diff --git a/www/chromium/files/patch-content_public_common_content__constants.h b/www/chromium/files/patch-content_public_common_content__constants.h index f59641fff434..103f553816f6 100644 --- a/www/chromium/files/patch-content_public_common_content__constants.h +++ b/www/chromium/files/patch-content_public_common_content__constants.h @@ -1,6 +1,6 @@ ---- content/public/common/content_constants.h.orig 2021-05-12 22:05:53 UTC +--- content/public/common/content_constants.h.orig 2021-12-31 00:57:32 UTC +++ content/public/common/content_constants.h -@@ -61,7 +61,7 @@ CONTENT_EXPORT extern const char kCorsExemptPurposeHea +@@ -59,7 +59,7 @@ CONTENT_EXPORT extern const char kCorsExemptPurposeHea // it at run time. CONTENT_EXPORT std::string GetCorsExemptRequestedWithHeaderName(); 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 da7a8163be2b..45abe10ce3a8 100644 --- a/www/chromium/files/patch-content_public_common_content__features.cc +++ b/www/chromium/files/patch-content_public_common_content__features.cc @@ -1,6 +1,6 @@ ---- content/public/common/content_features.cc.orig 2021-09-24 04:26:06 UTC +--- content/public/common/content_features.cc.orig 2022-01-20 10:35:57 UTC +++ content/public/common/content_features.cc -@@ -50,7 +50,7 @@ const base::Feature kAudioServiceOutOfProcess { +@@ -51,7 +51,7 @@ const base::Feature kAudioServiceOutOfProcess { // 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) || \ @@ -9,7 +9,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -886,13 +886,13 @@ const base::Feature kWebAssemblyBaseline{"WebAssemblyB +@@ -934,13 +934,13 @@ const base::Feature kWebAssemblyBaseline{"WebAssemblyB const base::Feature kWebAssemblyCodeProtection{ "WebAssemblyCodeProtection", base::FEATURE_DISABLED_BY_DEFAULT}; @@ -25,18 +25,20 @@ // defined(ARCH_CPU_X86_64) // Enable WebAssembly lazy compilation (JIT on first call). -@@ -909,8 +909,8 @@ const base::Feature kWebAssemblyTiering{"WebAssemblyTi - base::FEATURE_ENABLED_BY_DEFAULT}; - +@@ -959,9 +959,9 @@ const base::Feature kWebAssemblyTiering{"WebAssemblyTi // Enable WebAssembly trap handler. --#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || \ -- defined(OS_MAC)) && \ -+#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_BSD) || \ -+ defined(OS_MAC)) && \ - defined(ARCH_CPU_X86_64) - const base::Feature kWebAssemblyTrapHandler{"WebAssemblyTrapHandler", - base::FEATURE_ENABLED_BY_DEFAULT}; -@@ -932,7 +932,7 @@ const base::Feature kWebAuthCable { + const base::Feature kWebAssemblyTrapHandler { + "WebAssemblyTrapHandler", +-#if ((defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || \ +- defined(OS_MAC)) && \ +- defined(ARCH_CPU_X86_64)) || \ ++#if ((defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_BSD) || \ ++ |