diff options
| author | Matthias Wolf <freebsd@rheinwolf.de> | 2021-10-19 19:33:45 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2021-10-19 19:39:45 +0000 |
| commit | 336f302a55ad11465a4255ae250715b962639010 (patch) | |
| tree | c3e9a3cf7406fdf5fdb0ab3c60d132043615c2d7 | |
| parent | 6996a61924c2899cf68683451707bbed5d6b9794 (diff) | |
| download | ports-336f302a55ad11465a4255ae250715b962639010.tar.gz ports-336f302a55ad11465a4255ae250715b962639010.zip | |
www/chromium: update to 94.0.4606.81
MFH: 2021Q4
Security: https://vuxml.freebsd.org/freebsd/a7732806-0b2a-11ec-836b-3065ec8fd3ec.html
Security: https://vuxml.freebsd.org/freebsd/47b571f2-157b-11ec-ae98-704d7b472482.html
Security: https://vuxml.freebsd.org/freebsd/3551e106-1b17-11ec-a8a7-704d7b472482.html
Security: https://vuxml.freebsd.org/freebsd/b6c875f1-1d76-11ec-ae80-704d7b472482.html
Security: https://vuxml.freebsd.org/freebsd/777edbbe-2230-11ec-8869-704d7b472482.html
Security: https://vuxml.freebsd.org/freebsd/7d3d94d3-2810-11ec-9c51-3065ec8fd3ec.html
516 files changed, 3293 insertions, 2897 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile index d5f6820aa002..1f9921d2e06b 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -1,8 +1,7 @@ # Created by: Florent Thoumie <flz@FreeBSD.org> PORTNAME= chromium -PORTVERSION= 92.0.4515.159 -PORTREVISION= 2 +PORTVERSION= 94.0.4606.81 CATEGORIES= www MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ LOCAL/rene/chromium/:fonts @@ -14,7 +13,6 @@ COMMENT= Google web browser based on WebKit LICENSE= BSD3CLAUSE LGPL21 MPL11 LICENSE_COMB= multi -BROKEN_i386= ../../base/files/file_util_posix.cc:1258:29: error: no matching function for call to 'sendfile' (ssize_t vs off_t) ONLY_FOR_ARCHS= aarch64 amd64 i386 BUILD_DEPENDS= bash:shells/bash \ @@ -72,10 +70,10 @@ USES= bison compiler:c++17-lang cpe desktop-file-utils dos2unix gl gnome jpeg l CPE_VENDOR= google CPE_PRODUCT= chrome -DOS2UNIX_FILES= third_party/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h \ - third_party/vulkan_memory_allocator/src/vk_mem_alloc.h +DOS2UNIX_FILES= third_party/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h USE_GL= gbm gl -USE_GNOME= atk dconf glib20 gtk30 libxml2 libxslt +USE_GNOME= atk dconf gdkpixbuf2 glib20 gtk30 libxml2 libxslt +INSTALLS_ICONS= yes USE_LDCONFIG= ${DATADIR} USE_PERL5= build USE_XORG= x11 xcb xcomposite xcursor xext xdamage xfixes xi \ @@ -101,7 +99,6 @@ GN_ARGS+= clang_use_chrome_plugins=false \ enable_nacl=false \ enable_one_click_signin=true \ enable_remoting=false \ - fieldtrial_testing_like_official_build=true \ is_clang=true \ optimize_webui=false \ toolkit_views=true \ @@ -113,7 +110,7 @@ GN_ARGS+= clang_use_chrome_plugins=false \ use_gnome_keyring=false \ use_lld=true \ use_sysroot=false \ - use_system_freetype=true \ + use_system_freetype=false \ use_system_harfbuzz=true \ use_system_libjpeg=true \ extra_cxxflags="${CXXFLAGS}" \ @@ -269,7 +266,11 @@ pre-configure: #./build/linux/unbundle/remove_bundled_libraries.py [list of preserved] cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \ ./build/linux/unbundle/replace_gn_files.py --system-libraries \ - ffmpeg flac fontconfig freetype harfbuzz-ng libdrm libpng libwebp libxml libxslt openh264 opus snappy || ${FALSE} + flac fontconfig freetype harfbuzz-ng libdrm libpng libwebp libxml libxslt openh264 opus snappy || ${FALSE} + # Chromium uses an unreleased version of FFmpeg, so configure it + ${CP} -R \ + ${WRKSRC}/third_party/ffmpeg/chromium/config/Chrome/linux/ \ + ${WRKSRC}/third_party/ffmpeg/chromium/config/Chrome/freebsd do-configure: # GN generator bootstrapping and generating ninja files diff --git a/www/chromium/distinfo b/www/chromium/distinfo index 2138bdc60c5c..1dd9e9755ba1 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1629197071 -SHA256 (chromium-92.0.4515.159.tar.xz) = d97d337d0d70e959a75f1f510f5d78d2b57b5bf24573b7ade9fff9f26a7cfd11 -SIZE (chromium-92.0.4515.159.tar.xz) = 958060524 -SHA256 (chromium-92.0.4515.159-testdata.tar.xz) = 5787a7e7a6567dcf04bc3d2c3b5ed01a8d215b6d47ef37bd1844444938f41ffa -SIZE (chromium-92.0.4515.159-testdata.tar.xz) = 256835676 +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 SHA256 (test_fonts-85.tar.xz) = f22b61b3639acb147c98ec2e2305d8b96f0b55c8c74c40e2ea696402fae8cef9 SIZE (test_fonts-85.tar.xz) = 9511984 diff --git a/www/chromium/files/device_info_fetcher_freebsd.cc b/www/chromium/files/device_info_fetcher_freebsd.cc index 021bc035966b..dcd5af716e46 100644 --- a/www/chromium/files/device_info_fetcher_freebsd.cc +++ b/www/chromium/files/device_info_fetcher_freebsd.cc @@ -26,8 +26,6 @@ #include "base/system/sys_info.h" #include "net/base/network_interfaces.h" -using SettingValue = enterprise_signals::DeviceInfo::SettingValue; - namespace enterprise_signals { namespace { 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 ede4422aa141..c149f4f7bb49 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-08-17 00:15:54 UTC +--- build/config/compiler/pgo/pgo.gni.orig 2021-10-08 06:25:34 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 b9cbe4cc1c83..a416c5026ea5 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-08-17 00:18:54 UTC +--- 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 @@ -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 8528f242ee69..d283d4564188 100644 --- a/www/chromium/files/patch-BUILD.gn +++ b/www/chromium/files/patch-BUILD.gn @@ -1,6 +1,6 @@ ---- BUILD.gn.orig 2021-07-19 18:45:04 UTC +--- BUILD.gn.orig 2021-09-24 04:25:55 UTC +++ BUILD.gn -@@ -443,7 +443,7 @@ group("gn_all") { +@@ -449,7 +449,7 @@ group("gn_all") { ] } @@ -9,7 +9,7 @@ deps += [ "//third_party/breakpad:breakpad_unittests", "//third_party/breakpad:core-2-minidump", -@@ -488,8 +488,6 @@ group("gn_all") { +@@ -494,8 +494,6 @@ group("gn_all") { "//net:disk_cache_memory_test", "//net:quic_client", "//net:quic_server", @@ -18,7 +18,16 @@ "//testing:empty_main", ] -@@ -544,10 +542,6 @@ group("gn_all") { +@@ -506,7 +504,7 @@ group("gn_all") { + ] + } + +- if (is_chrome_branded && is_official_build) { ++ if (is_chrome_branded && is_official_build && !is_bsd) { + # TODO(dpranke): add the linux_dump_symbols flag? + deps += [ "//chrome:linux_symbols" ] + } +@@ -550,10 +548,6 @@ group("gn_all") { "//chrome/test:load_library_perf_tests", "//chrome/test:sync_performance_tests", "//chrome/test/chromedriver:chromedriver", @@ -29,7 +38,7 @@ "//media/cast:generate_barcode_video", "//media/cast:generate_timecode_audio", "//net:crash_cache", -@@ -606,10 +600,6 @@ group("gn_all") { +@@ -612,10 +606,6 @@ group("gn_all") { "//mojo:mojo_perftests", "//services/service_manager/public/cpp", "//testing/gmock:gmock_main", @@ -40,7 +49,7 @@ ] if (!is_android) { -@@ -687,7 +677,7 @@ group("gn_all") { +@@ -693,7 +683,7 @@ group("gn_all") { host_os == "win") { deps += [ "//chrome/test/mini_installer:mini_installer_tests" ] } @@ -49,7 +58,7 @@ deps += [ "//third_party/breakpad:symupload($host_toolchain)" ] } -@@ -702,7 +692,7 @@ group("gn_all") { +@@ -708,7 +698,7 @@ group("gn_all") { } } @@ -58,7 +67,7 @@ deps += [ "//third_party/crashpad/crashpad:crashpad_tests", "//third_party/crashpad/crashpad/handler:crashpad_handler", -@@ -819,7 +809,6 @@ group("gn_all") { +@@ -825,7 +815,6 @@ group("gn_all") { "//chrome/browser/vr:vr_common_perftests", "//chrome/browser/vr:vr_common_unittests", "//chrome/browser/vr:vr_pixeltests", @@ -66,7 +75,7 @@ ] if (is_android) { deps += [ "//chrome/browser/android/vr:vr_android_unittests" ] -@@ -1118,7 +1107,7 @@ if (!is_ios) { +@@ -1131,7 +1120,7 @@ if (!is_ios) { data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ] } @@ -75,7 +84,7 @@ data_deps += [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } -@@ -1127,7 +1116,7 @@ if (!is_ios) { +@@ -1140,7 +1129,7 @@ if (!is_ios) { data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } @@ -84,7 +93,16 @@ data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } -@@ -1371,9 +1360,6 @@ group("chromium_builder_perf") { +@@ -1374,7 +1363,7 @@ group("chromium_builder_perf") { + data_deps += [ "//chrome/test:performance_browser_tests" ] + } + if (is_linux || is_chromeos_lacros) { +- if (is_official_build) { ++ if (is_official_build && !is_bsd) { + # 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") { if (is_win) { data_deps += [ "//chrome/installer/mini_installer:mini_installer" ] diff --git a/www/chromium/files/patch-base_BUILD.gn b/www/chromium/files/patch-base_BUILD.gn index 071f2b46a17e..97725237b20e 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-07-19 18:45:05 UTC +--- base/BUILD.gn.orig 2021-09-24 04:25:55 UTC +++ base/BUILD.gn -@@ -972,7 +972,7 @@ component("base") { +@@ -935,7 +935,7 @@ component("base") { "timer/hi_res_timer_manager_posix.cc", ] @@ -9,7 +9,7 @@ sources += [ "cpu_affinity_posix.cc", "cpu_affinity_posix.h", -@@ -983,6 +983,11 @@ component("base") { +@@ -946,6 +946,11 @@ component("base") { "profiler/thread_delegate_posix.h", ] } @@ -21,7 +21,7 @@ } if (is_win) { -@@ -1394,7 +1399,7 @@ component("base") { +@@ -1367,7 +1372,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" ] } -@@ -1447,7 +1452,7 @@ component("base") { +@@ -1420,7 +1425,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) { -@@ -2119,6 +2124,34 @@ component("base") { +@@ -2099,6 +2104,34 @@ component("base") { } } @@ -74,7 +74,7 @@ # iOS if (is_ios) { sources -= [ -@@ -3339,7 +3372,7 @@ test("base_unittests") { +@@ -3292,7 +3325,7 @@ test("base_unittests") { } } @@ -83,7 +83,7 @@ sources += [ "debug/proc_maps_linux_unittest.cc", "files/scoped_file_linux_unittest.cc", -@@ -3382,7 +3415,7 @@ test("base_unittests") { +@@ -3339,7 +3372,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.gni b/www/chromium/files/patch-base_allocator_allocator.gni deleted file mode 100644 index a8a21f360289..000000000000 --- a/www/chromium/files/patch-base_allocator_allocator.gni +++ /dev/null @@ -1,11 +0,0 @@ ---- base/allocator/allocator.gni.orig 2021-07-19 18:45:05 UTC -+++ base/allocator/allocator.gni -@@ -60,7 +60,7 @@ declare_args() { - # not, and redesign or remove the flag accordingly. We may want to assert a - # possible conflict between |use_allocator = "partition"| and - # |use_partition_alloc = true| rather than prioritizing use_partition_alloc. -- use_partition_alloc = !is_ios # Never use PartitionAlloc on iOS. -+ use_partition_alloc = !is_ios # Never use PartitionAlloc on iOS. - } - - if (!use_partition_alloc && use_allocator == "partition") { 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 f859681f9b6b..b7a8e8f3c8a8 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-04-14 18:40:48 UTC +--- base/allocator/allocator_shim_unittest.cc.orig 2021-09-14 01:51:47 UTC +++ base/allocator/allocator_shim_unittest.cc @@ -369,7 +369,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) { @@ -36,7 +36,7 @@ #if !defined(OS_WIN) free(posix_memalign_ptr); -@@ -614,7 +614,7 @@ static size_t GetUsableSize(void* ptr) { +@@ -615,7 +615,7 @@ static size_t GetUsableSize(void* ptr) { static size_t GetUsableSize(void* ptr) { return malloc_size(ptr); } diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_address__space__randomization.h b/www/chromium/files/patch-base_allocator_partition__allocator_address__space__randomization.h new file mode 100644 index 000000000000..c15f7b02a90a --- /dev/null +++ b/www/chromium/files/patch-base_allocator_partition__allocator_address__space__randomization.h @@ -0,0 +1,11 @@ +--- base/allocator/partition_allocator/address_space_randomization.h.orig 2021-10-07 16:50:24 UTC ++++ base/allocator/partition_allocator/address_space_randomization.h +@@ -36,7 +36,7 @@ AslrMask(uintptr_t bits) { + + #if defined(ARCH_CPU_64_BITS) + +- #if defined(MEMORY_TOOL_REPLACES_ALLOCATOR) ++ #if defined(MEMORY_TOOL_REPLACES_ALLOCATOR) && !defined(OS_BSD) + + // We shouldn't allocate system pages at all for sanitizer builds. However, + // we do, and if random hint addresses interfere with address ranges 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 8776e5e8e230..cd2ad5a2b820 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-04-14 18:40:48 UTC +--- base/allocator/partition_allocator/partition_alloc.cc.orig 2021-09-24 04:25:55 UTC +++ base/allocator/partition_allocator/partition_alloc.cc -@@ -56,7 +56,12 @@ void PartitionAllocGlobalInit(OomFunction on_out_of_me +@@ -57,7 +57,12 @@ void PartitionAllocGlobalInit(OomFunction on_out_of_me "maximum direct mapped allocation"); // Check that some of our zanier calculations worked out as expected. @@ -10,6 +10,6 @@ +#else static_assert(kSmallestBucket == kAlignment, "generic smallest bucket"); +#endif - static_assert(kMaxBucketed == 983040, "generic max bucketed"); + static_assert(kMaxBucketed == 917504, "generic max bucketed"); STATIC_ASSERT_OR_PA_CHECK( - MaxSystemPagesPerSlotSpan() < (1 << 8), + MaxSystemPagesPerRegularSlotSpan() <= 16, 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 76d20b689187..b65ad60524a2 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-07-19 18:45:05 UTC +--- base/allocator/partition_allocator/partition_alloc_config.h.orig 2021-09-24 04:25:55 UTC +++ base/allocator/partition_allocator/partition_alloc_config.h -@@ -46,9 +46,13 @@ static_assert(sizeof(void*) != 8, ""); +@@ -61,9 +61,13 @@ static_assert(sizeof(void*) != 8, ""); #define PA_HAS_LINUX_KERNEL #endif 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 f9667782d087..f3baa9a491d9 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-07-19 18:45:05 UTC +--- base/allocator/partition_allocator/partition_alloc_unittest.cc.orig 2021-09-24 04:25:55 UTC +++ base/allocator/partition_allocator/partition_alloc_unittest.cc -@@ -1651,7 +1651,7 @@ TEST_F(PartitionAllocTest, LostFreeSlotSpansBug) { +@@ -1755,7 +1755,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 -@@ -1702,7 +1702,7 @@ TEST_F(PartitionAllocDeathTest, DISABLED_RepeatedTryRe +@@ -1806,7 +1806,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 f0e47dbc54d7..edb63a43d3f1 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,47 +1,47 @@ ---- base/allocator/partition_allocator/partition_root.cc.orig 2021-07-19 18:45:05 UTC +--- base/allocator/partition_allocator/partition_root.cc.orig 2021-09-14 01:51:47 UTC +++ base/allocator/partition_allocator/partition_root.cc -@@ -25,7 +25,7 @@ +@@ -27,7 +27,7 @@ #include "wow64apiset.h" #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include <pthread.h> #endif -@@ -39,7 +39,7 @@ namespace { +@@ -41,7 +41,7 @@ namespace base { - #if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) + namespace { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // NO_THREAD_SAFETY_ANALYSIS: acquires the lock and doesn't release it, by // design. -@@ -92,7 +92,7 @@ void AfterForkInChild() { +@@ -94,7 +94,7 @@ void AfterForkInChild() { internal::ThreadCacheRegistry::Instance() .ForcePurgeAllThreadAfterForkUnsafe(); } --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) std::atomic<bool> g_global_init_called; void PartitionAllocMallocInitOnce() { -@@ -102,7 +102,7 @@ void PartitionAllocMallocInitOnce() { +@@ -104,7 +104,7 @@ void PartitionAllocMallocInitOnce() { if (!g_global_init_called.compare_exchange_strong(expected, true)) return; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // 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. -@@ -127,7 +127,7 @@ void PartitionAllocMallocInitOnce() { +@@ -129,7 +129,7 @@ void PartitionAllocMallocInitOnce() { int err = pthread_atfork(BeforeForkInParent, AfterForkInParent, AfterForkInChild); PA_CHECK(err == 0); --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) } - #endif // BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) + } // namespace 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 7fcb4113bbdc..1afd2fd91a8d 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-04-14 18:40:48 UTC +--- base/allocator/partition_allocator/spinning_mutex.cc.orig 2021-09-14 01:51:47 UTC +++ base/allocator/partition_allocator/spinning_mutex.cc -@@ -16,9 +16,16 @@ +@@ -20,9 +20,16 @@ #include <unistd.h> #endif // defined(PA_HAS_LINUX_KERNEL) @@ -18,7 +18,7 @@ void SpinningMutex::FutexWait() { // Save and restore errno. -@@ -42,8 +49,13 @@ void SpinningMutex::FutexWait() { +@@ -46,8 +53,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 +32,7 @@ if (err) { // These are programming error, check them. -@@ -55,8 +67,14 @@ void SpinningMutex::FutexWait() { +@@ -59,8 +71,14 @@ void SpinningMutex::FutexWait() { void SpinningMutex::FutexWake() { int saved_errno = errno; 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 index 4e62c2a629f9..4b62e7b8dad3 100644 --- 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 @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/starscan/pcscan_internal.cc.orig 2021-07-28 07:02:32 UTC +--- base/allocator/partition_allocator/starscan/pcscan_internal.cc.orig 2021-09-24 04:25:55 UTC +++ base/allocator/partition_allocator/starscan/pcscan_internal.cc -@@ -72,7 +72,7 @@ namespace internal { +@@ -59,7 +59,7 @@ namespace internal { namespace { diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_starscan_stack_stack.cc b/www/chromium/files/patch-base_allocator_partition__allocator_starscan_stack_stack.cc index 44ee20228aa7..97c6764116f7 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_starscan_stack_stack.cc +++ b/www/chromium/files/patch-base_allocator_partition__allocator_starscan_stack_stack.cc @@ -1,4 +1,4 @@ ---- base/allocator/partition_allocator/starscan/stack/stack.cc.orig 2021-07-28 10:41:10 UTC +--- base/allocator/partition_allocator/starscan/stack/stack.cc.orig 2021-09-24 04:25:55 UTC +++ base/allocator/partition_allocator/starscan/stack/stack.cc @@ -17,6 +17,10 @@ #include <pthread.h> @@ -30,10 +30,10 @@ @@ -71,6 +83,9 @@ void* GetStackTop() { // See https://code.google.com/p/nativeclient/issues/detail?id=3431. return __libc_stack_end; - #endif // defined(LIBC_GLIBC) + #else +#if defined(OS_FREEBSD) + pthread_attr_destroy(&attr); +#endif return nullptr; + #endif // defined(LIBC_GLIBC) } - diff --git a/www/chromium/files/patch-base_containers_checked__iterators__unittest.cc b/www/chromium/files/patch-base_containers_checked__iterators__unittest.cc new file mode 100644 index 000000000000..95160ac0985a --- /dev/null +++ b/www/chromium/files/patch-base_containers_checked__iterators__unittest.cc @@ -0,0 +1,11 @@ +--- base/containers/checked_iterators_unittest.cc.orig 2021-10-05 14:50:27 UTC ++++ base/containers/checked_iterators_unittest.cc +@@ -88,7 +88,7 @@ TEST(CheckedContiguousIterator, ConvertingComparisonOp + // lags a bit behind. + // TODO(crbug.com/1166360): Enable this test on ChromeOS once the shared libc++ + // is sufficiently modern. +-#if defined(_LIBCPP_VERSION) && !defined(OS_NACL) && !defined(OS_CHROMEOS) ++#if defined(_LIBCPP_VERSION) && !defined(OS_NACL) && !defined(OS_CHROMEOS) && !defined(OS_BSD) + namespace { + + // Helper template that wraps an iterator and disables its dereference and diff --git a/www/chromium/files/patch-base_cpu.cc b/www/chromium/files/patch-base_cpu.cc index 7f8adecb5ac5..cbc9bb558f06 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-07-19 18:45:05 UTC +--- base/cpu.cc.orig 2021-09-14 01:51:47 UTC +++ base/cpu.cc @@ -16,7 +16,7 @@ - #include "base/stl_util.h" + #include "base/cxx17_backports.h" -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) || \ diff --git a/www/chromium/files/patch-base_debug_debugger__posix.cc b/www/chromium/files/patch-base_debug_debugger__posix.cc index 0d6e7bbd22d2..5ac1022dbb46 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-07-19 18:45:05 UTC +--- base/debug/debugger_posix.cc.orig 2021-09-24 04:25:55 UTC +++ base/debug/debugger_posix.cc -@@ -93,7 +93,7 @@ bool BeingDebugged() { +@@ -92,7 +92,7 @@ bool BeingDebugged() { KERN_PROC, KERN_PROC_PID, getpid() @@ -9,7 +9,7 @@ , sizeof(struct kinfo_proc), 0 #endif -@@ -101,33 +101,35 @@ bool BeingDebugged() { +@@ -100,33 +100,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.cc b/www/chromium/files/patch-base_debug_stack__trace.cc index 9d606cdbdc91..2733c1b031d9 100644 --- a/www/chromium/files/patch-base_debug_stack__trace.cc +++ b/www/chromium/files/patch-base_debug_stack__trace.cc @@ -1,11 +1,11 @@ ---- base/debug/stack_trace.cc.orig 2021-04-14 18:40:48 UTC +--- base/debug/stack_trace.cc.orig 2021-09-14 01:51:47 UTC +++ base/debug/stack_trace.cc -@@ -15,7 +15,7 @@ - +@@ -16,7 +16,7 @@ #if BUILDFLAG(CAN_UNWIND_WITH_FRAME_POINTERS) + #include "third_party/abseil-cpp/absl/types/optional.h" -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) #include <pthread.h> + #include "base/process/process_handle.h" - #include "base/threading/platform_thread.h" diff --git a/www/chromium/files/patch-base_debug_stack__trace.h b/www/chromium/files/patch-base_debug_stack__trace.h index 4c3df9dae05c..6e702f67799e 100644 --- a/www/chromium/files/patch-base_debug_stack__trace.h +++ b/www/chromium/files/patch-base_debug_stack__trace.h @@ -1,4 +1,4 @@ ---- base/debug/stack_trace.h.orig 2021-04-14 18:40:48 UTC +--- base/debug/stack_trace.h.orig 2021-09-24 04:25:55 UTC +++ base/debug/stack_trace.h @@ -19,6 +19,7 @@ #if !defined(OS_NACL) @@ -8,3 +8,12 @@ #include <unistd.h> #endif +@@ -156,7 +157,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. +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + constexpr bool kEnableScanningByDefault = true; + #else + constexpr bool kEnableScanningByDefault = false; 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 66045b0c285c..e54d8595294a 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-07-19 18:45:05 UTC +--- base/debug/stack_trace_posix.cc.orig 2021-09-24 04:25:55 UTC +++ base/debug/stack_trace_posix.cc @@ -35,7 +35,7 @@ #include <AvailabilityMacros.h> @@ -9,6 +9,24 @@ #include "base/debug/proc_maps_linux.h" #endif +@@ -424,7 +424,7 @@ void StackDumpSignalHandler(int signal, siginfo_t* inf + if (::signal(signal, SIG_DFL) == SIG_ERR) { + _exit(EXIT_FAILURE); + } +-#elif !defined(OS_LINUX) ++#elif !defined(OS_LINUX) && !defined(OS_BSD) + // 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 + PrintToStderr( + "Calling _exit(EXIT_FAILURE). Core file will not be generated.\n"); + _exit(EXIT_FAILURE); +-#endif // !defined(OS_LINUX) ++#endif // !defined(OS_LINUX) && !defined(OS_BSD) + + // 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 { // Reads /proc/self/maps. std::string contents; @@ -43,3 +61,15 @@ // Skip pseudo-paths, like [stack], [vdso], [heap], etc ... continue; } +@@ -801,9 +813,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. +-#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_BSD) + success &= (sigaction(SIGSYS, &action, nullptr) == 0); +-#endif // !defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#endif // !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_BSD) + + return success; + } 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 c885c484f31d..1e0c52e1e74c 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-05-12 22:05:40 UTC +--- base/files/file_path_unittest.cc.orig 2021-09-24 04:25:55 UTC +++ base/files/file_path_unittest.cc -@@ -1179,7 +1179,7 @@ TEST_F(FilePathTest, FromUTF8Unsafe_And_AsUTF8Unsafe) +@@ -1188,7 +1188,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__path__watcher__unittest.cc b/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc index 71d6ea460ea5..c046f76ff4cc 100644 --- a/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc +++ b/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc @@ -1,6 +1,6 @@ ---- base/files/file_path_watcher_unittest.cc.orig 2021-05-12 22:05:40 UTC +--- base/files/file_path_watcher_unittest.cc.orig 2021-09-24 04:25:55 UTC +++ base/files/file_path_watcher_unittest.cc -@@ -452,12 +452,12 @@ TEST_F(FilePathWatcherTest, WatchDirectory) { +@@ -451,12 +451,12 @@ TEST_F(FilePathWatcherTest, WatchDirectory) { VLOG(1) << "Waiting for file1 creation"; ASSERT_TRUE(WaitForEvents()); @@ -15,7 +15,7 @@ ASSERT_TRUE(base::DeleteFile(file1)); VLOG(1) << "Waiting for file1 deletion"; -@@ -1034,7 +1034,7 @@ TEST_F(FilePathWatcherTest, InotifyLimitInUpdateRecurs +@@ -1031,7 +1031,7 @@ TEST_F(FilePathWatcherTest, InotifyLimitInUpdateRecurs } } @@ -24,7 +24,7 @@ enum Permission { Read, -@@ -1042,7 +1042,7 @@ enum Permission { +@@ -1039,7 +1039,7 @@ enum Permission { Execute }; @@ -33,7 +33,7 @@ bool ChangeFilePermissions(const FilePath& path, Permission perm, bool allow) { struct stat stat_buf; -@@ -1071,9 +1071,9 @@ bool ChangeFilePermissions(const FilePath& path, Permi +@@ -1068,9 +1068,9 @@ bool ChangeFilePermissions(const FilePath& path, Permi } return chmod(path.value().c_str(), stat_buf.st_mode) == 0; } @@ -45,7 +45,7 @@ // Linux implementation of FilePathWatcher doesn't catch attribute changes. // http://crbug.com/78043 // Windows implementation of FilePathWatcher catches attribute changes that -@@ -1109,7 +1109,7 @@ TEST_F(FilePathWatcherTest, DirAttributesChanged) { +@@ -1106,7 +1106,7 @@ TEST_F(FilePathWatcherTest, DirAttributesChanged) { ASSERT_TRUE(ChangeFilePermissions(test_dir1, Execute, true)); } diff --git a/www/chromium/files/patch-base_files_file__util.cc b/www/chromium/files/patch-base_files_file__util.cc index 44ec0709b9b8..8cb98c28bfe2 100644 --- a/www/chromium/files/patch-base_files_file__util.cc +++ b/www/chromium/files/patch-base_files_file__util.cc @@ -1,6 +1,6 @@ ---- base/files/file_util.cc.orig 2021-07-28 07:18:23 UTC +--- base/files/file_util.cc.orig 2021-09-24 04:25:55 UTC +++ base/files/file_util.cc -@@ -52,7 +52,7 @@ bool Move(const FilePath& from_path, const FilePath& t +@@ -57,7 +57,7 @@ bool Move(const FilePath& from_path, const FilePath& t } bool CopyFileContents(File& infile, File& outfile) { diff --git a/www/chromium/files/patch-base_files_file__util.h b/www/chromium/files/patch-base_files_file__util.h index 2fe14cf11e09..de3e4fa1d2fb 100644 --- a/www/chromium/files/patch-base_files_file__util.h +++ b/www/chromium/files/patch-base_files_file__util.h @@ -1,6 +1,6 @@ ---- base/files/file_util.h.orig 2021-07-19 18:45:05 UTC +--- base/files/file_util.h.orig 2021-09-24 04:25:55 UTC +++ base/files/file_util.h -@@ -284,14 +284,14 @@ BASE_EXPORT bool SetPosixFilePermissions(const FilePat +@@ -280,14 +280,14 @@ BASE_EXPORT bool SetPosixFilePermissions(const FilePat BASE_EXPORT bool ExecutableExistsInPath(Environment* env, const FilePath::StringType& executable); @@ -17,7 +17,7 @@ #endif // OS_POSIX -@@ -614,7 +614,7 @@ BASE_EXPORT bool VerifyPathControlledByAdmin(const bas +@@ -610,7 +610,7 @@ BASE_EXPORT bool VerifyPathControlledByAdmin(const bas // the directory |path|, in the number of FilePath::CharType, or -1 on failure. BASE_EXPORT int GetMaximumPathComponentLength(const base::FilePath& path); @@ -26,7 +26,7 @@ // Broad categories of file systems as returned by statfs() on Linux. enum FileSystemType { FILE_SYSTEM_UNKNOWN, // statfs failed. -@@ -661,7 +661,7 @@ BASE_EXPORT bool CopyAndDeleteDirectory(const FilePath +@@ -657,7 +657,7 @@ BASE_EXPORT bool CopyAndDeleteDirectory(const FilePath const FilePath& to_path); #endif // defined(OS_WIN) @@ -35,7 +35,7 @@ // CopyFileContentsWithSendfile will use the sendfile(2) syscall to perform a // file copy without moving the data between kernel and userspace. This is much // more efficient than sequences of read(2)/write(2) calls. The |retry_slow| -@@ -673,7 +673,7 @@ BASE_EXPORT bool CopyAndDeleteDirectory(const FilePath +@@ -669,7 +669,7 @@ BASE_EXPORT bool CopyAndDeleteDirectory(const FilePath BASE_EXPORT bool CopyFileContentsWithSendfile(File& infile, File& outfile, bool& retry_slow); diff --git a/www/chromium/files/patch-base_files_file__util__posix.cc b/www/chromium/files/patch-base_files_file__util__posix.cc index c92ce21bda62..4f1bee8b12a5 100644 --- a/www/chromium/files/patch-base_files_file__util__posix.cc +++ b/www/chromium/files/patch-base_files_file__util__posix.cc @@ -1,4 +1,4 @@ ---- base/files/file_util_posix.cc.orig 2021-07-19 18:45:05 UTC +--- base/files/file_util_posix.cc.orig 2021-09-24 04:25:55 UTC +++ base/files/file_util_posix.cc @@ -23,6 +23,10 @@ #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) @@ -11,7 +11,7 @@ #include "base/base_switches.h" #include "base/bits.h" -@@ -383,7 +387,7 @@ bool CreatePipe(ScopedFD* read_fd, ScopedFD* write_fd, +@@ -384,7 +388,7 @@ bool CreatePipe(ScopedFD* read_fd, ScopedFD* write_fd, } bool CreateLocalNonBlockingPipe(int fds[2]) { @@ -20,7 +20,7 @@ return pipe2(fds, O_CLOEXEC | O_NONBLOCK) == 0; #else int raw_fds[2]; -@@ -936,8 +940,12 @@ bool AllocateFileRegion(File* file, int64_t offset, si +@@ -937,8 +941,12 @@ bool AllocateFileRegion(File* file, int64_t offset, si // space. It can fail because the filesystem doesn't support it. In that case, // use the manual method below. @@ -34,7 +34,7 @@ return true; DPLOG(ERROR) << "fallocate"; #elif defined(OS_APPLE) -@@ -1111,7 +1119,7 @@ int GetMaximumPathComponentLength(const FilePath& path +@@ -1113,7 +1121,7 @@ int GetMaximumPathComponentLength(const FilePath& path #if !defined(OS_ANDROID) // This is implemented in file_util_android.cc for that platform. bool GetShmemTempDir(bool executable, FilePath* path) { @@ -43,7 +43,7 @@ bool disable_dev_shm = false; #if !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_CHROMEOS_LACROS) disable_dev_shm = CommandLine::ForCurrentProcess()->HasSwitch( -@@ -1127,7 +1135,7 @@ bool GetShmemTempDir(bool executable, FilePath* path) +@@ -1129,7 +1137,7 @@ bool GetShmemTempDir(bool executable, FilePath* path) *path = FilePath("/dev/shm"); return true; } @@ -52,7 +52,7 @@ return GetTempDir(path); } #endif // !defined(OS_ANDROID) -@@ -1165,7 +1173,7 @@ PrefetchResult PreReadFile(const FilePath& file_path, +@@ -1167,7 +1175,7 @@ PrefetchResult PreReadFile(const FilePath& file_path, // posix_fadvise() is only available in the Android NDK in API 21+. Older // versions may have the required kernel support, but don't have enough usage // to justify backporting. @@ -61,7 +61,7 @@ (defined(OS_ANDROID) && __ANDROID_API__ >= 21) File file(file_path, File::FLAG_OPEN | File::FLAG_READ); if (!file.IsValid()) -@@ -1201,7 +1209,7 @@ PrefetchResult PreReadFile(const FilePath& file_path, +@@ -1203,7 +1211,7 @@ PrefetchResult PreReadFile(const FilePath& file_path, return internal::PreReadFileSlow(file_path, max_bytes) ? PrefetchResult{PrefetchResultCode::kSlowSuccess} : PrefetchResult{PrefetchResultCode::kSlowFailed}; @@ -70,7 +70,7 @@ // __ANDROID_API__ >= 21) } -@@ -1232,7 +1240,7 @@ bool MoveUnsafe(const FilePath& from_path, const FileP +@@ -1234,7 +1242,7 @@ bool MoveUnsafe(const FilePath& from_path, const FileP return true; } @@ -79,7 +79,17 @@ bool CopyFileContentsWithSendfile(File& infile, File& outfile, bool& retry_slow) { -@@ -1246,12 +1254,26 @@ bool CopyFileContentsWithSendfile(File& infile, +@@ -1243,17 +1251,36 @@ bool CopyFileContentsWithSendfile(File& infile, + return false; + } + ++#if defined(OS_BSD) ++ off_t copied = 0; ++ off_t res = 0; ++#else + size_t copied = 0; + ssize_t res = 0; ++#endif while (file_size - copied > 0) { // Don't specify an offset and the kernel will begin reading/writing to the // current file offsets. @@ -106,7 +116,7 @@ copied += res; } -@@ -1265,13 +1287,13 @@ bool CopyFileContentsWithSendfile(File& infile, +@@ -1267,13 +1294,13 @@ bool CopyFileContentsWithSendfile(File& infile, return res >= 0; } @@ -122,7 +132,7 @@ BASE_EXPORT bool IsPathExecutable(const FilePath& path) { bool result = false; FilePath tmp_file_path; -@@ -1292,6 +1314,6 @@ BASE_EXPORT bool IsPathExecutable(const FilePath& path +@@ -1294,6 +1321,6 @@ BASE_EXPORT bool IsPathExecutable(const FilePath& path } return result; } 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 59ef4f71c48b..35ba78243376 100644 --- a/www/chromium/files/patch-base_files_file__util__unittest.cc +++ b/www/chromium/files/patch-base_files_file__util__unittest.cc @@ -1,6 +1,6 @@ ---- base/files/file_util_unittest.cc.orig 2021-04-14 18:40:48 UTC +--- base/files/file_util_unittest.cc.orig 2021-09-14 01:51:47 UTC +++ base/files/file_util_unittest.cc -@@ -1638,7 +1638,7 @@ TEST_F(FileUtilTest, DeleteDirRecursiveWithOpenFile) { +@@ -1640,7 +1640,7 @@ TEST_F(FileUtilTest, DeleteDirRecursiveWithOpenFile) { #endif } @@ -9,7 +9,7 @@ // This test will validate that files which would block when read result in a // failure on a call to ReadFileToStringNonBlocking. To accomplish this we will // use a named pipe because it appears as a file on disk and we can control how -@@ -1671,7 +1671,7 @@ TEST_F(FileUtilTest, TestNonBlockingFileReadLinux) { +@@ -1673,7 +1673,7 @@ TEST_F(FileUtilTest, TestNonBlockingFileReadLinux) { ASSERT_EQ(result.size(), 1u); EXPECT_EQ(result[0], 'a'); } @@ -18,7 +18,7 @@ TEST_F(FileUtilTest, MoveFileNew) { // Create a file -@@ -3506,7 +3506,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) { +@@ -3508,7 +3508,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"; -@@ -3524,7 +3524,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithProcFileSyste +@@ -3526,7 +3526,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithProcFileSyste EXPECT_FALSE(ReadFileToStringWithMaxSize(file_path, nullptr, 4)); } diff --git a/www/chromium/files/patch-base_linux__util.cc b/www/chromium/files/patch-base_linux__util.cc index 619faa4a1798..5455bc589b4d 100644 --- a/www/chromium/files/patch-base_linux__util.cc +++ b/www/chromium/files/patch-base_linux__util.cc @@ -1,4 +1,4 @@ ---- base/linux_util.cc.orig 2021-04-14 18:40:48 UTC +--- base/linux_util.cc.orig 2021-09-14 01:51:47 UTC +++ base/linux_util.cc @@ -15,6 +15,7 @@ @@ -8,7 +8,7 @@ #include "base/files/dir_reader_posix.h" #include "base/files/file_util.h" -@@ -79,6 +80,9 @@ class DistroNameGetter { +@@ -78,6 +79,9 @@ class DistroNameGetter { public: DistroNameGetter() { static const char* const kFilesToCheck[] = {"/etc/os-release", @@ -18,7 +18,7 @@ "/usr/lib/os-release"}; for (const char* file : kFilesToCheck) { if (ReadDistroFromOSReleaseFile(file)) -@@ -135,6 +139,9 @@ void SetLinuxDistro(const std::string& distro) { +@@ -134,6 +138,9 @@ void SetLinuxDistro(const std::string& distro) { } bool GetThreadsForProcess(pid_t pid, std::vector<pid_t>* tids) { @@ -28,7 +28,7 @@ // 25 > strlen("/proc//task") + strlen(std::to_string(INT_MAX)) + 1 = 22 char buf[25]; strings::SafeSPrintf(buf, "/proc/%d/task", pid); -@@ -154,6 +161,7 @@ bool GetThreadsForProcess(pid_t pid, std::vector<pid_t +@@ -153,6 +160,7 @@ bool GetThreadsForProcess(pid_t pid, std::vector<pid_t } return true; diff --git a/www/chromium/files/patch-base_message__loop_message__pump__glib.cc b/www/chromium/files/patch-base_message__loop_message__pump__glib.cc index 32cd1a40850f..5cf21bba2dbd 100644 --- a/www/chromium/files/patch-base_message__loop_message__pump__glib.cc +++ b/www/chromium/files/patch-base_message__loop_message__pump__glib.cc @@ -1,4 +1,4 @@ ---- base/message_loop/message_pump_glib.cc.orig 2021-04-14 18:40:48 UTC +--- base/message_loop/message_pump_glib.cc.orig 2021-09-14 01:51:47 UTC +++ base/message_loop/message_pump_glib.cc @@ -8,6 +8,11 @@ #include <glib.h> @@ -10,9 +10,9 @@ +#endif + #include "base/logging.h" + #include "base/notreached.h" #include "base/numerics/safe_conversions.h" - #include "base/posix/eintr_wrapper.h" -@@ -48,9 +53,13 @@ int GetTimeIntervalMilliseconds(TimeTicks next_task_ti +@@ -49,9 +54,13 @@ int GetTimeIntervalMilliseconds(TimeTicks next_task_ti } bool RunningOnMainThread() { diff --git a/www/chromium/files/patch-base_posix_unix__domain__socket.cc b/www/chromium/files/patch-base_posix_unix__domain__socket.cc index a70ddacfd021..7064cdc080f5 100644 --- a/www/chromium/files/patch-base_posix_unix__domain__socket.cc +++ b/www/chromium/files/patch-base_posix_unix__domain__socket.cc @@ -1,4 +1,4 @@ ---- base/posix/unix_domain_socket.cc.orig 2021-06-09 22:13:52 UTC +--- base/posix/unix_domain_socket.cc.orig 2021-09-14 01:51:47 UTC +++ base/posix/unix_domain_socket.cc @@ -5,7 +5,10 @@ #include "base/posix/unix_domain_socket.h" @@ -11,7 +11,7 @@ #if !defined(OS_NACL_NONSFI) #include <sys/un.h> #endif -@@ -29,6 +32,14 @@ namespace base { +@@ -28,6 +31,14 @@ namespace base { const size_t UnixDomainSocket::kMaxFileDescriptors = 16; @@ -26,7 +26,7 @@ #if !defined(OS_NACL_NONSFI) bool CreateSocketPair(ScopedFD* one, ScopedFD* two) { int raw_socks[2]; -@@ -151,7 +162,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, +@@ -150,7 +161,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, #if !defined(OS_NACL_NONSFI) && !defined(OS_APPLE) // The PNaCl toolchain for Non-SFI binary build and macOS do not support // ucred. macOS supports xucred, but this structure is insufficient. @@ -35,7 +35,7 @@ #endif // !defined(OS_NACL_NONSFI) && !defined(OS_APPLE) ; char control_buffer[kControlBufferSize]; -@@ -181,9 +192,9 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, +@@ -180,9 +191,9 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, // SCM_CREDENTIALS. if (cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_type == SCM_CREDENTIALS) { diff --git a/www/chromium/files/patch-base_process_launch__posix.cc b/www/chromium/files/patch-base_process_launch__posix.cc index 48f4348273c3..4c7abac588b3 100644 --- a/www/chromium/files/patch-base_process_launch__posix.cc +++ b/www/chromium/files/patch-base_process_launch__posix.cc @@ -1,4 +1,4 @@ ---- base/process/launch_posix.cc.orig 2021-07-19 18:45:05 UTC +--- base/process/launch_posix.cc.orig 2021-09-24 04:25:55 UTC +++ base/process/launch_posix.cc @@ -58,12 +58,14 @@ #if defined(OS_FREEBSD) @@ -15,6 +15,15 @@ extern char** environ; namespace base { +@@ -183,7 +185,7 @@ void ResetChildSignalHandlersToDefaults(void) { + #endif // !defined(NDEBUG) + } + } +-#endif // !defined(OS_LINUX) || ++#endif // (!defined(OS_LINUX) && !defined(OS_BSD)) || + // (!defined(__i386__) && !defined(__x86_64__) && !defined(__arm__)) + } // anonymous namespace + @@ -220,6 +222,28 @@ void CloseSuperfluousFds(const base::InjectiveMultimap DirReaderPosix fd_dir(kFDDir); if (!fd_dir.IsValid()) { @@ -87,3 +96,20 @@ } #endif +@@ -558,7 +592,7 @@ static bool GetAppOutputInternal( + // DANGER: no calls to malloc or locks are allowed from now on: + // http://crbug.com/36678 + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + // See comments on the ResetFDOwnership() declaration in + // base/files/scoped_file.h regarding why this is called early here. + subtle::ResetFDOwnership(); +@@ -750,6 +784,6 @@ pid_t ForkWithFlags(unsigned long flags, pid_t* ptid, + + return 0; + } +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_NACL_NONSFI) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_NACL_NONSFI) || defined(OS_BSD) + + } // namespace base diff --git a/www/chromium/files/patch-base_process_memory.cc b/www/chromium/files/patch-base_process_memory.cc index a5b9652c888b..591fc6ec350c 100644 --- a/www/chromium/files/patch-base_process_memory.cc +++ b/www/chromium/files/patch-base_process_memory.cc @@ -1,11 +1,11 @@ ---- base/process/memory.cc.orig 2021-05-12 22:05:40 UTC +--- base/process/memory.cc.orig 2021-09-14 01:51:47 UTC +++ base/process/memory.cc -@@ -69,7 +69,7 @@ void TerminateBecauseOutOfMemory(size_t size) { - } - - // Defined in memory_mac.mm for Mac. --#if !defined(OS_APPLE) -+#if !defined(OS_APPLE) && !defined(OS_BSD) +@@ -70,7 +70,7 @@ void TerminateBecauseOutOfMemory(size_t size) { + // Defined in memory_mac.mm for macOS + use_allocator="none". In case of + // USE_PARTITION_ALLOC_AS_MALLOC, no need to route the call to the system + // default calloc of macOS. +-#if !defined(OS_APPLE) || BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) ++#if (!defined(OS_APPLE) && !defined(OS_BSD)) || BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) bool UncheckedCalloc(size_t num_items, size_t size, void** result) { const size_t alloc_size = num_items * size; diff --git a/www/chromium/files/patch-base_process_process__handle__freebsd.cc b/www/chromium/files/patch-base_process_process__handle__freebsd.cc index e938b55bfa05..446674518dba 100644 --- a/www/chromium/files/patch-base_process_process__handle__freebsd.cc +++ b/www/chromium/files/patch-base_process_process__handle__freebsd.cc @@ -1,20 +1,11 @@ ---- base/process/process_handle_freebsd.cc.orig 2021-07-19 18:45:05 UTC +--- base/process/process_handle_freebsd.cc.orig 2021-09-24 04:25:55 UTC +++ base/process/process_handle_freebsd.cc -@@ -3,7 +3,6 @@ - // found in the LICENSE file. - - #include "base/process/process_handle.h" --#include "base/stl_util.h" - - #include <limits.h> - #include <stddef.h> -@@ -12,14 +11,20 @@ - #include <sys/user.h> +@@ -12,15 +12,19 @@ #include <unistd.h> + #include "base/cxx17_backports.h" +#include "base/files/file_path.h" -+#include "base/stl_util.h" -+ + namespace base { ProcessId GetParentProcessId(ProcessHandle process) { diff --git a/www/chromium/files/patch-base_process_process__iterator__freebsd.cc b/www/chromium/files/patch-base_process_process__iterator__freebsd.cc index c83ab74f2678..94c3bb5ddfdd 100644 --- a/www/chromium/files/patch-base_process_process__iterator__freebsd.cc +++ b/www/chromium/files/patch-base_process_process__iterator__freebsd.cc @@ -1,17 +1,15 @@ ---- base/process/process_iterator_freebsd.cc.orig 2021-04-14 18:40:48 UTC +--- base/process/process_iterator_freebsd.cc.orig 2021-09-24 04:25:55 UTC +++ base/process/process_iterator_freebsd.cc -@@ -10,6 +10,10 @@ - #include <sys/sysctl.h> - #include <unistd.h> +@@ -21,7 +21,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter* + : index_of_kinfo_proc_(), + filter_(filter) { -+/* getuid() */ -+#include <unistd.h> -+#include <sys/types.h> -+ - #include "base/logging.h" - #include "base/stl_util.h" - #include "base/strings/string_split.h" -@@ -40,7 +44,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter* +- int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_UID, getuid() }; ++ int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_UID, (int) getuid() }; + + bool done = false; + int try_num = 1; +@@ -40,7 +40,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter* num_of_kinfo_proc += 16; kinfo_procs_.resize(num_of_kinfo_proc); len = num_of_kinfo_proc * sizeof(struct kinfo_proc); @@ -20,7 +18,7 @@ // If we get a mem error, it just means we need a bigger buffer, so // loop around again. Anything else is a real error and give up. if (errno != ENOMEM) { -@@ -50,7 +54,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter* +@@ -50,7 +50,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter* } } else { // Got the list, just make sure we're sized exactly right @@ -29,7 +27,7 @@ kinfo_procs_.resize(num_of_kinfo_proc); done = true; } -@@ -72,18 +76,13 @@ bool ProcessIterator::CheckForNextProcess() { +@@ -72,18 +72,13 @@ bool ProcessIterator::CheckForNextProcess() { for (; index_of_kinfo_proc_ < kinfo_procs_.size(); ++index_of_kinfo_proc_) { size_t length; struct kinfo_proc kinfo = kinfo_procs_[index_of_kinfo_proc_]; diff --git a/www/chromium/files/patch-base_process_process__metrics.cc b/www/chromium/files/patch-base_process_process__metrics.cc index 54e191de70b0..20a9ba831c6f 100644 --- a/www/chromium/files/patch-base_process_process__metrics.cc +++ b/www/chromium/files/patch-base_process_process__metrics.cc @@ -1,4 +1,4 @@ ---- base/process/process_metrics.cc.orig 2021-06-09 22:13:52 UTC +--- base/process/process_metrics.cc.orig 2021-09-14 01:51:47 UTC +++ base/process/process_metrics.cc @@ -17,7 +17,7 @@ namespace base { @@ -9,7 +9,7 @@ defined(OS_AIX) int CalculateEventsPerSecond(uint64_t event_count, uint64_t* last_event_count, -@@ -53,7 +53,7 @@ SystemMetrics SystemMetrics::Sample() { +@@ -55,7 +55,7 @@ SystemMetrics SystemMetrics::Sample() { SystemMetrics system_metrics; system_metrics.committed_memory_ = GetSystemCommitCharge(); @@ -18,16 +18,16 @@ GetSystemMemoryInfo(&system_metrics.memory_info_); GetVmStatInfo(&system_metrics.vmstat_info_); GetSystemDiskInfo(&system_metrics.disk_info_); -@@ -72,7 +72,7 @@ std::unique_ptr<Value> SystemMetrics::ToValue() const - std::unique_ptr<DictionaryValue> res(new DictionaryValue()); +@@ -74,7 +74,7 @@ Value SystemMetrics::ToValue() const { + Value res(Value::Type::DICTIONARY); - res->SetIntKey("committed_memory", static_cast<int>(committed_memory_)); + res.SetIntKey("committed_memory", static_cast<int>(committed_memory_)); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) - std::unique_ptr<DictionaryValue> meminfo = memory_info_.ToValue(); - std::unique_ptr<DictionaryValue> vmstat = vmstat_info_.ToValue(); - meminfo->MergeDictionary(vmstat.get()); -@@ -123,7 +123,7 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage( + Value meminfo = memory_info_.ToValue(); + Value vmstat = vmstat_info_.ToValue(); + meminfo.MergeDictionary(&vmstat); +@@ -125,7 +125,7 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage( } #endif @@ -36,7 +36,7 @@ defined(OS_AIX) int ProcessMetrics::CalculateIdleWakeupsPerSecond( uint64_t absolute_idle_wakeups) { -@@ -136,7 +136,7 @@ int ProcessMetrics::GetIdleWakeupsPerSecond() { +@@ -138,7 +138,7 @@ int ProcessMetrics::GetIdleWakeupsPerSecond() { NOTIMPLEMENTED(); // http://crbug.com/120488 return 0; } diff --git a/www/chromium/files/patch-base_process_process__metrics.h b/www/chromium/files/patch-base_process_process__metrics.h index 1280ac12748e..f37e2d06ff3f 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-07-19 18:45:05 UTC +--- base/process/process_metrics.h.orig 2021-09-14 01:51:47 UTC +++ base/process/process_metrics.h @@ -37,7 +37,7 @@ #include "base/win/windows_types.h" @@ -9,7 +9,7 @@ defined(OS_AIX) #include <string> #include <utility> -@@ -55,7 +55,7 @@ class Value; +@@ -54,7 +54,7 @@ class Value; // Full declaration is in process_metrics_iocounters.h. struct IoCounters; @@ -18,7 +18,7 @@ // Minor and major page fault counts since the process creation. // Both counts are process-wide, and exclude child processes. // -@@ -65,7 +65,7 @@ struct PageFaultCounts { +@@ -64,7 +64,7 @@ struct PageFaultCounts { int64_t minor; int64_t major; }; @@ -27,7 +27,7 @@ // Convert a POSIX timeval to microseconds. BASE_EXPORT int64_t TimeValToMicroseconds(const struct timeval& tv); -@@ -106,7 +106,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -105,7 +105,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; -@@ -132,7 +132,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -131,7 +131,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). -@@ -167,7 +167,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -166,7 +166,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 -@@ -216,14 +216,14 @@ class BASE_EXPORT ProcessMetrics { +@@ -215,14 +215,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(); -@@ -235,7 +235,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -234,7 +234,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 -@@ -246,10 +246,10 @@ class BASE_EXPORT ProcessMetrics { +@@ -245,10 +245,10 @@ class BASE_EXPORT ProcessMetrics { uint64_t absolute_package_idle_wakeups); #endif @@ -93,7 +93,7 @@ // defined(OS_AIX) #if defined(OS_WIN) -@@ -271,7 +271,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -270,7 +270,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_; -@@ -315,7 +315,7 @@ BASE_EXPORT size_t GetHandleLimit(); +@@ -314,7 +314,7 @@ BASE_EXPORT size_t GetHandleLimit(); BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_descriptors); #endif // defined(OS_POSIX) @@ -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. -@@ -477,7 +477,7 @@ BASE_EXPORT bool GetSystemDiskInfo(SystemDiskInfo* dis +@@ -478,7 +478,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) -@@ -589,7 +589,7 @@ class BASE_EXPORT SystemMetrics { +@@ -590,7 +590,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__metrics__freebsd.cc b/www/chromium/files/patch-base_process_process__metrics__freebsd.cc index c750a9881deb..3e8eb45662f0 100644 --- a/www/chromium/files/patch-base_process_process__metrics__freebsd.cc +++ b/www/chromium/files/patch-base_process_process__metrics__freebsd.cc @@ -1,6 +1,6 @@ ---- base/process/process_metrics_freebsd.cc.orig 2021-07-19 18:45:05 UTC +--- base/process/process_metrics_freebsd.cc.orig 2021-10-01 01:36:37 UTC +++ base/process/process_metrics_freebsd.cc -@@ -3,8 +3,10 @@ +@@ -3,21 +3,41 @@ // found in the LICENSE file. #include "base/process/process_metrics.h" @@ -11,17 +11,16 @@ #include <sys/sysctl.h> #include <sys/user.h> #include <unistd.h> -@@ -13,12 +15,31 @@ - #include "base/memory/ptr_util.h" - #include "base/process/process_metrics_iocounters.h" - #include "base/stl_util.h" -+#include "base/values.h" -+#include <unistd.h> /* getpagesize() */ -+#include <fcntl.h> /* O_RDONLY */ ++#include <fcntl.h> /* O_RDONLY */ +#include <kvm.h> +#include <libutil.h> + + #include "base/cxx17_backports.h" + #include "base/memory/ptr_util.h" + #include "base/process/process_metrics_iocounters.h" ++#include "base/values.h" + namespace base { +namespace { @@ -45,7 +44,16 @@ // static std::unique_ptr<ProcessMetrics> ProcessMetrics::CreateProcessMetrics( -@@ -69,4 +90,216 @@ size_t GetSystemCommitCharge() { +@@ -37,7 +57,7 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage( + } + + TimeDelta ProcessMetrics::GetCumulativeCPUUsage() { +- NOTREACHED(); ++ NOTIMPLEMENTED(); + return TimeDelta(); + } + +@@ -68,4 +88,221 @@ size_t GetSystemCommitCharge() { return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize); } @@ -214,51 +222,56 @@ + +SystemDiskInfo::SystemDiskInfo(const SystemDiskInfo& other) = default; + -+std::unique_ptr<Value> SystemDiskInfo::ToValue() const { -+ auto res = std::make_unique<DictionaryValue>(); ++SystemDiskInfo& SystemDiskInfo::operator=(const SystemDiskInfo&) = default; ++ ++Value SystemDiskInfo::ToValue() const { ++ Value res(Value::Type::DICTIONARY); + + // Write out uint64_t variables as doubles. + // Note: this may discard some precision, but for JS there's no other option. -+ res->SetDouble("reads", static_cast<double>(reads)); -+ res->SetDouble("reads_merged", static_cast<double>(reads_merged)); -+ res->SetDouble("sectors_read", static_cast<double>(sectors_read)); -+ res->SetDouble("read_time", static_cast<double>(read_time)); -+ res->SetDouble("writes", static_cast<double>(writes)); -+ res->SetDouble("writes_merged", static_cast<double>(writes_merged)); -+ res->SetDouble("sectors_written", static_cast<double>(sectors_written)); -+ res->SetDouble("write_time", static_cast<double>(write_time)); -+ res->SetDouble("io", static_cast<double>(io)); -+ res->SetDouble("io_time", static_cast<double>(io_time)); -+ res->SetDouble("weighted_io_time", static_cast<double>(weighted_io_time)); -+ -+ return std::move(res); ++ res.SetDoubleKey("reads", static_cast<double>(reads)); ++ res.SetDoubleKey("reads_merged", static_cast<double>(reads_merged)); ++ res.SetDoubleKey("sectors_read", static_cast<double>(sectors_read)); ++ res.SetDoubleKey("read_time", static_cast<double>(read_time)); ++ res.SetDoubleKey("writes", static_cast<double>(writes)); ++ res.SetDoubleKey("writes_merged", static_cast<double>(writes_merged)); ++ res.SetDoubleKey("sectors_written", static_cast<double>(sectors_written)); ++ res.SetDoubleKey("write_time", static_cast<double>(write_time)); ++ res.SetDoubleKey("io", static_cast<double>(io)); ++ res.SetDoubleKey("io_time", static_cast<double>(io_time)); ++ res.SetDoubleKey("weighted_io_time", static_cast<double>(weighted_io_time)); ++ ++ return res; +} + -+std::unique_ptr<DictionaryValue> SystemMemoryInfoKB::ToValue() const { -+ auto res = std::make_unique<DictionaryValue>(); -+ res->SetIntKey("total", total); -+ res->SetIntKey("free", free); -+ res->SetIntKey("available", available); -+ res->SetIntKey("buffers", buffers); -+ res->SetIntKey("cached", cached); -+ res->SetIntKey("active_anon", active_anon); -+ res->SetIntKey("inactive_anon", inactive_anon); -+ res->SetIntKey("active_file", active_file); -+ res->SetIntKey("inactive_file", inactive_file); -+ res->SetIntKey("swap_total", swap_total); -+ res->SetIntKey("swap_free", swap_free); -+ res->SetIntKey("swap_used", swap_total - swap_free); -+ res->SetIntKey("dirty", dirty); -+ res->SetIntKey("reclaimable", reclaimable); ++Value SystemMemoryInfoKB::ToValue() const { ++ Value res(Value::Type::DICTIONARY); ++ ++ res.SetIntKey("total", total); ++ res.SetIntKey("free", free); ++ res.SetIntKey("available", available); ++ res.SetIntKey("buffers", buffers); ++ res.SetIntKey("cached", cached); ++ res.SetIntKey("active_anon", active_anon); ++ res.SetIntKey("inactive_anon", inactive_anon); ++ res.SetIntKey("active_file", active_file); ++ res.SetIntKey("inactive_file", inactive_file); ++ res.SetIntKey("swap_total", swap_total); ++ res.SetIntKey("swap_free", swap_free); ++ res.SetIntKey("swap_used", swap_total - swap_free); ++ res.SetIntKey("dirty", dirty); ++ res.SetIntKey("reclaimable", reclaimable); + + return res; +} + -+std::unique_ptr<DictionaryValue> VmStatInfo::ToValue() const { -+ auto res = std::make_unique<DictionaryValue>(); -+ res->SetIntKey("pswpin", pswpin); -+ res->SetIntKey("pswpout", pswpout); -+ res->SetIntKey("pgmajfault", pgmajfault); ++Value VmStatInfo::ToValue() const { ++ Value res(Value::Type::DICTIONARY); ++ ++ res.SetIntKey("pswpin", pswpin); ++ res.SetIntKey("pswpout", pswpout); ++ res.SetIntKey("pgmajfault", pgmajfault); ++ + return res; +} } // namespace base diff --git a/www/chromium/files/patch-base_process_process__unittest.cc b/www/chromium/files/patch-base_process_process__unittest.cc index 302b9073639f..4f9397702033 100644 --- a/www/chromium/files/patch-base_process_process__unittest.cc +++ b/www/chromium/files/patch-base_process_process__unittest.cc @@ -1,6 +1,6 @@ ---- base/process/process_unittest.cc.orig 2021-07-19 18:45:05 UTC +--- base/process/process_unittest.cc.orig 2021-09-14 01:51:47 UTC +++ base/process/process_unittest.cc -@@ -138,7 +138,7 @@ TEST_F(ProcessTest, CreationTimeOtherProcess) { +@@ -140,7 +140,7 @@ TEST_F(ProcessTest, CreationTimeOtherProcess) { // was spawned and a time recorded after it was spawned. However, since the // base::Time and process creation clocks don't match, tolerate some error. constexpr base::TimeDelta kTolerance = @@ -9,7 +9,7 @@ // On Linux, process creation time is relative to boot time which has a // 1-second resolution. Tolerate 1 second for the imprecise boot time and // 100 ms for the imprecise clock. -@@ -285,6 +285,7 @@ TEST_F(ProcessTest, WaitForExitOrEventWithEventSet) { +@@ -287,6 +287,7 @@ TEST_F(ProcessTest, WaitForExitOrEventWithEventSet) { } #endif // OS_WIN @@ -17,7 +17,7 @@ // Ensure that the priority of a process is restored correctly after // backgrounding and restoring. // Note: a platform may not be willing or able to lower the priority of -@@ -342,6 +343,7 @@ TEST_F(ProcessTest, SetProcessBackgroundedSelf) { +@@ -344,6 +345,7 @@ TEST_F(ProcessTest, SetProcessBackgroundedSelf) { int new_priority = process.GetPriority(); EXPECT_EQ(old_priority, new_priority); } 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 cd120fcde687..9aa79d70ac60 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-04-14 18:40:48 UTC +--- base/process/process_util_unittest.cc.orig 2021-09-14 01:51:47 UTC +++ base/process/process_util_unittest.cc -@@ -1337,11 +1337,11 @@ std::string TestLaunchProcess(const CommandLine& cmdli +@@ -1336,11 +1336,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_profiler_register__context.h b/www/chromium/files/patch-base_profiler_register__context.h index 1b5f72e3189a..136080cf3b91 100644 --- a/www/chromium/files/patch-base_profiler_register__context.h +++ b/www/chromium/files/patch-base_profiler_register__context.h @@ -1,4 +1,4 @@ ---- base/profiler/register_context.h.orig 2021-04-14 18:40:48 UTC +--- base/profiler/register_context.h.orig 2021-09-14 01:51:47 UTC +++ base/profiler/register_context.h @@ -17,7 +17,7 @@ #include <windows.h> @@ -9,7 +9,7 @@ #include <sys/ucontext.h> #endif -@@ -190,6 +190,48 @@ inline uintptr_t& RegisterContextInstructionPointer(mc +@@ -209,6 +209,48 @@ inline uintptr_t& RegisterContextInstructionPointer(mc } #endif // #if defined(ARCH_CPU_ARM_FAMILY) && defined(ARCH_CPU_32_BITS) diff --git a/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc b/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc index a0fe47642167..6de970a38eeb 100644 --- a/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc +++ b/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc @@ -1,6 +1,6 @@ ---- base/profiler/stack_sampling_profiler_unittest.cc.orig 2021-04-14 18:40:48 UTC +--- base/profiler/stack_sampling_profiler_unittest.cc.orig 2021-09-14 01:51:47 UTC +++ base/profiler/stack_sampling_profiler_unittest.cc -@@ -42,7 +42,7 @@ +@@ -41,7 +41,7 @@ #include <intrin.h> #include <malloc.h> #include <windows.h> diff --git a/www/chromium/files/patch-base_profiler_thread__delegate__posix.cc b/www/chromium/files/patch-base_profiler_thread__delegate__posix.cc index 35b42ee88f59..2cfaf0bebbc0 100644 --- a/www/chromium/files/patch-base_profiler_thread__delegate__posix.cc +++ b/www/chromium/files/patch-base_profiler_thread__delegate__posix.cc @@ -1,6 +1,6 @@ ---- base/profiler/thread_delegate_posix.cc.orig 2021-07-19 18:45:05 UTC +--- base/profiler/thread_delegate_posix.cc.orig 2021-09-14 01:51:47 UTC +++ base/profiler/thread_delegate_posix.cc -@@ -13,6 +13,10 @@ +@@ -12,6 +12,10 @@ #include "build/build_config.h" #include "third_party/abseil-cpp/absl/types/optional.h" @@ -11,7 +11,7 @@ #if defined(OS_ANDROID) #include "base/files/file_util.h" #include "base/files/scoped_file.h" -@@ -43,7 +47,12 @@ absl::optional<uintptr_t> GetAndroidMainThreadStackBas +@@ -42,7 +46,12 @@ absl::optional<uintptr_t> GetAndroidMainThreadStackBas uintptr_t GetThreadStackBaseAddressImpl( SamplingProfilerThreadToken thread_token) { pthread_attr_t attr; @@ -24,7 +24,7 @@ // See crbug.com/617730 for limitations of this approach on Linux. void* address; size_t size; -@@ -130,16 +139,33 @@ std::vector<uintptr_t*> ThreadDelegatePosix::GetRegist +@@ -129,16 +138,33 @@ std::vector<uintptr_t*> ThreadDelegatePosix::GetRegist return { // Return the set of callee-save registers per the i386 System V ABI // section 2.2.3, plus the stack pointer. @@ -58,7 +58,7 @@ reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_RBP]), reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_RBX]), reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_R12]), -@@ -147,6 +173,7 @@ std::vector<uintptr_t*> ThreadDelegatePosix::GetRegist +@@ -146,6 +172,7 @@ std::vector<uintptr_t*> ThreadDelegatePosix::GetRegist reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_R14]), reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_R15]), reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_RSP]), diff --git a/www/chromium/files/patch-base_sampling__heap__profiler_sampling__heap__profiler.cc b/www/chromium/files/patch-base_sampling__heap__profiler_sampling__heap__profiler.cc index 147615bfbf75..78f5a70b338c 100644 --- a/www/chromium/files/patch-base_sampling__heap__profiler_sampling__heap__profiler.cc +++ b/www/chromium/files/patch-base_sampling__heap__profiler_sampling__heap__profiler.cc @@ -1,6 +1,6 @@ ---- base/sampling_heap_profiler/sampling_heap_profiler.cc.orig 2021-04-14 18:40:48 UTC +--- base/sampling_heap_profiler/sampling_heap_profiler.cc.orig 2021-09-14 01:51:47 UTC +++ base/sampling_heap_profiler/sampling_heap_profiler.cc -@@ -30,6 +30,10 @@ +@@ -27,6 +27,10 @@ #include <sys/prctl.h> #endif @@ -11,7 +11,7 @@ #if defined(OS_ANDROID) && BUILDFLAG(CAN_UNWIND_WITH_CFI_TABLE) && \ defined(OFFICIAL_BUILD) #include "base/trace_event/cfi_backtrace_android.h" // no-presubmit-check -@@ -65,6 +69,10 @@ const char* GetAndLeakThreadName() { +@@ -62,6 +66,10 @@ const char* GetAndLeakThreadName() { #elif defined(OS_APPLE) int err = pthread_getname_np(pthread_self(), name, kBufferLen); if (err == 0 && *name != '\0') diff --git a/www/chromium/files/patch-base_strings_sys__string__conversions__unittest.cc b/www/chromium/files/patch-base_strings_sys__string__conversions__unittest.cc index 61769926edcc..bc016b95adbe 100644 --- a/www/chromium/files/patch-base_strings_sys__string__conversions__unittest.cc +++ b/www/chromium/files/patch-base_strings_sys__string__conversions__unittest.cc @@ -1,6 +1,6 @@ ---- base/strings/sys_string_conversions_unittest.cc.orig 2021-04-14 18:40:48 UTC +--- base/strings/sys_string_conversions_unittest.cc.orig 2021-09-14 01:51:47 UTC +++ base/strings/sys_string_conversions_unittest.cc -@@ -76,7 +76,7 @@ TEST(SysStrings, SysUTF8ToWide) { +@@ -75,7 +75,7 @@ TEST(SysStrings, SysUTF8ToWide) { } // Tests depend on setting a specific Linux locale. @@ -9,7 +9,7 @@ TEST(SysStrings, SysWideToNativeMB) { #if !defined(SYSTEM_NATIVE_UTF8) ScopedLocale locale("en_US.UTF-8"); -@@ -191,6 +191,6 @@ TEST(SysStrings, SysNativeMBAndWide) { +@@ -190,6 +190,6 @@ TEST(SysStrings, SysNativeMBAndWide) { EXPECT_EQ(wide, trip); } } diff --git a/www/chromium/files/patch-base_system_sys__info.cc b/www/chromium/files/patch-base_system_sys__info.cc index d2be91728b01..42f73e193cd3 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-04-14 18:40:48 UTC +--- base/system/sys_info.cc.orig 2021-09-14 01:51:47 UTC +++ base/system/sys_info.cc -@@ -94,7 +94,7 @@ void SysInfo::GetHardwareInfo(base::OnceCallback<void( +@@ -91,7 +91,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.h b/www/chromium/files/patch-base_system_sys__info.h index c0b215d92149..b546599cf524 100644 --- a/www/chromium/files/patch-base_system_sys__info.h +++ b/www/chromium/files/patch-base_system_sys__info.h @@ -1,6 +1,6 @@ ---- base/system/sys_info.h.orig 2021-04-14 18:40:48 UTC +--- base/system/sys_info.h.orig 2021-09-14 01:51:47 UTC +++ base/system/sys_info.h -@@ -209,6 +209,8 @@ class BASE_EXPORT SysInfo { +@@ -210,6 +210,8 @@ class BASE_EXPORT SysInfo { // On Desktop this returns true when memory <= 512MB. static bool IsLowEndDevice(); @@ -9,7 +9,7 @@ private: FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory); FRIEND_TEST_ALL_PREFIXES(debug::SystemMetricsTest, ParseMeminfo); -@@ -218,7 +220,7 @@ class BASE_EXPORT SysInfo { +@@ -219,7 +221,7 @@ class BASE_EXPORT SysInfo { static bool IsLowEndDeviceImpl(); static HardwareInfo GetHardwareInfoSync(); diff --git a/www/chromium/files/patch-base_test_BUILD.gn b/www/chromium/files/patch-base_test_BUILD.gn index 2719ad877a29..314efe5ce605 100644 --- a/www/chromium/files/patch-base_test_BUILD.gn +++ b/www/chromium/files/patch-base_test_BUILD.gn @@ -1,14 +1,14 @@ ---- base/test/BUILD.gn.orig 2021-07-19 18:45:05 UTC +--- base/test/BUILD.gn.orig 2021-09-24 04:25:55 UTC +++ base/test/BUILD.gn -@@ -425,7 +425,11 @@ if (is_linux || is_chromeos) { +@@ -426,7 +426,11 @@ if (is_linux || is_chromeos) { copy("fonts_conf") { sources = [ "fonts.conf" ] -- outputs = [ "${root_build_dir}/etc/fonts/{{source_file_part}}" ] +- outputs = [ "$root_out_dir/etc/fonts/{{source_file_part}}" ] + if (is_bsd) { -+ outputs = [ "${root_build_dir}/usr/local/etc/fonts/{{source_file_part}}" ] ++ outputs = [ "$root_out_dir/usr/local/etc/fonts/{{source_file_part}}" ] + } else { -+ outputs = [ "${root_build_dir}/etc/fonts/{{source_file_part}}" ] ++ outputs = [ "$root_out_dir/etc/fonts/{{source_file_part}}" ] + } } 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 efdfb4483653..e85c81a29ad7 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-07-19 18:45:05 UTC +--- base/test/launcher/test_launcher.cc.orig 2021-09-14 01:51:47 UTC +++ base/test/launcher/test_launcher.cc -@@ -60,6 +60,7 @@ +@@ -61,6 +61,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" -@@ -601,7 +602,7 @@ ChildProcessResults DoLaunchChildTestProcess( +@@ -607,7 +608,7 @@ ChildProcessResults DoLaunchChildTestProcess( #if !defined(OS_FUCHSIA) options.new_process_group = true; #endif @@ -17,7 +17,7 @@ options.kill_on_parent_death = true; #endif -@@ -1523,7 +1524,7 @@ bool TestLauncher::Init(CommandLine* command_line) { +@@ -1529,7 +1530,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 1f2d086d17c7..40cf54e73b22 100644 --- a/www/chromium/files/patch-base_test_test__suite.cc +++ b/www/chromium/files/patch-base_test_test__suite.cc @@ -1,4 +1,4 @@ ---- base/test/test_suite.cc.orig 2021-07-19 18:45:05 UTC +--- base/test/test_suite.cc.orig 2021-09-14 01:51:47 UTC +++ base/test/test_suite.cc @@ -68,7 +68,7 @@ #include "base/test/test_support_android.h" @@ -9,7 +9,7 @@ #include "base/test/fontconfig_util_linux.h" #endif -@@ -214,7 +214,7 @@ class CheckForLeakedGlobals : public testing::EmptyTes +@@ -217,7 +217,7 @@ class CheckForLeakedGlobals : public testing::EmptyTes }; // base::Process is not available on iOS @@ -18,7 +18,7 @@ class CheckProcessPriority : public testing::EmptyTestEventListener { public: CheckProcessPriority() { CHECK(!IsProcessBackgrounded()); } -@@ -351,14 +351,14 @@ void TestSuite::PreInitialize() { +@@ -354,14 +354,14 @@ void TestSuite::PreInitialize() { testing::GTEST_FLAG(catch_exceptions) = false; #endif EnableTerminationOnHeapCorruption(); @@ -35,7 +35,7 @@ // On Android, AtExitManager is created in // testing/android/native_test_wrapper.cc before main() is called. -@@ -632,7 +632,7 @@ void TestSuite::Initialize() { +@@ -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"); @@ -44,7 +44,7 @@ SetUpFontconfig(); #endif -@@ -645,7 +645,7 @@ void TestSuite::Initialize() { +@@ -648,7 +648,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 1b335ea99b35..bd9ca23b258a 100644 --- a/www/chromium/files/patch-base_threading_platform__thread.h +++ b/www/chromium/files/patch-base_threading_platform__thread.h @@ -1,6 +1,6 @@ ---- base/threading/platform_thread.h.orig 2021-04-14 18:40:48 UTC +--- base/threading/platform_thread.h.orig 2021-09-24 04:25:56 UTC +++ base/threading/platform_thread.h -@@ -231,7 +231,7 @@ class BASE_EXPORT PlatformThread { +@@ -240,7 +240,7 @@ class BASE_EXPORT PlatformThread { // Returns a realtime period provided by |delegate|. static TimeDelta GetRealtimePeriod(Delegate* delegate); 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 f257725cea33..823686b3b1ce 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-07-19 18:45:05 UTC +--- base/threading/platform_thread_linux.cc.orig 2021-10-01 01:36:37 UTC +++ base/threading/platform_thread_linux.cc @@ -29,7 +29,9 @@ @@ -10,6 +10,15 @@ #include <sys/resource.h> #include <sys/time.h> #include <sys/types.h> +@@ -132,7 +134,7 @@ int sched_setattr(pid_t pid, + #endif // !defined(OS_NACL) && !defined(OS_AIX) + #endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) + +-#if !defined(OS_NACL) ++#if !defined(OS_NACL) && !defined(OS_BSD) + const FilePath::CharType kCgroupDirectory[] = + FILE_PATH_LITERAL("/sys/fs/cgroup"); + @@ -300,7 +302,7 @@ const ThreadPriorityToNiceValuePair kThreadPriorityToN absl::optional<bool> CanIncreaseCurrentThreadPriorityForPlatform( @@ -19,6 +28,15 @@ // 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 + } + + bool SetCurrentThreadPriorityForPlatform(ThreadPriority priority) { +-#if !defined(OS_NACL) ++#if !defined(OS_NACL) && !defined(OS_BSD) + // For legacy schedtune interface + SetThreadCgroupsForThreadPriority(PlatformThread::CurrentId(), priority); + @@ -350,7 +352,7 @@ absl::optional<ThreadPriority> GetCurrentThreadPriorit void PlatformThread::SetName(const std::string& name) { ThreadIdNameManager::GetInstance()->SetName(name); @@ -28,3 +46,25 @@ // 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 + // priority. + CHECK_NE(thread_id, process_id); + ++#if !defined(OS_BSD) + // For legacy schedtune interface + SetThreadCgroupsForThreadPriority(thread_id, priority); ++#endif + + #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() {} + void TerminateOnThread() {} + + size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) { +-#if !defined(THREAD_SANITIZER) ++#if defined(OS_BSD) ++ return (1 << 23); ++#elif !defined(THREAD_SANITIZER) + return 0; + #else + // ThreadSanitizer bloats the stack heavily. Evidence has been that the 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 d469007593db..e75f4b2de1b5 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-07-19 18:45:05 UTC +--- base/threading/platform_thread_posix.cc.orig 2021-09-14 01:51:47 UTC +++ base/threading/platform_thread_posix.cc -@@ -33,6 +33,10 @@ +@@ -32,6 +32,10 @@ #include <sys/syscall.h> #endif @@ -11,12 +11,12 @@ #if defined(OS_FUCHSIA) #include <zircon/process.h> #else -@@ -194,6 +198,8 @@ PlatformThreadId PlatformThread::CurrentId() { +@@ -193,6 +197,8 @@ PlatformThreadId PlatformThread::CurrentId() { // into the kernel. #if defined(OS_APPLE) return pthread_mach_thread_np(pthread_self()); +#elif defined(OS_BSD) + return pthread_getthreadid_np(); #elif defined(OS_LINUX) || defined(OS_CHROMEOS) - static NoDestructor<InitAtFork> init_at_fork; + static InitAtFork init_at_fork; if (g_thread_id == -1) { 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 f69b6c17844a..a784071e91e7 100644 --- a/www/chromium/files/patch-base_threading_platform__thread__unittest.cc +++ b/www/chromium/files/patch-base_threading_platform__thread__unittest.cc @@ -1,4 +1,4 @@ ---- base/threading/platform_thread_unittest.cc.orig 2021-04-14 18:40:48 UTC +--- base/threading/platform_thread_unittest.cc.orig 2021-09-14 01:51:47 UTC +++ base/threading/platform_thread_unittest.cc @@ -313,7 +313,7 @@ TEST(PlatformThreadTest, // and hardcodes what we know. Please inform scheduler-dev@chromium.org if this @@ -9,7 +9,7 @@ // 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; -@@ -407,9 +407,9 @@ TEST(PlatformThreadTest, SetHugeThreadName) { +@@ -404,9 +404,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 b23c3958b13c..e90dcf410c0d 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-05-12 22:05:40 UTC +--- base/threading/scoped_blocking_call_unittest.cc.orig 2021-09-14 01:51:47 UTC +++ base/threading/scoped_blocking_call_unittest.cc -@@ -274,7 +274,7 @@ TEST_F(ScopedBlockingCallIOJankMonitoringTest, ManyInA +@@ -302,7 +302,7 @@ TEST_F(ScopedBlockingCallIOJankMonitoringTest, ManyInA } TEST_F(ScopedBlockingCallIOJankMonitoringTest, OverlappingMultipleWindows) { @@ -9,7 +9,7 @@ internal::IOJankMonitoringWindow::kMonitoringWindow * 3 + internal::IOJankMonitoringWindow::kIOJankInterval * 5; -@@ -531,7 +531,7 @@ TEST_F(ScopedBlockingCallIOJankMonitoringTest, MultiTh +@@ -559,7 +559,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_time_time.cc b/www/chromium/files/patch-base_time_time.cc index 071c04757fff..8809f2523e7c 100644 --- a/www/chromium/files/patch-base_time_time.cc +++ b/www/chromium/files/patch-base_time_time.cc @@ -1,4 +1,4 @@ ---- base/time/time.cc.orig 2021-07-28 07:27:11 UTC +--- base/time/time.cc.orig 2021-09-24 04:25:56 UTC +++ base/time/time.cc @@ -4,12 +4,12 @@ @@ -13,5 +13,5 @@ -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) + #include <atomic> #include <cmath> - #include <limits> diff --git a/www/chromium/files/patch-base_time_time__unittest.cc b/www/chromium/files/patch-base_time_time__unittest.cc deleted file mode 100644 index 02772da581c3..000000000000 --- a/www/chromium/files/patch-base_time_time__unittest.cc +++ /dev/null @@ -1,18 +0,0 @@ ---- base/time/time_unittest.cc.orig 2021-07-19 18:45:05 UTC -+++ base/time/time_unittest.cc -@@ -2007,6 +2007,7 @@ TEST(TimeDelta, Overflows) { - static_assert((kLargeDelta / 0.5).is_max(), ""); - static_assert((kLargeDelta / -0.5).is_min(), ""); - -+#if !defined(OS_BSD) - static_assert( - TimeDelta::Max() / kOneSecond == std::numeric_limits<double>::infinity(), - ""); -@@ -2035,6 +2036,7 @@ TEST(TimeDelta, Overflows) { - static_assert(TimeDelta::Max() % -kOneSecond == TimeDelta::Max(), ""); - static_assert(TimeDelta::Min() % kOneSecond == TimeDelta::Min(), ""); - static_assert(TimeDelta::Min() % -kOneSecond == TimeDelta::Min(), ""); -+#endif - - // Division by zero. - static_assert((kOneSecond / 0).is_max(), ""); 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 f4491ec684a2..fb2f57729c8b 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,6 +1,6 @@ ---- base/trace_event/malloc_dump_provider.cc.orig 2021-07-19 18:45:05 UTC +--- base/trace_event/malloc_dump_provider.cc.orig 2021-09-24 04:25:56 UTC +++ base/trace_event/malloc_dump_provider.cc -@@ -21,6 +21,8 @@ +@@ -23,6 +23,8 @@ #if defined(OS_APPLE) #include <malloc/malloc.h> @@ -9,7 +9,7 @@ #else #include <malloc.h> #endif -@@ -203,6 +205,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump +@@ -213,6 +215,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump &allocated_objects_count); #elif defined(OS_FUCHSIA) // TODO(fuchsia): Port, see https://crbug.com/706592. @@ -17,5 +17,5 @@ + total_virtual_size = 0; + allocated_objects_size = 0; #else - struct mallinfo info = mallinfo(); - // In case of Android's jemalloc |arena| is 0 and the outer pages size is + #if defined(__GLIBC__) && defined(__GLIBC_PREREQ) + #if __GLIBC_PREREQ(2, 33) diff --git a/www/chromium/files/patch-base_trace__event_process__memory__dump.cc b/www/chromium/files/patch-base_trace__event_process__memory__dump.cc index 346392d8ec65..fa2b435c8b7a 100644 --- a/www/chromium/files/patch-base_trace__event_process__memory__dump.cc +++ b/www/chromium/files/patch-base_trace__event_process__memory__dump.cc @@ -1,6 +1,6 @@ ---- base/trace_event/process_memory_dump.cc.orig 2021-07-19 18:45:05 UTC +--- base/trace_event/process_memory_dump.cc.orig 2021-09-14 01:51:47 UTC +++ base/trace_event/process_memory_dump.cc -@@ -104,7 +104,7 @@ absl::optional<size_t> ProcessMemoryDump::CountResiden +@@ -105,7 +105,7 @@ absl::optional<size_t> ProcessMemoryDump::CountResiden #if defined(OS_WIN) std::unique_ptr<PSAPI_WORKING_SET_EX_INFORMATION[]> vec( new PSAPI_WORKING_SET_EX_INFORMATION[max_vec_size]); diff --git a/www/chromium/files/patch-build_config_c++_c++.gni b/www/chromium/files/patch-build_config_c++_c++.gni new file mode 100644 index 000000000000..ec43c6b5fc4c --- /dev/null +++ b/www/chromium/files/patch-build_config_c++_c++.gni @@ -0,0 +1,11 @@ +--- build/config/c++/c++.gni.orig 2021-10-06 09:43:59 UTC ++++ build/config/c++/c++.gni +@@ -43,7 +43,7 @@ declare_args() { + + use_custom_libcxx = + use_custom_libcxx || (use_custom_libcxx_for_host && !is_a_target_toolchain) +-use_custom_libcxx = use_custom_libcxx && !is_nacl ++use_custom_libcxx = use_custom_libcxx && !is_nacl && !is_bsd + + declare_args() { + # WARNING: Setting this to a non-default value is highly discouraged. diff --git a/www/chromium/files/patch-build_config_compiler_BUILD.gn b/www/chromium/files/patch-build_config_compiler_BUILD.gn index 9bc74ac51a27..b2581f2d38cb 100644 --- a/www/chromium/files/patch-build_config_compiler_BUILD.gn +++ b/www/chromium/files/patch-build_config_compiler_BUILD.gn @@ -1,15 +1,24 @@ ---- build/config/compiler/BUILD.gn.orig 2021-07-19 18:45:05 UTC +--- build/config/compiler/BUILD.gn.orig 2021-09-24 04:25:56 UTC +++ build/config/compiler/BUILD.gn -@@ -144,7 +144,7 @@ declare_args() { +@@ -139,7 +139,7 @@ declare_args() { # - # TODO(crbug.com/977230): Enabling this when 'use_xcode_clang' is true may - # call an old clang that doesn't support auto-init. -- init_stack_vars = !is_android && !use_xcode_clang -+ init_stack_vars = !is_android && !use_xcode_clang && !is_bsd + # TODO(crbug.com/1131993): Enabling this when 'is_android' is true breaks + # content_shell_test_apk on both ARM and x86. +- init_stack_vars = !is_android ++ init_stack_vars = !is_android && !is_bsd # This argument is to control whether enabling text section splitting in the # final binary. When enabled, the separated text sections with prefix -@@ -347,7 +347,7 @@ config("compiler") { +@@ -238,7 +238,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") { +- if (!using_sanitizer && ++ if (!using_sanitizer && !is_bsd && + (is_linux || is_chromeos || is_android || is_fuchsia)) { + ldflags = [ + "-Wl,-z,defs", +@@ -354,7 +354,7 @@ config("compiler") { } # Linker warnings. @@ -18,16 +27,7 @@ ldflags += [ "-Wl,--fatal-warnings" ] } if (fatal_linker_warnings && is_apple) { -@@ -442,7 +442,7 @@ config("compiler") { - - # Compiler instrumentation can introduce dependencies in DSOs to symbols in - # the executable they are loaded into, so they are unresolved at link-time. -- if (!using_sanitizer) { -+ if (!using_sanitizer && !is_bsd) { - ldflags += [ - "-Wl,-z,defs", - "-Wl,--as-needed", -@@ -532,7 +532,7 @@ config("compiler") { +@@ -530,7 +530,7 @@ config("compiler") { ldflags += [ "-Wl,-z,keep-text-section-prefix" ] } @@ -36,7 +36,7 @@ cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ] # TODO(hans): Remove this once Clang generates better optimized debug info -@@ -675,7 +675,12 @@ config("compiler") { +@@ -680,7 +680,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. @@ -47,10 +47,10 @@ + } else { + ldflags += [ "-Wl,--thinlto-jobs=all" ] + } - - ldflags += [ - "-Wl,--thinlto-cache-dir=" + -@@ -861,7 +866,7 @@ config("compiler_cpu_abi") { + if (is_mac) { + ldflags += + [ "-Wl,-cache_path_lto," + +@@ -879,7 +884,7 @@ config("compiler_cpu_abi") { cflags += [ "-mtune=$arm_tune" ] } } else if (current_cpu == "arm64") { @@ -59,17 +59,18 @@ cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] } -@@ -1211,7 +1216,7 @@ config("compiler_deterministic") { - "-Xclang", - ".", - ] -- if (!is_win) { -+ if (!is_win && !is_bsd) { - # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167) - asmflags = [ "-Wa,-fdebug-compilation-dir,." ] - } -@@ -1594,7 +1599,7 @@ config("default_warnings") { - cflags += [ "-Wno-nonportable-include-path" ] +@@ -1231,6 +1236,9 @@ config("compiler_deterministic") { + "-Xclang", + ".", + ] ++ } else if (is_bsd) { ++ # -ffile-compilation-dir is not supported in the LLVM version FreeBSD ships ++ cflags += [ "-fdebug-compilation-dir=." ] + } else { + # -ffile-compilation-dir is an alias for both -fdebug-compilation-dir= + # and -fcoverage-compilation-dir=. +@@ -1610,7 +1618,7 @@ config("default_warnings") { + cflags += [ "-Wno-null-pointer-subtraction" ] } - if (current_toolchain == host_toolchain || !use_xcode_clang) { @@ -77,8 +78,8 @@ # Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not # recognize. cflags += [ -@@ -1635,6 +1640,18 @@ config("default_warnings") { - cflags += [ "-Wno-max-tokens" ] +@@ -1643,6 +1651,18 @@ config("default_warnings") { + cflags += [ "-Wmax-tokens" ] } } + @@ -96,25 +97,25 @@ } } } -@@ -1769,7 +1786,7 @@ config("no_chromium_code") { - # suppressing them individually, we just blanket suppress them here. - "-Wno-unused-variable", +@@ -1781,7 +1801,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", -@@ -1847,7 +1864,7 @@ config("export_dynamic") { - config("thin_archive") { - # The macOS and iOS default linker ld64 does not support reading thin +@@ -1861,7 +1881,7 @@ config("thin_archive") { # archives. -- if ((is_posix && !is_nacl && (!is_apple || use_lld)) || is_fuchsia) { -+ if ((is_posix && !is_nacl && (!is_apple || use_lld) && !is_bsd) || is_fuchsia) { + # TODO(crbug.com/1221615): Enable on is_apple if use_lld once that no longer + # confuses lldb. +- if ((is_posix && !is_nacl && !is_apple) || is_fuchsia) { ++ if ((is_posix && !is_nacl && !is_apple && !is_bsd) || is_fuchsia) { arflags = [ "-T" ] } else if (is_win && use_lld) { arflags = [ "/llvmlibthin" ] -@@ -2381,7 +2398,7 @@ config("symbols") { +@@ -2353,7 +2373,7 @@ 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) { @@ -122,8 +123,8 @@ + cflags += [ "-g0" ] } - # TODO(https://crbug.com/1050118): Investigate missing debug info on mac. -@@ -2414,7 +2431,7 @@ config("symbols") { + if (is_apple) { +@@ -2378,7 +2398,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" && diff --git a/www/chromium/files/patch-build_config_compiler_compiler.gni b/www/chromium/files/patch-build_config_compiler_compiler.gni index 66d5dcf2d2d4..821a613e30c3 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-05-12 22:05:40 UTC +--- build/config/compiler/compiler.gni.orig 2021-09-14 01:51:47 UTC +++ build/config/compiler/compiler.gni -@@ -202,7 +202,7 @@ declare_args() { +@@ -205,7 +205,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_linux_BUILD.gn b/www/chromium/files/patch-build_config_linux_BUILD.gn index 573507ef09e7..1576d19ca1eb 100644 --- a/www/chromium/files/patch-build_config_linux_BUILD.gn +++ b/www/chromium/files/patch-build_config_linux_BUILD.gn @@ -1,6 +1,6 @@ ---- build/config/linux/BUILD.gn.orig 2021-04-14 18:40:48 UTC +--- build/config/linux/BUILD.gn.orig 2021-09-24 04:25:56 UTC +++ build/config/linux/BUILD.gn -@@ -30,7 +30,7 @@ config("runtime_library") { +@@ -39,7 +39,7 @@ config("runtime_library") { if ((!(is_chromeos_ash || is_chromeos_lacros) || default_toolchain != "//build/toolchain/cros:target") && diff --git a/www/chromium/files/patch-build_config_ozone.gni b/www/chromium/files/patch-build_config_ozone.gni index 28f294c8de21..46330d6927de 100644 --- a/www/chromium/files/patch-build_config_ozone.gni +++ b/www/chromium/files/patch-build_config_ozone.gni @@ -1,12 +1,12 @@ ---- build/config/ozone.gni.orig 2021-04-14 18:40:48 UTC +--- build/config/ozone.gni.orig 2021-09-24 04:25:56 UTC +++ build/config/ozone.gni -@@ -79,6 +79,9 @@ declare_args() { - ozone_platform = "x11" - ozone_platform_drm = true - ozone_platform_x11 = true +@@ -85,6 +85,9 @@ declare_args() { + } else if (is_chromeos_lacros) { + ozone_platform = "wayland" + ozone_platform_wayland = true + } else if (is_bsd) { + ozone_platform = "x11" + ozone_platform_x11 = true - } else if (is_linux || is_chromeos_lacros) { + } else if (is_linux) { ozone_platform = "x11" ozone_platform_wayland = true diff --git a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni index 1613bd73a406..f27a62b5d4f3 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-06-09 22:13:52 UTC +--- build/toolchain/gcc_toolchain.gni.orig 2021-09-14 01:51:47 UTC +++ build/toolchain/gcc_toolchain.gni -@@ -51,6 +51,11 @@ if (enable_resource_allowlist_generation) { +@@ -48,6 +48,11 @@ if (enable_resource_allowlist_generation) { "enable_resource_allowlist_generation=true does not work for target_os=$target_os") } @@ -12,7 +12,7 @@ # This template defines a toolchain for something that works like gcc # (including clang). # -@@ -647,20 +652,32 @@ template("gcc_toolchain") { +@@ -666,20 +671,32 @@ template("gcc_toolchain") { # actually just be doing a native compile. The invoker can optionally override # use_gold too. template("clang_toolchain") { diff --git a/www/chromium/files/patch-cc_BUILD.gn b/www/chromium/files/patch-cc_BUILD.gn index 67f4df2ae89e..6016ad192eeb 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-07-19 18:45:05 UTC +--- cc/BUILD.gn.orig 2021-09-24 04:25:56 UTC +++ cc/BUILD.gn -@@ -642,7 +642,7 @@ cc_test_static_library("test_support") { +@@ -646,7 +646,7 @@ cc_test_static_library("test_support") { if (enable_vulkan) { deps += [ "//gpu/vulkan/init" ] } @@ -9,7 +9,7 @@ data_deps = [ "//third_party/mesa_headers" ] } } -@@ -860,7 +860,6 @@ cc_test("cc_unittests") { +@@ -864,7 +864,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 1fb0ba72b6da..9b6e8ccff5a8 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-04-14 18:40:48 UTC +--- cc/layers/scrollbar_layer_impl_base.cc.orig 2021-09-24 04:25:56 UTC +++ cc/layers/scrollbar_layer_impl_base.cc -@@ -219,8 +219,8 @@ gfx::Rect ScrollbarLayerImplBase::ComputeThumbQuadRect +@@ -221,8 +221,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 457e67f323fb..89c9b58cb212 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-07-19 18:45:05 UTC +--- cc/test/layer_tree_test.cc.orig 2021-09-14 01:51:47 UTC +++ cc/test/layer_tree_test.cc -@@ -673,7 +673,7 @@ LayerTreeTest::LayerTreeTest(viz::RendererType rendere +@@ -674,7 +674,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-chrome_BUILD.gn b/www/chromium/files/patch-chrome_BUILD.gn index 22afdb41b250..783da8838ac7 100644 --- a/www/chromium/files/patch-chrome_BUILD.gn +++ b/www/chromium/files/patch-chrome_BUILD.gn @@ -1,13 +1,31 @@ ---- chrome/BUILD.gn.orig 2021-07-19 18:45:05 UTC +--- chrome/BUILD.gn.orig 2021-09-24 04:25:56 UTC +++ chrome/BUILD.gn -@@ -1368,6 +1368,10 @@ group("browser_dependencies") { - public_deps += [ "//chromeos/lacros" ] +@@ -276,7 +276,9 @@ if (!is_android && !is_mac) { + ":xdg_mime", # Needs to be public for installer to consume files. + ] + +- data_deps += [ "//components/crash/core/app:chrome_crashpad_handler" ] ++ if (!is_bsd) { ++ data_deps += [ "//components/crash/core/app:chrome_crashpad_handler" ] ++ } + } + + ldflags = [] +@@ -1366,7 +1368,7 @@ group("browser_dependencies") { + ] } -+ if (is_bsd) { -+ public_deps -= [ "//components/crash/core/app" ] -+ } -+ - if (is_chromeos_ash) { - public_deps += [ - "//ash/constants", +- if (!is_fuchsia) { ++ if (!is_fuchsia && !is_bsd) { + public_deps += [ "//components/crash/core/app" ] + } + +@@ -1686,7 +1688,7 @@ if (enable_resource_allowlist_generation) { + } + + if (is_linux || is_chromeos) { +- if (is_official_build) { ++ if (is_official_build && !is_bsd) { + group("linux_symbols") { + deps = [ + ":angle_egl_symbols", diff --git a/www/chromium/files/patch-chrome_app_BUILD.gn b/www/chromium/files/patch-chrome_app_BUILD.gn index 3b4817c30b95..978ee92ead87 100644 --- a/www/chromium/files/patch-chrome_app_BUILD.gn +++ b/www/chromium/files/patch-chrome_app_BUILD.gn @@ -1,11 +1,11 @@ ---- chrome/app/BUILD.gn.orig 2021-07-19 18:45:06 UTC +--- chrome/app/BUILD.gn.orig 2021-09-24 04:25:56 UTC +++ chrome/app/BUILD.gn -@@ -144,7 +144,7 @@ static_library("test_support") { +@@ -154,7 +154,7 @@ static_library("test_support") { "//v8:v8_headers", ] - if (!is_fuchsia) { + if (!is_fuchsia && !is_bsd) { - # TODO(crbug.com/753619): Enable crash reporting on Fuchsia. + # TODO(crbug.com/1226159): Complete crash reporting integration on Fuchsia. deps += [ "//components/crash/core/app", diff --git a/www/chromium/files/patch-chrome_app_chrome__main.cc b/www/chromium/files/patch-chrome_app_chrome__main.cc index 4889852b2be1..ecce2391064c 100644 --- a/www/chromium/files/patch-chrome_app_chrome__main.cc +++ b/www/chromium/files/patch-chrome_app_chrome__main.cc @@ -1,7 +1,7 @@ ---- chrome/app/chrome_main.cc.orig 2021-07-19 18:45:06 UTC +--- chrome/app/chrome_main.cc.orig 2021-09-24 04:25:56 UTC +++ chrome/app/chrome_main.cc -@@ -22,7 +22,7 @@ - #include "chrome/app/chrome_main_mac.h" +@@ -25,7 +25,7 @@ + #include "chrome/app/notification_metrics.h" #endif -#if defined(OS_WIN) || defined(OS_LINUX) @@ -9,18 +9,17 @@ #include "base/base_switches.h" #endif -@@ -133,12 +133,12 @@ int ChromeMain(int argc, const char** argv) { - MainThreadStackSamplingProfiler scoped_sampling_profiler; - - // Chrome-specific process modes. +@@ -145,11 +145,11 @@ int ChromeMain(int argc, const char** argv) { + if (headless::IsChromeNativeHeadless()) { + headless::SetUpCommandLine(command_line); + } else { -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) || \ defined(OS_WIN) - if (command_line->HasSwitch(switches::kHeadless)) { - return headless::HeadlessShellMain(params); - } + if (command_line->HasSwitch(switches::kHeadless)) + return headless::HeadlessShellMain(params); -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) || // defined(OS_WIN) + } - #if defined(OS_LINUX) 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 fb37b2702fef..ff6ba275fcfe 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-07-19 18:45:06 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2021-10-01 01:36:38 UTC +++ chrome/app/chrome_main_delegate.cc -@@ -150,12 +150,12 @@ +@@ -153,15 +153,17 @@ #include "v8/include/v8.h" #endif @@ -13,9 +13,14 @@ - defined(OS_LINUX) || defined(OS_CHROMEOS) + defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "chrome/browser/policy/policy_path_parser.h" ++#if !defined(OS_BSD) #include "components/crash/core/app/crashpad.h" #endif -@@ -259,7 +259,7 @@ void SetUpExtendedCrashReporting(bool is_browser_proce ++#endif + + #if BUILDFLAG(ENABLE_NACL) + #include "components/nacl/common/nacl_switches.h" +@@ -265,7 +267,7 @@ void SetUpExtendedCrashReporting(bool is_browser_proce #endif // defined(OS_WIN) @@ -24,7 +29,7 @@ void AdjustLinuxOOMScore(const std::string& process_type) { int score = -1; -@@ -294,7 +294,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty +@@ -300,7 +302,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty if (score > -1) base::AdjustOOMScore(base::GetCurrentProcId(), score); } @@ -33,7 +38,7 @@ // Returns true if this subprocess type needs the ResourceBundle initialized // and resources loaded. -@@ -340,7 +340,7 @@ bool HandleVersionSwitches(const base::CommandLine& co +@@ -346,7 +348,7 @@ bool HandleVersionSwitches(const base::CommandLine& co // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -42,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) || -@@ -350,7 +350,7 @@ void HandleHelpSwitches(const base::CommandLine& comma +@@ -356,7 +358,7 @@ void HandleHelpSwitches(const base::CommandLine& comma PLOG(FATAL) << "execlp failed"; } } @@ -51,7 +56,7 @@ #if !defined(OS_MAC) && !defined(OS_ANDROID) void SIGTERMProfilingShutdown(int signal) { -@@ -404,7 +404,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -410,7 +412,7 @@ void InitializeUserDataDir(base::CommandLine* command_ std::string process_type = command_line->GetSwitchValueASCII(switches::kProcessType); @@ -60,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. -@@ -416,7 +416,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -422,7 +424,7 @@ void InitializeUserDataDir(base::CommandLine* command_ user_data_dir = base::FilePath::FromUTF8Unsafe(user_data_dir_string); } } @@ -69,7 +74,7 @@ #if defined(OS_MAC) policy::path_parser::CheckUserDataDirPolicy(&user_data_dir); #endif // OS_MAC -@@ -487,7 +487,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat +@@ -493,7 +495,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat startup_metric_utils::RecordApplicationStartTime(now); #endif @@ -78,7 +83,16 @@ defined(OS_CHROMEOS) // Record the startup process creation time on supported platforms. On Android // this is recorded in ChromeMainDelegateAndroid. -@@ -739,7 +739,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -673,6 +675,8 @@ void ChromeMainDelegate::PostFieldTrialInitialization( + // not always enabled on Linux/ChromeOS. + #if defined(OS_LINUX) || defined(OS_CHROMEOS) + bool enable_gwp_asan = crash_reporter::IsCrashpadEnabled(); ++#elif defined(OS_BSD) ++ bool enable_gwp_asan = false; + #else + bool enable_gwp_asan = true; + #endif +@@ -781,7 +785,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi v8_crashpad_support::SetUp(); #endif @@ -87,7 +101,7 @@ if (!crash_reporter::IsCrashpadEnabled()) { breakpad::SetFirstChanceExceptionHandler(v8::TryHandleWebAssemblyTrapPosix); } -@@ -752,7 +752,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -794,7 +798,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi } // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -96,7 +110,7 @@ // This will directly exit if the user asked for help. HandleHelpSwitches(command_line); #endif -@@ -961,7 +961,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1005,7 +1009,7 @@ void ChromeMainDelegate::PreSandboxStartup() { crash_reporter::InitializeCrashKeys(); @@ -105,7 +119,7 @@ ChromeCrashReporterClient::Create(); #endif -@@ -974,7 +974,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1018,7 +1022,7 @@ void ChromeMainDelegate::PreSandboxStartup() { child_process_logging::Init(); #endif #if defined(ARCH_CPU_ARM_FAMILY) && \ @@ -114,7 +128,7 @@ // Create an instance of the CPU class to parse /proc/cpuinfo and cache // cpu_brand info. base::CPU cpu_info; -@@ -1092,7 +1092,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1136,7 +1140,7 @@ void ChromeMainDelegate::PreSandboxStartup() { locale; } @@ -123,7 +137,7 @@ // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess) { #if defined(OS_ANDROID) -@@ -1113,7 +1113,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1157,7 +1161,7 @@ void ChromeMainDelegate::PreSandboxStartup() { } #endif // defined(OS_ANDROID) } @@ -132,7 +146,7 @@ #if defined(OS_ANDROID) CHECK_EQ(base::android::GetLibraryProcessType(), -@@ -1133,7 +1133,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1177,7 +1181,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. @@ -141,7 +155,7 @@ AdjustLinuxOOMScore(process_type); #endif #if defined(OS_WIN) -@@ -1175,7 +1175,7 @@ int ChromeMainDelegate::RunProcess( +@@ -1219,7 +1223,7 @@ int ChromeMainDelegate::RunProcess( // This entry is not needed on Linux, where the NaCl loader // process is launched via nacl_helper instead. @@ -150,7 +164,7 @@ {switches::kNaClLoaderProcess, NaClMain}, #else {"<invalid>", nullptr}, // To avoid constant array of size 0 -@@ -1203,7 +1203,7 @@ void ChromeMainDelegate::ProcessExiting(const std::str +@@ -1247,7 +1251,7 @@ void ChromeMainDelegate::ProcessExiting(const std::str #endif // !defined(OS_ANDROID) } @@ -159,7 +173,7 @@ void ChromeMainDelegate::ZygoteStarting( std::vector<std::unique_ptr<content::ZygoteForkDelegate>>* delegates) { #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -1240,7 +1240,7 @@ void ChromeMainDelegate::ZygoteForked() { +@@ -1284,7 +1288,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 31731424cfaa..04962e0934d7 100644 --- a/www/chromium/files/patch-chrome_app_chromium__strings.grd +++ b/www/chromium/files/patch-chrome_app_chromium__strings.grd @@ -1,4 +1,4 @@ ---- chrome/app/chromium_strings.grd.orig 2021-07-19 18:45:06 UTC +--- chrome/app/chromium_strings.grd.orig 2021-09-14 01:51:48 UTC +++ chrome/app/chromium_strings.grd @@ -722,7 +722,7 @@ Chromium is unable to recover your settings. </if> @@ -9,7 +9,7 @@ <message name="IDS_ABOUT_BROWSER_SWITCH_DESCRIPTION_UNKNOWN_BROWSER" desc="Description shown while waiting for an alternative browser to open, when the browser name is not auto-detected"> Your system administrator has configured Chromium to open an alternative browser to access <ph name="TARGET_URL_HOSTNAME">$1<ex>example.com</ex></ph>. </message> -@@ -852,7 +852,7 @@ Chromium is unable to recover your settings. +@@ -846,7 +846,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 1f8f577b74a5..8ad7bfd4f70f 100644 --- a/www/chromium/files/patch-chrome_app_generated__resources.grd +++ b/www/chromium/files/patch-chrome_app_generated__resources.grd @@ -1,15 +1,15 @@ ---- chrome/app/generated_resources.grd.orig 2021-07-19 18:45:06 UTC +--- chrome/app/generated_resources.grd.orig 2021-09-24 04:25:56 UTC +++ chrome/app/generated_resources.grd -@@ -293,7 +293,7 @@ are declared in tools/grit/grit_rule.gni. - <part file="profiles_strings.grdp" /> - - <!-- Web app intent picker strings --> +@@ -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> - <if expr="is_win or is_macosx or is_linux"> + <if expr="is_win or is_macosx or is_linux or is_posix"> - <part file="protocol_handler_intent_picker_strings.grdp" /> + <part file="url_handler_intent_picker_strings.grdp" /> </if> -@@ -5298,7 +5298,7 @@ Keep your key file in a safe place. You will need it t +@@ -5453,7 +5453,7 @@ Keep your key file in a safe place. You will need it t </if> <!-- chrome://browser-switch strings --> @@ -18,7 +18,7 @@ <message name="IDS_ABOUT_BROWSER_SWITCH_TITLE" desc="about:browser-switch page title"> Legacy Browser Support </message> -@@ -7480,7 +7480,7 @@ Keep your key file in a safe place. You will need it t +@@ -7731,7 +7731,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> -@@ -8502,7 +8502,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -8795,7 +8795,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 2e3f2994043e..1ffb5c52bc32 100644 --- a/www/chromium/files/patch-chrome_app_google__chrome__strings.grd +++ b/www/chromium/files/patch-chrome_app_google__chrome__strings.grd @@ -1,4 +1,4 @@ ---- chrome/app/google_chrome_strings.grd.orig 2021-07-19 18:45:06 UTC +--- chrome/app/google_chrome_strings.grd.orig 2021-09-14 01:51:48 UTC +++ chrome/app/google_chrome_strings.grd @@ -730,7 +730,7 @@ Google Chrome is unable to recover your settings. </if> @@ -9,7 +9,7 @@ <message name="IDS_ABOUT_BROWSER_SWITCH_DESCRIPTION_UNKNOWN_BROWSER" desc="Description shown while waiting for an alternative browser to open, when the browser name is not auto-detected"> Your system administrator has configured Google Chrome to open an alternative browser to access <ph name="TARGET_URL_HOSTNAME">$1<ex>example.com</ex></ph>. </message> -@@ -860,7 +860,7 @@ Google Chrome is unable to recover your settings. +@@ -854,7 +854,7 @@ Google Chrome is unable to recover your settings. </message> <!-- ProcessSingleton --> diff --git a/www/chromium/files/patch-chrome_app_profiles__strings.grdp b/www/chromium/files/patch-chrome_app_profiles__strings.grdp index a184ddf245a6..55fff4ccbc26 100644 --- a/www/chromium/files/patch-chrome_app_profiles__strings.grdp +++ b/www/chromium/files/patch-chrome_app_profiles__strings.grdp @@ -1,6 +1,6 @@ ---- chrome/app/profiles_strings.grdp.orig 2021-07-19 18:45:06 UTC +--- chrome/app/profiles_strings.grdp.orig 2021-09-14 01:51:48 UTC +++ chrome/app/profiles_strings.grdp -@@ -78,7 +78,7 @@ +@@ -69,7 +69,7 @@ Add Profile... </message> </if> diff --git a/www/chromium/files/patch-chrome_app_settings__strings.grdp b/www/chromium/files/patch-chrome_app_settings__strings.grdp index fe05c6f9aa33..e0be89211d5f 100644 --- a/www/chromium/files/patch-chrome_app_settings__strings.grdp +++ b/www/chromium/files/patch-chrome_app_settings__strings.grdp @@ -1,4 +1,4 @@ ---- chrome/app/settings_strings.grdp.orig 2021-05-12 22:05:42 UTC +--- chrome/app/settings_strings.grdp.orig 2021-10-08 06:25:37 UTC +++ chrome/app/settings_strings.grdp @@ -123,7 +123,7 @@ Theme @@ -13,8 +13,8 @@ Use Classic </message> </if> -- <if expr="not is_linux or chromeos or lacros"> -+ <if expr="not is_posix or chromeos or lacros"> +- <if expr="not is_linux or chromeos or lacros or is_fuchsia"> ++ <if expr="not is_posix or chromeos or lacros or is_fuchsia"> <message name="IDS_SETTINGS_RESET_TO_DEFAULT_THEME" desc="Name of the control which resets the browser theme back to the default theme."> Reset to default </message> diff --git a/www/chromium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc b/www/chromium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc deleted file mode 100644 index 8ca6abaeb397..000000000000 --- a/www/chromium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc +++ /dev/null @@ -1,21 +0,0 @@ ---- chrome/app/shutdown_signal_handlers_posix.cc.orig 2021-04-14 18:40:52 UTC -+++ chrome/app/shutdown_signal_handlers_posix.cc -@@ -186,12 +186,18 @@ void InstallShutdownSignalHandlers( - g_pipe_pid = getpid(); - g_shutdown_pipe_read_fd = pipefd[0]; - g_shutdown_pipe_write_fd = pipefd[1]; -+#if defined(OS_BSD) -+ // PTHREAD_STACK_MIN causes chromium to crash under FreeBSD, -+ // we request the default pthread stack size by specifying 0 here. -+ const size_t kShutdownDetectorThreadStackSize = 0; -+#else - #if !defined(ADDRESS_SANITIZER) - const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2; - #else - // ASan instrumentation bloats the stack frames, so we need to increase the - // stack size to avoid hitting the guard page. - const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4; -+#endif - #endif - ShutdownDetector* detector = new ShutdownDetector( - g_shutdown_pipe_read_fd, std::move(shutdown_callback), task_runner); diff --git a/www/chromium/files/patch-chrome_browser_BUILD.gn b/www/chromium/files/patch-chrome_browser_BUILD.gn index 281afe26f2d2..8f33e4de17c7 100644 --- a/www/chromium/files/patch-chrome_browser_BUILD.gn +++ b/www/chromium/files/patch-chrome_browser_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/browser/BUILD.gn.orig 2021-07-19 18:45:07 UTC +--- chrome/browser/BUILD.gn.orig 2021-09-24 04:25:57 UTC +++ chrome/browser/BUILD.gn -@@ -2456,9 +2456,18 @@ static_library("browser") { +@@ -2458,9 +2458,18 @@ static_library("browser") { deps += [ "//chromeos/services/libassistant/public/mojom" ] } } @@ -20,8 +20,8 @@ if (use_ozone) { deps += [ "//ui/events/ozone", -@@ -5310,6 +5319,18 @@ static_library("browser") { - } +@@ -5515,6 +5524,17 @@ static_library("browser") { + ] } + if (is_bsd) { @@ -35,16 +35,15 @@ + ] + } + -+ - if (is_posix || is_fuchsia) { - deps += [ "//chrome/app:shutdown_signal_handlers" ] - } -@@ -5468,7 +5489,7 @@ static_library("browser") { + if (is_posix) { + sources += [ + "shutdown_signal_handlers_posix.cc", +@@ -5675,7 +5695,7 @@ static_library("browser") { ] } - if (is_posix && !is_mac) { + if (is_posix && !is_mac && !is_bsd) { - # TODO(crbug.com / 753619): Enable crash reporting on Fuchsia. + # TODO(crbug.com/1226159): Complete crash reporting integration on Fuchsia. sources += [ "//chrome/app/chrome_crash_reporter_client.cc", diff --git a/www/chromium/files/patch-chrome_browser_about__flags.cc b/www/chromium/files/patch-chrome_browser_about__flags.cc index 0486e7a5451e..d077386236b6 100644 --- a/www/chromium/files/patch-chrome_browser_about__flags.cc +++ b/www/chromium/files/patch-chrome_browser_about__flags.cc @@ -1,6 +1,6 @@ ---- chrome/browser/about_flags.cc.orig 2021-07-21 14:11:02 UTC +--- chrome/browser/about_flags.cc.orig 2021-09-24 04:25:57 UTC +++ chrome/browser/about_flags.cc -@@ -192,7 +192,7 @@ +@@ -195,7 +195,7 @@ #include "ui/gl/gl_switches.h" #include "ui/native_theme/native_theme_features.h" @@ -9,25 +9,25 @@ #include "base/allocator/buildflags.h" #endif -@@ -992,7 +992,7 @@ const FeatureEntry::FeatureVariation kMemoriesVariatio - nullptr, - }}; +@@ -966,7 +966,7 @@ const FeatureEntry::FeatureVariation kMemoriesVariatio + base::size(kMemoryVariationRemote), nullptr}, + }; -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) || \ defined(OS_WIN) const FeatureEntry::FeatureParam kOmniboxDocumentProviderServerScoring[] = { {"DocumentUseServerScore", "true"}, -@@ -1263,7 +1263,7 @@ const FeatureEntry::FeatureVariation kOmniboxBookmarkP - nullptr, - }, - }; +@@ -1164,7 +1164,7 @@ const FeatureEntry::FeatureVariation kOmniboxBookmarkP + {"Dynamic Replace URL (Title - Path|URL)", + kOmniboxBookmarkPathsDynamicReplaceUrl, + base::size(kOmniboxBookmarkPathsDynamicReplaceUrl), nullptr}}; -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) || // defined(OS_WIN) const FeatureEntry::FeatureVariation -@@ -3151,7 +3151,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3131,7 +3131,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(media::kDeprecateLowUsageCodecs)}, #endif // defined(OS_CHROMEOS) @@ -36,7 +36,7 @@ { "enable-accelerated-video-decode", flag_descriptions::kAcceleratedVideoDecodeName, -@@ -3169,7 +3169,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3149,7 +3149,7 @@ const FeatureEntry kFeatureEntries[] = { kOsMac | kOsWin | kOsCrOS | kOsAndroid | kOsLinux, SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode), }, @@ -45,7 +45,7 @@ { "disable-accelerated-video-encode", flag_descriptions::kAcceleratedVideoEncodeName, -@@ -3510,7 +3510,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3511,7 +3511,7 @@ const FeatureEntry kFeatureEntries[] = { {"enable-login-detection", flag_descriptions::kEnableLoginDetectionName, flag_descriptions::kEnableLoginDetectionDescription, kOsAll, FEATURE_VALUE_TYPE(login_detection::kLoginDetection)}, @@ -54,7 +54,7 @@ {"enable-save-data", flag_descriptions::kEnableSaveDataName, flag_descriptions::kEnableSaveDataDescription, kOsCrOS | kOsLinux, SINGLE_VALUE_TYPE( -@@ -3520,7 +3520,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3521,7 +3521,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kEnableNavigationPredictorDescription, kOsCrOS | kOsLinux, FEATURE_VALUE_TYPE(blink::features::kNavigationPredictor)}, @@ -63,7 +63,7 @@ {"enable-preconnect-to-search", flag_descriptions::kEnablePreconnectToSearchName, flag_descriptions::kEnablePreconnectToSearchDescription, kOsAll, -@@ -4346,7 +4346,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4326,7 +4326,7 @@ const FeatureEntry kFeatureEntries[] = { kOsAll, FEATURE_VALUE_TYPE(omnibox::kOmniboxTrendingZeroPrefixSuggestionsOnNTP)}, @@ -72,25 +72,22 @@ defined(OS_WIN) {"omnibox-experimental-keyword-mode", flag_descriptions::kOmniboxExperimentalKeywordModeName, -@@ -4443,7 +4443,7 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kOmniboxKeywordSpaceTriggeringSettingName, - flag_descriptions::kOmniboxKeywordSpaceTriggeringSettingDescription, - kOsDesktop, FEATURE_VALUE_TYPE(omnibox::kKeywordSpaceTriggeringSetting)}, +@@ -4438,7 +4438,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kOmniboxPreserveLongerShortcutsTextName, + flag_descriptions::kOmniboxPreserveLongerShortcutsTextDescription, + kOsDesktop, FEATURE_VALUE_TYPE(omnibox::kPreserveLongerShortcutsText)}, -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) || // defined(OS_WIN) #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -4721,7 +4721,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4707,12 +4707,12 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(chrome::android::kReaderModeInCCT)}, #endif // !defined(OS_ANDROID) -#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) - {"direct-manipulation-stylus", - flag_descriptions::kDirectManipulationStylusName, -@@ -4732,7 +4732,7 @@ const FeatureEntry kFeatureEntries[] = { {"webui-feedback", flag_descriptions::kWebuiFeedbackName, flag_descriptions::kWebuiFeedbackDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kWebUIFeedback)}, @@ -99,16 +96,16 @@ // defined(OS_CHROMEOS) #if !defined(OS_ANDROID) -@@ -5373,7 +5373,7 @@ const FeatureEntry kFeatureEntries[] = { - kSharingDeviceExpirationVariations, - "SharingDeviceExpiration")}, +@@ -5322,7 +5322,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kSharingSendViaSyncDescription, kOsAll, + FEATURE_VALUE_TYPE(kSharingSendViaSync)}, -#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) {"sharing-hub-desktop-app-menu", flag_descriptions::kSharingHubDesktopAppMenuName, flag_descriptions::kSharingHubDesktopAppMenuDescription, kOsDesktop, -@@ -5382,7 +5382,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5331,7 +5331,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kSharingHubDesktopOmniboxName, flag_descriptions::kSharingHubDesktopOmniboxDescription, kOsDesktop, FEATURE_VALUE_TYPE(sharing_hub::kSharingHubDesktopOmnibox)}, @@ -117,7 +114,7 @@ #if BUILDFLAG(IS_CHROMEOS_ASH) {"ash-enable-pip-rounded-corners", -@@ -5856,7 +5856,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5805,7 +5805,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kMouseSubframeNoImplicitCaptureDescription, kOsAll, FEATURE_VALUE_TYPE(features::kMouseSubframeNoImplicitCapture)}, @@ -126,7 +123,7 @@ defined(OS_CHROMEOS) {"global-media-controls", flag_descriptions::kGlobalMediaControlsName, flag_descriptions::kGlobalMediaControlsDescription, -@@ -5897,7 +5897,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5846,7 +5846,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kGlobalMediaControlsOverlayControlsDescription, kOsWin | kOsMac | kOsLinux, FEATURE_VALUE_TYPE(media::kGlobalMediaControlsOverlayControls)}, @@ -134,36 +131,27 @@ +#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || // defined(OS_CHROMEOS) - #if BUILDFLAG(ENABLE_SPELLCHECK) && defined(OS_WIN) -@@ -6089,7 +6089,7 @@ const FeatureEntry kFeatureEntries[] = { - kPasswordsAccountStorageVariations, - "ButterForPasswords")}, - --#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) - {"passwords-account-storage-iph", - flag_descriptions::kEnablePasswordsAccountStorageIPHName, -@@ -6097,7 +6097,7 @@ const FeatureEntry kFeatureEntries[] = { - kOsWin | kOsMac | kOsLinux, - FEATURE_VALUE_TYPE( - feature_engagement::kIPHPasswordsAccountStorageFeature)}, --#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) - - {"autofill-always-return-cloud-tokenized-card", -@@ -6701,7 +6701,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(features::kIncognitoBrandConsistencyForAndroid)}, + {"safety-tips", flag_descriptions::kSafetyTipName, +@@ -6648,7 +6648,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(features::kIncognitoReauthenticationForAndroid)}, #endif -#if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || \ +#if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ - defined(OS_CHROMEOS) + defined(OS_CHROMEOS) || defined(OS_FUCHSIA) {"incognito-brand-consistency-for-desktop", flag_descriptions::kIncognitoBrandConsistencyForDesktopName, -@@ -6806,7 +6806,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(language::kDetailedLanguageSettings)}, +@@ -6667,7 +6667,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kInheritNativeThemeFromParentWidgetDescription, + kOsDesktop, + FEATURE_VALUE_TYPE(views::features::kInheritNativeThemeFromParentWidget)}, +-#endif // defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || ++#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[] = { + FEATURE_VALUE_TYPE(language::kForceAppLanguagePrompt)}, #endif -#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) @@ -171,7 +159,7 @@ {"commander", flag_descriptions::kCommanderName, flag_descriptions::kCommanderDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kCommander)}, -@@ -6835,8 +6835,8 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6805,8 +6805,8 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kSyncAutofillWalletOfferDataDescription, kOsAll, FEATURE_VALUE_TYPE(switches::kSyncAutofillWalletOfferData)}, @@ -182,33 +170,16 @@ BUILDFLAG(ENABLE_PRINTING) {"enable-oop-print-drivers", flag_descriptions::kEnableOopPrintDriversName, flag_descriptions::kEnableOopPrintDriversDescription, kOsDesktop, -@@ -6855,14 +6855,14 @@ const FeatureEntry kFeatureEntries[] = { - - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ -+#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) || \ - defined(OS_MAC) - {"enable-ephemeral-guest-profiles-on-desktop", - flag_descriptions::kEnableEphemeralGuestProfilesOnDesktopName, - flag_descriptions::kEnableEphemeralGuestProfilesOnDesktopDescription, - kOsWin | kOsLinux | kOsMac, - FEATURE_VALUE_TYPE(features::kEnableEphemeralGuestProfilesOnDesktop)}, --#endif // defined(OS_WIN) || (defined(OS_LINUX) || -+#endif // defined(OS_WIN) || (defined(OS_LINUX) || defined(OS_BSD) || - // BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_MAC) - - #if defined(OS_ANDROID) -@@ -7148,7 +7148,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(media::kVaapiAV1Decoder)}, - #endif // defined(OS_CHROMEOS) +@@ -7091,7 +7091,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(media::kVaapiVp9kSVCHWEncoding)}, + #endif // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS_ASH) -#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", -@@ -7225,7 +7225,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7181,7 +7181,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(metrics::structured::kBluetoothSessionizedMetrics)}, #endif @@ -217,3 +188,21 @@ {"use-ozone-platform", flag_descriptions::kUseOzonePlatformName, flag_descriptions::kUseOzonePlatformDescription, kOsLinux, FEATURE_VALUE_TYPE(features::kUseOzonePlatform)}, +@@ -7224,7 +7224,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(chromeos::features::kLauncherAppSort)}, + #endif + +-#if BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_MAC) || defined(OS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) + {"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_apps_platform__apps_api_media__galleries_media__galleries__watch__apitest.cc b/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_media__galleries_media__galleries__watch__apitest.cc index ab2df2289660..75677148cd36 100644 --- a/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_media__galleries_media__galleries__watch__apitest.cc +++ b/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_media__galleries_media__galleries__watch__apitest.cc @@ -1,6 +1,6 @@ ---- chrome/browser/apps/platform_apps/api/media_galleries/media_galleries_watch_apitest.cc.orig 2021-05-12 22:05:43 UTC +--- chrome/browser/apps/platform_apps/api/media_galleries/media_galleries_watch_apitest.cc.orig 2021-09-14 01:51:49 UTC +++ chrome/browser/apps/platform_apps/api/media_galleries/media_galleries_watch_apitest.cc -@@ -234,7 +234,7 @@ IN_PROC_BROWSER_TEST_F(MediaGalleriesGalleryWatchApiTe +@@ -242,7 +242,7 @@ IN_PROC_BROWSER_TEST_F(MediaGalleriesGalleryWatchApiTe // Test is flaky on windows and linux: crbug.com/1150017. // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/chromium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.cc b/www/chromium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.cc new file mode 100644 index 000000000000..3c22db0ec515 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.cc @@ -0,0 +1,36 @@ +--- chrome/browser/apps/platform_apps/platform_app_launch.cc.orig 2021-09-24 18:17:35 UTC ++++ chrome/browser/apps/platform_apps/platform_app_launch.cc +@@ -17,13 +17,13 @@ + #include "extensions/common/constants.h" + #include "extensions/common/extension.h" + +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) + #include "chrome/browser/ui/browser.h" + #include "chrome/browser/ui/browser_navigator.h" + #include "chrome/browser/ui/browser_window.h" + #include "chrome/browser/web_applications/extension_status_utils.h" + #include "chrome/common/webui_url_constants.h" +-#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) ++#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) + + namespace apps { + +@@ -122,7 +122,7 @@ bool OpenExtensionApplicationTab(Profile* profile, con + return app_tab != nullptr; + } + +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) + bool OpenDeprecatedApplicationPrompt(Profile* profile, + const std::string& app_id) { + if (!extensions::IsExtensionUnsupportedDeprecatedApp(profile, app_id)) +@@ -142,7 +142,7 @@ bool OpenDeprecatedApplicationPrompt(Profile* profile, + // TODO(crbug.com/1225779): Show the deprecated apps dialog. + return true; + } +-#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) ++#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) + + bool OpenExtensionApplicationWithReenablePrompt( + Profile* profile, diff --git a/www/chromium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.h b/www/chromium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.h new file mode 100644 index 000000000000..a133bcabdb34 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.h @@ -0,0 +1,11 @@ +--- chrome/browser/apps/platform_apps/platform_app_launch.h.orig 2021-09-24 18:17:59 UTC ++++ chrome/browser/apps/platform_apps/platform_app_launch.h +@@ -36,7 +36,7 @@ bool OpenExtensionApplicationWindow(Profile* profile, + // and false otherwise. + bool OpenExtensionApplicationTab(Profile* profile, const std::string& app_id); + +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) + // Opens the deprecated Chrome Apps flow if |app_id| refers to a Chrome App and + // Chrome Apps are deprecated on the |profile|. Returns true if that was the + // case, or false otherwise. diff --git a/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc b/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc index 1161c330736d..8d3f48160b1a 100644 --- a/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc +++ b/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/background/background_mode_manager.cc.orig 2021-05-12 22:05:43 UTC +--- chrome/browser/background/background_mode_manager.cc.orig 2021-09-24 04:25:58 UTC +++ chrome/browser/background/background_mode_manager.cc -@@ -882,7 +882,7 @@ gfx::ImageSkia GetStatusTrayIcon() { +@@ -892,7 +892,7 @@ gfx::ImageSkia GetStatusTrayIcon() { return gfx::ImageSkia(); return family->CreateExact(size).AsImageSkia(); diff --git a/www/chromium/files/patch-chrome_browser_browser__resources.grd b/www/chromium/files/patch-chrome_browser_browser__resources.grd deleted file mode 100644 index e0b0b128c4c6..000000000000 --- a/www/chromium/files/patch-chrome_browser_browser__resources.grd +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/browser_resources.grd.orig 2021-05-12 22:05:43 UTC -+++ chrome/browser/browser_resources.grd -@@ -41,7 +41,7 @@ - <include name="IDR_DISCARDS_SITE_DATA_MOJOM_WEBUI_JS" file="${root_gen_dir}\mojom-webui\chrome\browser\ui\webui\discards\site_data.mojom-webui.js" use_base_dir="false" type="BINDATA" /> - <include name="IDR_DISCARDS_SORTED_TABLE_BEHAVIOR_JS" file="resources\discards\sorted_table_behavior.js" type="BINDATA" /> - </if> -- <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)"> - <include name="IDR_BROWSER_SWITCH_APP_JS" file="${root_gen_dir}\chrome\browser\resources\browser_switch\app.js" use_base_dir="false" type="BINDATA" /> - <include name="IDR_BROWSER_SWITCH_PROXY_JS" file="resources\browser_switch\browser_switch_proxy.js" type="BINDATA" /> - <include name="IDR_BROWSER_SWITCH_HTML" file="resources\browser_switch\browser_switch.html" allowexternalscript="true" type="BINDATA" /> 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 df9ef0a2d6dd..770f3922ba00 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-07-19 18:45:08 UTC +--- 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 -@@ -637,7 +637,9 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedder +@@ -639,7 +639,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 e435dd6da16e..50d4d685654f 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,7 @@ ---- chrome/browser/chrome_browser_interface_binders.cc.orig 2021-07-19 18:45:08 UTC +--- chrome/browser/chrome_browser_interface_binders.cc.orig 2021-09-24 04:25:58 UTC +++ chrome/browser/chrome_browser_interface_binders.cc -@@ -146,7 +146,7 @@ - #include "mojo/public/cpp/bindings/self_owned_receiver.h" +@@ -155,7 +155,7 @@ + #include "ui/webui/resources/cr_components/most_visited/most_visited.mojom.h" #endif // defined(OS_ANDROID) -#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ @@ -9,16 +9,24 @@ defined(OS_CHROMEOS) #include "chrome/browser/ui/webui/discards/discards.mojom.h" #include "chrome/browser/ui/webui/discards/discards_ui.h" -@@ -612,7 +612,7 @@ void PopulateChromeFrameBinders( +@@ -637,14 +637,14 @@ 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 (base::FeatureList::IsEnabled(features::kWebAppWindowControlsOverlay) && - !render_frame_host->GetParent()) { + if (!render_frame_host->GetParent()) { map->Add<chrome::mojom::DraggableRegions>( -@@ -854,7 +854,7 @@ void PopulateChromeWebUIFrameBinders( + base::BindRepeating(&DraggableRegionsHostImpl::CreateIfAllowed)); + } + #endif + +-#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MAC) || \ ++#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MAC) || defined(OS_BSD) || \ + defined(OS_WIN) + if (base::FeatureList::IsEnabled(blink::features::kDesktopPWAsSubApps) && + !render_frame_host->GetParent()) { +@@ -952,7 +952,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 bfcee4e9c114..ff6af844c16f 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-07-19 18:45:08 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2021-09-24 04:25:58 UTC +++ chrome/browser/chrome_browser_main.cc -@@ -257,7 +257,7 @@ +@@ -260,7 +260,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" -@@ -956,7 +956,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -942,7 +942,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 . -@@ -965,7 +965,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -951,7 +951,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) -@@ -990,7 +990,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -976,7 +976,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,7 +36,7 @@ metrics::DesktopSessionDurationTracker::Initialize(); ProfileActivityMetricsRecorder::Initialize(); TouchModeStatsTracker::Initialize( -@@ -1156,6 +1156,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { +@@ -1146,6 +1146,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { base::TimeDelta::FromMinutes(1)); #if !defined(OS_ANDROID) @@ -44,7 +44,7 @@ if (base::FeatureList::IsEnabled(features::kWebUsb)) { web_usb_detector_ = std::make_unique<WebUsbDetector>(); content::GetUIThreadTaskRunner({base::TaskPriority::BEST_EFFORT}) -@@ -1163,6 +1164,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { +@@ -1153,6 +1154,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { base::BindOnce(&WebUsbDetector::Initialize, base::Unretained(web_usb_detector_.get()))); } 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 32b0e4269229..56adce70da10 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,15 +1,15 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2021-07-19 18:45:08 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2021-09-24 04:25:58 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -450,7 +450,7 @@ - #include "components/user_manager/user.h" +@@ -361,7 +361,7 @@ #include "components/user_manager/user_manager.h" #include "services/service_manager/public/mojom/interface_provider_spec.mojom.h" + #include "storage/browser/file_system/external_mount_points.h" -#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) #include "chrome/browser/chrome_browser_main_linux.h" #elif defined(OS_ANDROID) #include "base/android/application_status_listener.h" -@@ -511,7 +511,7 @@ +@@ -425,7 +425,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,19 +18,20 @@ #include "chrome/browser/browser_switcher/browser_switcher_navigation_throttle.h" #endif -@@ -530,9 +530,9 @@ +@@ -442,10 +442,10 @@ + #include "components/crash/content/browser/crash_handler_host_linux.h" + #endif - // TODO(crbug/1169547) Remove `BUILDFLAG(IS_CHROMEOS_LACROS)` once the - // migration is complete. --#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || \ ++#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || defined(OS_BSD) || \ + BUILDFLAG(IS_CHROMEOS_ASH) #include "chrome/browser/enterprise/connectors/device_trust/navigation_throttle.h" --#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) -+#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || ++#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || defined(OS_BSD) || + // BUILDFLAG(IS_CHROMEOS_ASH) // TODO(crbug.com/939205): Once the upcoming App Service is available, use a - // single navigation throttle to display the intent picker on all platforms. -@@ -550,7 +550,7 @@ +@@ -464,7 +464,7 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -39,7 +40,7 @@ #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h" #endif -@@ -951,11 +951,13 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHos +@@ -860,11 +860,13 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHos } int GetCrashSignalFD(const base::CommandLine& command_line) { @@ -53,7 +54,7 @@ // Extensions have the same process type as renderers. if (command_line.HasSwitch(extensions::switches::kExtensionProcess)) { -@@ -1377,7 +1379,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( +@@ -1255,7 +1257,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( #elif BUILDFLAG(IS_CHROMEOS_LACROS) main_parts = std::make_unique<ChromeBrowserMainPartsLacros>(parameters, &startup_data_); @@ -62,7 +63,7 @@ main_parts = std::make_unique<ChromeBrowserMainPartsLinux>(parameters, &startup_data_); #elif defined(OS_ANDROID) -@@ -1408,7 +1410,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( +@@ -1289,7 +1291,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( std::make_unique<ChromeBrowserMainExtraPartsViewsLacros>()); // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -71,7 +72,7 @@ main_parts->AddParts( std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>()); #else -@@ -2192,7 +2194,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2058,7 +2060,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin command_line->AppendSwitchASCII(switches::kMetricsClientID, client_info->client_id); } @@ -80,7 +81,7 @@ #if defined(OS_ANDROID) bool enable_crash_reporter = true; #else -@@ -3753,7 +3755,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst +@@ -3649,7 +3651,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst } } @@ -89,7 +90,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -3788,7 +3790,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFi +@@ -3684,7 +3686,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFi mappings->Share(kCrashDumpSignal, crash_signal_fd); } } @@ -98,21 +99,22 @@ #if defined(OS_WIN) std::wstring ChromeContentBrowserClient::GetAppContainerSidForSandboxType( -@@ -4146,11 +4148,11 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -4067,12 +4069,12 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati &throttles); } --#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || \ ++#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || defined(OS_BSD) || \ + BUILDFLAG(IS_CHROMEOS_ASH) MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle:: MaybeCreateThrottleFor(handle), &throttles); --#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) -+#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || ++#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || defined(OS_BSD) || + // BUILDFLAG(IS_CHROMEOS_ASH) #if !defined(OS_ANDROID) - MaybeAddThrottle(DevToolsWindow::MaybeCreateNavigationThrottle(handle), -@@ -4172,7 +4174,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -4101,7 +4103,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 bfcfc6b9c69b..4ca2096c798c 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-07-19 18:45:08 UTC +--- chrome/browser/chrome_content_browser_client.h.orig 2021-09-24 04:25:58 UTC +++ chrome/browser/chrome_content_browser_client.h -@@ -405,12 +405,12 @@ class ChromeContentBrowserClient : public content::Con +@@ -402,12 +402,12 @@ class ChromeContentBrowserClient : public content::Con void OverridePageVisibilityState( content::RenderFrameHost* render_frame_host, content::PageVisibilityState* visibility_state) override; diff --git a/www/chromium/files/patch-chrome_browser_crash__upload__list_crash__upload__list.cc b/www/chromium/files/patch-chrome_browser_crash__upload__list_crash__upload__list.cc index a54db09784be..63fec6929287 100644 --- a/www/chromium/files/patch-chrome_browser_crash__upload__list_crash__upload__list.cc +++ b/www/chromium/files/patch-chrome_browser_crash__upload__list_crash__upload__list.cc @@ -1,6 +1,6 @@ ---- chrome/browser/crash_upload_list/crash_upload_list.cc.orig 2021-05-12 22:05:43 UTC +--- chrome/browser/crash_upload_list/crash_upload_list.cc.orig 2021-09-24 04:25:58 UTC +++ chrome/browser/crash_upload_list/crash_upload_list.cc -@@ -48,7 +48,7 @@ scoped_refptr<UploadList> CreateCrashUploadList() { +@@ -52,7 +52,7 @@ scoped_refptr<UploadList> CreateCrashUploadList() { // to log uploads in CrashUploadList::kReporterLogFilename. // Linux is handled below. #if !(BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ 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 a6fa5e8db1ce..ca0cd92dda81 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,6 +1,6 @@ ---- chrome/browser/device_identity/device_oauth2_token_service_factory.cc.orig 2021-05-12 22:05:43 UTC +--- 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 -@@ -28,7 +28,7 @@ std::unique_ptr<DeviceOAuth2TokenStore> CreatePlatform +@@ -29,7 +29,7 @@ std::unique_ptr<DeviceOAuth2TokenStore> CreatePlatform return std::make_unique<chromeos::DeviceOAuth2TokenStoreChromeOS>( local_state); #elif defined(OS_WIN) || defined(OS_MAC) || \ 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 41cb3b945507..d7dafc8bb5ce 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-04-14 18:40:53 UTC +--- chrome/browser/devtools/devtools_eye_dropper.cc.orig 2021-09-14 01:51:50 UTC +++ chrome/browser/devtools/devtools_eye_dropper.cc -@@ -187,7 +187,7 @@ void DevToolsEyeDropper::UpdateCursor() { +@@ -188,7 +188,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 300cf93bc885..b7baf030713a 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-07-19 18:45:08 UTC +--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2021-09-24 04:25:58 UTC +++ chrome/browser/download/chrome_download_manager_delegate.cc -@@ -1439,7 +1439,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1395,7 +1395,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 -@@ -1494,7 +1494,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1450,7 +1450,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(); -@@ -1598,7 +1598,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow +@@ -1554,7 +1554,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. -@@ -1640,7 +1640,7 @@ ChromeDownloadManagerDelegate::GetQuarantineConnection +@@ -1596,7 +1596,7 @@ ChromeDownloadManagerDelegate::GetQuarantineConnection std::unique_ptr<download::DownloadItemRenameHandler> ChromeDownloadManagerDelegate::GetRenameHandlerForDownload( download::DownloadItem* download_item) { 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 e4b987862928..8134355b8df0 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-04-14 18:40:53 UTC +--- chrome/browser/download/download_commands.cc.orig 2021-09-24 04:25:58 UTC +++ chrome/browser/download/download_commands.cc @@ -27,7 +27,7 @@ #include "net/base/url_util.h" @@ -6,30 +6,24 @@ -#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) + defined(OS_MAC) || defined(OS_FUCHSIA) #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" -@@ -155,7 +155,7 @@ void DownloadCommands::ExecuteCommand(Command command) +@@ -165,7 +165,7 @@ void DownloadCommands::ExecuteCommand(Command command) model_->ExecuteCommand(this, command); } -#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_CHROMEOS) || defined(OS_FUCHSIA) Browser* DownloadCommands::GetBrowser() const { -@@ -179,12 +179,12 @@ bool DownloadCommands::CanOpenPdfInSystemViewer() cons - return IsDownloadPdf() && - (IsAdobeReaderDefaultPDFViewer() ? is_adobe_pdf_reader_up_to_date - : true); --#elif defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#elif defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - return IsDownloadPdf(); +@@ -200,7 +200,7 @@ bool DownloadCommands::CanOpenPdfInSystemViewer() cons #endif } -#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_CHROMEOS) || defined(OS_FUCHSIA) void DownloadCommands::CopyFileAsImageToClipboard() { 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 8bfaedfefb0d..564dd56e41a8 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__commands.h +++ b/www/chromium/files/patch-chrome_browser_download_download__commands.h @@ -1,11 +1,11 @@ ---- chrome/browser/download/download_commands.h.orig 2021-07-19 18:45:08 UTC +--- chrome/browser/download/download_commands.h.orig 2021-09-24 04:25:58 UTC +++ chrome/browser/download/download_commands.h -@@ -47,7 +47,7 @@ class DownloadCommands { +@@ -48,7 +48,7 @@ class DownloadCommands { bool IsCommandVisible(Command command) const; void ExecuteCommand(Command command); -#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) + defined(OS_MAC) || defined(OS_FUCHSIA) bool IsDownloadPdf() const; bool CanOpenPdfInSystemViewer() const; diff --git a/www/chromium/files/patch-chrome_browser_download_download__item__model.cc b/www/chromium/files/patch-chrome_browser_download_download__item__model.cc index 85bffdf06da9..dbee5ca7b579 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-07-19 18:45:08 UTC +--- chrome/browser/download/download_item_model.cc.orig 2021-09-24 04:25:58 UTC +++ chrome/browser/download/download_item_model.cc -@@ -579,7 +579,7 @@ bool DownloadItemModel::IsCommandChecked( +@@ -625,7 +625,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()); -@@ -620,7 +620,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand +@@ -666,7 +666,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 d6f5abf57b31..f5bf90bb75ac 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__prefs.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__prefs.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_prefs.cc.orig 2021-07-19 18:45:08 UTC +--- chrome/browser/download/download_prefs.cc.orig 2021-09-14 01:51:50 UTC +++ chrome/browser/download/download_prefs.cc -@@ -68,7 +68,7 @@ namespace { +@@ -70,7 +70,7 @@ namespace { // Consider downloads 'dangerous' if they go to the home directory on Linux and // to the desktop on any platform. bool DownloadPathIsDangerous(const base::FilePath& download_path) { @@ -9,7 +9,7 @@ base::FilePath home_dir = base::GetHomeDir(); if (download_path == home_dir) { return true; -@@ -173,7 +173,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi +@@ -175,7 +175,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); -@@ -301,7 +301,7 @@ void DownloadPrefs::RegisterProfilePrefs( +@@ -294,7 +294,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 -@@ -438,7 +438,7 @@ bool DownloadPrefs::IsDownloadPathManaged() const { +@@ -428,7 +428,7 @@ bool DownloadPrefs::IsDownloadPathManaged() const { } bool DownloadPrefs::IsAutoOpenByUserUsed() const { @@ -36,7 +36,7 @@ defined(OS_MAC) if (ShouldOpenPdfInSystemReader()) return true; -@@ -453,7 +453,7 @@ bool DownloadPrefs::IsAutoOpenEnabled(const GURL& url, +@@ -443,7 +443,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")) && -@@ -504,7 +504,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens +@@ -498,7 +498,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) -@@ -526,7 +526,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons +@@ -520,7 +520,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons #endif void DownloadPrefs::ResetAutoOpenByUser() { diff --git a/www/chromium/files/patch-chrome_browser_download_download__shelf__context__menu.cc b/www/chromium/files/patch-chrome_browser_download_download__shelf__context__menu.cc deleted file mode 100644 index 7460978af18f..000000000000 --- a/www/chromium/files/patch-chrome_browser_download_download__shelf__context__menu.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/download/download_shelf_context_menu.cc.orig 2021-05-12 22:05:43 UTC -+++ chrome/browser/download/download_shelf_context_menu.cc -@@ -148,7 +148,7 @@ std::u16string DownloadShelfContextMenu::GetLabelForCo - : IDS_DOWNLOAD_MENU_PLATFORM_OPEN_ALWAYS; - break; - } --#elif defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#elif defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - if (can_open_pdf_in_system_viewer) { - id = IDS_DOWNLOAD_MENU_PLATFORM_OPEN_ALWAYS; - break; diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_attestation__service.cc b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_attestation__service.cc deleted file mode 100644 index 94294223caaf..000000000000 --- a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_attestation__service.cc +++ /dev/null @@ -1,70 +0,0 @@ ---- chrome/browser/enterprise/connectors/device_trust/attestation_service.cc.orig 2021-07-28 07:35:48 UTC -+++ chrome/browser/enterprise/connectors/device_trust/attestation_service.cc -@@ -18,10 +18,10 @@ - namespace enterprise_connectors { - - AttestationService::AttestationService() { --#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) -+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) - key_pair_ = std::make_unique<enterprise_connectors::DeviceTrustKeyPair>(); - key_pair_->Init(); --#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) -+#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) - } - - AttestationService::~AttestationService() = default; -@@ -71,11 +71,11 @@ std::string AttestationService::ProtobufChallengeToJso - base::Base64Encode(challenge_response, &encoded); - signed_data.SetKey("data", base::Value(encoded)); - --#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) -+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) - std::string signature; - key_pair_->GetSignatureInBase64(challenge_response, &signature); - signed_data.SetKey("signature", base::Value(signature)); --#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) -+#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) - - base::Value dict(base::Value::Type::DICTIONARY); - dict.SetKey("challengeResponse", std::move(signed_data)); -@@ -85,11 +85,11 @@ std::string AttestationService::ProtobufChallengeToJso - return json; - } - --#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) -+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) - std::string AttestationService::ExportPEMPublicKey() { - return key_pair_->ExportPEMPublicKey(); - } --#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) -+#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) - - void AttestationService::SignEnterpriseChallenge( - const SignEnterpriseChallengeRequest& request, -@@ -110,9 +110,9 @@ void AttestationService::SignEnterpriseChallengeTask( - - KeyInfo key_info; - // Set the public key so VA can verify the client. --#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) -+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) - key_info.set_signed_public_key_and_challenge(ExportPEMPublicKey()); --#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) -+#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) - - ChallengeResponse response_pb; - *response_pb.mutable_challenge() = signed_challenge; -@@ -135,12 +135,12 @@ void AttestationService::SignEnterpriseChallengeTask( - bool AttestationService::SignChallengeData(const std::string& data, - std::string* response) { - std::string signature; --#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) -+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) - if (!key_pair_->GetSignatureInBase64(data, &signature)) { - LOG(ERROR) << __func__ << ": Failed to sign data."; - return false; - } --#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) -+#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) - SignedData signed_data; - signed_data.set_data(data); - signed_data.set_signature(signature); diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_attestation__service.h b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_attestation__service.h deleted file mode 100644 index 9eb8b1b6a487..000000000000 --- a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_attestation__service.h +++ /dev/null @@ -1,14 +0,0 @@ ---- chrome/browser/enterprise/connectors/device_trust/attestation_service.h.orig 2021-07-28 07:36:46 UTC -+++ chrome/browser/enterprise/connectors/device_trust/attestation_service.h -@@ -94,9 +94,9 @@ class AttestationService { - AttestationCallback callback, - const std::string& challenge_response_proto); - --#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) -+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) - std::unique_ptr<enterprise_connectors::DeviceTrustKeyPair> key_pair_; --#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) -+#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) - - GoogleKeys google_keys_; - base::WeakPtrFactory<AttestationService> weak_factory_{this}; diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service.cc b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service.cc deleted file mode 100644 index 2207540b6ba1..000000000000 --- a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service.cc +++ /dev/null @@ -1,31 +0,0 @@ ---- chrome/browser/enterprise/connectors/device_trust/device_trust_service.cc.orig 2021-07-19 18:45:08 UTC -+++ chrome/browser/enterprise/connectors/device_trust/device_trust_service.cc -@@ -82,12 +82,12 @@ void DeviceTrustService::OnReporterInitialized(bool su - - DeviceTrustReportEvent report; - --#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) -+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) - auto* credential = report.mutable_attestation_credential(); - credential->set_format( - DeviceTrustReportEvent::Credential::EC_NID_X9_62_PRIME256V1_PUBLIC_DER); - credential->set_credential(attestation_service_->ExportPEMPublicKey()); --#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) -+#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) - - reporter_->SendReport(&report, std::move(signal_report_callback_)); - } -@@ -117,11 +117,11 @@ void DeviceTrustService::SetSignalReportCallbackForTes - base::Unretained(this), std::move(cb)); - } - --#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) -+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) - std::string DeviceTrustService::GetAttestationCredentialForTesting() const { - return attestation_service_->ExportPEMPublicKey(); - } --#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) -+#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) - - void DeviceTrustService::BuildChallengeResponse(const std::string& challenge, - AttestationCallback callback) { diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service.h b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service.h deleted file mode 100644 index 98c8cc888e3a..000000000000 --- a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service.h +++ /dev/null @@ -1,14 +0,0 @@ ---- chrome/browser/enterprise/connectors/device_trust/device_trust_service.h.orig 2021-07-19 18:45:08 UTC -+++ chrome/browser/enterprise/connectors/device_trust/device_trust_service.h -@@ -41,9 +41,9 @@ class DeviceTrustService : public KeyedService { - std::unique_ptr<DeviceTrustSignalReporter> reporter); - using SignalReportCallback = base::OnceCallback<void(bool)>; - void SetSignalReportCallbackForTesting(SignalReportCallback cb); --#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) -+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) - std::string GetAttestationCredentialForTesting() const; --#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) -+#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) - - // Starts flow that actually builds a response. This method is called - // from a non_UI thread. 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 new file mode 100644 index 000000000000..e7574450bceb --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc @@ -0,0 +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 +@@ -13,9 +13,9 @@ + #include "components/keyed_service/content/browser_context_dependency_manager.h" + #include "components/keyed_service/core/keyed_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_extensions_BUILD.gn b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn index 3af65d639695..459e555bb959 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn +++ b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn @@ -1,7 +1,7 @@ ---- chrome/browser/extensions/BUILD.gn.orig 2021-07-19 18:45:08 UTC +--- chrome/browser/extensions/BUILD.gn.orig 2021-09-24 04:25:58 UTC +++ chrome/browser/extensions/BUILD.gn -@@ -1259,6 +1259,12 @@ static_library("extensions") { - ] +@@ -1275,6 +1275,12 @@ static_library("extensions") { + deps += [ "//chrome/services/printing/public/mojom" ] } + if (is_bsd) { 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 new file mode 100644 index 000000000000..4c28d0ef9da6 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc @@ -0,0 +1,20 @@ +--- 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 +@@ -154,7 +154,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction:: + + // getPersistentSecret + +-#if !defined(OS_LINUX) ++#if !defined(OS_LINUX) && !defined(OS_BSD) + + EnterpriseReportingPrivateGetPersistentSecretFunction:: + EnterpriseReportingPrivateGetPersistentSecretFunction() = default; +@@ -206,7 +206,7 @@ void EnterpriseReportingPrivateGetPersistentSecretFunc + } + } + +-#endif // !defined(OS_LINUX) ++#endif // !defined(OS_LINUX) && !defined(OS_BSD) + + // getDeviceData + 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 new file mode 100644 index 000000000000..e087aff0c7b2 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.h @@ -0,0 +1,20 @@ +--- 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 +@@ -41,7 +41,7 @@ class EnterpriseReportingPrivateGetDeviceIdFunction : + DISALLOW_COPY_AND_ASSIGN(EnterpriseReportingPrivateGetDeviceIdFunction); + }; + +-#if !defined(OS_LINUX) ++#if !defined(OS_LINUX) && !defined(OS_BSD) + + class EnterpriseReportingPrivateGetPersistentSecretFunction + : public ExtensionFunction { +@@ -69,7 +69,7 @@ class EnterpriseReportingPrivateGetPersistentSecretFun + void SendResponse(const std::string& data, long int status); + }; + +-#endif // !defined(OS_LINUX) ++#endif // !defined(OS_LINUX) && !defined(OS_BSD) + + class EnterpriseReportingPrivateGetDeviceDataFunction + : public ExtensionFunction { 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 353cec01ec98..16db51be7492 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-08-17 00:15:57 UTC +--- 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 @@ -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 9f6eb2ee06cd..183a9b196f60 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-07-19 18:45:08 UTC +--- 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 -@@ -285,7 +285,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionInteractiveTest, T +@@ -286,7 +286,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_runtime_chrome__runtime__api__delegate.cc b/www/chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc index 17797250a1e9..34647711948b 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig 2021-04-14 18:40:53 UTC +--- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig 2021-09-14 01:51:50 UTC +++ chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc -@@ -286,6 +286,8 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor +@@ -285,6 +285,8 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor info->os = extensions::api::runtime::PLATFORM_OS_CROS; } else if (strcmp(os, "linux") == 0) { info->os = extensions::api::runtime::PLATFORM_OS_LINUX; diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc b/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc index e74d885790a6..c8ea0be62458 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2021-07-19 18:45:08 UTC +--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2021-09-14 01:51:50 UTC +++ chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -181,7 +181,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -182,7 +182,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ (*s_allowlist)[::prefs::kUseCustomChromeFrame] = settings_api::PrefType::PREF_TYPE_BOOLEAN; #endif -@@ -195,7 +195,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -196,7 +196,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist settings_api::PrefType::PREF_TYPE_NUMBER; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. 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 b2daa01497ed..f5a7b5e6388a 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-05-12 22:05:44 UTC +--- 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 @@ -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( -@@ -572,7 +572,7 @@ void WebrtcLoggingPrivateStartEventLoggingFunction::Fi +@@ -579,7 +579,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 -@@ -595,9 +595,9 @@ WebrtcLoggingPrivateGetLogsDirectoryFunction::Run() { +@@ -602,9 +602,9 @@ WebrtcLoggingPrivateGetLogsDirectoryFunction::Run() { &WebrtcLoggingPrivateGetLogsDirectoryFunction::FireErrorCallback, this)); return RespondLater(); 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 10dd794f341c..d3949de1b593 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-07-19 18:45:08 UTC +--- chrome/browser/extensions/external_provider_impl.cc.orig 2021-09-24 04:25:58 UTC +++ chrome/browser/extensions/external_provider_impl.cc -@@ -797,7 +797,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -796,7 +796,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>( -@@ -825,7 +825,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -824,7 +824,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 6dd62acdaec6..7ce17b797387 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,6 +1,6 @@ ---- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2021-07-19 18:45:08 UTC +--- 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 -@@ -222,7 +222,7 @@ const struct { +@@ -213,7 +213,7 @@ const struct { {base::DIR_HOME, FILE_PATH_LITERAL("Library/Mobile Documents"), kDontBlockChildren}, #endif 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 37e18602f6c5..d21752e932dc 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-07-19 18:45:08 UTC +--- 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 -@@ -46,7 +46,7 @@ enum class ForcedShowDialogState { +@@ -37,7 +37,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 -@@ -96,7 +96,7 @@ void ForceFirstRunDialogShownForTesting(bool shown) { +@@ -82,7 +82,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 1f192e114dff..bb3950a4f798 100644 --- a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc @@ -1,28 +1,28 @@ ---- chrome/browser/flag_descriptions.cc.orig 2021-07-19 18:45:08 UTC +--- chrome/browser/flag_descriptions.cc.orig 2021-09-24 04:25:58 UTC +++ chrome/browser/flag_descriptions.cc -@@ -5015,7 +5015,7 @@ const char kInstallableInkDropDescription[] = +@@ -5110,7 +5110,7 @@ const char kDownloadShelfWebUIDescription[] = // Random platform combinations ----------------------------------------------- -#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_CHROMEOS) || defined(OS_FUCHSIA) const char kEnableOopPrintDriversName[] = -@@ -5039,10 +5039,10 @@ const char kSettingsLandingPageRedesignDescription[] = +@@ -5134,10 +5134,10 @@ const char kSettingsLandingPageRedesignDescription[] = "Changes the layout of the chrome://settings page to only show one section " "at a time."; -#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_CHROMEOS) || defined(OS_FUCHSIA) -#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) const char kCommanderName[] = "Commander"; const char kCommanderDescription[] = -@@ -5058,7 +5058,7 @@ const char kDesktopDetailedLanguageSettingsName[] = +@@ -5153,7 +5153,7 @@ const char kDesktopDetailedLanguageSettingsName[] = const char kDesktopDetailedLanguageSettingsDescription[] = "Enable the new detailed language settings page"; @@ -31,20 +31,9 @@ #if defined(OS_CHROMEOS) || defined(OS_LINUX) #if BUILDFLAG(USE_TCMALLOC) -@@ -5085,20 +5085,20 @@ const char kWebShareDescription[] = - - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ -+#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) || \ - defined(OS_MAC) - const char kEnableEphemeralGuestProfilesOnDesktopName[] = - "Enable ephemeral Guest profiles on Desktop"; - const char kEnableEphemeralGuestProfilesOnDesktopDescription[] = - "Enables ephemeral Guest profiles on Windows, Linux, and Mac."; --#endif // defined(OS_WIN) || (defined(OS_LINUX) || -+#endif // defined(OS_WIN) || (defined(OS_LINUX) || defined(OS_BSD) || - // BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_MAC) +@@ -5178,11 +5178,11 @@ const char kWebShareDescription[] = + "platforms."; + #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) @@ -56,7 +45,7 @@ // Feature flags -------------------------------------------------------------- -@@ -5184,7 +5184,7 @@ const char kAutofillCreditCardUploadDescription[] = +@@ -5249,7 +5249,7 @@ const char kAutofillCreditCardUploadDescription[] = #endif // defined(TOOLKIT_VIEWS) || defined(OS_ANDROID) @@ -65,9 +54,9 @@ const char kSendWebUIJavaScriptErrorReportsName[] = "Send WebUI JavaScript Error Reports"; const char kSendWebUIJavaScriptErrorReportsDescription[] = -@@ -5193,7 +5193,7 @@ const char kSendWebUIJavaScriptErrorReportsDescription - "will be sent to Google."; - #endif +@@ -5264,7 +5264,7 @@ const char kElasticOverscrollDescription[] = + "Enables Elastic Overscrolling on touchscreens and precision touchpads."; + #endif // defined(OS_WIN) || defined(OS_ANDROID) -#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) || \ diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.h b/www/chromium/files/patch-chrome_browser_flag__descriptions.h index 728321dc3006..7870c80884ec 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-07-19 18:45:08 UTC +--- chrome/browser/flag_descriptions.h.orig 2021-09-24 04:25:58 UTC +++ chrome/browser/flag_descriptions.h @@ -22,9 +22,9 @@ #include "printing/buildflags/buildflags.h" @@ -12,29 +12,29 @@ // This file declares strings used in chrome://flags. These messages are not // translated, because instead of end-users they target Chromium developers and -@@ -2928,7 +2928,7 @@ extern const char kInstallableInkDropDescription[]; +@@ -2954,7 +2954,7 @@ extern const char kDownloadShelfWebUIDescription[]; // Random platform combinations ----------------------------------------------- -#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_CHROMEOS) || defined(OS_FUCHSIA) extern const char kEnableOopPrintDriversName[]; -@@ -2943,10 +2943,10 @@ extern const char kWebuiFeedbackDescription[]; +@@ -2969,10 +2969,10 @@ extern const char kWebuiFeedbackDescription[]; extern const char kSettingsLandingPageRedesignName[]; extern const char kSettingsLandingPageRedesignDescription[]; -#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_CHROMEOS) || defined(OS_FUCHSIA) -#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) extern const char kCommanderName[]; extern const char kCommanderDescription[]; -@@ -2957,7 +2957,7 @@ extern const char kDesktopRestructuredLanguageSettings +@@ -2983,7 +2983,7 @@ extern const char kDesktopRestructuredLanguageSettings extern const char kDesktopDetailedLanguageSettingsName[]; extern const char kDesktopDetailedLanguageSettingsDescription[]; @@ -43,18 +43,9 @@ #if defined(OS_CHROMEOS) || defined(OS_LINUX) #if BUILDFLAG(USE_TCMALLOC) -@@ -2978,17 +2978,17 @@ extern const char kWebShareDescription[]; - - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ -+#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) || \ - defined(OS_MAC) - extern const char kEnableEphemeralGuestProfilesOnDesktopName[]; - extern const char kEnableEphemeralGuestProfilesOnDesktopDescription[]; --#endif // defined(OS_WIN) || (defined(OS_LINUX) || -+#endif // defined(OS_WIN) || (defined(OS_LINUX) || defined(OS_BSD) || - // BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_MAC) +@@ -3002,10 +3002,10 @@ 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) @@ -65,15 +56,9 @@ // Feature flags -------------------------------------------------------------- -@@ -3046,12 +3046,12 @@ extern const char kAutofillCreditCardUploadDescription - - #endif // defined(TOOLKIT_VIEWS) || defined(OS_ANDROID) - --#if !defined(OS_WIN) && !defined(OS_FUCHSIA) -+#if !defined(OS_WIN) && !defined(OS_FUCHSIA) && !defined(OS_BSD) - extern const char kSendWebUIJavaScriptErrorReportsName[]; - extern const char kSendWebUIJavaScriptErrorReportsDescription[]; - #endif +@@ -3061,7 +3061,7 @@ extern const char kElasticOverscrollName[]; + extern const char kElasticOverscrollDescription[]; + #endif // defined(OS_WIN) || defined(OS_ANDROID) -#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) || \ 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 new file mode 100644 index 000000000000..170ea4aa48d5 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_headless_headless__mode__util.cc @@ -0,0 +1,26 @@ +--- chrome/browser/headless/headless_mode_util.cc.orig 2021-09-24 18:22:53 UTC ++++ chrome/browser/headless/headless_mode_util.cc +@@ -9,7 +9,7 @@ + // Native headless is currently available only on Linux platform. More + // platforms will be added soon, so avoid function level clutter by providing + // stub implementations at the end of the file. +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + + #include <cstdlib> + #include <vector> +@@ -100,7 +100,7 @@ void SetHeadlessDisplayBounds() { + + } // namespace headless + +-#else // defined(OS_LINUX) ++#else // defined(OS_LINUX) || defined(OS_BSD) + + namespace headless { + +@@ -114,4 +114,4 @@ void SetHeadlessDisplayBounds() {} + + } // namespace headless + +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) diff --git a/www/chromium/files/patch-chrome_browser_intranet__redirect__detector.h b/www/chromium/files/patch-chrome_browser_intranet__redirect__detector.h index ce008bcd179e..3ad163336f6c 100644 --- a/www/chromium/files/patch-chrome_browser_intranet__redirect__detector.h +++ b/www/chromium/files/patch-chrome_browser_intranet__redirect__detector.h @@ -1,11 +1,11 @@ ---- chrome/browser/intranet_redirect_detector.h.orig 2021-04-14 18:40:53 UTC +--- chrome/browser/intranet_redirect_detector.h.orig 2021-09-24 04:25:58 UTC +++ chrome/browser/intranet_redirect_detector.h @@ -27,7 +27,7 @@ class SimpleURLLoader; class PrefRegistrySimple; -#if !(defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || \ -+#if !(defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) ||\ - defined(OS_CHROMEOS)) ++#if !(defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) || defined(OS_FUCHSIA)) #error "IntranetRedirectDetector should only be built on Desktop platforms." #endif diff --git a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc index 1dede6d286ce..8c2236c5f76c 100644 --- a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc +++ b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc @@ -1,6 +1,6 @@ ---- chrome/browser/media/webrtc/webrtc_event_log_uploader.cc.orig 2021-04-14 18:40:53 UTC +--- chrome/browser/media/webrtc/webrtc_event_log_uploader.cc.orig 2021-09-24 04:25:58 UTC +++ chrome/browser/media/webrtc/webrtc_event_log_uploader.cc -@@ -41,6 +41,8 @@ const char kProduct[] = "Chrome_Mac"; +@@ -42,6 +42,8 @@ const char kProduct[] = "Chrome_Mac"; const char kProduct[] = "Chrome_ChromeOS"; #elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) const char kProduct[] = "Chrome_Linux"; @@ -8,4 +8,4 @@ +const char kProduct[] = "Chrome_FreeBSD"; #elif defined(OS_ANDROID) const char kProduct[] = "Chrome_Android"; - #else + #elif defined(OS_FUCHSIA) diff --git a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc index 87d35945d84a..598de0b22423 100644 --- a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc +++ b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc @@ -1,9 +1,9 @@ ---- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2021-04-14 18:40:53 UTC +--- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2021-09-24 04:25:58 UTC +++ chrome/browser/media/webrtc/webrtc_log_uploader.cc -@@ -360,6 +360,8 @@ void WebRtcLogUploader::SetupMultipart( - const char product[] = "Chrome_Android"; - #elif BUILDFLAG(IS_CHROMEOS_ASH) +@@ -363,6 +363,8 @@ void WebRtcLogUploader::SetupMultipart( const char product[] = "Chrome_ChromeOS"; + #elif defined(OS_FUCHSIA) + const char product[] = "Chrome_Fuchsia"; +#elif defined(OS_FREEBSD) + const char product[] = "Chrome_FreeBSD"; #else 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 ef628a8fe399..eff2a50b8eea 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,4 +1,4 @@ ---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2021-07-19 18:45:08 UTC +--- 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 @@ -62,7 +62,9 @@ // of lacros-chrome is complete. @@ -19,3 +19,17 @@ #if defined(USE_OZONE) || defined(USE_X11) #include "ui/events/devices/device_data_manager.h" +@@ -224,11 +226,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."; + bluetooth_utility::ReportBluetoothAvailability(); + LOG(ERROR) << "crbug.com/1216328: Checking Bluetooth availability ended."; ++#endif + + // Record whether Chrome is the default browser or not. + LOG(ERROR) << "crbug.com/1216328: Checking default browser status started. " 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 3202428e6739..311f1bc92fa9 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-07-19 18:45:08 UTC +--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2021-09-24 04:25:58 UTC +++ chrome/browser/metrics/chrome_metrics_service_client.cc -@@ -722,10 +722,10 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -721,10 +721,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,20 @@ // BUILDFLAG(IS_CHROMEOS_LACROS)) #if BUILDFLAG(ENABLE_PLUGINS) -@@ -1013,7 +1013,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve +@@ -819,10 +819,10 @@ void ChromeMetricsServiceClient::RegisterMetricsServic + std::make_unique<PowerMetricsProvider>()); + #endif + +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) + metrics_service_->RegisterMetricsProvider( + metrics::CreateDesktopSessionMetricsProvider()); +-#endif // defined(OS_WIN) || defined(OS_MAC) || (defined(OS_LINUX) ++#endif // defined(OS_WIN) || defined(OS_MAC) || (defined(OS_LINUX) || defined(OS_BSD) + } + + void ChromeMetricsServiceClient::RegisterUKMProviders() { +@@ -996,7 +996,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 ce24977fae8c..b60c3bc0578c 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-07-19 18:45:08 UTC +--- chrome/browser/metrics/process_memory_metrics_emitter.cc.orig 2021-09-24 04:25:58 UTC +++ chrome/browser/metrics/process_memory_metrics_emitter.cc -@@ -516,7 +516,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc +@@ -546,7 +546,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 -@@ -539,7 +539,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc +@@ -569,7 +569,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 648e3bfb22ff..45a3617f8533 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,4 +1,4 @@ ---- chrome/browser/net/system_network_context_manager.cc.orig 2021-05-12 22:05:44 UTC +--- chrome/browser/net/system_network_context_manager.cc.orig 2021-09-24 04:25:58 UTC +++ chrome/browser/net/system_network_context_manager.cc @@ -82,11 +82,11 @@ @@ -27,7 +27,7 @@ #if defined(OS_POSIX) auth_dynamic_params->ntlm_v2_enabled = -@@ -364,10 +364,10 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -376,10 +376,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); -@@ -422,10 +422,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -434,10 +434,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( -@@ -521,7 +521,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea +@@ -566,7 +566,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_new__tab__page_modules_drive_drive__service.cc b/www/chromium/files/patch-chrome_browser_new__tab__page_modules_drive_drive__service.cc new file mode 100644 index 000000000000..3690b39521f7 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_new__tab__page_modules_drive_drive__service.cc @@ -0,0 +1,11 @@ +--- chrome/browser/new_tab_page/modules/drive/drive_service.cc.orig 2021-09-24 18:25:14 UTC ++++ chrome/browser/new_tab_page/modules/drive/drive_service.cc +@@ -36,6 +36,8 @@ constexpr char kPlatform[] = "WINDOWS"; + constexpr char kPlatform[] = "MAC_OS"; + #elif OS_CHROMEOS + constexpr char kPlatform[] = "CHROME_OS"; ++#elif OS_FREEBSD ++constexpr char kPlatform[] = "FREEBSD"; + #else + constexpr char kPlatform[] = "UNSPECIFIED_PLATFORM"; + #endif diff --git a/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc b/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc index 1c0775de4e01..3536b8419316 100644 --- a/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc +++ b/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc @@ -1,4 +1,4 @@ ---- chrome/browser/notifications/notification_display_service_impl.cc.orig 2021-05-12 22:05:44 UTC +--- chrome/browser/notifications/notification_display_service_impl.cc.orig 2021-09-24 04:25:58 UTC +++ chrome/browser/notifications/notification_display_service_impl.cc @@ -29,7 +29,7 @@ #include "chrome/browser/extensions/api/notifications/extension_notification_handler.h" @@ -6,19 +6,19 @@ -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) || \ - defined(OS_WIN) + defined(OS_WIN) || defined(OS_FUCHSIA) #include "chrome/browser/send_tab_to_self/desktop_notification_handler.h" #include "chrome/browser/sharing/sharing_notification_handler.h" -@@ -65,7 +65,7 @@ void NotificationDisplayServiceImpl::RegisterProfilePr +@@ -63,7 +63,7 @@ NotificationDisplayServiceImpl* NotificationDisplaySer + // static + void NotificationDisplayServiceImpl::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) registry->RegisterBooleanPref(prefs::kAllowNativeNotifications, true); registry->RegisterBooleanPref(prefs::kAllowSystemNotifications, true); #endif -@@ -81,7 +81,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer +@@ -79,7 +79,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer AddNotificationHandler(NotificationHandler::Type::WEB_PERSISTENT, std::make_unique<PersistentNotificationHandler>()); diff --git a/www/chromium/files/patch-chrome_browser_notifications_notification__platform__bridge__delegator.cc b/www/chromium/files/patch-chrome_browser_notifications_notification__platform__bridge__delegator.cc index 10d386cd81da..e1c0996b03a2 100644 --- a/www/chromium/files/patch-chrome_browser_notifications_notification__platform__bridge__delegator.cc +++ b/www/chromium/files/patch-chrome_browser_notifications_notification__platform__bridge__delegator.cc @@ -1,11 +1,11 @@ ---- chrome/browser/notifications/notification_platform_bridge_delegator.cc.orig 2021-04-14 18:40:53 UTC +--- chrome/browser/notifications/notification_platform_bridge_delegator.cc.orig 2021-09-14 01:51:50 UTC +++ chrome/browser/notifications/notification_platform_bridge_delegator.cc @@ -57,7 +57,7 @@ bool SystemNotificationsEnabled(Profile* profile) { #elif defined(OS_WIN) return NotificationPlatformBridgeWin::SystemNotificationEnabled(); #else --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) if (profile) { // Prefs take precedence over flags. PrefService* prefs = profile->GetPrefs(); 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 9926d71400ac..27109ef36102 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-05-12 22:05:44 UTC +--- 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 @@ -9,6 +9,10 @@ #include <string> @@ -11,7 +11,7 @@ #include "base/bind.h" #include "base/callback_helpers.h" #include "base/command_line.h" -@@ -102,8 +106,11 @@ +@@ -105,8 +109,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 new file mode 100644 index 000000000000..73a91fc0622a --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc @@ -0,0 +1,11 @@ +--- 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 +@@ -92,7 +92,7 @@ KeyedService* PasswordReuseManagerFactory::BuildServic + + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ + BUILDFLAG(IS_CHROMEOS_LACROS) + std::unique_ptr<password_manager::PasswordStoreSigninNotifier> notifier = + std::make_unique<password_manager::PasswordStoreSigninNotifierImpl>( diff --git a/www/chromium/files/patch-chrome_browser_password__manager_password__store__factory.cc b/www/chromium/files/patch-chrome_browser_password__manager_password__store__factory.cc deleted file mode 100644 index 942b05e1771b..000000000000 --- a/www/chromium/files/patch-chrome_browser_password__manager_password__store__factory.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/password_manager/password_store_factory.cc.orig 2021-07-19 18:45:09 UTC -+++ chrome/browser/password_manager/password_store_factory.cc -@@ -166,7 +166,7 @@ PasswordStoreFactory::BuildServiceInstanceFor( - // 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) - std::unique_ptr<password_manager::PasswordStoreSigninNotifier> notifier = - std::make_unique<password_manager::PasswordStoreSigninNotifierImpl>( - IdentityManagerFactory::GetForProfile(profile)); diff --git a/www/chromium/files/patch-chrome_browser_pdf_pdf__extension__test.cc b/www/chromium/files/patch-chrome_browser_pdf_pdf__extension__test.cc index 4c9a3801df75..5d6e0198e124 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,20 +1,20 @@ ---- chrome/browser/pdf/pdf_extension_test.cc.orig 2021-07-19 18:45:09 UTC +--- chrome/browser/pdf/pdf_extension_test.cc.orig 2021-09-24 04:25:58 UTC +++ chrome/browser/pdf/pdf_extension_test.cc -@@ -791,11 +791,11 @@ IN_PROC_BROWSER_TEST_F(PDFPluginDisabledTest, DirectNa +@@ -812,11 +812,11 @@ IN_PROC_BROWSER_TEST_P(PDFPluginDisabledTest, DirectNa } // TODO(crbug.com/1201401): fix flakiness and reenable --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) #define MAYBE_EmbedPdfPlaceholderWithCSP DISABLED_EmbedPdfPlaceholderWithCSP #else #define MAYBE_EmbedPdfPlaceholderWithCSP EmbedPdfPlaceholderWithCSP --#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) -+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - IN_PROC_BROWSER_TEST_F(PDFPluginDisabledTest, +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) + IN_PROC_BROWSER_TEST_P(PDFPluginDisabledTest, MAYBE_EmbedPdfPlaceholderWithCSP) { // Navigate to a page with CSP that uses <embed> to embed a PDF as a plugin. -@@ -2332,7 +2332,7 @@ IN_PROC_BROWSER_TEST_F(PDFExtensionClipboardTest, +@@ -2404,7 +2404,7 @@ IN_PROC_BROWSER_TEST_F(PDFExtensionClipboardTest, } // Flaky on Linux (https://crbug.com/1121446) diff --git a/www/chromium/files/patch-chrome_browser_performance__manager_policies_high__pmf__discard__policy.cc b/www/chromium/files/patch-chrome_browser_performance__manager_policies_high__pmf__discard__policy.cc new file mode 100644 index 000000000000..a809c0a6f185 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_performance__manager_policies_high__pmf__discard__policy.cc @@ -0,0 +1,20 @@ +--- chrome/browser/performance_manager/policies/high_pmf_discard_policy.cc.orig 2021-09-24 18:27:13 UTC ++++ chrome/browser/performance_manager/policies/high_pmf_discard_policy.cc +@@ -17,7 +17,7 @@ + #include "content/public/browser/browser_task_traits.h" + #include "content/public/browser/browser_thread.h" + +-#if !defined(OS_LINUX) ++#if !defined(OS_LINUX) && !defined(OS_BSD) + #include "base/memory/memory_pressure_monitor.h" + #endif + +@@ -122,7 +122,7 @@ void HighPMFDiscardPolicy::OnProcessMemoryMetricsAvail + + if (should_discard) { + discard_attempt_in_progress_ = true; +-#if !defined(OS_LINUX) ++#if !defined(OS_LINUX) && !defined(OS_BSD) + // Record the memory pressure level before discarding a tab. + content::GetUIThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce([]() { diff --git a/www/chromium/files/patch-chrome_browser_performance__monitor_process__monitor.cc b/www/chromium/files/patch-chrome_browser_performance__monitor_process__monitor.cc index 81a25f3b443b..0f4aabc3e5a5 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-05-12 22:05:44 UTC +--- chrome/browser/performance_monitor/process_monitor.cc.orig 2021-09-14 01:51:50 UTC +++ chrome/browser/performance_monitor/process_monitor.cc -@@ -80,7 +80,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me +@@ -76,7 +76,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 c95b87393778..c56c4121294c 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-05-12 22:05:44 UTC +--- chrome/browser/performance_monitor/process_monitor.h.orig 2021-09-24 04:25:58 UTC +++ chrome/browser/performance_monitor/process_monitor.h -@@ -44,7 +44,7 @@ class ProcessMonitor { +@@ -57,7 +57,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_platform__util__linux.cc b/www/chromium/files/patch-chrome_browser_platform__util__linux.cc index fa4fa58a7fe8..0ca2e07e3e4b 100644 --- a/www/chromium/files/patch-chrome_browser_platform__util__linux.cc +++ b/www/chromium/files/patch-chrome_browser_platform__util__linux.cc @@ -1,6 +1,6 @@ ---- chrome/browser/platform_util_linux.cc.orig 2021-06-11 09:25:25 UTC +--- chrome/browser/platform_util_linux.cc.orig 2021-09-14 01:51:50 UTC +++ chrome/browser/platform_util_linux.cc -@@ -126,7 +126,9 @@ void RunCommand(const std::string& command, +@@ -297,7 +297,9 @@ void RunCommand(const std::string& command, base::LaunchOptions options; options.current_directory = working_directory; diff --git a/www/chromium/files/patch-chrome_browser_policy_browser__signin__policy__handler.cc b/www/chromium/files/patch-chrome_browser_policy_browser__signin__policy__handler.cc index 2c2f9eb096cc..259f40114c52 100644 --- a/www/chromium/files/patch-chrome_browser_policy_browser__signin__policy__handler.cc +++ b/www/chromium/files/patch-chrome_browser_policy_browser__signin__policy__handler.cc @@ -1,11 +1,11 @@ ---- chrome/browser/policy/browser_signin_policy_handler.cc.orig 2021-07-19 18:45:09 UTC +--- chrome/browser/policy/browser_signin_policy_handler.cc.orig 2021-09-14 01:51:50 UTC +++ chrome/browser/policy/browser_signin_policy_handler.cc -@@ -52,7 +52,7 @@ void BrowserSigninPolicyHandler::ApplyPolicySettings(c - } - switch (static_cast<BrowserSigninMode>(value->GetInt())) { - case BrowserSigninMode::kForced: +@@ -43,7 +43,7 @@ void BrowserSigninPolicyHandler::ApplyPolicySettings(c + const base::Value* value = policies.GetValue(policy_name()); + switch (static_cast<BrowserSigninMode>(value->GetInt())) { + case BrowserSigninMode::kForced: -#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_BSD) - prefs->SetValue(prefs::kForceBrowserSignin, base::Value(true)); + prefs->SetValue(prefs::kForceBrowserSignin, base::Value(true)); #endif - FALLTHROUGH; + FALLTHROUGH; diff --git a/www/chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc b/www/chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc index 9167be6cb070..7e41060c1186 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-05-12 22:05:44 UTC +--- 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 -@@ -43,9 +43,9 @@ +@@ -44,9 +44,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" -@@ -75,7 +75,7 @@ void ChromeBrowserCloudManagementControllerDesktop:: +@@ -80,7 +80,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 7565ed62ee3e..794797236560 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-07-19 18:45:09 UTC +--- 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 -@@ -1308,11 +1308,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1363,11 +1363,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // !defined(OS_MAC) && !defined(OS_CHROMEOS) @@ -14,55 +14,56 @@ #if !defined(OS_MAC) { key::kFullscreenAllowed, -@@ -1663,7 +1663,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -1728,7 +1728,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH SimpleSchemaValidatingPolicyHandler::MANDATORY_ALLOWED)); #endif // defined(OS_ANDROID) -#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || \ +#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || defined(OS_BSD) || \ - defined(OS_CHROMEOS) + defined(OS_CHROMEOS) || defined(OS_FUCHSIA) handlers->AddHandler( std::make_unique< -@@ -1671,7 +1671,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -1736,7 +1736,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH key::kContextAwareAccessSignalsAllowlist, enterprise_connectors::kContextAwareAccessSignalsAllowlistPref, chrome_schema)); -#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || +#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || defined(OS_BSD) || - // defined(OS_CHROMEOS) + // defined(OS_CHROMEOS) || defined(OS_FUCHSIA) #if defined(OS_CHROMEOS) -@@ -2028,13 +2028,13 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2091,14 +2091,14 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH SimpleSchemaValidatingPolicyHandler::RECOMMENDED_PROHIBITED, SimpleSchemaValidatingPolicyHandler::MANDATORY_ALLOWED)); --#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_FUCHSIA) handlers->AddHandler(std::make_unique<SimpleSchemaValidatingPolicyHandler>( key::kWebAppSettings, prefs::kWebAppSettings, chrome_schema, SCHEMA_ALLOW_UNKNOWN, SimpleSchemaValidatingPolicyHandler::RECOMMENDED_PROHIBITED, SimpleSchemaValidatingPolicyHandler::MANDATORY_ALLOWED)); --#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) -+#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) +-#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_FUCHSIA) #endif // BUILDFLAG(ENABLE_EXTENSIONS) +@@ -2119,7 +2119,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH + policy::key::kSpellcheckLanguageBlocklist)); + #endif // BUILDFLAG(ENABLE_SPELLCHECK) -@@ -2056,7 +2056,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH - - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) handlers->AddHandler(std::make_unique<SimpleDeprecatingPolicyHandler>( std::make_unique<SimplePolicyHandler>(key::kAllowNativeNotifications, prefs::kAllowNativeNotifications, -@@ -2064,7 +2064,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2127,7 +2127,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH std::make_unique<SimplePolicyHandler>(key::kAllowSystemNotifications, prefs::kAllowSystemNotifications, base::Value::Type::BOOLEAN))); --#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) return handlers; } diff --git a/www/chromium/files/patch-chrome_browser_policy_device__management__service__configuration.cc b/www/chromium/files/patch-chrome_browser_policy_device__management__service__configuration.cc index 56bd7bddd290..4134e07d655d 100644 --- a/www/chromium/files/patch-chrome_browser_policy_device__management__service__configuration.cc +++ b/www/chromium/files/patch-chrome_browser_policy_device__management__service__configuration.cc @@ -1,4 +1,4 @@ ---- chrome/browser/policy/device_management_service_configuration.cc.orig 2021-04-14 18:40:54 UTC +--- chrome/browser/policy/device_management_service_configuration.cc.orig 2021-09-14 01:51:50 UTC +++ chrome/browser/policy/device_management_service_configuration.cc @@ -20,7 +20,7 @@ #endif @@ -11,7 +11,7 @@ #endif @@ -98,7 +98,7 @@ std::string DeviceManagementServiceConfiguration::GetReportingConnectorServerUrl( - content::BrowserContext* context) { + content::BrowserContext* context) const { #if defined(OS_WIN) || defined(OS_MAC) || \ - ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(OS_ANDROID)) + ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(OS_ANDROID)) || defined(OS_BSD) 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 b26510726f6b..93f24890d4a0 100644 --- a/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc +++ b/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc @@ -1,6 +1,6 @@ ---- chrome/browser/prefs/browser_prefs.cc.orig 2021-07-19 18:45:09 UTC +--- chrome/browser/prefs/browser_prefs.cc.orig 2021-09-24 04:25:59 UTC +++ chrome/browser/prefs/browser_prefs.cc -@@ -395,14 +395,14 @@ +@@ -405,14 +405,14 @@ #endif #if defined(OS_WIN) || defined(OS_MAC) || \ @@ -17,7 +17,7 @@ #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" #endif -@@ -883,10 +883,10 @@ void RegisterLocalState(PrefRegistrySimple* registry) +@@ -1012,10 +1012,10 @@ void RegisterLocalState(PrefRegistrySimple* registry) // TODO(crbug/1169547) Remove `BUILDFLAG(IS_CHROMEOS_LACROS)` once the // migration is complete. @@ -30,7 +30,7 @@ #if defined(OS_MAC) confirm_quit::RegisterLocalState(registry); -@@ -914,7 +914,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) +@@ -1043,7 +1043,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) #endif // defined(OS_WIN) #if defined(OS_WIN) || defined(OS_MAC) || \ @@ -39,7 +39,7 @@ web_app::url_handler_prefs::RegisterLocalStatePrefs(registry); #endif -@@ -1205,7 +1205,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync +@@ -1335,7 +1335,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) || \ diff --git a/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc b/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc index e3ce555560e9..d7e49d174568 100644 --- a/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc +++ b/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc @@ -1,6 +1,6 @@ ---- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2021-04-14 18:40:54 UTC +--- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2021-09-14 01:51:50 UTC +++ chrome/browser/prefs/pref_service_incognito_allowlist.cc -@@ -138,7 +138,7 @@ const char* const kPersistentPrefNames[] = { +@@ -139,7 +139,7 @@ const char* const kPersistentPrefNames[] = { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. 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 7274f38c5818..25092969a07b 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,15 +1,6 @@ ---- chrome/browser/printing/print_job_worker.cc.orig 2021-07-19 18:45:09 UTC +--- chrome/browser/printing/print_job_worker.cc.orig 2021-09-14 01:51:50 UTC +++ chrome/browser/printing/print_job_worker.cc -@@ -47,7 +47,7 @@ - #include "printing/printing_features.h" - #endif - --#if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && defined(USE_CUPS) -+#if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) && defined(USE_CUPS) - #include "printing/mojom/print.mojom.h" - #endif - -@@ -228,7 +228,7 @@ void PrintJobWorker::UpdatePrintSettings(base::Value n +@@ -224,7 +224,7 @@ void PrintJobWorker::UpdatePrintSettings(base::Value n crash_key = std::make_unique<crash_keys::ScopedPrinterInfo>( print_backend->GetPrinterDriverInfo(printer_name)); @@ -18,7 +9,7 @@ PrinterBasicInfo basic_info; if (print_backend->GetPrinterBasicInfo(printer_name, &basic_info) == mojom::ResultCode::kSuccess) { -@@ -239,7 +239,7 @@ void PrintJobWorker::UpdatePrintSettings(base::Value n +@@ -235,7 +235,7 @@ void PrintJobWorker::UpdatePrintSettings(base::Value n new_settings.SetKey(kSettingAdvancedSettings, std::move(advanced_settings)); } 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 59e5c6ede8bf..f433ff0e7fe8 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-07-19 18:45:09 UTC +--- 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 -@@ -361,7 +361,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -358,7 +358,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_profile.cc b/www/chromium/files/patch-chrome_browser_profiles_profile.cc deleted file mode 100644 index c17915b8cc92..000000000000 --- a/www/chromium/files/patch-chrome_browser_profiles_profile.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/profiles/profile.cc.orig 2021-07-19 18:45:09 UTC -+++ chrome/browser/profiles/profile.cc -@@ -385,7 +385,7 @@ bool Profile::IsIncognitoProfile() const { - bool Profile::IsEphemeralGuestProfileEnabled() { - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ -+#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) || \ - defined(OS_MAC) - return base::FeatureList::IsEnabled( - features::kEnableEphemeralGuestProfilesOnDesktop); diff --git a/www/chromium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc b/www/chromium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc deleted file mode 100644 index 6fd0273fc570..000000000000 --- a/www/chromium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/profiles/profile_attributes_entry.cc.orig 2021-07-19 18:45:09 UTC -+++ chrome/browser/profiles/profile_attributes_entry.cc -@@ -163,7 +163,7 @@ void ProfileAttributesEntry::Initialize(ProfileInfoCac - base::FeatureList::IsEnabled(features::kForceSignInReauth))) { - is_force_signin_profile_locked_ = true; - } --#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -+#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ - defined(OS_WIN) - } else if (IsSigninRequired()) { - // Profiles that require signin in the absence of an enterprise policy are 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 fe98bcd27603..c8453b69e997 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-07-19 18:45:09 UTC +--- chrome/browser/profiles/profiles_state.cc.orig 2021-09-14 01:51:50 UTC +++ chrome/browser/profiles/profiles_state.cc -@@ -185,7 +185,7 @@ bool IsRegularOrGuestSession(Browser* browser) { +@@ -180,7 +180,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 19a8a5eed6b6..7576af363f36 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,6 +1,24 @@ ---- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig 2021-07-19 18:45:09 UTC +--- 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 -@@ -2176,7 +2176,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) +@@ -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) case IDC_CHECK_SPELLING_WHILE_TYPING: return prefs->GetBoolean(spellcheck::prefs::kSpellCheckEnable); @@ -9,3 +27,12 @@ // 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 new file mode 100644 index 000000000000..a08298e804c3 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.h @@ -0,0 +1,20 @@ +--- 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__browser__proxy.js b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.ts index c797763f4518..891fb8b8e59c 100644 --- a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.js +++ b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.ts @@ -1,20 +1,20 @@ ---- chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.js.orig 2021-04-14 18:40:54 UTC -+++ chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.js -@@ -23,7 +23,7 @@ export class AppearanceBrowserProxy { +--- chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.ts.orig 2021-09-24 17:29:52 UTC ++++ chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.ts +@@ -16,7 +16,7 @@ export interface AppearanceBrowserProxy { - useDefaultTheme() {} + useDefaultTheme(): void; - // <if expr="is_linux and not chromeos"> + // <if expr="is_posix and not chromeos"> - useSystemTheme() {} - + useSystemTheme(): void; // </if> -@@ -63,7 +63,7 @@ export class AppearanceBrowserProxyImpl { + +@@ -44,7 +44,7 @@ export class AppearanceBrowserProxyImpl implements App chrome.send('useDefaultTheme'); } - // <if expr="is_linux and not chromeos"> + // <if expr="is_posix and not chromeos"> - /** @override */ useSystemTheme() { chrome.send('useSystemTheme'); + } diff --git a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html index 7c0f76e70945..aa0737875900 100644 --- a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html +++ b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html @@ -1,4 +1,4 @@ ---- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2021-04-14 18:40:54 UTC +--- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2021-09-14 01:51:51 UTC +++ chrome/browser/resources/settings/appearance_page/appearance_page.html @@ -27,7 +27,7 @@ <cr-link-row class="first" hidden="[[!pageVisibility.setTheme]]" @@ -26,4 +26,4 @@ +<if expr="is_posix and not chromeos and not lacros"> <div class="hr" hidden="[[!pageVisibility.bookmarksBar]]"></div> <settings-toggle-button - pref="{{prefs.browser.custom_chrome_frame}}" + hidden="[[!showCustomChromeFrame_]]" diff --git a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.js b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.js deleted file mode 100644 index 1733158d82fe..000000000000 --- a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.js +++ /dev/null @@ -1,33 +0,0 @@ ---- chrome/browser/resources/settings/appearance_page/appearance_page.js.orig 2021-05-12 22:05:45 UTC -+++ chrome/browser/resources/settings/appearance_page/appearance_page.js -@@ -150,7 +150,7 @@ Polymer({ - 'themeChanged_(' + - 'prefs.extensions.theme.id.value, useSystemTheme_, isForcedTheme_)', - -- // <if expr="is_linux and not chromeos"> -+ // <if expr="is_bsd and not chromeos"> - // NOTE: this pref only exists on Linux. - 'useSystemThemePrefChanged_(prefs.extensions.theme.use_system.value)', - // </if> -@@ -239,7 +239,7 @@ Polymer({ - this.appearanceBrowserProxy_.useDefaultTheme(); - }, - -- // <if expr="is_linux and not chromeos"> -+ // <if expr="is_bsd and not chromeos"> - /** - * @param {boolean} useSystemTheme - * @private -@@ -322,10 +322,10 @@ Polymer({ - } - - let i18nId; -- // <if expr="is_linux and not chromeos and not lacros"> -+ // <if expr="is_posix and not chromeos and not lacros"> - i18nId = useSystemTheme ? 'systemTheme' : 'classicTheme'; - // </if> -- // <if expr="not is_linux or chromeos or lacros"> -+ // <if expr="not is_posix or chromeos or lacros"> - i18nId = 'chooseFromWebStore'; - // </if> - this.themeSublabel_ = this.i18n(i18nId); 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 new file mode 100644 index 000000000000..c37f51bb9b2c --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.ts @@ -0,0 +1,51 @@ +--- 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 +@@ -149,7 +149,7 @@ class SettingsAppearancePageElement extends SettingsAp + 'prefs.autogenerated.theme.policy.color.controlledBy)', + }, + +- // <if expr="is_linux and not chromeos and not lacros"> ++ // <if expr="is_posix and not chromeos and not lacros"> + /** + * Whether to show the "Custom Chrome Frame" setting. + */ +@@ -171,7 +171,7 @@ class SettingsAppearancePageElement extends SettingsAp + 'themeChanged_(' + + 'prefs.extensions.theme.id.value, useSystemTheme_, isForcedTheme_)', + +- // <if expr="is_linux and not chromeos"> ++ // <if expr="is_posix and not chromeos"> + // NOTE: this pref only exists on Linux. + 'useSystemThemePrefChanged_(prefs.extensions.theme.use_system.value)', + // </if> +@@ -190,7 +190,7 @@ class SettingsAppearancePageElement extends SettingsAp + private showReaderModeOption_: boolean; + private isForcedTheme_: boolean; + +- // <if expr="is_linux and not chromeos and not lacros"> ++ // <if expr="is_posix and not chromeos and not lacros"> + private showCustomChromeFrame_: boolean; + // </if> + +@@ -268,7 +268,7 @@ class SettingsAppearancePageElement extends SettingsAp + this.appearanceBrowserProxy_.useDefaultTheme(); + } + +- // <if expr="is_linux and not chromeos"> ++ // <if expr="is_posix and not chromeos"> + private useSystemThemePrefChanged_(useSystemTheme: boolean) { + this.useSystemTheme_ = useSystemTheme; + } +@@ -329,10 +329,10 @@ class SettingsAppearancePageElement extends SettingsAp + } + + let i18nId; +- // <if expr="is_linux and not chromeos and not lacros"> ++ // <if expr="is_posix and not chromeos and not lacros"> + i18nId = useSystemTheme ? 'systemTheme' : 'classicTheme'; + // </if> +- // <if expr="not is_linux or chromeos or lacros"> ++ // <if expr="not is_posix or chromeos or lacros"> + i18nId = 'chooseFromWebStore'; + // </if> + this.themeSublabel_ = this.i18n(i18nId); diff --git a/www/chromium/files/patch-chrome_browser_resources_settings_route.js b/www/chromium/files/patch-chrome_browser_resources_settings_route.js index bbd253a01b81..4f8d83b68083 100644 --- a/www/chromium/files/patch-chrome_browser_resources_settings_route.js +++ b/www/chromium/files/patch-chrome_browser_resources_settings_route.js @@ -1,6 +1,6 @@ ---- chrome/browser/resources/settings/route.js.orig 2021-07-19 18:45:09 UTC +--- chrome/browser/resources/settings/route.js.orig 2021-09-24 04:25:59 UTC +++ chrome/browser/resources/settings/route.js -@@ -184,7 +184,7 @@ function createBrowserSettingsRoutes() { +@@ -185,7 +185,7 @@ function createBrowserSettingsRoutes() { r.ACCESSIBILITY = r.ADVANCED.createSection('/accessibility', 'a11y'); diff --git a/www/chromium/files/patch-chrome_browser_search_drive_drive__service.cc b/www/chromium/files/patch-chrome_browser_search_drive_drive__service.cc deleted file mode 100644 index e650cbd3c101..000000000000 --- a/www/chromium/files/patch-chrome_browser_search_drive_drive__service.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/search/drive/drive_service.cc.orig 2021-07-19 18:45:09 UTC -+++ chrome/browser/search/drive/drive_service.cc -@@ -27,6 +27,8 @@ namespace { - constexpr char kDriveScope[] = "https://www.googleapis.com/auth/drive.readonly"; - #if OS_LINUX - constexpr char kPlatform[] = "LINUX"; -+#elif OS_FREEBSD -+constexpr char kPlatform[] = "FREEBSD"; - #elif OS_WIN - constexpr char kPlatform[] = "WINDOWS"; - #elif OS_MAC 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 b766698ee952..28b378680835 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,15 +1,15 @@ ---- chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc.orig 2021-07-19 18:45:09 UTC +--- 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 @@ -13,7 +13,7 @@ - #include "chrome/browser/ui/send_tab_to_self/send_tab_to_self_toolbar_button_controller.h" + #include "chrome/browser/send_tab_to_self/receiving_ui_handler.h" #include "components/send_tab_to_self/features.h" -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) || \ defined(OS_WIN) #include "chrome/browser/send_tab_to_self/desktop_notification_handler.h" - #endif -@@ -35,7 +35,7 @@ ReceivingUiHandlerRegistry* ReceivingUiHandlerRegistry + #include "chrome/browser/ui/send_tab_to_self/send_tab_to_self_toolbar_icon_controller.h" +@@ -36,7 +36,7 @@ ReceivingUiHandlerRegistry* ReceivingUiHandlerRegistry // Instantiates all the handlers relevant to this platform. void ReceivingUiHandlerRegistry::InstantiatePlatformSpecificHandlers( Profile* profile) { @@ -18,8 +18,8 @@ defined(OS_WIN) // If STTS 2.0 is enabled the handler will be created when the toolbar -@@ -54,7 +54,7 @@ void ReceivingUiHandlerRegistry::InstantiatePlatformSp - SendTabToSelfToolbarButtonController* +@@ -55,7 +55,7 @@ void ReceivingUiHandlerRegistry::InstantiatePlatformSp + SendTabToSelfToolbarIconController* ReceivingUiHandlerRegistry::GetToolbarButtonControllerForProfile( Profile* profile) { -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ 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 ea033448ba83..a05062afed6c 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,15 @@ ---- chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc.orig 2021-07-19 18:45:09 UTC +--- 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 -@@ -42,7 +42,7 @@ void SendTabToSelfClientService::SendTabToSelfModelLoa +@@ -15,7 +15,7 @@ + #include "components/send_tab_to_self/features.h" + #include "components/send_tab_to_self/send_tab_to_self_model.h" + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) || \ + 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 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 index 691d359471fb..e7e42db2ff6f 100644 --- a/www/chromium/files/patch-chrome_browser_service__sandbox__type.h +++ b/www/chromium/files/patch-chrome_browser_service__sandbox__type.h @@ -1,6 +1,6 @@ ---- chrome/browser/service_sandbox_type.h.orig 2021-07-28 07:42:53 UTC +--- chrome/browser/service_sandbox_type.h.orig 2021-09-14 01:51:51 UTC +++ chrome/browser/service_sandbox_type.h -@@ -12,8 +12,8 @@ +@@ -11,8 +11,8 @@ #include "printing/buildflags/buildflags.h" #include "sandbox/policy/sandbox_type.h" @@ -11,8 +11,8 @@ BUILDFLAG(ENABLE_PRINTING) #include "chrome/browser/printing/print_backend_service_manager.h" #endif -@@ -127,8 +127,8 @@ content::GetServiceSandboxType<printing::mojom::Printi - #endif // defined(OS_WIN) && BUILDFLAG(ENABLE_PRINT_PREVIEW) +@@ -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) || \ @@ -22,7 +22,7 @@ BUILDFLAG(ENABLE_PRINTING) namespace printing { namespace mojom { -@@ -144,7 +144,7 @@ content::GetServiceSandboxType<printing::mojom::PrintB +@@ -190,7 +190,7 @@ content::GetServiceSandboxType<printing::mojom::PrintB ? sandbox::policy::SandboxType::kPrintBackend : sandbox::policy::SandboxType::kNoSandbox; } diff --git a/www/chromium/files/patch-chrome_browser_sessions_session__restore.cc b/www/chromium/files/patch-chrome_browser_sessions_session__restore.cc deleted file mode 100644 index 37cfc3b21589..000000000000 --- a/www/chromium/files/patch-chrome_browser_sessions_session__restore.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/sessions/session_restore.cc.orig 2021-07-19 18:45:09 UTC -+++ chrome/browser/sessions/session_restore.cc -@@ -958,7 +958,7 @@ void SessionRestore::RestoreSessionAfterCrash(Browser* - // On linux, apps can be restored without the proper app frame, - // disabling restorations on linux for now. http://crbug.com/1199109 - #if BUILDFLAG(ENABLE_APP_SESSION_SERVICE) --#if !defined(OS_MAC) && !defined(OS_LINUX) -+#if !defined(OS_MAC) && !defined(OS_LINUX) && !defined(OS_BSD) - // Apps should always be restored on crash restore. - behavior |= SessionRestore::RESTORE_APPS; - #endif 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 new file mode 100644 index 000000000000..31ae26238090 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_shutdown__signal__handlers__posix.cc @@ -0,0 +1,15 @@ +--- chrome/browser/shutdown_signal_handlers_posix.cc.orig 2021-10-07 15:08:14 UTC ++++ chrome/browser/shutdown_signal_handlers_posix.cc +@@ -186,7 +186,11 @@ void InstallShutdownSignalHandlers( + g_pipe_pid = getpid(); + g_shutdown_pipe_read_fd = pipefd[0]; + g_shutdown_pipe_write_fd = pipefd[1]; +-#if !defined(ADDRESS_SANITIZER) ++#if defined(OS_BSD) ++ // PTHREAD_STACK_MIN causes Chromium to crash under FreeBSD, ++ // we request the default pthread stack size by specifying 0 here. ++ const size_t kShutdownDetectorThreadStackSize = 0; ++#elif !defined(ADDRESS_SANITIZER) + const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2; + #else + // ASan instrumentation bloats the stack frames, so we need to increase the 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 4bb990e7e472..6240aa591798 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-04-14 18:40:55 UTC +--- chrome/browser/signin/signin_util.cc.orig 2021-09-24 04:25:59 UTC +++ chrome/browser/signin/signin_util.cc -@@ -34,7 +34,7 @@ +@@ -37,7 +37,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 17baa2ade67f..2f3312e22189 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-07-19 18:45:09 UTC +--- chrome/browser/sync/chrome_sync_client.cc.orig 2021-09-24 04:25:59 UTC +++ chrome/browser/sync/chrome_sync_client.cc -@@ -471,7 +471,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy +@@ -465,7 +465,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)) { -@@ -480,7 +480,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy +@@ -474,7 +474,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_profile__sync__service__factory.cc b/www/chromium/files/patch-chrome_browser_sync_sync__service__factory.cc index 9f3d3f9dac08..c6ef51928130 100644 --- a/www/chromium/files/patch-chrome_browser_sync_profile__sync__service__factory.cc +++ b/www/chromium/files/patch-chrome_browser_sync_sync__service__factory.cc @@ -1,17 +1,17 @@ ---- chrome/browser/sync/profile_sync_service_factory.cc.orig 2021-07-19 18:45:09 UTC -+++ chrome/browser/sync/profile_sync_service_factory.cc -@@ -217,7 +217,7 @@ KeyedService* ProfileSyncServiceFactory::BuildServiceI +--- chrome/browser/sync/sync_service_factory.cc.orig 2021-09-24 18:28:51 UTC ++++ chrome/browser/sync/sync_service_factory.cc +@@ -110,7 +110,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) || \ - (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+ (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) ++ (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) syncer::SyncPrefs prefs(profile->GetPrefs()); local_sync_backend_enabled = prefs.IsLocalSyncEnabled(); UMA_HISTOGRAM_BOOLEAN("Sync.Local.Enabled", local_sync_backend_enabled); -@@ -235,7 +235,7 @@ KeyedService* ProfileSyncServiceFactory::BuildServiceI +@@ -128,7 +128,7 @@ std::unique_ptr<KeyedService> BuildSyncService( - init_params.start_behavior = syncer::ProfileSyncService::AUTO_START; + init_params.start_behavior = syncer::SyncServiceImpl::AUTO_START; } -#endif // defined(OS_WIN) || defined(OS_MAC) || (defined(OS_LINUX) || +#endif // defined(OS_WIN) || defined(OS_MAC) || (defined(OS_LINUX) || defined(OS_BSD) || diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h index 442b6e7d1208..250cbbc09938 100644 --- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h +++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h @@ -1,6 +1,6 @@ ---- chrome/browser/task_manager/sampling/task_group.h.orig 2021-07-19 18:45:09 UTC +--- chrome/browser/task_manager/sampling/task_group.h.orig 2021-09-14 01:51:51 UTC +++ chrome/browser/task_manager/sampling/task_group.h -@@ -41,7 +41,7 @@ constexpr int kUnsupportedVMRefreshFlags = +@@ -42,7 +42,7 @@ constexpr int kUnsupportedVMRefreshFlags = REFRESH_TYPE_WEBCACHE_STATS | REFRESH_TYPE_NETWORK_USAGE | REFRESH_TYPE_NACL | REFRESH_TYPE_IDLE_WAKEUPS | REFRESH_TYPE_HANDLES | REFRESH_TYPE_START_TIME | REFRESH_TYPE_CPU_TIME | REFRESH_TYPE_PRIORITY | @@ -9,7 +9,7 @@ REFRESH_TYPE_FD_COUNT | #endif REFRESH_TYPE_HARD_FAULTS; -@@ -147,10 +147,10 @@ class TaskGroup { +@@ -148,10 +148,10 @@ class TaskGroup { } #endif // BUILDFLAG(ENABLE_NACL) @@ -22,7 +22,7 @@ int idle_wakeups_per_second() const { return idle_wakeups_per_second_; } void set_idle_wakeups_per_second(int idle_wakeups) { -@@ -167,9 +167,9 @@ class TaskGroup { +@@ -168,9 +168,9 @@ class TaskGroup { void RefreshNaClDebugStubPort(int child_process_unique_id); void OnRefreshNaClDebugStubPortDone(int port); #endif @@ -34,7 +34,7 @@ void OnCpuRefreshDone(double cpu_usage); void OnSwappedMemRefreshDone(int64_t swapped_mem_bytes); -@@ -239,10 +239,10 @@ class TaskGroup { +@@ -240,10 +240,10 @@ class TaskGroup { #if BUILDFLAG(ENABLE_NACL) int nacl_debug_stub_port_; #endif // BUILDFLAG(ENABLE_NACL) 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 index ce1be9ce87ce..eceadff1a6a9 100644 --- a/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc +++ b/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc @@ -1,9 +1,9 @@ ---- chrome/browser/tracing/crash_service_uploader.cc.orig 2021-04-14 18:40:55 UTC +--- chrome/browser/tracing/crash_service_uploader.cc.orig 2021-09-24 04:25:59 UTC +++ chrome/browser/tracing/crash_service_uploader.cc -@@ -161,6 +161,8 @@ void TraceCrashServiceUploader::DoCompressOnBackground - const char product[] = "Chrome_Linux"; - #elif defined(OS_ANDROID) +@@ -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 diff --git a/www/chromium/files/patch-chrome_browser_ui_BUILD.gn b/www/chromium/files/patch-chrome_browser_ui_BUILD.gn index 53f39b1c2008..9642e893b410 100644 --- a/www/chromium/files/patch-chrome_browser_ui_BUILD.gn +++ b/www/chromium/files/patch-chrome_browser_ui_BUILD.gn @@ -1,16 +1,12 @@ ---- chrome/browser/ui/BUILD.gn.orig 2021-07-19 18:45:09 UTC +--- chrome/browser/ui/BUILD.gn.orig 2021-09-24 04:25:59 UTC +++ chrome/browser/ui/BUILD.gn -@@ -615,7 +615,7 @@ static_library("ui") { - deps += [ "//chrome/browser/vr:vr_base" ] +@@ -642,10 +642,20 @@ static_library("ui") { + ] } - if (!is_fuchsia) { + if (!is_fuchsia && !is_bsd) { - # TODO(crbug.com/753619): Enable crash reporting on Fuchsia. - deps += [ - "//components/crash/core/app", -@@ -623,6 +623,13 @@ static_library("ui") { - ] + deps += [ "//components/crash/core/app" ] } + if (is_bsd) { @@ -18,12 +14,15 @@ + "webui/crashes_ui.cc", + "webui/crashes_ui.h", + ] ++ deps -= [ ++ "//components/crash/core/browser", ++ ] + } + - if (is_win || is_android || is_linux || is_chromeos) { + if (is_android) { sources += [ - "webui/sandbox/sandbox_internals_ui.cc", -@@ -3425,7 +3432,7 @@ static_library("ui") { + "android/android_about_app_info.cc", +@@ -3530,7 +3540,7 @@ static_library("ui") { } } 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 5f13fc7c621b..686e764c158b 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-07-19 18:45:10 UTC +--- chrome/browser/ui/browser_command_controller.cc.orig 2021-09-24 04:26:00 UTC +++ chrome/browser/ui/browser_command_controller.cc @@ -89,7 +89,7 @@ @@ -27,7 +27,7 @@ case IDC_MINIMIZE_WINDOW: browser_->window()->Minimize(); break; -@@ -989,7 +989,7 @@ void BrowserCommandController::InitCommandState() { +@@ -1009,7 +1009,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 0d13cced8a27..c65710e00e03 100644 --- a/www/chromium/files/patch-chrome_browser_ui_browser__dialogs.h +++ b/www/chromium/files/patch-chrome_browser_ui_browser__dialogs.h @@ -1,11 +1,29 @@ ---- chrome/browser/ui/browser_dialogs.h.orig 2021-07-28 07:44:03 UTC +--- chrome/browser/ui/browser_dialogs.h.orig 2021-09-24 04:26:00 UTC +++ chrome/browser/ui/browser_dialogs.h -@@ -121,7 +121,7 @@ void ShowWebAppInstallDialog(content::WebContents* web - std::unique_ptr<WebApplicationInfo> web_app_info, - AppInstallationAcceptanceCallback callback); - --#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) - // Callback used to indicate whether a user has accepted the launch of a - // web app. The boolean parameter is true when the user accepts the dialog. - using WebAppProtocolHandlerAcceptanceCallback = +@@ -24,7 +24,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" + #endif + +@@ -78,7 +78,7 @@ struct SelectedFileInfo; + } // namespace ui + + #if defined(OS_WIN) || defined(OS_MAC) || \ +- (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) ++ (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) + namespace web_app { + struct UrlHandlerLaunchParams; + } +@@ -175,7 +175,7 @@ void ShowWebAppProtocolHandlerIntentPicker( + #endif // !defined(OS_ANDROID) + + #if defined(OS_WIN) || defined(OS_MAC) || \ +- (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) ++ (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) + // Callback that runs when the Web App URL Handler Intent Picker dialog is + // closed. `accepted` is true when the dialog is accepted, false otherwise. + // `launch_params` contains information of the app that is selected to open by 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 1423f3767a23..1a61c40ea0a7 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,4 +1,4 @@ ---- chrome/browser/ui/browser_view_prefs.cc.orig 2021-04-14 18:40:55 UTC +--- chrome/browser/ui/browser_view_prefs.cc.orig 2021-09-24 04:26:00 UTC +++ chrome/browser/ui/browser_view_prefs.cc @@ -29,7 +29,7 @@ const char kTabStripLayoutType[] = "tab_strip_layout_t @@ -9,7 +9,7 @@ bool GetCustomFramePrefDefault() { #if defined(USE_OZONE) if (features::IsUsingOzonePlatform()) { -@@ -56,10 +56,10 @@ void RegisterBrowserViewProfilePrefs( +@@ -57,10 +57,10 @@ void RegisterBrowserViewProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { // 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_signin__view__controller.cc b/www/chromium/files/patch-chrome_browser_ui_signin__view__controller.cc new file mode 100644 index 000000000000..53b628078d55 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_signin__view__controller.cc @@ -0,0 +1,11 @@ +--- chrome/browser/ui/signin_view_controller.cc.orig 2021-09-24 18:29:46 UTC ++++ chrome/browser/ui/signin_view_controller.cc +@@ -240,7 +240,7 @@ void SigninViewController::ShowModalEnterpriseConfirma + const AccountInfo& account_info, + SkColor profile_color, + base::OnceCallback<void(bool)> callback) { +-#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_LACROS) + CloseModalSignin(); + // The delegate will delete itself on request of the UI code when the widget diff --git a/www/chromium/files/patch-chrome_browser_ui_signin__view__controller__delegate.h b/www/chromium/files/patch-chrome_browser_ui_signin__view__controller__delegate.h new file mode 100644 index 000000000000..533c5be1ea9f --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_signin__view__controller__delegate.h @@ -0,0 +1,11 @@ +--- chrome/browser/ui/signin_view_controller_delegate.h.orig 2021-09-24 18:29:25 UTC ++++ chrome/browser/ui/signin_view_controller_delegate.h +@@ -63,7 +63,7 @@ class SigninViewControllerDelegate { + const CoreAccountId& account_id, + signin_metrics::ReauthAccessPoint access_point); + +-#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_LACROS) + // Returns a platform-specific SigninViewContolllerDelegate instance that + // displays the enterprise confirmation modal dialog. The returned object 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 new file mode 100644 index 000000000000..217bebcde702 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_signin_dice__web__signin__interceptor__delegate.cc @@ -0,0 +1,11 @@ +--- 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 +@@ -56,7 +56,7 @@ class ForcedEnterpriseSigninInterceptionHandle + private: + void ShowEnterpriseProfileInterceptionDialog(const AccountInfo& account_info, + SkColor profile_color) { +-#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_LACROS) + if (base::FeatureList::IsEnabled(kAccountPoliciesLoadedWithoutSync)) { + browser_->signin_view_controller()->ShowModalEnterpriseConfirmationDialog( diff --git a/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc b/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc index 65f3cc534301..57b20c95a293 100644 --- a/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc +++ b/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2021-04-14 18:40:55 UTC +--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2021-09-24 04:26:00 UTC +++ chrome/browser/ui/startup/bad_flags_prompt.cc -@@ -96,7 +96,7 @@ static const char* kBadFlags[] = { +@@ -95,7 +95,7 @@ static const char* kBadFlags[] = { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/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 4b2a8716fc5c..c9d71112cfd4 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,44 +1,38 @@ ---- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2021-07-19 18:45:10 UTC +--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2021-09-24 04:26:00 UTC +++ chrome/browser/ui/startup/startup_browser_creator.cc -@@ -126,12 +126,12 @@ - #include "ui/base/ui_base_features.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) +@@ -131,7 +131,7 @@ #include "chrome/browser/ui/startup/web_app_protocol_handling_startup_utils.h" - #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_launch_params.h" - #include "chrome/browser/web_applications/components/url_handler_manager_impl.h" + #include "chrome/browser/ui/startup/web_app_url_handling_startup_utils.h" #endif -@@ -471,7 +471,7 @@ bool MaybeLaunchApplication( + +@@ -470,7 +470,7 @@ bool MaybeLaunchApplication( + return false; } - #if defined(OS_WIN) || defined(OS_MAC) || \ -- (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) -+ (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) - // If |command_line| contains a single URL argument and that URL matches URL - // handling registration from installed web apps, show app options to user and - // launch one if accepted. -@@ -999,7 +999,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( - } - } +-#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) + bool MaybeLaunchUrlHandlerWebAppFromCmd( + const base::CommandLine& command_line, + const base::FilePath& cur_dir, +@@ -1103,7 +1103,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( + if (command_line.HasSwitch(switches::kAppId)) { + std::string app_id = command_line.GetSwitchValueASCII(switches::kAppId); -#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) - // Web app Protocol handling. - auto startup_callback = base::BindOnce( - [](bool process_startup, const base::CommandLine& command_line, -@@ -1060,7 +1060,7 @@ bool StartupBrowserCreator::StartupLaunchAfterProtocol + // 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 + } // Web app URL handling. - #if defined(OS_WIN) || defined(OS_MAC) || \ -- (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) -+ (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) - if (MaybeLaunchUrlHandlerWebApp(command_line, cur_dir, - std::make_unique<LaunchModeRecorder>())) { - return true; +-#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)) { diff --git a/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc deleted file mode 100644 index cb016f1c3bf2..000000000000 --- a/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/ui/startup/startup_browser_creator_impl.cc.orig 2021-06-10 11:16:56 UTC -+++ chrome/browser/ui/startup/startup_browser_creator_impl.cc -@@ -106,7 +106,7 @@ namespace { - bool ShouldRestoreApps(bool is_post_restart) { - #if BUILDFLAG(IS_CHROMEOS_ASH) - return true; --#elif defined(OS_MAC) || defined(OS_LINUX) || defined(OS_WIN) -+#elif defined(OS_MAC) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) - // TODO(stahon@microsoft.com) - // Even when app restores are enabled on mac, don't actually restore apps - // because they do not restore correctly. http://crbug.com/1194201 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 4c6a9158ec1f..dac872633e2d 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-07-19 18:45:10 UTC +--- chrome/browser/ui/tab_helpers.cc.orig 2021-09-24 04:26:00 UTC +++ chrome/browser/ui/tab_helpers.cc -@@ -155,7 +155,7 @@ +@@ -158,7 +158,7 @@ #include "chrome/browser/lacros/web_contents_can_go_back_observer.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_CHROMEOS) || defined(OS_FUCHSIA) #include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h" #include "chrome/browser/ui/hats/hats_helper.h" -@@ -423,11 +423,11 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con +@@ -426,11 +426,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) || \ @@ -22,4 +22,4 @@ +#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) if (base::FeatureList::IsEnabled( - features::kHappinessTrackingSurveysForDesktopDemo)) { + features::kHappinessTrackingSurveysForDesktopDemo) || diff --git a/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc b/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc index 93122f906e77..9e658522e6b8 100644 --- a/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc +++ b/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2021-07-19 18:45:10 UTC +--- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2021-09-14 01:51:51 UTC +++ chrome/browser/ui/task_manager/task_manager_table_model.cc -@@ -450,13 +450,13 @@ std::u16string TaskManagerTableModel::GetText(int row, +@@ -451,13 +451,13 @@ std::u16string TaskManagerTableModel::GetText(int row, ? stringifier_->backgrounded_string() : stringifier_->foregrounded_string(); @@ -16,7 +16,7 @@ case IDS_TASK_MANAGER_KEEPALIVE_COUNT_COLUMN: { return stringifier_->GetKeepaliveCountText( -@@ -616,7 +616,7 @@ int TaskManagerTableModel::CompareValues(int row1, +@@ -618,7 +618,7 @@ int TaskManagerTableModel::CompareValues(int row1, return BooleanCompare(is_proc1_bg, is_proc2_bg); } @@ -25,7 +25,7 @@ case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: { const int proc1_fd_count = observed_task_manager()->GetOpenFdCount(tasks_[row1]); -@@ -624,7 +624,7 @@ int TaskManagerTableModel::CompareValues(int row1, +@@ -626,7 +626,7 @@ int TaskManagerTableModel::CompareValues(int row1, observed_task_manager()->GetOpenFdCount(tasks_[row2]); return ValueCompare(proc1_fd_count, proc2_fd_count); } @@ -34,7 +34,7 @@ default: NOTREACHED(); -@@ -790,11 +790,11 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col +@@ -792,11 +792,11 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col type = REFRESH_TYPE_KEEPALIVE_COUNT; break; 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 38b1bd7d5c54..f0759553cff7 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-05-12 22:05:45 UTC +--- chrome/browser/ui/test/test_browser_dialog.cc.orig 2021-09-14 01:51:51 UTC +++ chrome/browser/ui/test/test_browser_dialog.cc -@@ -115,7 +115,7 @@ bool TestBrowserDialog::VerifyUi() { +@@ -116,7 +116,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 1d94f669db5a..5792b307fd2b 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-04-14 18:40:55 UTC +--- chrome/browser/ui/test/test_browser_ui.cc.orig 2021-09-24 04:26:00 UTC +++ chrome/browser/ui/test/test_browser_ui.cc -@@ -13,7 +13,7 @@ +@@ -17,7 +17,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,16 @@ #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" -@@ -37,7 +37,7 @@ std::string NameFromTestCase() { +@@ -38,7 +38,7 @@ std::string NameFromTestCase() { + + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) + void InstallUIControlsAura() { + #if defined(OS_WIN) + ui_controls::InstallUIControlsAura(aura::test::CreateUIControlsAura(nullptr)); +@@ -59,7 +59,7 @@ void InstallUIControlsAura() { TestBrowserUi::TestBrowserUi() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -18,7 +27,7 @@ // Default to fuzzy diff. The magic number is chosen based on // past experiments. SetPixelMatchAlgorithm( -@@ -50,7 +50,7 @@ TestBrowserUi::~TestBrowserUi() = default; +@@ -72,7 +72,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 new file mode 100644 index 000000000000..30e5170b9bc9 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_test_test__browser__ui.h @@ -0,0 +1,20 @@ +--- chrome/browser/ui/test/test_browser_ui.h.orig 2021-09-24 18:31:01 UTC ++++ chrome/browser/ui/test/test_browser_ui.h +@@ -95,7 +95,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_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) + // 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 { + // 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) + std::unique_ptr<ui::test::SkiaGoldMatchingAlgorithm> algorithm_; + #endif + diff --git a/www/chromium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc b/www/chromium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc index 523858afb942..d9690ef370b2 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc @@ -1,29 +1,29 @@ ---- chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc.orig 2021-04-14 18:40:55 UTC +--- chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc.orig 2021-09-14 01:51:51 UTC +++ chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc -@@ -22,7 +22,7 @@ +@@ -20,7 +20,7 @@ + #include "ui/gfx/image/image_skia.h" + #include "ui/views/widget/widget.h" - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) #include "chrome/browser/shell_integration_linux.h" #endif -@@ -61,7 +61,7 @@ void ChromeNativeAppWindowViewsAura::OnBeforeWidgetIni +@@ -57,7 +57,7 @@ void ChromeNativeAppWindowViewsAura::OnBeforeWidgetIni + const AppWindow::CreateParams& create_params, + views::Widget::InitParams* init_params, views::Widget* widget) { - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) std::string app_name = web_app::GenerateApplicationNameFromAppId(app_window()->extension_id()); // Set up a custom WM_CLASS for app windows. This allows task switchers in -@@ -71,7 +71,7 @@ void ChromeNativeAppWindowViewsAura::OnBeforeWidgetIni +@@ -67,7 +67,7 @@ void ChromeNativeAppWindowViewsAura::OnBeforeWidgetIni init_params->wm_class_class = shell_integration_linux::GetProgramClassClass(); const char kX11WindowRoleApp[] = "app"; init_params->wm_role_name = std::string(kX11WindowRoleApp); --#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) ChromeNativeAppWindowViews::OnBeforeWidgetInit(create_params, init_params, widget); 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 efbc5821608a..314880b84275 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,4 +1,4 @@ ---- chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc.orig 2021-05-12 22:05:46 UTC +--- 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 @@ -1857,7 +1857,7 @@ class BookmarkBarViewTest20 : public BookmarkBarViewEv } 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 89ac2c80c9c0..c2c5d6242702 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-07-19 18:45:10 UTC +--- 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 -@@ -40,7 +40,7 @@ +@@ -43,7 +43,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> -@@ -50,7 +50,7 @@ +@@ -53,7 +53,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 { -@@ -135,7 +135,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( +@@ -140,7 +140,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. -@@ -166,7 +166,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( +@@ -171,7 +171,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( base::RunLoop().RunUntilIdle(); exit(EXIT_FAILURE); 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 1b49df8903bc..1d78425ca27e 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-07-19 18:45:10 UTC +--- 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 -@@ -185,7 +185,7 @@ bool UseNewWarnings() { +@@ -195,7 +195,7 @@ bool UseNewWarnings() { } int GetFilenameStyle(const views::Label& label) { @@ -9,7 +9,7 @@ if (UseNewWarnings()) return STYLE_EMPHASIZED; #endif -@@ -193,7 +193,7 @@ int GetFilenameStyle(const views::Label& label) { +@@ -203,7 +203,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 45793b210fbd..4f908a6a5eea 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,8 +1,8 @@ ---- chrome/browser/ui/views/eye_dropper/eye_dropper_view.cc.orig 2021-06-10 11:18:23 UTC +--- 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 -@@ -104,7 +104,7 @@ EyeDropperView::EyeDropperView(content::RenderFrameHos - SetModalType(ui::MODAL_TYPE_WINDOW); - SetOwnedByWidget(false); +@@ -146,7 +146,7 @@ EyeDropperView::EyeDropperView(content::RenderFrameHos + // EyeDropper/WidgetDelegate. + set_owned_by_client(); SetPreferredSize(GetSize()); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) 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 47cdcd94121d..78b0b1fc76b1 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-06-10 11:18:04 UTC +--- 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 -@@ -38,7 +38,7 @@ void EyeDropperView::MoveViewToFront() { +@@ -79,7 +79,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 new file mode 100644 index 000000000000..617e2f0f66b2 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__desktop__window__tree__host__linux.cc @@ -0,0 +1,11 @@ +--- 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 +@@ -146,7 +146,7 @@ bool BrowserDesktopWindowTreeHostLinux::SupportsClient + } + + void BrowserDesktopWindowTreeHostLinux::UpdateFrameHints() { +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + auto* view = static_cast<BrowserFrameViewLinux*>( + native_frame_->browser_frame()->GetFrameView()); + auto* layout = view->layout(); diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__desktop__window__tree__host__linux.h b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__desktop__window__tree__host__linux.h new file mode 100644 index 000000000000..62900cd38192 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__desktop__window__tree__host__linux.h @@ -0,0 +1,11 @@ +--- 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 +@@ -76,7 +76,7 @@ class BrowserDesktopWindowTreeHostLinux + // browser_desktop_window_tree_host_lacros.cc. + #if BUILDFLAG(IS_CHROMEOS_LACROS) + using DesktopBrowserFrameAuraPlatform = DesktopBrowserFrameLacros; +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + using DesktopBrowserFrameAuraPlatform = DesktopBrowserFrameAuraLinux; + #else + #error Unknown platform diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc index 9314d065ffb8..8f1d1c536e1b 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,4 +1,4 @@ ---- chrome/browser/ui/views/frame/browser_frame.cc.orig 2021-07-19 18:45:10 UTC +--- chrome/browser/ui/views/frame/browser_frame.cc.orig 2021-09-24 04:26:00 UTC +++ chrome/browser/ui/views/frame/browser_frame.cc @@ -44,11 +44,11 @@ @@ -23,7 +23,7 @@ return ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme(); #else return false; -@@ -237,7 +237,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() { +@@ -244,7 +244,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() { IsVisibleOnAllWorkspaces()); // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -32,16 +32,16 @@ // 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() -@@ -358,7 +358,7 @@ void BrowserFrame::SelectNativeTheme() { +@@ -365,7 +365,7 @@ void BrowserFrame::SelectNativeTheme() { } } -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - if (const views::LinuxUI* linux_ui = views::LinuxUI::instance()) - native_theme = linux_ui->GetNativeTheme(GetNativeWindow()); - #endif -@@ -371,7 +371,7 @@ bool BrowserFrame::RegenerateFrameOnThemeChange( + 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( 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 1d095b52d7be..d934e538ef4d 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,20 +1,20 @@ ---- chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc.orig 2021-04-14 18:40:55 UTC +--- 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 -@@ -16,7 +16,7 @@ +@@ -15,7 +15,7 @@ + #include "chrome/browser/ui/views/frame/glass_browser_frame_view.h" + #endif - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) - #include "chrome/browser/ui/views/frame/desktop_linux_browser_frame_view.h" - #include "chrome/browser/ui/views/frame/desktop_linux_browser_frame_view_layout.h" - #include "ui/views/linux_ui/linux_ui.h" -@@ -32,7 +32,7 @@ std::unique_ptr<OpaqueBrowserFrameView> CreateOpaqueBr +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "chrome/browser/ui/views/frame/browser_frame_view_layout_linux.h" + #include "chrome/browser/ui/views/frame/browser_frame_view_layout_linux_native.h" + #include "chrome/browser/ui/views/frame/browser_frame_view_linux.h" +@@ -32,7 +32,7 @@ namespace { + std::unique_ptr<OpaqueBrowserFrameView> CreateOpaqueBrowserFrameView( + BrowserFrame* frame, BrowserView* browser_view) { - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) auto* linux_ui = views::LinuxUI::instance(); auto* profile = browser_view->browser()->profile(); auto* theme_service_factory = ThemeServiceFactory::GetForProfile(profile); diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc index 96c3636335d1..913678ee46e5 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-07-19 18:45:10 UTC +--- chrome/browser/ui/views/frame/browser_view.cc.orig 2021-09-24 04:26:00 UTC +++ chrome/browser/ui/views/frame/browser_view.cc -@@ -1586,7 +1586,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra +@@ -1601,7 +1601,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 01fd780ef2de..e8514d54aa84 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,6 +1,6 @@ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2021-07-19 18:45:10 UTC +--- 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 -@@ -52,7 +52,7 @@ +@@ -53,7 +53,7 @@ #include "ui/views/window/vector_icons/vector_icons.h" #include "ui/views/window/window_shape.h" @@ -9,7 +9,7 @@ #include "ui/views/controls/menu/menu_runner.h" #endif -@@ -463,7 +463,7 @@ OpaqueBrowserFrameView::FrameButtonStyle +@@ -516,7 +516,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; -@@ -657,7 +657,7 @@ gfx::Rect OpaqueBrowserFrameView::GetIconBounds() cons +@@ -726,7 +726,7 @@ gfx::Rect OpaqueBrowserFrameView::GetIconBounds() cons } void OpaqueBrowserFrameView::WindowIconPressed() { diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__platform__specific.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__platform__specific.cc deleted file mode 100644 index 7d8feb3ed288..000000000000 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__platform__specific.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc.orig 2021-04-14 18:40:55 UTC -+++ chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc -@@ -6,7 +6,7 @@ - - #include "build/build_config.h" - --#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_BSD) - - // static - std::unique_ptr<OpaqueBrowserFrameViewPlatformSpecific> 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 051c085e216a..63db0fc98a23 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-07-19 18:45:10 UTC +--- 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 -@@ -68,7 +68,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser +@@ -111,7 +111,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,16 +9,16 @@ 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); -@@ -85,7 +85,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser +@@ -128,7 +128,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser } // 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) model->AddSeparator(ui::NORMAL_SEPARATOR); - model->AddCheckItemWithStringId(IDC_USE_SYSTEM_TITLE_BAR, - IDS_SHOW_WINDOW_DECORATIONS_MENU); -@@ -128,7 +128,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo + bool supports_server_side_decorations = true; + #if defined(USE_OZONE) && \ +@@ -185,7 +185,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 458e7ae62a45..de9c0c6fa37e 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-07-19 18:45:10 UTC +--- 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 -@@ -23,7 +23,7 @@ +@@ -30,7 +30,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 -@@ -40,7 +40,7 @@ SystemMenuModelDelegate::~SystemMenuModelDelegate() {} +@@ -61,7 +61,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); -@@ -60,7 +60,7 @@ bool SystemMenuModelDelegate::IsCommandIdEnabled(int c +@@ -81,7 +81,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_profiles_profile__menu__view__base.cc b/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc index caa8e1fd6443..787ec3fc554e 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-07-19 18:45:10 UTC +--- 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 -@@ -604,7 +604,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo( +@@ -599,7 +599,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.cc b/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc new file mode 100644 index 000000000000..deda118e9ac2 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc @@ -0,0 +1,20 @@ +--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig 2021-09-24 18:32:11 UTC ++++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc +@@ -83,7 +83,7 @@ SigninViewControllerDelegateViews::CreateReauthConfirm + kReauthDialogHeight, kReauthDialogWidth); + } + +-#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_LACROS) + // static + std::unique_ptr<views::WebView> +@@ -345,7 +345,7 @@ SigninViewControllerDelegate::CreateReauthConfirmation + browser, ui::MODAL_TYPE_CHILD, false, true); + } + +-#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_LACROS) + // static + SigninViewControllerDelegate* 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 new file mode 100644 index 000000000000..ff3c69bf2922 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h @@ -0,0 +1,11 @@ +--- 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 +@@ -62,7 +62,7 @@ class SigninViewControllerDelegateViews + Browser* browser, + signin_metrics::ReauthAccessPoint); + +-#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_LACROS) + static std::unique_ptr<views::WebView> CreateEnterpriseConfirmationWebView( + Browser* browser, 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 3d2ec505ef78..65ce7a9ee668 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,4 +1,4 @@ ---- chrome/browser/ui/views/tabs/tab.cc.orig 2021-07-19 18:45:10 UTC +--- chrome/browser/ui/views/tabs/tab.cc.orig 2021-09-24 04:26:00 UTC +++ chrome/browser/ui/views/tabs/tab.cc @@ -580,7 +580,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& if (mouse_hovered_ || !GetWidget()->IsMouseEventsEnabled()) 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 201c3e610835..e11300a7ff75 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-07-19 18:45:10 UTC +--- 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 -@@ -457,7 +457,7 @@ void TabDragController::Init(TabDragContext* source_co +@@ -453,7 +453,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()); -@@ -918,7 +918,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon +@@ -919,7 +919,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. -@@ -2193,7 +2193,7 @@ TabDragController::Liveness TabDragController::GetLoca +@@ -2214,7 +2214,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 new file mode 100644 index 000000000000..24414ee3a226 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__controller.cc @@ -0,0 +1,11 @@ +--- 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 +@@ -298,7 +298,7 @@ void TabHoverCardController::ShowHoverCard(bool is_ini + slide_animator_->UpdateTargetBounds(); + MaybeStartThumbnailObservation(target_tab_, is_initial); + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Ensure the hover card Widget assumes the highest z-order to avoid occlusion + // by other secondary UI Widgets (such as the omnibox Widget, see + // crbug.com/1226536). diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc b/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc index f1cf64c1f419..ce9224c83e22 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-07-19 18:45:10 UTC +--- chrome/browser/ui/webui/about_ui.cc.orig 2021-09-24 04:26:00 UTC +++ chrome/browser/ui/webui/about_ui.cc -@@ -582,7 +582,7 @@ std::string ChromeURLs() { +@@ -574,7 +574,7 @@ std::string ChromeURLs() { return html; } @@ -9,7 +9,7 @@ std::string AboutLinuxProxyConfig() { std::string data; AppendHeader(&data, 0, -@@ -638,7 +638,7 @@ void AboutUIHTMLSource::StartDataRequest( +@@ -630,7 +630,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 95bb4e8f30d5..eaaac5bc0159 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,6 +1,6 @@ ---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2021-07-19 18:45:10 UTC +--- 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 -@@ -31,7 +31,9 @@ +@@ -30,7 +30,9 @@ #include "chrome/browser/ui/webui/bluetooth_internals/bluetooth_internals_ui.h" #include "chrome/browser/ui/webui/components/components_ui.h" #include "chrome/browser/ui/webui/constrained_web_dialog_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" -@@ -280,12 +282,12 @@ +@@ -288,12 +290,12 @@ #include "chrome/browser/ui/webui/conflicts/conflicts_ui.h" #endif @@ -25,7 +25,7 @@ defined(OS_ANDROID) #include "chrome/browser/ui/webui/sandbox/sandbox_internals_ui.h" #endif -@@ -523,7 +525,7 @@ bool IsAboutUI(const GURL& url) { +@@ -540,7 +542,7 @@ bool IsAboutUI(const GURL& url) { #if !defined(OS_ANDROID) || url.host_piece() == chrome::kChromeUITermsHost #endif @@ -34,7 +34,7 @@ || url.host_piece() == chrome::kChromeUILinuxProxyConfigHost #endif #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -572,8 +574,10 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -589,8 +591,10 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we return &NewWebUI<ComponentsUI>; if (url.spec() == chrome::kChromeUIConstrainedHTMLTestURL) return &NewWebUI<ConstrainedWebDialogUI>; @@ -45,7 +45,7 @@ if (url.host_piece() == chrome::kChromeUIDeviceLogHost) return &NewWebUI<chromeos::DeviceLogUI>; if (url.host_piece() == chrome::kChromeUIDomainReliabilityInternalsHost) -@@ -969,7 +973,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -994,7 +998,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we if (url.host_piece() == chrome::kChromeUINaClHost) return &NewWebUI<NaClUI>; #endif @@ -54,7 +54,7 @@ defined(USE_AURA) if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost) return &NewWebUI<ConstrainedWebDialogUI>; -@@ -1019,13 +1023,13 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -1048,13 +1052,13 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we return &NewWebUI<media_router::MediaRouterInternalsUI>; } #endif @@ -70,7 +70,7 @@ defined(OS_CHROMEOS) if (url.host_piece() == chrome::kChromeUIDiscardsHost) return &NewWebUI<DiscardsUI>; -@@ -1033,7 +1037,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -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) || \ @@ -79,7 +79,7 @@ if (url.host_piece() == chrome::kChromeUIBrowserSwitchHost) return &NewWebUI<BrowserSwitchUI>; #endif -@@ -1221,8 +1225,10 @@ base::RefCountedMemory* ChromeWebUIControllerFactory:: +@@ -1255,8 +1259,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 b61da1dfe144..09463de2475a 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,6 @@ ---- chrome/browser/ui/webui/ntp/app_launcher_handler.cc.orig 2021-07-19 18:45:10 UTC +--- 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 -@@ -1373,7 +1373,7 @@ void AppLauncherHandler::InstallOsHooks(const web_app: +@@ -1337,7 +1337,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_settings__localized__strings__provider.cc b/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc index fbc3d6227265..d11e9f19061f 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,6 +1,15 @@ ---- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2021-07-19 18:45:10 UTC +--- 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 -@@ -337,7 +337,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -112,7 +112,7 @@ + #include "ui/accessibility/accessibility_features.h" + #endif + +-#if defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS) ++#if (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) + #include "ui/display/screen.h" + #endif + +@@ -361,7 +361,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. @@ -9,7 +18,7 @@ {"systemTheme", IDS_SETTINGS_SYSTEM_THEME}, {"useSystemTheme", IDS_SETTINGS_USE_SYSTEM_THEME}, {"classicTheme", IDS_SETTINGS_CLASSIC_THEME}, -@@ -345,7 +345,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -369,7 +369,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht #else {"resetToDefaultTheme", IDS_SETTINGS_RESET_TO_DEFAULT_THEME}, #endif @@ -18,3 +27,12 @@ {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS}, #endif #if defined(OS_MAC) +@@ -390,7 +390,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() && 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 new file mode 100644 index 000000000000..c9711d8665a3 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__ui.cc @@ -0,0 +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 +@@ -139,7 +139,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) + #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))); 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 index b78451aa5d1c..dfc1142c6d68 100644 --- 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 @@ -1,11 +1,11 @@ ---- chrome/browser/web_applications/components/web_app_file_handler_registration.h.orig 2021-07-19 18:45:10 UTC +--- 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 -@@ -42,7 +42,7 @@ void UnregisterFileHandlersWithOs(const AppId& app_id, - std::unique_ptr<ShortcutInfo> info, +@@ -40,7 +40,7 @@ void UnregisterFileHandlersWithOs(const AppId& app_id, + Profile* profile, base::OnceCallback<void(bool)> callback); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#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 index a04a76d0f108..acd9d0f8c713 100644 --- 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 @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/components/web_app_shortcut.cc.orig 2021-04-14 18:40:56 UTC +--- 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 -@@ -33,7 +33,7 @@ namespace { +@@ -34,7 +34,7 @@ namespace { #if defined(OS_MAC) const int kDesiredIconSizesForShortcut[] = {16, 32, 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 new file mode 100644 index 000000000000..e0324196c5a9 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__shortcut.h @@ -0,0 +1,11 @@ +--- 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_extension__status__utils.h b/www/chromium/files/patch-chrome_browser_web__applications_extension__status__utils.h new file mode 100644 index 000000000000..37ec602bbd17 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_web__applications_extension__status__utils.h @@ -0,0 +1,11 @@ +--- chrome/browser/web_applications/extension_status_utils.h.orig 2021-09-24 18:36:53 UTC ++++ chrome/browser/web_applications/extension_status_utils.h +@@ -37,7 +37,7 @@ bool IsExtensionForceInstalled(content::BrowserContext + bool IsExternalExtensionUninstalled(content::BrowserContext* context, + const std::string& extension_id); + +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) + // Returns whether |extension_id| is a Chrome App and should be blocked by the + // Chrome Apps Deprecation. Policy installed Chrome Apps are still allowed, and + // all apps are allowed if the deprecation feature flag is not enabled. diff --git a/www/chromium/files/patch-chrome_browser_web__applications_extensions_bookmark__app__finalizer__utils.cc b/www/chromium/files/patch-chrome_browser_web__applications_extensions_bookmark__app__finalizer__utils.cc deleted file mode 100644 index d8b4b0ab0dea..000000000000 --- a/www/chromium/files/patch-chrome_browser_web__applications_extensions_bookmark__app__finalizer__utils.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/web_applications/extensions/bookmark_app_finalizer_utils.cc.orig 2021-04-14 18:40:56 UTC -+++ chrome/browser/web_applications/extensions/bookmark_app_finalizer_utils.cc -@@ -18,7 +18,7 @@ namespace { - bool CanOsAddDesktopShortcuts() { - // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is - // complete. --#if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_WIN) -+#if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_WIN) || defined(OS_BSD) - return true; - #else - return false; 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 new file mode 100644 index 000000000000..da21038387c5 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc @@ -0,0 +1,11 @@ +--- 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 +@@ -75,7 +75,7 @@ bool IsExternalExtensionUninstalled(content::BrowserCo + return prefs && prefs->IsExternalExtensionUninstalled(extension_id); + } + +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) + bool IsExtensionUnsupportedDeprecatedApp(content::BrowserContext* context, + const std::string& extension_id) { + auto* registry = ExtensionRegistry::Get(context); 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 586f42d173fc..93e13cc8ded5 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-07-28 07:47:22 UTC +--- 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 -@@ -318,7 +318,7 @@ void ExternallyManagedAppInstallTask::OnWebAppInstalle +@@ -320,7 +320,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__install__task.cc b/www/chromium/files/patch-chrome_browser_web__applications_web__app__install__task.cc index 848f6b353548..15077643344e 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-07-19 18:45:10 UTC +--- 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 -@@ -862,7 +862,7 @@ void WebAppInstallTask::OnInstallFinalizedCreateShortc +@@ -853,7 +853,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 2f5383c2bcca..64b4e4a35fdf 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-07-19 18:45:10 UTC +--- chrome/browser/web_applications/web_app_provider.cc.orig 2021-09-24 04:26:00 UTC +++ chrome/browser/web_applications/web_app_provider.cc -@@ -229,7 +229,7 @@ void WebAppProvider::CreateWebAppsSubsystems(Profile* +@@ -273,7 +273,7 @@ void WebAppProvider::CreateWebAppsSubsystems(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_components_web__app__utils.cc b/www/chromium/files/patch-chrome_browser_web__applications_web__app__utils.cc index 7e2f7da3a998..d40e8f016404 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_components_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/components/web_app_utils.cc.orig 2021-07-28 07:46:50 UTC -+++ chrome/browser/web_applications/components/web_app_utils.cc -@@ -198,13 +198,13 @@ std::u16string GetFileTypeAssociationsHandledByWebApps +--- chrome/browser/web_applications/web_app_utils.cc.orig 2021-09-24 18:37:27 UTC ++++ chrome/browser/web_applications/web_app_utils.cc +@@ -212,13 +212,13 @@ std::u16string GetFileTypeAssociationsHandledByWebApps const apps::FileHandlers file_handlers = GetFileHandlersForAllWebAppsWithOrigin(profile, url); std::vector<std::string> associations; @@ -16,12 +16,12 @@ std::set<std::string> extensions_set = apps::GetFileExtensionsFromFileHandlers(file_handlers); associations.reserve(extensions_set.size()); -@@ -215,7 +215,7 @@ std::u16string GetFileTypeAssociationsHandledByWebApps +@@ -229,7 +229,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) - return base::UTF8ToUTF16(base::JoinString( - associations, l10n_util::GetStringUTF8( + if (found_multiple) + *found_multiple = associations.size() > 1; diff --git a/www/chromium/files/patch-chrome_common_BUILD.gn b/www/chromium/files/patch-chrome_common_BUILD.gn index 3416a0ba2728..53a6cac1f902 100644 --- a/www/chromium/files/patch-chrome_common_BUILD.gn +++ b/www/chromium/files/patch-chrome_common_BUILD.gn @@ -1,17 +1,15 @@ ---- chrome/common/BUILD.gn.orig 2021-07-19 18:45:10 UTC +--- chrome/common/BUILD.gn.orig 2021-09-24 04:26:00 UTC +++ chrome/common/BUILD.gn -@@ -257,6 +257,10 @@ static_library("common") { - public_deps += [ "//ppapi/shared_impl" ] +@@ -333,7 +333,7 @@ static_library("common") { + ] } -+ if (is_bsd) { -+ deps -= [ "//components/crash/core/app" ] -+ } -+ - if (enable_extensions) { - sources += [ - "extensions/api/commands/commands_handler.cc", -@@ -484,13 +488,21 @@ static_library("common") { +- if (!is_fuchsia) { ++ if (!is_fuchsia && !is_bsd) { + deps += [ "//components/crash/core/app" ] + } + +@@ -493,13 +493,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 731571657861..a9da537a2e69 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-05-12 22:05:46 UTC +--- chrome/common/channel_info.h.orig 2021-09-14 01:51:52 UTC +++ chrome/common/channel_info.h -@@ -91,7 +91,7 @@ std::string GetChannelSuffixForDataDir(); +@@ -101,7 +101,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 590df2168c31..9739070de6d9 100644 --- a/www/chromium/files/patch-chrome_common_chrome__features.cc +++ b/www/chromium/files/patch-chrome_common_chrome__features.cc @@ -1,6 +1,6 @@ ---- chrome/common/chrome_features.cc.orig 2021-07-19 18:45:10 UTC +--- chrome/common/chrome_features.cc.orig 2021-09-24 04:26:00 UTC +++ chrome/common/chrome_features.cc -@@ -83,13 +83,13 @@ const base::Feature kAsyncDns { +@@ -82,13 +82,13 @@ const base::Feature kAsyncDns { #endif }; @@ -16,7 +16,38 @@ #if BUILDFLAG(IS_CHROMEOS_ASH) // Enable Borealis on Chrome OS. -@@ -282,7 +282,7 @@ const base::Feature kDesktopPWAsNotificationIconAndTit +@@ -99,13 +99,13 @@ const base::Feature kBorealis{"Borealis", base::FEATUR + const base::Feature kChangePictureVideoMode{"ChangePictureVideoMode", + base::FEATURE_ENABLED_BY_DEFAULT}; + +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) + // Controls whether Chrome Apps are supported. See https://crbug.com/1221251. + // If the feature is disabled, Chrome Apps continue to work. If enabled, Chrome + // Apps will not launch and will be marked in the UI as deprecated. + const base::Feature kChromeAppsDeprecation{"ChromeAppsDeprecation", + base::FEATURE_DISABLED_BY_DEFAULT}; +-#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{ + "DefaultPinnedAppsUpdate2021Q2", base::FEATURE_ENABLED_BY_DEFAULT}; + #endif + +-#if BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_MAC) || defined(OS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) + // 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 + base::FEATURE_ENABLED_BY_DEFAULT +@@ -273,7 +273,7 @@ const base::Feature kDesktopPWAsNotificationIconAndTit // Enables or disables Desktop PWAs to be auto-started on OS login. const base::Feature kDesktopPWAsRunOnOsLogin { "DesktopPWAsRunOnOsLogin", @@ -25,28 +56,12 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -378,13 +378,13 @@ const base::Feature kEnableAllSystemWebApps{"EnableAll - - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ -+#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) || \ - defined(OS_MAC) - COMPONENT_EXPORT(CHROME_FEATURES) - // Enables ephemeral Guest profiles on desktop. - extern const base::Feature kEnableEphemeralGuestProfilesOnDesktop{ - "EnableEphemeralGuestProfilesOnDesktop", base::FEATURE_DISABLED_BY_DEFAULT}; --#endif // defined(OS_WIN) || (defined(OS_LINUX) || -+#endif // defined(OS_WIN) || (defined(OS_LINUX) || defined(OS_BSD) || - // BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_MAC) - - #if defined(OS_WIN) -@@ -566,7 +566,7 @@ const base::Feature kIncognitoBrandConsistencyForAndro - "IncognitoBrandConsistencyForAndroid", base::FEATURE_DISABLED_BY_DEFAULT}; - #endif +@@ -558,7 +558,7 @@ const base::Feature kIncognitoReauthenticationForAndro + const base::Feature kIncognitoNtpRevamp{"IncognitoNtpRevamp", + base::FEATURE_DISABLED_BY_DEFAULT}; -#if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || \ +#if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ - defined(OS_CHROMEOS) + defined(OS_CHROMEOS) || defined(OS_FUCHSIA) // When enabled, removes any theme or background customization done by the user // on the Incognito UI. diff --git a/www/chromium/files/patch-chrome_common_chrome__features.h b/www/chromium/files/patch-chrome_common_chrome__features.h index dc1c03e1f02d..31ee2dd97448 100644 --- a/www/chromium/files/patch-chrome_common_chrome__features.h +++ b/www/chromium/files/patch-chrome_common_chrome__features.h @@ -1,6 +1,6 @@ ---- chrome/common/chrome_features.h.orig 2021-07-19 18:45:10 UTC +--- chrome/common/chrome_features.h.orig 2021-09-24 04:26:00 UTC +++ chrome/common/chrome_features.h -@@ -69,10 +69,10 @@ extern const base::Feature kAppShimNewCloseBehavior; +@@ -67,10 +67,10 @@ extern const base::Feature kAppShimNewCloseBehavior; COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kAsyncDns; @@ -13,26 +13,30 @@ #if BUILDFLAG(IS_CHROMEOS_ASH) COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kBorealis; -@@ -250,11 +250,11 @@ extern const base::Feature kEnableAmbientAuthenticatio +@@ -79,7 +79,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::F + COMPONENT_EXPORT(CHROME_FEATURES) + extern const base::Feature kChangePictureVideoMode; - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ -+#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) || \ - defined(OS_MAC) +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) COMPONENT_EXPORT(CHROME_FEATURES) - extern const base::Feature kEnableEphemeralGuestProfilesOnDesktop; --#endif // defined(OS_WIN) || (defined(OS_LINUX) || -+#endif // defined(OS_WIN) || (defined(OS_LINUX) || defined(OS_BSD) || - // BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_MAC) + extern const base::Feature kChromeAppsDeprecation; + #endif +@@ -158,7 +158,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) + extern const base::Feature kDefaultPinnedAppsUpdate2021Q2; + #endif - #if defined(OS_WIN) -@@ -374,7 +374,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) - extern const base::Feature kIncognitoBrandConsistencyForAndroid; +-#if BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_MAC) || defined(OS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) + COMPONENT_EXPORT(CHROME_FEATURES) + extern const base::Feature kDesktopPWAsAppIconShortcutsMenuUI; #endif +@@ -367,7 +367,7 @@ extern const base::Feature kIncognitoReauthenticationF + COMPONENT_EXPORT(CHROME_FEATURES) + extern const base::Feature kIncognitoNtpRevamp; -#if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || \ +#if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ - defined(OS_CHROMEOS) + defined(OS_CHROMEOS) || defined(OS_FUCHSIA) COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kIncognitoBrandConsistencyForDesktop; diff --git a/www/chromium/files/patch-chrome_common_chrome__paths.cc b/www/chromium/files/patch-chrome_common_chrome__paths.cc index e5809d62f4ce..32db03041d0d 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-07-19 18:45:10 UTC +--- chrome/common/chrome_paths.cc.orig 2021-09-24 04:26:00 UTC +++ chrome/common/chrome_paths.cc -@@ -43,15 +43,23 @@ +@@ -43,17 +43,25 @@ namespace { @@ -23,8 +23,11 @@ #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) +#endif - #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + #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) { return false; break; @@ -34,7 +37,7 @@ if (!GetUserDownloadsDirectorySafe(&cur)) return false; break; -@@ -416,6 +424,9 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -415,6 +423,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")); @@ -44,7 +47,7 @@ #else cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies")); #endif -@@ -427,7 +438,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -426,7 +437,7 @@ bool PathProvider(int key, base::FilePath* result) { #if BUILDFLAG(IS_CHROMEOS_ASH) || \ ((defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ BUILDFLAG(CHROMIUM_BRANDING)) || \ @@ -53,7 +56,7 @@ case chrome::DIR_USER_EXTERNAL_EXTENSIONS: { if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) return false; -@@ -435,7 +446,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -434,7 +445,7 @@ bool PathProvider(int key, base::FilePath* result) { break; } #endif @@ -62,7 +65,7 @@ case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: { cur = base::FilePath(kFilepathSinglePrefExtensions); break; -@@ -470,7 +481,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -469,7 +480,7 @@ bool PathProvider(int key, base::FilePath* result) { #endif break; @@ -71,7 +74,7 @@ case chrome::DIR_NATIVE_MESSAGING: #if defined(OS_MAC) #if BUILDFLAG(GOOGLE_CHROME_BRANDING) -@@ -484,6 +495,9 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -483,6 +494,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")); @@ -81,7 +84,7 @@ #else cur = base::FilePath(FILE_PATH_LITERAL( "/etc/chromium/native-messaging-hosts")); -@@ -496,7 +510,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -495,7 +509,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__switches.cc b/www/chromium/files/patch-chrome_common_chrome__switches.cc index 1a6a28086ffe..b65c4fbe3f86 100644 --- a/www/chromium/files/patch-chrome_common_chrome__switches.cc +++ b/www/chromium/files/patch-chrome_common_chrome__switches.cc @@ -1,11 +1,11 @@ ---- chrome/common/chrome_switches.cc.orig 2021-07-19 18:45:10 UTC +--- chrome/common/chrome_switches.cc.orig 2021-09-24 04:26:00 UTC +++ chrome/common/chrome_switches.cc -@@ -810,7 +810,7 @@ const char kAllowNaClFileHandleAPI[] = "allow-n +@@ -796,7 +796,7 @@ const char kAllowNaClFileHandleAPI[] = "allow-n const char kAllowNaClSocketAPI[] = "allow-nacl-socket-api"; #endif -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) || \ - defined(OS_WIN) + defined(OS_WIN) || defined(OS_FUCHSIA) const char kEnableNewAppMenuIcon[] = "enable-new-app-menu-icon"; diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.h b/www/chromium/files/patch-chrome_common_chrome__switches.h index cb1e3c7a1732..11a31aeaae6d 100644 --- a/www/chromium/files/patch-chrome_common_chrome__switches.h +++ b/www/chromium/files/patch-chrome_common_chrome__switches.h @@ -1,11 +1,11 @@ ---- chrome/common/chrome_switches.h.orig 2021-07-19 18:45:10 UTC +--- chrome/common/chrome_switches.h.orig 2021-09-24 04:26:00 UTC +++ chrome/common/chrome_switches.h -@@ -254,7 +254,7 @@ extern const char kAllowNaClFileHandleAPI[]; +@@ -250,7 +250,7 @@ extern const char kAllowNaClFileHandleAPI[]; extern const char kAllowNaClSocketAPI[]; #endif -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) || \ - defined(OS_WIN) + defined(OS_WIN) || defined(OS_FUCHSIA) extern const char kEnableNewAppMenuIcon[]; extern const char kGuest[]; diff --git a/www/chromium/files/patch-chrome_common_extensions_command.cc b/www/chromium/files/patch-chrome_common_extensions_command.cc index d2d5f31a0918..ef7a1d6c1b37 100644 --- a/www/chromium/files/patch-chrome_common_extensions_command.cc +++ b/www/chromium/files/patch-chrome_common_extensions_command.cc @@ -1,11 +1,11 @@ ---- chrome/common/extensions/command.cc.orig 2021-04-14 18:40:56 UTC +--- chrome/common/extensions/command.cc.orig 2021-09-24 04:26:00 UTC +++ chrome/common/extensions/command.cc @@ -294,7 +294,7 @@ std::string Command::CommandPlatform() { return values::kKeybindingPlatformMac; - #elif BUILDFLAG(IS_CHROMEOS_ASH) + #elif BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) return values::kKeybindingPlatformChromeOs; --#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) return values::kKeybindingPlatformLinux; #else return ""; diff --git a/www/chromium/files/patch-chrome_common_features.gni b/www/chromium/files/patch-chrome_common_features.gni index f3d8f02ffe39..361728e162cd 100644 --- a/www/chromium/files/patch-chrome_common_features.gni +++ b/www/chromium/files/patch-chrome_common_features.gni @@ -1,8 +1,8 @@ ---- chrome/common/features.gni.orig 2021-04-14 18:40:56 UTC +--- chrome/common/features.gni.orig 2021-09-24 04:26:00 UTC +++ chrome/common/features.gni -@@ -54,7 +54,7 @@ declare_args() { - enable_one_click_signin = - is_win || is_mac || ((is_linux || is_chromeos_lacros) && !is_chromecast) +@@ -52,7 +52,7 @@ declare_args() { + enable_one_click_signin = is_win || is_mac || is_fuchsia || + ((is_linux || is_chromeos_lacros) && !is_chromecast) - enable_service_discovery = (enable_mdns && !is_android) || is_mac + enable_service_discovery = (enable_mdns && !is_android) || is_mac || is_bsd diff --git a/www/chromium/files/patch-chrome_common_pref__names.cc b/www/chromium/files/patch-chrome_common_pref__names.cc index d798a2d3c94c..09f936e1807c 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-07-19 18:45:10 UTC +--- chrome/common/pref_names.cc.orig 2021-09-24 04:26:00 UTC +++ chrome/common/pref_names.cc -@@ -1125,7 +1125,7 @@ const char kAllowedDomainsForApps[] = "settings.allowe +@@ -1131,7 +1131,7 @@ const char kAllowedDomainsForApps[] = "settings.allowe // 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 -@@ -1228,7 +1228,7 @@ const char kShowUpdatePromotionInfoBar[] = +@@ -1234,7 +1234,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"; -@@ -1686,7 +1686,7 @@ const char kDownloadDefaultDirectory[] = "download.def +@@ -1700,7 +1700,7 @@ const char kDownloadDefaultDirectory[] = "download.def // upgrade a unsafe location to a safe location. const char kDownloadDirUpgraded[] = "download.directory_upgrade"; @@ -27,8 +27,8 @@ defined(OS_MAC) const char kOpenPdfDownloadInSystemReader[] = "download.open_pdf_in_system_reader"; -@@ -1958,7 +1958,7 @@ const char kWebAppsUninstalledDefaultChromeApps[] = - const char kWebAppsPreferences[] = "web_apps.web_app_ids"; +@@ -1979,7 +1979,7 @@ const char kWebAppsPreferences[] = "web_apps.web_app_i + const char kWebAppsIsolationState[] = "web_apps.isolation_state"; #if defined(OS_WIN) || defined(OS_MAC) || \ - (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) @@ -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 -@@ -2074,12 +2074,12 @@ const char kAmbientAuthenticationInPrivateModesEnabled +@@ -2101,12 +2101,12 @@ const char kAmbientAuthenticationInPrivateModesEnabled // requests. const char kBasicAuthOverHttpEnabled[] = "auth.basic_over_http_enabled"; @@ -49,14 +49,23 @@ -#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) || defined(OS_BSD) - #if defined(OS_POSIX) + #if defined(OS_POSIX) || defined(OS_FUCHSIA) // Boolean that specifies whether NTLMv2 is enabled. -@@ -2993,7 +2993,7 @@ const char kBlockAutoplayEnabled[] = "media.block_auto +@@ -3059,7 +3059,7 @@ const char kAutoplayWhitelist[] = "media.autoplay_whit + const char kBlockAutoplayEnabled[] = "media.block_autoplay"; + #endif // !defined(OS_ANDROID) - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if defined(OS_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 + // Boolean that indicates if system notifications are allowed to be used in + // place of Chrome notifications. + const char kAllowSystemNotifications[] = "system_notifications.allowed"; +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + // Integer that holds the value of the next persistent notification ID to be + // used. diff --git a/www/chromium/files/patch-chrome_common_pref__names.h b/www/chromium/files/patch-chrome_common_pref__names.h index b8e9f85dd341..e4a79f5de08e 100644 --- a/www/chromium/files/patch-chrome_common_pref__names.h +++ b/www/chromium/files/patch-chrome_common_pref__names.h @@ -1,6 +1,6 @@ ---- chrome/common/pref_names.h.orig 2021-07-19 18:45:10 UTC +--- chrome/common/pref_names.h.orig 2021-09-24 04:26:00 UTC +++ chrome/common/pref_names.h -@@ -360,7 +360,7 @@ extern const char kForceYouTubeRestrict[]; +@@ -361,7 +361,7 @@ extern const char kForceYouTubeRestrict[]; extern const char kAllowedDomainsForApps[]; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ extern const char kUsesSystemTheme[]; #endif extern const char kCurrentThemePackFilename[]; -@@ -389,7 +389,7 @@ extern const char kShowUpdatePromotionInfoBar[]; +@@ -390,7 +390,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) -@@ -561,7 +561,7 @@ extern const char kDownloadExtensionsToOpen[]; +@@ -571,7 +571,7 @@ extern const char kDownloadExtensionsToOpen[]; extern const char kDownloadExtensionsToOpenByPolicy[]; extern const char kDownloadAllowedURLsForOpenByPolicy[]; extern const char kDownloadDirUpgraded[]; @@ -27,8 +27,8 @@ defined(OS_MAC) extern const char kOpenPdfDownloadInSystemReader[]; #endif -@@ -665,7 +665,7 @@ extern const char kWebAppsUninstalledDefaultChromeApps - extern const char kWebAppsPreferences[]; +@@ -676,7 +676,7 @@ extern const char kWebAppsPreferences[]; + extern const char kWebAppsIsolationState[]; #if defined(OS_WIN) || defined(OS_MAC) || \ - (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) @@ -36,7 +36,7 @@ extern const char kWebAppsUrlHandlerInfo[]; #endif -@@ -801,9 +801,9 @@ extern const char kGloballyScopeHTTPAuthCacheEnabled[] +@@ -818,9 +818,9 @@ extern const char kGloballyScopeHTTPAuthCacheEnabled[] extern const char kAmbientAuthenticationInPrivateModesEnabled[]; extern const char kBasicAuthOverHttpEnabled[]; @@ -46,14 +46,14 @@ -#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) || defined(OS_BSD) - #if defined(OS_POSIX) + #if defined(OS_POSIX) || defined(OS_FUCHSIA) extern const char kNtlmV2Enabled[]; -@@ -1039,7 +1039,7 @@ extern const char kBlockAutoplayEnabled[]; +@@ -1060,7 +1060,7 @@ extern const char kAutoplayWhitelist[]; + extern const char kBlockAutoplayEnabled[]; + #endif - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) extern const char kAllowNativeNotifications[]; extern const char kAllowSystemNotifications[]; #endif diff --git a/www/chromium/files/patch-chrome_common_webui__url__constants.cc b/www/chromium/files/patch-chrome_common_webui__url__constants.cc index 99058328f9a9..fd685308f678 100644 --- a/www/chromium/files/patch-chrome_common_webui__url__constants.cc +++ b/www/chromium/files/patch-chrome_common_webui__url__constants.cc @@ -1,6 +1,6 @@ ---- chrome/common/webui_url_constants.cc.orig 2021-07-19 18:45:10 UTC +--- chrome/common/webui_url_constants.cc.orig 2021-09-24 04:26:00 UTC +++ chrome/common/webui_url_constants.cc -@@ -359,12 +359,12 @@ const char kChromeUIOSSettingsHost[] = "os-settings"; +@@ -372,12 +372,12 @@ const char kChromeUIOSSettingsHost[] = "os-settings"; const char kChromeUIOSSettingsURL[] = "chrome://os-settings/"; #endif @@ -15,7 +15,7 @@ defined(OS_CHROMEOS) const char kChromeUIDiscardsHost[] = "discards"; const char kChromeUIDiscardsURL[] = "chrome://discards/"; -@@ -379,7 +379,7 @@ const char kChromeUINearbyShareURL[] = "chrome://nearb +@@ -392,7 +392,7 @@ const char kChromeUINearbyShareURL[] = "chrome://nearb const char kChromeUILinuxProxyConfigHost[] = "linux-proxy-config"; #endif @@ -24,16 +24,16 @@ defined(OS_ANDROID) const char kChromeUISandboxHost[] = "sandbox"; #endif -@@ -387,7 +387,7 @@ const char kChromeUISandboxHost[] = "sandbox"; +@@ -400,7 +400,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) || \ + #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_FUCHSIA) || \ - (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) + (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) const char kChromeUIBrowserSwitchHost[] = "browser-switch"; const char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/"; const char kChromeUIEnterpriseProfileWelcomeHost[] = -@@ -402,7 +402,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro +@@ -415,7 +415,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro const char kChromeUIProfilePickerStartupQuery[] = "startup"; #endif @@ -42,7 +42,7 @@ defined(USE_AURA) const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog"; #endif -@@ -584,14 +584,14 @@ const char* const kChromeHostURLs[] = { +@@ -601,14 +601,14 @@ const char* const kChromeHostURLs[] = { kChromeUIInternetDetailDialogHost, kChromeUIAssistantOptInHost, #endif @@ -59,7 +59,7 @@ defined(OS_ANDROID) kChromeUISandboxHost, #endif -@@ -653,7 +653,7 @@ const char* const kChromeDebugURLs[] = { +@@ -671,7 +671,7 @@ const char* const kChromeDebugURLs[] = { blink::kChromeUIGpuJavaCrashURL, kChromeUIJavaCrashURL, #endif 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 7f2d7d09500e..768d04c34712 100644 --- a/www/chromium/files/patch-chrome_common_webui__url__constants.h +++ b/www/chromium/files/patch-chrome_common_webui__url__constants.h @@ -1,6 +1,6 @@ ---- chrome/common/webui_url_constants.h.orig 2021-07-19 18:45:10 UTC +--- chrome/common/webui_url_constants.h.orig 2021-09-24 04:26:00 UTC +++ chrome/common/webui_url_constants.h -@@ -309,12 +309,12 @@ extern const char kChromeUIOSSettingsHost[]; +@@ -316,12 +316,12 @@ extern const char kChromeUIOSSettingsHost[]; extern const char kChromeUIOSSettingsURL[]; #endif @@ -12,10 +12,10 @@ -#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_CHROMEOS) || defined(OS_FUCHSIA) extern const char kChromeUIDiscardsHost[]; extern const char kChromeUIDiscardsURL[]; -@@ -329,7 +329,7 @@ extern const char kChromeUINearbyShareURL[]; +@@ -336,7 +336,7 @@ extern const char kChromeUINearbyShareURL[]; extern const char kChromeUILinuxProxyConfigHost[]; #endif @@ -24,16 +24,16 @@ defined(OS_ANDROID) extern const char kChromeUISandboxHost[]; #endif -@@ -337,7 +337,7 @@ extern const char kChromeUISandboxHost[]; +@@ -344,7 +344,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) || \ + #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_FUCHSIA) || \ - (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) + (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) extern const char kChromeUIBrowserSwitchHost[]; extern const char kChromeUIBrowserSwitchURL[]; extern const char kChromeUIEnterpriseProfileWelcomeHost[]; -@@ -349,7 +349,7 @@ extern const char kChromeUIProfilePickerUrl[]; +@@ -356,7 +356,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 new file mode 100644 index 000000000000..db7474a1363f --- /dev/null +++ b/www/chromium/files/patch-chrome_renderer_chrome__render__frame__observer.cc @@ -0,0 +1,11 @@ +--- chrome/renderer/chrome_render_frame_observer.cc.orig 2021-09-24 18:38:51 UTC ++++ chrome/renderer/chrome_render_frame_observer.cc +@@ -281,7 +281,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) + // Only the main frame is allowed to control draggable regions, to avoid other + // frames manipulate the regions in the browser process. + if (!render_frame()->IsMainFrame()) diff --git a/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.cc b/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.cc index 44f9c3b25a6d..4b99eb331ea7 100644 --- a/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.cc +++ b/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.cc @@ -1,4 +1,4 @@ ---- chrome/renderer/pepper/pepper_flash_font_file_host.cc.orig 2021-04-14 18:40:56 UTC +--- chrome/renderer/pepper/pepper_flash_font_file_host.cc.orig 2021-09-14 01:51:52 UTC +++ chrome/renderer/pepper/pepper_flash_font_file_host.cc @@ -16,7 +16,7 @@ #include "ppapi/proxy/ppapi_messages.h" @@ -7,7 +7,7 @@ -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_OPENBSD) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "components/services/font/public/cpp/font_loader.h" - #include "content/public/common/common_sandbox_support_linux.h" + #include "pdf/font_table_linux.h" #elif defined(OS_WIN) @@ -30,7 +30,7 @@ PepperFlashFontFileHost::PepperFlashFontFileHost( const ppapi::proxy::SerializedFontDescription& description, @@ -25,5 +25,5 @@ -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) if (font_file_.IsValid()) { - result = content::GetFontTable(font_file_.GetPlatformFile(), table, - 0 /* offset */, + result = + pdf::GetFontTable(font_file_.GetPlatformFile(), table, /*offset=*/0, diff --git a/www/chromium/files/patch-chrome_services_speech_audio__source__fetcher__impl.cc b/www/chromium/files/patch-chrome_services_speech_audio__source__fetcher__impl.cc index 4bd38a729df6..5472435c95a7 100644 --- a/www/chromium/files/patch-chrome_services_speech_audio__source__fetcher__impl.cc +++ b/www/chromium/files/patch-chrome_services_speech_audio__source__fetcher__impl.cc @@ -1,6 +1,6 @@ ---- chrome/services/speech/audio_source_fetcher_impl.cc.orig 2021-06-10 11:24:44 UTC +--- chrome/services/speech/audio_source_fetcher_impl.cc.orig 2021-09-24 04:26:00 UTC +++ chrome/services/speech/audio_source_fetcher_impl.cc -@@ -65,7 +65,7 @@ void AudioSourceFetcherImpl::Start( +@@ -68,7 +68,7 @@ void AudioSourceFetcherImpl::Start( // TODO(crbug.com/1185978): Check implementation / sandbox policy on Mac and // Windows. diff --git a/www/chromium/files/patch-chrome_services_speech_soda_soda__test__paths.h b/www/chromium/files/patch-chrome_services_speech_soda_soda__test__paths.h index 01fe02d3da8e..9775a8f1fcec 100644 --- a/www/chromium/files/patch-chrome_services_speech_soda_soda__test__paths.h +++ b/www/chromium/files/patch-chrome_services_speech_soda_soda__test__paths.h @@ -1,7 +1,7 @@ ---- chrome/services/speech/soda/soda_test_paths.h.orig 2021-07-28 07:49:56 UTC +--- chrome/services/speech/soda/soda_test_paths.h.orig 2021-09-14 01:51:52 UTC +++ chrome/services/speech/soda/soda_test_paths.h @@ -34,7 +34,7 @@ constexpr base::FilePath::CharType kSodaResourcePath[] - constexpr base::FilePath::CharType kSodaTestBinaryRelativePath = + constexpr base::FilePath::CharType kSodaTestBinaryRelativePath[] = FILE_PATH_LITERAL("SODA_for_testing.dll"); -#elif defined(OS_LINUX) diff --git a/www/chromium/files/patch-chrome_test_BUILD.gn b/www/chromium/files/patch-chrome_test_BUILD.gn index 3f895d679117..f9fac3fa7f02 100644 --- a/www/chromium/files/patch-chrome_test_BUILD.gn +++ b/www/chromium/files/patch-chrome_test_BUILD.gn @@ -1,17 +1,15 @@ ---- chrome/test/BUILD.gn.orig 2021-07-19 18:45:11 UTC +--- chrome/test/BUILD.gn.orig 2021-10-08 06:25:42 UTC +++ chrome/test/BUILD.gn -@@ -476,6 +476,10 @@ static_library("test_support") { +@@ -536,7 +536,7 @@ static_library("test_support") { ] } -+ if (is_bsd) { -+ public_deps -= [ "//components/crash/core/app" ] -+ } -+ - if (is_chromeos_lacros) { - deps += [ - "//chromeos/lacros", -@@ -1799,7 +1803,7 @@ if (!is_android) { +- if (!is_fuchsia) { ++ if (!is_fuchsia && !is_bsd) { + public_deps += [ "//components/crash/core/app" ] + } + +@@ -2119,7 +2119,7 @@ if (!is_android && !is_fuchsia) { ] } @@ -20,7 +18,7 @@ sources += [ "../browser/error_reporting/webui_js_error_reporting_browsertest.cc", ] -@@ -5425,7 +5429,7 @@ test("unit_tests") { +@@ -6353,7 +6353,7 @@ test("unit_tests") { ] } @@ -29,12 +27,12 @@ deps += [ "//chrome/browser/error_reporting:unit_test" ] } -@@ -7354,7 +7358,7 @@ test("chrome_app_unittests") { +@@ -8445,7 +8445,7 @@ test("chrome_app_unittests") { "//components/safe_browsing:buildflags", "//pdf:pdf_ppapi", ] - if (!is_fuchsia) { + if (!is_fuchsia && !is_bsd) { - # TODO(crbug.com/753619): Enable crash reporting on Fuchsia. deps += [ "//third_party/breakpad:client" ] } + if (enable_gwp_asan) { 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 f1ac5eeef45b..01b8bf0cceee 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,6 +1,6 @@ ---- chrome/test/base/in_process_browser_test.cc.orig 2021-07-19 18:45:11 UTC +--- chrome/test/base/in_process_browser_test.cc.orig 2021-09-14 01:51:52 UTC +++ chrome/test/base/in_process_browser_test.cc -@@ -83,6 +83,10 @@ +@@ -82,6 +82,10 @@ #include "services/device/public/cpp/test/fake_geolocation_manager.h" #endif @@ -11,7 +11,7 @@ #if defined(OS_WIN) #include "base/win/scoped_com_initializer.h" #include "base/win/windows_version.h" -@@ -334,7 +338,7 @@ void InProcessBrowserTest::SetUp() { +@@ -348,7 +352,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 -@@ -403,7 +407,7 @@ void InProcessBrowserTest::TearDown() { +@@ -417,7 +421,7 @@ void InProcessBrowserTest::TearDown() { com_initializer_.reset(); #endif BrowserTestBase::TearDown(); 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 9ddaefead968..2152ae1a795e 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,11 +1,11 @@ ---- chrome/test/base/test_browser_window.h.orig 2021-07-19 18:45:11 UTC +--- chrome/test/base/test_browser_window.h.orig 2021-09-24 04:26:00 UTC +++ chrome/test/base/test_browser_window.h -@@ -188,7 +188,7 @@ class TestBrowserWindow : public BrowserWindow { +@@ -197,7 +197,7 @@ class TestBrowserWindow : public BrowserWindow { void MaybeShowProfileSwitchIPH() override {} #if defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_WIN) || \ -- defined(OS_LINUX) -+ defined(OS_LINUX) || defined(OS_BSD) +- defined(OS_LINUX) || defined(OS_FUCHSIA) ++ defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) void ShowHatsDialog( const std::string& site_id, base::OnceClosure success_callback, 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 new file mode 100644 index 000000000000..53bea66f92f2 --- /dev/null +++ b/www/chromium/files/patch-chrome_updater_device__management_cloud__policy__util.cc @@ -0,0 +1,50 @@ +--- chrome/updater/device_management/cloud_policy_util.cc.orig 2021-09-24 18:39:26 UTC ++++ chrome/updater/device_management/cloud_policy_util.cc +@@ -21,7 +21,7 @@ + #include <wincred.h> + #endif + +-#if defined(OS_LINUX) || defined(OS_MAC) ++#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_BSD) + #include <pwd.h> + #include <sys/types.h> + #include <unistd.h> +@@ -35,7 +35,7 @@ + + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include <limits.h> // For HOST_NAME_MAX + #endif + +@@ -62,7 +62,7 @@ + + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "base/system/sys_info.h" + #endif + +@@ -115,6 +115,11 @@ std::string GetMachineName() { + if (gethostname(hostname, HOST_NAME_MAX) == 0) // Success. + return hostname; + return std::string(); ++#elif defined(OS_BSD) ++ char hostname[MAXHOSTNAMELEN]; ++ if (gethostname(hostname, MAXHOSTNAMELEN) == 0) // Success. ++ return hostname; ++ return std::string(); + #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() { + } + + std::string GetOSVersion() { +-#if defined(OS_LINUX) || defined(OS_MAC) ++#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_BSD) + return base::SysInfo::OperatingSystemVersion(); + #elif defined(OS_WIN) + base::win::OSInfo::VersionNumber version_number = diff --git a/www/chromium/files/patch-chrome_utility_services.cc b/www/chromium/files/patch-chrome_utility_services.cc index 2eebfd5bbd5f..26c32aa2a4c0 100644 --- a/www/chromium/files/patch-chrome_utility_services.cc +++ b/www/chromium/files/patch-chrome_utility_services.cc @@ -1,6 +1,6 @@ ---- chrome/utility/services.cc.orig 2021-07-19 18:45:12 UTC +--- chrome/utility/services.cc.orig 2021-09-14 01:51:53 UTC +++ chrome/utility/services.cc -@@ -80,7 +80,7 @@ +@@ -81,7 +81,7 @@ #endif #if BUILDFLAG(ENABLE_PRINTING) @@ -9,7 +9,7 @@ defined(OS_CHROMEOS) #include "chrome/services/printing/print_backend_service_impl.h" #include "chrome/services/printing/public/mojom/print_backend_service.mojom.h" -@@ -244,7 +244,7 @@ auto RunPaintPreviewCompositor( +@@ -247,7 +247,7 @@ auto RunPaintPreviewCompositor( #endif // BUILDFLAG(ENABLE_PAINT_PREVIEW) #if BUILDFLAG(ENABLE_PRINTING) @@ -18,7 +18,7 @@ defined(OS_CHROMEOS) auto RunPrintBackendService( mojo::PendingReceiver<printing::mojom::PrintBackendService> receiver) { -@@ -365,7 +365,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -367,7 +367,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& #endif #if BUILDFLAG(ENABLE_PRINTING) 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 0f48b637db80..159debd029b5 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,6 +1,6 @@ ---- chromecast/browser/cast_browser_main_parts.cc.orig 2021-07-19 18:45:12 UTC +--- chromecast/browser/cast_browser_main_parts.cc.orig 2021-09-24 04:26:02 UTC +++ chromecast/browser/cast_browser_main_parts.cc -@@ -77,7 +77,7 @@ +@@ -78,7 +78,7 @@ #include "ui/base/ui_base_switches.h" #include "ui/gl/gl_switches.h" @@ -9,7 +9,7 @@ #include <fontconfig/fontconfig.h> #include <signal.h> #include <sys/prctl.h> -@@ -132,7 +132,7 @@ +@@ -133,7 +133,7 @@ #include "extensions/browser/extension_prefs.h" // nogncheck #endif @@ -18,7 +18,7 @@ #include "chromecast/browser/exo/wayland_server_controller.h" #endif -@@ -274,7 +274,7 @@ class CastViewsDelegate : public views::ViewsDelegate +@@ -275,7 +275,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()); -@@ -290,7 +290,7 @@ base::FilePath GetApplicationFontsDir() { +@@ -291,7 +291,7 @@ base::FilePath GetApplicationFontsDir() { } } @@ -36,7 +36,7 @@ } // namespace -@@ -319,7 +319,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { +@@ -320,7 +320,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. -@@ -329,7 +329,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { +@@ -330,7 +330,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. -@@ -486,7 +486,7 @@ void CastBrowserMainParts::ToolkitInitialized() { +@@ -492,7 +492,7 @@ void CastBrowserMainParts::ToolkitInitialized() { views_delegate_ = std::make_unique<CastViewsDelegate>(); #endif // defined(USE_AURA) @@ -63,7 +63,7 @@ base::FilePath dir_font = GetApplicationFontsDir(); const FcChar8 *dir_font_char8 = reinterpret_cast<const FcChar8*>(dir_font.value().data()); if (!FcConfigAppFontAddDir(gfx::GetGlobalFontConfig(), dir_font_char8)) { -@@ -671,7 +671,7 @@ int CastBrowserMainParts::PreMainMessageLoopRun() { +@@ -677,7 +677,7 @@ int CastBrowserMainParts::PreMainMessageLoopRun() { cast_browser_process_->browser_context()); #endif @@ -72,7 +72,7 @@ wayland_server_controller_ = std::make_unique<WaylandServerController>(window_manager_.get()); #endif -@@ -752,7 +752,7 @@ void CastBrowserMainParts::PostMainMessageLoopRun() { +@@ -758,7 +758,7 @@ void CastBrowserMainParts::PostMainMessageLoopRun() { cast_browser_process_->cast_service()->Stop(); 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 792e4ce0ee94..3ce699f183e0 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-07-19 18:45:12 UTC +--- chromecast/browser/cast_browser_main_parts.h.orig 2021-09-24 04:26:02 UTC +++ chromecast/browser/cast_browser_main_parts.h -@@ -136,7 +136,7 @@ class CastBrowserMainParts : public content::BrowserMa +@@ -142,7 +142,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 2ae9a8335894..89b48c3c3116 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,7 +1,7 @@ ---- chromecast/browser/cast_content_browser_client.cc.orig 2021-07-19 18:45:12 UTC +--- chromecast/browser/cast_content_browser_client.cc.orig 2021-09-24 04:26:02 UTC +++ chromecast/browser/cast_content_browser_client.cc -@@ -131,9 +131,9 @@ - #include "chromecast/external_mojo/broker_service/broker_service.h" // nogncheck +@@ -128,9 +128,9 @@ + #include "extensions/common/constants.h" // nogncheck #endif -#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(USE_OZONE) @@ -12,7 +12,7 @@ #if BUILDFLAG(ENABLE_CAST_RENDERER) #include "base/sequenced_task_runner.h" -@@ -475,7 +475,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS +@@ -476,7 +476,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. -@@ -867,12 +867,12 @@ CastContentBrowserClient::CreateThrottlesForNavigation +@@ -868,12 +868,12 @@ CastContentBrowserClient::CreateThrottlesForNavigation handle, general_audience_browsing_service_.get())); } diff --git a/www/chromium/files/patch-chromecast_browser_cast__content__browser__client__receiver__bindings.cc b/www/chromium/files/patch-chromecast_browser_cast__content__browser__client__receiver__bindings.cc index dc24d792bf34..7c42be3ea9b1 100644 --- a/www/chromium/files/patch-chromecast_browser_cast__content__browser__client__receiver__bindings.cc +++ b/www/chromium/files/patch-chromecast_browser_cast__content__browser__client__receiver__bindings.cc @@ -1,4 +1,4 @@ ---- chromecast/browser/cast_content_browser_client_receiver_bindings.cc.orig 2021-07-19 18:45:12 UTC +--- chromecast/browser/cast_content_browser_client_receiver_bindings.cc.orig 2021-09-24 04:26:02 UTC +++ chromecast/browser/cast_content_browser_client_receiver_bindings.cc @@ -35,7 +35,7 @@ #include "media/mojo/services/media_service.h" // nogncheck @@ -9,7 +9,7 @@ #include "chromecast/browser/webview/js_channel_service.h" #include "chromecast/common/mojom/js_channel.mojom.h" #endif -@@ -217,7 +217,7 @@ void CastContentBrowserClient::RunServiceInstance( +@@ -221,7 +221,7 @@ void CastContentBrowserClient::RunServiceInstance( void CastContentBrowserClient::BindHostReceiverForRenderer( content::RenderProcessHost* render_process_host, mojo::GenericPendingReceiver receiver) { 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 821c3998eca1..b341d3cd7f67 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-07-19 18:45:12 UTC +--- chromecast/renderer/cast_content_renderer_client.cc.orig 2021-09-14 01:51:53 UTC +++ chromecast/renderer/cast_content_renderer_client.cc -@@ -201,7 +201,7 @@ void CastContentRendererClient::RenderFrameCreated( +@@ -205,7 +205,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 f9a9626784e5..dbd576ce1d43 100644 --- a/www/chromium/files/patch-components_BUILD.gn +++ b/www/chromium/files/patch-components_BUILD.gn @@ -1,18 +1,16 @@ ---- components/BUILD.gn.orig 2021-07-19 18:45:12 UTC +--- components/BUILD.gn.orig 2021-09-24 04:26:02 UTC +++ components/BUILD.gn -@@ -351,9 +351,13 @@ test("components_unittests") { +@@ -360,6 +360,13 @@ test("components_unittests") { + ] } - if (!is_fuchsia) { # !iOS and !Fuchsia -+ if (!is_bsd) { -+ deps += [ -+ "//components/crash/content/browser:unit_tests", -+ "//components/crash/core/app:unit_tests", -+ ] -+ } - deps += [ -- "//components/crash/content/browser:unit_tests", -- "//components/crash/core/app:unit_tests", - "//components/data_reduction_proxy/core/browser:unit_tests", - "//components/data_reduction_proxy/core/common:unit_tests", - ] ++ if (is_bsd) { ++ deps -= [ ++ "//components/crash/content/browser:unit_tests", ++ "//components/crash/core/app:unit_tests", ++ ] ++ } ++ + data_deps += [ + ":components_tests_pak", + "//third_party/mesa_headers", 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 4b7d30437279..12b31f8a1ee9 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-07-19 18:45:12 UTC +--- components/autofill/core/browser/personal_data_manager.cc.orig 2021-09-24 04:26:02 UTC +++ components/autofill/core/browser/personal_data_manager.cc -@@ -2034,7 +2034,7 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp +@@ -2071,7 +2071,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. -@@ -2058,7 +2058,7 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp +@@ -2095,7 +2095,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 72ac12b0d73e..8179057ed3dc 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-07-19 18:45:12 UTC +--- components/autofill/core/common/autofill_payments_features.cc.orig 2021-09-14 01:51:54 UTC +++ components/autofill/core/common/autofill_payments_features.cc -@@ -176,7 +176,7 @@ bool ShouldShowImprovedUserConsentForCreditCardSave() +@@ -178,7 +178,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_autofill_core_common_autofill__util.cc b/www/chromium/files/patch-components_autofill_core_common_autofill__util.cc index 30e21d8c3748..1db5a620da49 100644 --- a/www/chromium/files/patch-components_autofill_core_common_autofill__util.cc +++ b/www/chromium/files/patch-components_autofill_core_common_autofill__util.cc @@ -1,6 +1,6 @@ ---- components/autofill/core/common/autofill_util.cc.orig 2021-07-19 18:45:12 UTC +--- components/autofill/core/common/autofill_util.cc.orig 2021-09-14 01:51:54 UTC +++ components/autofill/core/common/autofill_util.cc -@@ -161,7 +161,7 @@ bool SanitizedFieldIsEmpty(const std::u16string& value +@@ -153,7 +153,7 @@ bool SanitizedFieldIsEmpty(const std::u16string& value } bool ShouldAutoselectFirstSuggestionOnArrowDown() { diff --git a/www/chromium/files/patch-components_cast__channel_cast__message__util.cc b/www/chromium/files/patch-components_cast__channel_cast__message__util.cc index bf1889c74d42..a8341c0a790b 100644 --- a/www/chromium/files/patch-components_cast__channel_cast__message__util.cc +++ b/www/chromium/files/patch-components_cast__channel_cast__message__util.cc @@ -1,6 +1,6 @@ ---- components/cast_channel/cast_message_util.cc.orig 2021-07-19 18:45:12 UTC +--- components/cast_channel/cast_message_util.cc.orig 2021-09-14 01:51:54 UTC +++ components/cast_channel/cast_message_util.cc -@@ -169,7 +169,7 @@ int GetVirtualConnectPlatformValue() { +@@ -168,7 +168,7 @@ int GetVirtualConnectPlatformValue() { return 4; #elif BUILDFLAG(IS_CHROMEOS_ASH) return 5; diff --git a/www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.cc b/www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.cc index ffb5cd7878a5..8fd80c716043 100644 --- a/www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.cc +++ b/www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.cc @@ -1,11 +1,11 @@ ---- components/content_settings/core/browser/website_settings_registry.cc.orig 2021-04-14 18:40:59 UTC +--- components/content_settings/core/browser/website_settings_registry.cc.orig 2021-09-14 01:51:54 UTC +++ components/content_settings/core/browser/website_settings_registry.cc -@@ -69,7 +69,7 @@ const WebsiteSettingsInfo* WebsiteSettingsRegistry::Re +@@ -67,7 +67,7 @@ const WebsiteSettingsInfo* WebsiteSettingsRegistry::Re + #if defined(OS_WIN) + if (!(platform & PLATFORM_WINDOWS)) return nullptr; - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) if (!(platform & PLATFORM_LINUX)) return nullptr; #elif defined(OS_MAC) diff --git a/www/chromium/files/patch-components_crash_core_app_BUILD.gn b/www/chromium/files/patch-components_crash_core_app_BUILD.gn index 6a1084c43765..768d797d884c 100644 --- a/www/chromium/files/patch-components_crash_core_app_BUILD.gn +++ b/www/chromium/files/patch-components_crash_core_app_BUILD.gn @@ -1,9 +1,9 @@ ---- components/crash/core/app/BUILD.gn.orig 2021-04-14 18:40:59 UTC +--- components/crash/core/app/BUILD.gn.orig 2021-09-14 01:51:54 UTC +++ components/crash/core/app/BUILD.gn @@ -3,7 +3,7 @@ # found in the LICENSE file. - # TODO(crbug.com/753619): Enable crash reporting on Fuchsia. + # TODO(crbug.com/1226159): Complete crash reporting integration on Fuchsia. -assert(!is_fuchsia) +assert(!is_fuchsia && !is_bsd) 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 9c9aa78af044..db87ddab12be 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,28 +1,20 @@ ---- components/feature_engagement/public/event_constants.cc.orig 2021-07-19 18:45:13 UTC +--- components/feature_engagement/public/event_constants.cc.orig 2021-09-24 04:26:03 UTC +++ components/feature_engagement/public/event_constants.cc -@@ -10,13 +10,13 @@ namespace feature_engagement { +@@ -10,7 +10,7 @@ namespace feature_engagement { namespace events { -#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) const char kNewTabOpened[] = "new_tab_opened"; --#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) - --#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) const char kSixthTabOpened[] = "sixth_tab_opened"; - const char kTabGroupCreated[] = "tab_group_created"; -@@ -43,7 +43,7 @@ const char kDesktopPwaInstalled[] = "desktop_pwa_insta +@@ -39,7 +39,7 @@ const char kDesktopPwaInstalled[] = "desktop_pwa_insta const char kUpdatedConnectionSecurityIndicatorDisplayed[] = "updated_connection_security_indicator_displayed"; -#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) #if defined(OS_IOS) 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 ddc196ab72d2..ea16ccdbaa27 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,31 +1,20 @@ ---- components/feature_engagement/public/event_constants.h.orig 2021-07-19 18:45:13 UTC +--- components/feature_engagement/public/event_constants.h.orig 2021-09-24 04:26:03 UTC +++ components/feature_engagement/public/event_constants.h -@@ -12,16 +12,16 @@ namespace feature_engagement { +@@ -12,7 +12,7 @@ namespace feature_engagement { namespace events { - // Desktop and IOS. + // Desktop -#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) // The user has explicitly opened a new tab via an entry point from inside of // Chrome. - extern const char kNewTabOpened[]; --#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) - - // Desktop --#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) - // A new tab was opened when 5 (or more) tabs were already open. - extern const char kSixthTabOpened[]; -@@ -69,7 +69,7 @@ extern const char kDesktopPwaInstalled[]; +@@ -65,7 +65,7 @@ extern const char kDesktopPwaInstalled[]; // Omnibox displayed the updated connection security indicator. extern const char kUpdatedConnectionSecurityIndicatorDisplayed[]; -#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) #if defined(OS_IOS) 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 5a73260c5d3b..97befdeff889 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc @@ -1,20 +1,35 @@ ---- components/feature_engagement/public/feature_constants.cc.orig 2021-07-19 18:45:13 UTC +--- components/feature_engagement/public/feature_constants.cc.orig 2021-09-24 04:26:03 UTC +++ components/feature_engagement/public/feature_constants.cc -@@ -12,7 +12,7 @@ const base::Feature kIPHDemoMode{"IPH_DemoMode", +@@ -12,7 +12,7 @@ const base::Feature kIPHSnooze{"IPH_Snooze", base::FEA 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_CHROMEOS) || defined(OS_FUCHSIA) const base::Feature kIPHDesktopTabGroupsNewGroupFeature{ "IPH_DesktopTabGroupsNewGroup", base::FEATURE_DISABLED_BY_DEFAULT}; -@@ -42,7 +42,7 @@ const base::Feature kIPHUpdatedConnectionSecurityIndic +@@ -40,7 +40,7 @@ const base::Feature kIPHDesktopPwaInstallFeature{ + "IPH_DesktopPwaInstall", base::FEATURE_DISABLED_BY_DEFAULT}; + const base::Feature kIPHProfileSwitchFeature{"IPH_ProfileSwitch", + base::FEATURE_ENABLED_BY_DEFAULT}; +-#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) + + #if defined(OS_ANDROID) +@@ -203,12 +203,12 @@ const base::Feature kIPHDiscoverFeedHeaderFeature{ + "IPH_DiscoverFeedHeaderMenu", base::FEATURE_DISABLED_BY_DEFAULT}; + #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_ANDROID) || defined(OS_FUCHSIA) + const base::Feature kIPHUpdatedConnectionSecurityIndicatorsFeature{ "IPH_UpdatedConnectionSecurityIndicators", base::FEATURE_DISABLED_BY_DEFAULT}; - -#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_ANDROID) || defined(OS_FUCHSIA) - #if defined(OS_ANDROID) + } // namespace feature_engagement 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 4e337050f26c..9dab6a50b115 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h @@ -1,20 +1,29 @@ ---- components/feature_engagement/public/feature_constants.h.orig 2021-07-19 18:45:13 UTC +--- components/feature_engagement/public/feature_constants.h.orig 2021-09-24 04:26:03 UTC +++ components/feature_engagement/public/feature_constants.h -@@ -16,7 +16,7 @@ extern const base::Feature kIPHDemoMode; +@@ -19,7 +19,7 @@ extern const base::Feature kIPHSnooze; // 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_CHROMEOS) || defined(OS_FUCHSIA) extern const base::Feature kIPHDesktopTabGroupsNewGroupFeature; extern const base::Feature kIPHFocusModeFeature; -@@ -31,7 +31,7 @@ extern const base::Feature kIPHDesktopSnoozeFeature; +@@ -35,7 +35,7 @@ extern const base::Feature kIPHDesktopSnoozeFeature; extern const base::Feature kIPHDesktopPwaInstallFeature; extern const base::Feature kIPHProfileSwitchFeature; extern const base::Feature kIPHUpdatedConnectionSecurityIndicatorsFeature; -#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) // All the features declared for Android below that are also used in Java, +@@ -126,7 +126,7 @@ extern const base::Feature kIPHBadgedTranslateManualTr + extern const base::Feature 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_ANDROID) || defined(OS_FUCHSIA) + extern const base::Feature kIPHUpdatedConnectionSecurityIndicatorsFeature; + #endif diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc b/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc index 8e2a954081a3..b618be6453ce 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,6 +1,6 @@ ---- components/feature_engagement/public/feature_list.cc.orig 2021-07-19 18:45:13 UTC +--- components/feature_engagement/public/feature_list.cc.orig 2021-09-14 01:51:54 UTC +++ components/feature_engagement/public/feature_list.cc -@@ -89,7 +89,7 @@ const base::Feature* const kAllFeatures[] = { +@@ -94,7 +94,7 @@ const base::Feature* const kAllFeatures[] = { &kIPHBadgedTranslateManualTriggerFeature, &kIPHDiscoverFeedHeaderFeature, #endif // defined(OS_IOS) @@ -9,7 +9,7 @@ defined(OS_CHROMEOS) &kIPHDesktopTabGroupsNewGroupFeature, &kIPHFocusModeFeature, -@@ -103,7 +103,7 @@ const base::Feature* const kAllFeatures[] = { +@@ -109,7 +109,7 @@ const base::Feature* const kAllFeatures[] = { &kIPHDesktopPwaInstallFeature, &kIPHProfileSwitchFeature, &kIPHUpdatedConnectionSecurityIndicatorsFeature, 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 92c16c5056eb..f5aa6a725727 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,38 +1,38 @@ ---- components/feature_engagement/public/feature_list.h.orig 2021-07-19 18:45:13 UTC +--- components/feature_engagement/public/feature_list.h.orig 2021-09-24 04:26:03 UTC +++ components/feature_engagement/public/feature_list.h -@@ -167,7 +167,7 @@ DEFINE_VARIATION_PARAM(kIPHDiscoverFeedHeaderFeature, +@@ -176,7 +176,7 @@ DEFINE_VARIATION_PARAM(kIPHDiscoverFeedHeaderFeature, "IPH_DiscoverFeedHeaderMenu"); #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) DEFINE_VARIATION_PARAM(kIPHDesktopTabGroupsNewGroupFeature, "IPH_DesktopTabGroupsNewGroup"); -@@ -186,7 +186,7 @@ DEFINE_VARIATION_PARAM(kIPHDesktopPwaInstallFeature, " +@@ -196,7 +196,7 @@ DEFINE_VARIATION_PARAM(kIPHDesktopPwaInstallFeature, " DEFINE_VARIATION_PARAM(kIPHProfileSwitchFeature, "IPH_ProfileSwitch"); DEFINE_VARIATION_PARAM(kIPHUpdatedConnectionSecurityIndicatorsFeature, "IPH_UpdatedConnectionSecurityIndicators"); -#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 -@@ -271,7 +271,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation - VARIATION_ENTRY(kIPHBadgedReadingListFeature), +@@ -284,7 +284,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation + VARIATION_ENTRY(kIPHReadingListMessagesFeature), VARIATION_ENTRY(kIPHBadgedTranslateManualTriggerFeature), VARIATION_ENTRY(kIPHDiscoverFeedHeaderFeature), -#elif defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ +#elif defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ - defined(OS_CHROMEOS) + defined(OS_CHROMEOS) || defined(OS_FUCHSIA) VARIATION_ENTRY(kIPHDesktopTabGroupsNewGroupFeature), VARIATION_ENTRY(kIPHFocusModeFeature), -@@ -285,7 +285,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation +@@ -299,7 +299,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation VARIATION_ENTRY(kIPHDesktopPwaInstallFeature), VARIATION_ENTRY(kIPHProfileSwitchFeature), VARIATION_ENTRY(kIPHUpdatedConnectionSecurityIndicatorsFeature), -#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_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 adbda9ec11a1..bc64aed3596e 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-07-19 18:45:13 UTC +--- components/feed/core/v2/proto_util.cc.orig 2021-09-24 04:26:03 UTC +++ components/feed/core/v2/proto_util.cc -@@ -83,8 +83,8 @@ feedwire::Version GetPlatformVersionMessage() { +@@ -85,8 +85,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()); -@@ -99,8 +99,8 @@ feedwire::Version GetAppVersionMessage(const ChromeInf +@@ -101,8 +101,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 39c90be47bc4..0199df983cb0 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-07-19 18:45:13 UTC +--- components/flags_ui/flags_state.cc.orig 2021-09-24 04:26:03 UTC +++ components/flags_ui/flags_state.cc -@@ -631,7 +631,7 @@ int FlagsState::GetCurrentPlatform() { +@@ -642,7 +642,7 @@ unsigned short FlagsState::GetCurrentPlatform() { return kOsWin; #elif BUILDFLAG(IS_CHROMEOS_ASH) return kOsCrOS; diff --git a/www/chromium/files/patch-components_gcm__driver_gcm__client__impl.cc b/www/chromium/files/patch-components_gcm__driver_gcm__client__impl.cc index 658fb2372bfd..57e2d63a96cc 100644 --- a/www/chromium/files/patch-components_gcm__driver_gcm__client__impl.cc +++ b/www/chromium/files/patch-components_gcm__driver_gcm__client__impl.cc @@ -1,6 +1,6 @@ ---- components/gcm_driver/gcm_client_impl.cc.orig 2021-07-19 18:45:13 UTC +--- components/gcm_driver/gcm_client_impl.cc.orig 2021-09-14 01:51:54 UTC +++ components/gcm_driver/gcm_client_impl.cc -@@ -134,6 +134,9 @@ void ToCheckinProtoVersion( +@@ -133,6 +133,9 @@ void ToCheckinProtoVersion( case GCMClient::PLATFORM_CROS: platform = checkin_proto::ChromeBuildProto_Platform_PLATFORM_CROS; break; diff --git a/www/chromium/files/patch-components_metrics_BUILD.gn b/www/chromium/files/patch-components_metrics_BUILD.gn index ff62518b57c6..89f147134233 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-04-14 18:40:59 UTC +--- components/metrics/BUILD.gn.orig 2021-09-24 04:26:03 UTC +++ components/metrics/BUILD.gn -@@ -176,6 +176,11 @@ static_library("metrics") { +@@ -180,6 +180,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 a6486356fe46..69117a782987 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-07-19 18:45:13 UTC +--- components/metrics/metrics_log.cc.orig 2021-09-14 01:51:54 UTC +++ components/metrics/metrics_log.cc -@@ -249,7 +249,7 @@ void MetricsLog::RecordCoreSystemProfile( +@@ -265,7 +265,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 14dff98a6f46..0220981ee19d 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-04-14 18:40:59 UTC +--- components/neterror/resources/neterror.js.orig 2021-09-14 01:51:54 UTC +++ components/neterror/resources/neterror.js -@@ -144,7 +144,7 @@ function detailsButtonClick() { +@@ -123,7 +123,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 4275d94c4cb0..5eba4062f5f9 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-05-12 22:05:50 UTC +--- 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 -@@ -788,7 +788,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C +@@ -789,7 +789,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C } #endif // #if !defined(OS_ANDROID) 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 d0d9a63236c8..317c6fa98a5d 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-07-19 18:45:13 UTC +--- components/paint_preview/browser/paint_preview_client.cc.orig 2021-09-14 01:51:55 UTC +++ components/paint_preview/browser/paint_preview_client.cc -@@ -308,8 +308,8 @@ void PaintPreviewClient::CapturePaintPreview( +@@ -309,8 +309,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_performance__manager_features.cc b/www/chromium/files/patch-components_performance__manager_features.cc index fba7d5ed85c9..888271e08bc7 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-07-28 07:52:32 UTC +--- components/performance_manager/features.cc.orig 2021-09-14 01:51:55 UTC +++ components/performance_manager/features.cc -@@ -54,7 +54,7 @@ const base::Feature kRunOnMainThread{"RunOnMainThread" - #if !defined(OS_ANDROID) - const base::Feature kUrgentDiscardingFromPerformanceManager { +@@ -56,7 +56,7 @@ const base::Feature kUrgentDiscardingFromPerformanceMa "UrgentDiscardingFromPerformanceManager", --#if BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_LINUX) || defined(OS_BSD) + // Chrome OS 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) base::FEATURE_DISABLED_BY_DEFAULT #else base::FEATURE_ENABLED_BY_DEFAULT diff --git a/www/chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc b/www/chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc index 5ab17d2b3c45..92fe624459ae 100644 --- a/www/chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc +++ b/www/chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc @@ -1,9 +1,9 @@ ---- components/policy/core/browser/policy_pref_mapping_test.cc.orig 2021-05-12 22:05:50 UTC +--- components/policy/core/browser/policy_pref_mapping_test.cc.orig 2021-09-24 04:26:04 UTC +++ components/policy/core/browser/policy_pref_mapping_test.cc -@@ -279,6 +279,8 @@ class PolicyTestCase { - const std::string os("chromeos"); - #elif defined(OS_LINUX) - const std::string os("linux"); +@@ -339,6 +339,8 @@ class PolicyTestCase { + const std::string os("mac"); + #elif defined(OS_WIN) + const std::string os("win"); +#elif defined(OS_FREEBSD) + const std::string os("freebsd"); #else 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 3d08bfbccdf5..75ee4156731e 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-04-22 08:07:56 UTC +--- 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 -@@ -385,7 +385,7 @@ void CloudPolicyClient::FetchPolicy() { +@@ -405,7 +405,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 b39d1232a3ce..ac8188e50f3b 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-07-19 18:45:13 UTC +--- 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 @@ -18,7 +18,7 @@ #include <wincred.h> @@ -9,25 +9,25 @@ #include <pwd.h> #include <sys/types.h> #include <unistd.h> -@@ -35,7 +35,7 @@ +@@ -33,7 +33,7 @@ + #import <SystemConfiguration/SCDynamicStoreCopySpecific.h> + #endif - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. -#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) #include <limits.h> // For HOST_NAME_MAX #endif -@@ -71,7 +71,7 @@ +@@ -67,7 +67,7 @@ + #include "base/system/sys_info.h" + #endif - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. -#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) #include "base/system/sys_info.h" #endif -@@ -108,6 +108,10 @@ std::string GetMachineName() { +@@ -102,6 +102,10 @@ std::string GetMachineName() { if (gethostname(hostname, HOST_NAME_MAX) == 0) // Success. return hostname; return std::string(); @@ -38,7 +38,7 @@ #elif defined(OS_IOS) // Use the Vendor ID as the machine name. return ios::device_util::GetVendorId(); -@@ -158,7 +162,7 @@ std::string GetMachineName() { +@@ -152,7 +156,7 @@ std::string GetMachineName() { } std::string GetOSVersion() { @@ -47,12 +47,12 @@ return base::SysInfo::OperatingSystemVersion(); #elif defined(OS_WIN) base::win::OSInfo::VersionNumber version_number = -@@ -183,7 +187,7 @@ std::string GetOSArchitecture() { +@@ -177,7 +181,7 @@ std::string GetOSArchitecture() { } std::string GetOSUsername() { --#if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_APPLE) -+#if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_APPLE) || defined(OS_BSD) +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_APPLE) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_APPLE) || defined(OS_BSD) struct passwd* creds = getpwuid(getuid()); if (!creds || !creds->pw_name) return std::string(); diff --git a/www/chromium/files/patch-components_policy_core_common_schema.cc b/www/chromium/files/patch-components_policy_core_common_schema.cc index cf9ef7612b54..0b9c94c62291 100644 --- a/www/chromium/files/patch-components_policy_core_common_schema.cc +++ b/www/chromium/files/patch-components_policy_core_common_schema.cc @@ -1,6 +1,6 @@ ---- components/policy/core/common/schema.cc.orig 2021-04-14 18:41:00 UTC +--- components/policy/core/common/schema.cc.orig 2021-09-14 01:51:55 UTC +++ components/policy/core/common/schema.cc -@@ -24,7 +24,11 @@ +@@ -25,7 +25,11 @@ #include "base/strings/stringprintf.h" #include "components/policy/core/common/json_schema_constants.h" #include "components/policy/core/common/schema_internal.h" 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 9e729a66c201..e88b3c7113ed 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-07-19 18:45:14 UTC +--- components/policy/resources/policy_templates.json.orig 2021-09-24 04:26:04 UTC +++ components/policy/resources/policy_templates.json -@@ -1246,7 +1246,7 @@ +@@ -1272,7 +1272,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, -@@ -1272,7 +1272,7 @@ +@@ -1298,7 +1298,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -18,8 +18,8 @@ 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -1293,7 +1293,7 @@ - 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], +@@ -1329,7 +1329,7 @@ + 'owners': ['file://components/policy/resources/OWNERS', 'okalitova@chromium.org'], 'type': 'string', 'schema': { 'type': 'string' }, - 'supported_on': ['chrome.*:58-', 'chrome_os:58-'], @@ -27,7 +27,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': True, -@@ -4604,7 +4604,7 @@ +@@ -4705,7 +4705,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, -@@ -4660,7 +4660,7 @@ +@@ -4761,7 +4761,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, -@@ -9137,7 +9137,7 @@ +@@ -9320,7 +9320,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, -@@ -10851,7 +10851,7 @@ +@@ -11161,7 +11161,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, -@@ -11698,7 +11698,7 @@ +@@ -12008,7 +12008,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, diff --git a/www/chromium/files/patch-components_policy_tools_generate__policy__source.py b/www/chromium/files/patch-components_policy_tools_generate__policy__source.py index c89b4291048a..e58ac1b2527f 100644 --- a/www/chromium/files/patch-components_policy_tools_generate__policy__source.py +++ b/www/chromium/files/patch-components_policy_tools_generate__policy__source.py @@ -1,13 +1,13 @@ ---- components/policy/tools/generate_policy_source.py.orig 2021-04-14 18:41:00 UTC +--- components/policy/tools/generate_policy_source.py.orig 2021-09-24 04:26:04 UTC +++ components/policy/tools/generate_policy_source.py -@@ -37,8 +37,9 @@ PLATFORM_STRINGS = { +@@ -47,8 +47,9 @@ PLATFORM_STRINGS = { 'ios': ['ios'], 'chrome.win': ['win'], 'chrome.linux': ['linux'], + 'chrome.freebsd': ['freebsd'], 'chrome.mac': ['mac'], -- 'chrome.*': ['win', 'mac', 'linux'], -+ 'chrome.*': ['win', 'mac', 'linux', 'freebsd'], - 'chrome.win7': ['win'] +- 'chrome.*': ['win', 'mac', 'linux', 'fuchsia'], ++ 'chrome.*': ['win', 'mac', 'linux', 'fuchsia', 'freebsd'], + 'chrome.win7': ['win'], } 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 new file mode 100644 index 000000000000..a67a3cb09fcb --- /dev/null +++ b/www/chromium/files/patch-components_safe__browsing_core_common_features.cc @@ -0,0 +1,20 @@ +--- 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_safe__browsing_core_realtime_url__lookup__service__base.cc b/www/chromium/files/patch-components_safe__browsing_core_realtime_url__lookup__service__base.cc deleted file mode 100644 index 8d740bc014ec..000000000000 --- a/www/chromium/files/patch-components_safe__browsing_core_realtime_url__lookup__service__base.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- components/safe_browsing/core/realtime/url_lookup_service_base.cc.orig 2021-07-19 18:45:14 UTC -+++ components/safe_browsing/core/realtime/url_lookup_service_base.cc -@@ -107,7 +107,7 @@ RTLookupRequest::OSType GetRTLookupRequestOSType() { - return RTLookupRequest::OS_TYPE_FUCHSIA; - #elif defined(OS_IOS) - return RTLookupRequest::OS_TYPE_IOS; --#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) - return RTLookupRequest::OS_TYPE_LINUX; - #elif defined(OS_MAC) - return RTLookupRequest::OS_TYPE_MAC; diff --git a/www/chromium/files/patch-components_safe__browsing_core_resources_gen__file__type__proto.py b/www/chromium/files/patch-components_safe__browsing_core_resources_gen__file__type__proto.py deleted file mode 100644 index ce1f514c3990..000000000000 --- a/www/chromium/files/patch-components_safe__browsing_core_resources_gen__file__type__proto.py +++ /dev/null @@ -1,19 +0,0 @@ ---- components/safe_browsing/core/resources/gen_file_type_proto.py.orig 2021-07-19 18:45:14 UTC -+++ components/safe_browsing/core/resources/gen_file_type_proto.py -@@ -33,6 +33,7 @@ def PlatformTypes(): - "android": download_file_types_pb2.DownloadFileType.PLATFORM_ANDROID, - "chromeos": download_file_types_pb2.DownloadFileType.PLATFORM_CHROME_OS, - "linux": download_file_types_pb2.DownloadFileType.PLATFORM_LINUX, -+ "bsd": download_file_types_pb2.DownloadFileType.PLATFORM_LINUX, - "mac": download_file_types_pb2.DownloadFileType.PLATFORM_MAC, - "win": download_file_types_pb2.DownloadFileType.PLATFORM_WINDOWS, - } -@@ -171,7 +172,7 @@ class DownloadFileTypeProtoGenerator(BinaryProtoGenera - 'Outfile must have a %d for version and %s for platform.') - parser.add_option('-t', '--type', - help='The platform type. One of android, chromeos, ' + -- 'linux, mac, win') -+ 'linux, bsd, mac, win') - - def AddExtraCommandLineArgsForVirtualEnvRun(self, opts, command): - if opts.type is not None: diff --git a/www/chromium/files/patch-components_security__interstitials_content_utils.cc b/www/chromium/files/patch-components_security__interstitials_content_utils.cc index 7386bcd6e406..68db1378ce55 100644 --- a/www/chromium/files/patch-components_security__interstitials_content_utils.cc +++ b/www/chromium/files/patch-components_security__interstitials_content_utils.cc @@ -1,6 +1,6 @@ ---- components/security_interstitials/content/utils.cc.orig 2021-05-12 22:05:51 UTC +--- components/security_interstitials/content/utils.cc.orig 2021-09-24 04:26:04 UTC +++ components/security_interstitials/content/utils.cc -@@ -33,7 +33,7 @@ void LaunchDateAndTimeSettings() { +@@ -34,7 +34,7 @@ void LaunchDateAndTimeSettings() { #if defined(OS_ANDROID) JNIEnv* env = base::android::AttachCurrentThread(); Java_DateAndTimeSettingsHelper_openDateAndTimeSettings(env); diff --git a/www/chromium/files/patch-components_startup__metric__utils_browser_startup__metric__utils.cc b/www/chromium/files/patch-components_startup__metric__utils_browser_startup__metric__utils.cc index 78e3bb5c0e1e..12417fffad99 100644 --- a/www/chromium/files/patch-components_startup__metric__utils_browser_startup__metric__utils.cc +++ b/www/chromium/files/patch-components_startup__metric__utils_browser_startup__metric__utils.cc @@ -1,6 +1,6 @@ ---- components/startup_metric_utils/browser/startup_metric_utils.cc.orig 2021-06-11 09:43:41 UTC +--- components/startup_metric_utils/browser/startup_metric_utils.cc.orig 2021-09-24 04:26:04 UTC +++ components/startup_metric_utils/browser/startup_metric_utils.cc -@@ -343,7 +343,7 @@ base::TimeTicks StartupTimeToTimeTicks(base::Time time +@@ -344,7 +344,7 @@ base::TimeTicks StartupTimeToTimeTicks(base::Time time // Enabling this logic on OS X causes a significant performance regression. // https://crbug.com/601270 @@ -9,7 +9,7 @@ static bool statics_initialized = false; base::ThreadPriority previous_priority = base::ThreadPriority::NORMAL; -@@ -357,7 +357,7 @@ base::TimeTicks StartupTimeToTimeTicks(base::Time time +@@ -358,7 +358,7 @@ base::TimeTicks StartupTimeToTimeTicks(base::Time time static const base::Time time_base = base::Time::Now(); static const base::TimeTicks trace_ticks_base = base::TimeTicks::Now(); 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 new file mode 100644 index 000000000000..b18645f0be13 --- /dev/null +++ b/www/chromium/files/patch-components_translate_core_browser_translate__prefs.cc @@ -0,0 +1,11 @@ +--- components/translate/core/browser/translate_prefs.cc.orig 2021-09-24 18:43:51 UTC ++++ components/translate/core/browser/translate_prefs.cc +@@ -839,7 +839,7 @@ bool TranslatePrefs::CanTranslateLanguage( + bool TranslatePrefs::IsDetailedLanguageSettingsEnabled() { + #if defined(OS_ANDROID) + return base::FeatureList::IsEnabled(language::kDetailedLanguageSettings); +-#elif defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) ++#elif defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) + return base::FeatureList::IsEnabled( + language::kDesktopDetailedLanguageSettings); + #else diff --git a/www/chromium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc b/www/chromium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc index bda897b7422e..c9be6fe741b5 100644 --- a/www/chromium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc +++ b/www/chromium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc @@ -1,6 +1,6 @@ ---- components/url_formatter/spoof_checks/idn_spoof_checker.cc.orig 2021-05-12 22:05:51 UTC +--- components/url_formatter/spoof_checks/idn_spoof_checker.cc.orig 2021-09-14 01:51:56 UTC +++ components/url_formatter/spoof_checks/idn_spoof_checker.cc -@@ -291,7 +291,7 @@ IDNSpoofChecker::IDNSpoofChecker() { +@@ -292,7 +292,7 @@ IDNSpoofChecker::IDNSpoofChecker() { // The ideal fix would be to change the omnibox font used for Thai. In // that case, the Linux-only list should be revisited and potentially // removed. diff --git a/www/chromium/files/patch-components_viz_common_features.cc b/www/chromium/files/patch-components_viz_common_features.cc index f6c743023c65..a6685fd18c75 100644 --- a/www/chromium/files/patch-components_viz_common_features.cc +++ b/www/chromium/files/patch-components_viz_common_features.cc @@ -1,11 +1,11 @@ ---- components/viz/common/features.cc.orig 2021-07-19 18:45:15 UTC +--- components/viz/common/features.cc.orig 2021-09-24 04:26:05 UTC +++ components/viz/common/features.cc -@@ -42,7 +42,7 @@ const base::Feature kSimpleFrameRateThrottling{ +@@ -46,7 +46,7 @@ const base::Feature kSimpleFrameRateThrottling{ const base::Feature kUseSkiaRenderer { "UseSkiaRenderer", #if defined(OS_WIN) || defined(OS_ANDROID) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ -- defined(OS_LINUX) -+ defined(OS_LINUX) || defined(OS_BSD) - base::FEATURE_ENABLED_BY_DEFAULT - #elif defined(OS_MAC) +- defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_MAC) ++ defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_MAC) || defined(OS_BSD) base::FEATURE_ENABLED_BY_DEFAULT + #else + base::FEATURE_DISABLED_BY_DEFAULT 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 c1c21ef5e574..f67f61fc0f8c 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-04-14 18:41:02 UTC +--- components/viz/host/host_display_client.h.orig 2021-09-24 04:26:05 UTC +++ components/viz/host/host_display_client.h -@@ -46,7 +46,7 @@ class VIZ_HOST_EXPORT HostDisplayClient : public mojom +@@ -45,7 +45,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_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 ff79929650a8..c0ff09735e62 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-07-19 18:45:15 UTC +--- 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 @@ -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); -@@ -493,7 +493,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw +@@ -495,7 +495,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-content_app_content__main.cc b/www/chromium/files/patch-content_app_content__main.cc index 11811afdc3fc..e32b81b2dc72 100644 --- a/www/chromium/files/patch-content_app_content__main.cc +++ b/www/chromium/files/patch-content_app_content__main.cc @@ -1,6 +1,6 @@ ---- content/app/content_main.cc.orig 2021-07-19 18:45:15 UTC +--- content/app/content_main.cc.orig 2021-09-24 04:26:05 UTC +++ content/app/content_main.cc -@@ -62,7 +62,7 @@ +@@ -63,7 +63,7 @@ #include "base/posix/global_descriptors.h" #endif @@ -9,7 +9,7 @@ #include "base/files/scoped_file.h" #endif -@@ -233,7 +233,7 @@ int RunContentProcess(const ContentMainParams& params, +@@ -243,7 +243,7 @@ RunContentProcess(const ContentMainParams& params, #endif base::EnableTerminationOnOutOfMemory(); @@ -18,7 +18,7 @@ // The various desktop environments set this environment variable that // allows the dbus client library to connect directly to the bus. When this // variable is not set (test environments like xvfb-run), the dbus client -@@ -308,7 +308,7 @@ int RunContentProcess(const ContentMainParams& params, +@@ -318,7 +318,7 @@ RunContentProcess(const ContentMainParams& params, InitializeMac(); #endif 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 fc29048b83c7..a96328f8a01f 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-07-19 18:45:15 UTC +--- content/app/content_main_runner_impl.cc.orig 2021-09-24 04:26:05 UTC +++ content/app/content_main_runner_impl.cc -@@ -137,7 +137,7 @@ +@@ -136,7 +136,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" -@@ -157,7 +157,7 @@ +@@ -156,7 +156,7 @@ #include "content/public/common/content_client.h" #endif @@ -17,8 +17,8 @@ +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #if BUILDFLAG(USE_ZYGOTE_HANDLE) - #include "content/browser/sandbox_host_linux.h" -@@ -310,7 +310,7 @@ void InitializeZygoteSandboxForBrowserProcess( + #include "base/stack_canary_linux.h" +@@ -311,7 +311,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 -@@ -401,7 +401,7 @@ void PreSandboxInit() { +@@ -399,7 +399,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 RunZygote(ContentMainDelegate* delegate) { +@@ -532,7 +532,7 @@ int NO_STACK_PROTECTOR RunZygote(ContentMainDelegate* delegate->ZygoteStarting(&zygote_fork_delegates); media::InitializeMediaLibrary(); @@ -45,7 +45,7 @@ PreSandboxInit(); #endif -@@ -927,7 +927,7 @@ int ContentMainRunnerImpl::Run(bool start_minimal_brow +@@ -943,7 +943,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 -@@ -937,7 +937,7 @@ int ContentMainRunnerImpl::Run(bool start_minimal_brow +@@ -953,7 +953,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 b98b7e56b8db..0f4082027c51 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-07-19 18:45:15 UTC +--- content/browser/BUILD.gn.orig 2021-09-24 04:26:05 UTC +++ content/browser/BUILD.gn -@@ -2255,6 +2255,17 @@ source_set("browser") { +@@ -2311,6 +2311,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 b187c973fd19..ca64a129dc71 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-07-19 18:45:15 UTC +--- content/browser/browser_main_loop.cc.orig 2021-09-24 04:26:05 UTC +++ content/browser/browser_main_loop.cc -@@ -559,7 +559,7 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -547,7 +547,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() < -@@ -569,7 +569,7 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -557,7 +557,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. -@@ -579,7 +579,7 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -567,7 +567,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 3db4b0966c12..299cead766bb 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,13 +1,11 @@ ---- content/browser/devtools/protocol/system_info_handler.cc.orig 2021-07-19 18:45:15 UTC +--- content/browser/devtools/protocol/system_info_handler.cc.orig 2021-09-24 04:26:05 UTC +++ content/browser/devtools/protocol/system_info_handler.cc -@@ -52,8 +52,8 @@ std::unique_ptr<SystemInfo::Size> GfxSizeToSystemInfoS - // 1153667. +@@ -53,7 +53,7 @@ std::unique_ptr<SystemInfo::Size> GfxSizeToSystemInfoS // Windows builds need more time -- see Issue 873112 and 1004472. + // Mac builds need more time - see Issue angleproject:6182. // ASAN builds need more time -- see Issue 1167875. --#if ((defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC)) && \ -- !defined(NDEBUG)) || \ -+#if ((defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD)) && \ -+ !defined(NDEBUG)) || \ - defined(OS_WIN) || defined(ADDRESS_SANITIZER) || defined(USE_OZONE) +-#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; - #else 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 7659d34c6309..e033d81a5338 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-07-19 18:45:15 UTC +--- content/browser/font_access/font_enumeration_cache.h.orig 2021-09-24 04:26:05 UTC +++ content/browser/font_access/font_enumeration_cache.h -@@ -15,7 +15,7 @@ +@@ -22,7 +22,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 5154d254aac5..82481861ee3d 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-07-19 18:45:15 UTC +--- content/browser/gpu/compositor_util.cc.orig 2021-09-24 04:26:05 UTC +++ content/browser/gpu/compositor_util.cc -@@ -128,11 +128,11 @@ const GpuFeatureData GetGpuFeatureData( +@@ -127,11 +127,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 new file mode 100644 index 000000000000..b6d300575103 --- /dev/null +++ b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc @@ -0,0 +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 +@@ -1346,7 +1346,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) + // 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 4f8775f85c7c..d5193290c324 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,6 @@ ---- content/browser/gpu/gpu_process_host.cc.orig 2021-07-19 18:45:15 UTC +--- content/browser/gpu/gpu_process_host.cc.orig 2021-09-24 04:26:05 UTC +++ content/browser/gpu/gpu_process_host.cc -@@ -232,8 +232,8 @@ static const char* const kSwitchNames[] = { +@@ -231,8 +231,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 +11,7 @@ switches::kDisableDevShmUsage, #endif #if defined(OS_WIN) -@@ -1169,7 +1169,7 @@ bool GpuProcessHost::LaunchGpuProcess() { +@@ -1130,7 +1130,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_renderer__host_delegated__frame__host.cc b/www/chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc index a186c499b0e5..c04a8e6a50e1 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/delegated_frame_host.cc.orig 2021-05-12 22:05:52 UTC +--- content/browser/renderer_host/delegated_frame_host.cc.orig 2021-09-24 04:26:05 UTC +++ content/browser/renderer_host/delegated_frame_host.cc -@@ -259,7 +259,7 @@ void DelegatedFrameHost::EmbedSurface( +@@ -271,7 +271,7 @@ void DelegatedFrameHost::EmbedSurface( if (!primary_surface_id || primary_surface_id->local_surface_id() != local_surface_id_) { diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc b/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc index 305d1fa32d6d..8ab1be5d2529 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_message_filter.cc.orig 2021-07-19 18:45:15 UTC +--- content/browser/renderer_host/render_message_filter.cc.orig 2021-09-14 01:51:56 UTC +++ content/browser/renderer_host/render_message_filter.cc -@@ -68,7 +68,7 @@ +@@ -67,7 +67,7 @@ #if defined(OS_MAC) #include "ui/accelerated_widget_mac/window_resize_helper_mac.h" #endif @@ -9,7 +9,7 @@ #include "base/linux_util.h" #include "base/threading/platform_thread.h" #endif -@@ -130,7 +130,7 @@ void RenderMessageFilter::GenerateFrameRoutingID( +@@ -129,7 +129,7 @@ void RenderMessageFilter::GenerateFrameRoutingID( std::move(callback).Run(routing_id, frame_token, devtools_frame_token); } @@ -18,7 +18,7 @@ void RenderMessageFilter::SetThreadPriorityOnFileThread( base::PlatformThreadId ns_tid, base::ThreadPriority priority) { -@@ -151,7 +151,7 @@ void RenderMessageFilter::SetThreadPriorityOnFileThrea +@@ -150,7 +150,7 @@ void RenderMessageFilter::SetThreadPriorityOnFileThrea } #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 f9d6038b2c0e..686e3d66bcac 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-07-19 18:45:15 UTC +--- content/browser/renderer_host/render_message_filter.h.orig 2021-09-14 01:51:56 UTC +++ content/browser/renderer_host/render_message_filter.h -@@ -76,14 +76,14 @@ class CONTENT_EXPORT RenderMessageFilter +@@ -75,14 +75,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 130c84131877..79ca79045d32 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,6 +1,6 @@ ---- content/browser/renderer_host/render_process_host_impl.cc.orig 2021-07-19 18:45:15 UTC +--- 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 -@@ -224,7 +224,7 @@ +@@ -231,7 +231,7 @@ #include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h" #endif @@ -9,7 +9,7 @@ #include <sys/resource.h> #include <sys/time.h> -@@ -1371,7 +1371,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = +@@ -1376,7 +1376,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; -@@ -1382,7 +1382,7 @@ size_t GetPlatformProcessLimit() { +@@ -1387,7 +1387,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) -@@ -1456,7 +1456,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public +@@ -1463,7 +1463,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; -@@ -1884,7 +1884,7 @@ bool RenderProcessHostImpl::Init() { +@@ -1915,7 +1915,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) -@@ -3294,8 +3294,8 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin +@@ -3370,8 +3370,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) -@@ -4968,6 +4968,8 @@ void RenderProcessHostImpl::OnProcessLaunched() { +@@ -5041,6 +5041,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 3a068d1274ed..95a1c28070c9 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-07-19 18:45:15 UTC +--- 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 -@@ -257,7 +257,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs( +@@ -256,7 +256,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 e02b7154ab82..08f2c2117c3b 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-07-19 18:45:15 UTC +--- 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 -@@ -112,7 +112,7 @@ +@@ -111,7 +111,7 @@ #include "ui/gfx/gdi_util.h" #endif @@ -9,16 +9,16 @@ #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" -@@ -464,7 +464,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge +@@ -463,7 +463,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge if (manager) return ToBrowserAccessibilityWin(manager->GetRoot())->GetCOM(); --#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) BrowserAccessibilityManager* manager = host()->GetOrCreateRootBrowserAccessibilityManager(); if (manager && manager->GetRoot()) -@@ -2255,7 +2255,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { +@@ -2272,7 +2272,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { } bool RenderWidgetHostViewAura::NeedsMouseCapture() { @@ -27,7 +27,7 @@ return NeedsInputGrab(); #else return false; -@@ -2421,7 +2421,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit +@@ -2438,7 +2438,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit if (!target_host) return; 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 1de5e8dfee82..cb32c161c110 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-07-19 18:45:15 UTC +--- 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 -@@ -715,7 +715,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand +@@ -596,7 +596,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand if (event->type() == ui::ET_MOUSE_EXITED) { if (mouse_locked || selection_popup) return false; 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 f34a2f3b3f71..1c8a018538f0 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,6 +1,6 @@ ---- content/browser/scheduler/responsiveness/native_event_observer.h.orig 2021-04-14 18:41:02 UTC +--- content/browser/scheduler/responsiveness/native_event_observer.h.orig 2021-09-14 01:51:56 UTC +++ content/browser/scheduler/responsiveness/native_event_observer.h -@@ -14,7 +14,7 @@ +@@ -16,7 +16,7 @@ #include "content/public/browser/native_event_processor_observer_mac.h" #endif @@ -9,7 +9,7 @@ #include "ui/aura/window_event_dispatcher_observer.h" #endif -@@ -39,7 +39,7 @@ namespace responsiveness { +@@ -41,7 +41,7 @@ namespace responsiveness { class CONTENT_EXPORT NativeEventObserver #if defined(OS_MAC) : public NativeEventProcessorObserver @@ -18,7 +18,7 @@ : public aura::WindowEventDispatcherObserver #elif defined(OS_WIN) : public base::MessagePumpForUI::Observer -@@ -56,7 +56,7 @@ class CONTENT_EXPORT NativeEventObserver +@@ -58,7 +58,7 @@ class CONTENT_EXPORT NativeEventObserver NativeEventObserver(WillRunEventCallback will_run_event_callback, DidRunEventCallback did_run_event_callback); @@ -27,7 +27,7 @@ ~NativeEventObserver() override; #else virtual ~NativeEventObserver(); -@@ -68,7 +68,7 @@ class CONTENT_EXPORT NativeEventObserver +@@ -70,7 +70,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, -@@ -85,7 +85,7 @@ class CONTENT_EXPORT NativeEventObserver +@@ -87,7 +87,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 5e8c93642165..e95d5120dcaf 100644 --- a/www/chromium/files/patch-content_browser_utility__process__host.cc +++ b/www/chromium/files/patch-content_browser_utility__process__host.cc @@ -1,6 +1,6 @@ ---- content/browser/utility_process_host.cc.orig 2021-05-12 22:05:52 UTC +--- content/browser/utility_process_host.cc.orig 2021-09-24 04:26:05 UTC +++ content/browser/utility_process_host.cc -@@ -67,7 +67,7 @@ UtilityProcessHost::UtilityProcessHost() +@@ -68,7 +68,7 @@ UtilityProcessHost::UtilityProcessHost() UtilityProcessHost::UtilityProcessHost(std::unique_ptr<Client> client) : sandbox_type_(sandbox::policy::SandboxType::kUtility), @@ -9,7 +9,7 @@ child_flags_(ChildProcessHost::CHILD_ALLOW_SELF), #else child_flags_(ChildProcessHost::CHILD_NORMAL), -@@ -240,8 +240,8 @@ bool UtilityProcessHost::StartProcess() { +@@ -233,8 +233,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_web__contents_web__contents__view__aura.cc b/www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc index 8db1688aa96b..1116ab01fae9 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,6 +1,6 @@ ---- content/browser/web_contents/web_contents_view_aura.cc.orig 2021-07-19 18:45:15 UTC +--- 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 -@@ -156,7 +156,7 @@ class WebDragSourceAura : public content::WebContentsO +@@ -157,7 +157,7 @@ class WebDragSourceAura : public content::WebContentsO DISALLOW_COPY_AND_ASSIGN(WebDragSourceAura); }; @@ -9,7 +9,7 @@ // Fill out the OSExchangeData with a file contents, synthesizing a name if // necessary. void PrepareDragForFileContents(const DropData& drop_data, -@@ -239,7 +239,7 @@ void PrepareDragData(const DropData& drop_data, +@@ -240,7 +240,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. -@@ -1205,7 +1205,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent* +@@ -1210,7 +1210,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_browser_zygote__host_zygote__host__impl__linux.cc b/www/chromium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.cc index 58db69b7cd56..f716a45bf74b 100644 --- a/www/chromium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.cc +++ b/www/chromium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.cc @@ -1,6 +1,37 @@ ---- content/browser/zygote_host/zygote_host_impl_linux.cc.orig 2021-04-14 18:41:02 UTC +--- content/browser/zygote_host/zygote_host_impl_linux.cc.orig 2021-10-01 01:36:48 UTC +++ content/browser/zygote_host/zygote_host_impl_linux.cc -@@ -73,6 +73,7 @@ ZygoteHostImpl* ZygoteHostImpl::GetInstance() { +@@ -26,6 +26,7 @@ + + namespace content { + ++#if !defined(OS_BSD) + namespace { + + // Receive a fixed message on fd and return the sender's PID. +@@ -51,6 +52,7 @@ bool ReceiveFixedMessage(int fd, + } + + } // namespace ++#endif + + // static + ZygoteHost* ZygoteHost::GetInstance() { +@@ -58,10 +60,14 @@ ZygoteHost* ZygoteHost::GetInstance() { + } + + ZygoteHostImpl::ZygoteHostImpl() ++#if !defined(OS_BSD) + : use_namespace_sandbox_(false), + use_suid_sandbox_(false), + use_suid_sandbox_for_adj_oom_score_(false), + sandbox_binary_(), ++#else ++ : sandbox_binary_(), ++#endif + zygote_pids_lock_(), + zygote_pids_() {} + +@@ -73,6 +79,7 @@ ZygoteHostImpl* ZygoteHostImpl::GetInstance() { } void ZygoteHostImpl::Init(const base::CommandLine& command_line) { @@ -8,7 +39,7 @@ if (command_line.HasSwitch(sandbox::policy::switches::kNoSandbox)) { return; } -@@ -123,6 +124,7 @@ void ZygoteHostImpl::Init(const base::CommandLine& com +@@ -123,6 +130,7 @@ void ZygoteHostImpl::Init(const base::CommandLine& com "you can try using --" << sandbox::policy::switches::kNoSandbox << "."; } @@ -16,17 +47,18 @@ } void ZygoteHostImpl::AddZygotePid(pid_t pid) { -@@ -147,6 +149,9 @@ pid_t ZygoteHostImpl::LaunchZygote( +@@ -147,6 +155,10 @@ pid_t ZygoteHostImpl::LaunchZygote( base::CommandLine* cmd_line, base::ScopedFD* control_fd, base::FileHandleMappingVector additional_remapped_fds) { +#if defined(OS_BSD) + NOTIMPLEMENTED(); ++ return -1; +#else int fds[2]; CHECK_EQ(0, socketpair(AF_UNIX, SOCK_SEQPACKET, 0, fds)); CHECK(base::UnixDomainSocket::EnableReceiveProcessId(fds[0])); -@@ -214,9 +219,10 @@ pid_t ZygoteHostImpl::LaunchZygote( +@@ -214,9 +226,10 @@ pid_t ZygoteHostImpl::LaunchZygote( AddZygotePid(pid); return pid; diff --git a/www/chromium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.h b/www/chromium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.h index 6abe223edb8b..f9214ed17401 100644 --- a/www/chromium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.h +++ b/www/chromium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.h @@ -1,4 +1,4 @@ ---- content/browser/zygote_host/zygote_host_impl_linux.h.orig 2021-04-14 18:41:02 UTC +--- content/browser/zygote_host/zygote_host_impl_linux.h.orig 2021-10-01 01:36:48 UTC +++ content/browser/zygote_host/zygote_host_impl_linux.h @@ -42,8 +42,10 @@ class CONTENT_EXPORT ZygoteHostImpl : public ZygoteHos base::ScopedFD* control_fd, @@ -11,3 +11,15 @@ bool HasZygote() { return !zygote_pids_.empty(); } private: +@@ -57,9 +59,11 @@ class CONTENT_EXPORT ZygoteHostImpl : public ZygoteHos + + int renderer_sandbox_status_; + ++#if !defined(OS_BSD) + bool use_namespace_sandbox_; + bool use_suid_sandbox_; + bool use_suid_sandbox_for_adj_oom_score_; ++#endif + std::string sandbox_binary_; + + // This lock protects the |zygote_pids_| set. diff --git a/www/chromium/files/patch-content_common_BUILD.gn b/www/chromium/files/patch-content_common_BUILD.gn index b79fd5fbe007..7bb9a2039ab4 100644 --- a/www/chromium/files/patch-content_common_BUILD.gn +++ b/www/chromium/files/patch-content_common_BUILD.gn @@ -1,22 +1,19 @@ ---- content/common/BUILD.gn.orig 2021-05-12 22:05:53 UTC +--- content/common/BUILD.gn.orig 2021-09-24 04:26:05 UTC +++ content/common/BUILD.gn -@@ -338,7 +338,7 @@ source_set("common") { +@@ -333,7 +333,7 @@ source_set("common") { sources -= [ "cursors/webcursor_aura.cc" ] } - if (is_linux || is_chromeos) { + if ((is_linux || is_chromeos) && !is_bsd) { sources += [ - "common_sandbox_support_linux.cc", "sandbox_init_linux.cc", -@@ -354,6 +354,15 @@ source_set("common") { + "zygote/sandbox_support_linux.cc", +@@ -348,6 +348,12 @@ source_set("common") { ] } + if (is_bsd) { -+ sources += [ -+ "common_sandbox_support_linux.cc", -+ ] + deps += [ + "//third_party/fontconfig", + ] @@ -25,7 +22,7 @@ if (use_zygote_handle) { sources += [ "zygote/zygote_handle_impl_linux.h", -@@ -403,7 +412,7 @@ source_set("common") { +@@ -397,7 +403,7 @@ source_set("common") { } } diff --git a/www/chromium/files/patch-content_common_common__sandbox__support__linux.cc b/www/chromium/files/patch-content_common_common__sandbox__support__linux.cc deleted file mode 100644 index b355997bede1..000000000000 --- a/www/chromium/files/patch-content_common_common__sandbox__support__linux.cc +++ /dev/null @@ -1,10 +0,0 @@ ---- content/common/common_sandbox_support_linux.cc.orig 2021-04-14 18:41:02 UTC -+++ content/common/common_sandbox_support_linux.cc -@@ -5,6 +5,7 @@ - #include "content/public/common/common_sandbox_support_linux.h" - - #include <sys/stat.h> -+#include <unistd.h> - - #include <limits> - #include <memory> diff --git a/www/chromium/files/patch-content_common_user__agent.cc b/www/chromium/files/patch-content_common_user__agent.cc index 97125531a77c..6d100d165503 100644 --- a/www/chromium/files/patch-content_common_user__agent.cc +++ b/www/chromium/files/patch-content_common_user__agent.cc @@ -1,6 +1,6 @@ ---- content/common/user_agent.cc.orig 2021-04-14 18:41:03 UTC +--- content/common/user_agent.cc.orig 2021-09-14 01:51:56 UTC +++ content/common/user_agent.cc -@@ -225,6 +225,14 @@ std::string BuildOSCpuInfoFromOSVersionAndCpuType(cons +@@ -249,6 +249,14 @@ std::string BuildOSCpuInfoFromOSVersionAndCpuType(cons ); #endif diff --git a/www/chromium/files/patch-content_gpu_BUILD.gn b/www/chromium/files/patch-content_gpu_BUILD.gn index 822f297289fc..cb219b9e75c0 100644 --- a/www/chromium/files/patch-content_gpu_BUILD.gn +++ b/www/chromium/files/patch-content_gpu_BUILD.gn @@ -1,9 +1,9 @@ ---- content/gpu/BUILD.gn.orig 2021-04-14 18:41:03 UTC +--- content/gpu/BUILD.gn.orig 2021-09-14 01:51:56 UTC +++ content/gpu/BUILD.gn -@@ -137,7 +137,7 @@ target(link_target_type, "gpu_sources") { +@@ -136,7 +136,7 @@ target(link_target_type, "gpu_sources") { + # Use DRI on desktop Linux builds. - if (current_cpu != "s390x" && current_cpu != "ppc64" && - (is_linux || is_chromeos_lacros) && + if (current_cpu != "s390x" && current_cpu != "ppc64" && is_linux && - (!is_chromecast || is_cast_desktop_build)) { + (!is_chromecast || is_cast_desktop_build) && !is_bsd) { configs += [ "//build/config/linux/dri" ] 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 34fec8d73045..a3633d6288e2 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,6 +1,19 @@ ---- content/gpu/gpu_sandbox_hook_linux.cc.orig 2021-04-14 18:41:03 UTC +--- content/gpu/gpu_sandbox_hook_linux.cc.orig 2021-10-01 01:36:48 UTC +++ content/gpu/gpu_sandbox_hook_linux.cc -@@ -378,6 +378,7 @@ std::vector<BrokerFilePermission> FilePermissionsForGp +@@ -89,6 +89,12 @@ static const char kLibTegraPath[] = "/usr/lib64/libteg + static const char kLibV4l2Path[] = "/usr/lib64/libv4l2.so"; + static const char kLibV4lEncPluginPath[] = + "/usr/lib64/libv4l/plugins/libv4l-encplugin.so"; ++#elif defined(OS_BSD) ++static const char kLibGlesPath[] = "/usr/local/lib/libGLESv2.so.2"; ++static const char kLibEglPath[] = "/usr/local/lib/libEGL.so.1"; ++static const char kLibV4l2Path[] = "/usr/local/lib/libv4l2.so"; ++static const char kLibV4lEncPluginPath[] = ++ "/usr/local/lib/libv4l/plugins/libv4l-encplugin.so"; + #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 } void LoadArmGpuLibraries() { @@ -8,7 +21,7 @@ // Preload the Mali library. if (UseChromecastSandboxAllowlist()) { for (const char* path : kAllowedChromecastPaths) { -@@ -410,6 +411,7 @@ void LoadArmGpuLibraries() { +@@ -416,6 +423,7 @@ void LoadArmGpuLibraries() { dlopen(driver_paths[i], dlopen_flag); } } diff --git a/www/chromium/files/patch-content_public_app_content__main__delegate.h b/www/chromium/files/patch-content_public_app_content__main__delegate.h index 54763e741627..04c4aef49366 100644 --- a/www/chromium/files/patch-content_public_app_content__main__delegate.h +++ b/www/chromium/files/patch-content_public_app_content__main__delegate.h @@ -1,6 +1,6 @@ ---- content/public/app/content_main_delegate.h.orig 2021-04-14 18:41:03 UTC +--- content/public/app/content_main_delegate.h.orig 2021-09-14 01:51:56 UTC +++ content/public/app/content_main_delegate.h -@@ -49,7 +49,7 @@ class CONTENT_EXPORT ContentMainDelegate { +@@ -53,7 +53,7 @@ class CONTENT_EXPORT ContentMainDelegate { // Called right before the process exits. virtual void ProcessExiting(const std::string& process_type) {} @@ -9,7 +9,7 @@ // Tells the embedder that the zygote process is starting, and allows it to // specify one or more zygote delegates if it wishes by storing them in // |*delegates|. -@@ -58,7 +58,7 @@ class CONTENT_EXPORT ContentMainDelegate { +@@ -62,7 +62,7 @@ class CONTENT_EXPORT ContentMainDelegate { // Called every time the zygote process forks. virtual void ZygoteForked() {} diff --git a/www/chromium/files/patch-content_public_common_common__param__traits__macros.h b/www/chromium/files/patch-content_public_common_common__param__traits__macros.h index 2aa96543cdd0..6f9be9826016 100644 --- a/www/chromium/files/patch-content_public_common_common__param__traits__macros.h +++ b/www/chromium/files/patch-content_public_common_common__param__traits__macros.h @@ -1,6 +1,6 @@ ---- content/public/common/common_param_traits_macros.h.orig 2021-04-14 18:41:03 UTC +--- content/public/common/common_param_traits_macros.h.orig 2021-09-14 01:51:57 UTC +++ content/public/common/common_param_traits_macros.h -@@ -121,7 +121,7 @@ IPC_STRUCT_TRAITS_BEGIN(blink::RendererPreferences) +@@ -122,7 +122,7 @@ IPC_STRUCT_TRAITS_BEGIN(blink::RendererPreferences) IPC_STRUCT_TRAITS_MEMBER(accept_languages) IPC_STRUCT_TRAITS_MEMBER(plugin_fullscreen_allowed) IPC_STRUCT_TRAITS_MEMBER(caret_browsing_enabled) diff --git a/www/chromium/files/patch-content_public_common_content__features.cc b/www/chromium/files/patch-content_public_common_content__features.cc index 8e911845dda6..da7a8163be2b 100644 --- a/www/chromium/files/patch-content_public_common_content__features.cc +++ b/www/chromium/files/patch-content_public_common_content__features.cc @@ -1,4 +1,4 @@ ---- content/public/common/content_features.cc.orig 2021-07-19 18:45:16 UTC +--- content/public/common/content_features.cc.orig 2021-09-24 04:26:06 UTC +++ content/public/common/content_features.cc @@ -50,7 +50,7 @@ const base::Feature kAudioServiceOutOfProcess { // TODO(crbug.com/1052397): Remove !IS_CHROMEOS_LACROS once lacros starts being @@ -9,23 +9,23 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -851,13 +851,13 @@ const base::Feature kWebAssemblyBaseline{"WebAssemblyB +@@ -886,13 +886,13 @@ const base::Feature kWebAssemblyBaseline{"WebAssemblyB const base::Feature kWebAssemblyCodeProtection{ "WebAssemblyCodeProtection", base::FEATURE_DISABLED_BY_DEFAULT}; --#if defined(OS_LINUX) && defined(ARCH_CPU_X86_64) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(ARCH_CPU_X86_64) +-#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(ARCH_CPU_X86_64) ++#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(ARCH_CPU_X86_64) // Use memory protection keys in userspace (PKU) (if available) to protect code // JITed for WebAssembly. Fall back to traditional memory protection if // WebAssemblyCodeProtection is also enabled. const base::Feature kWebAssemblyCodeProtectionPku{ "WebAssemblyCodeProtectionPku", base::FEATURE_DISABLED_BY_DEFAULT}; --#endif // defined(OS_LINUX) && defined(ARCH_CPU_X86_64) -+#endif // (defined(OS_LINUX) || defined(OS_BSD)) && defined(ARCH_CPU_X86_64) +-#endif // (defined(OS_LINUX) || defined(OS_CHROMEOS)) && ++#endif // (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && + // defined(ARCH_CPU_X86_64) // Enable WebAssembly lazy compilation (JIT on first call). - const base::Feature kWebAssemblyLazyCompilation{ -@@ -873,8 +873,8 @@ const base::Feature kWebAssemblyTiering{"WebAssemblyTi +@@ -909,8 +909,8 @@ const base::Feature kWebAssemblyTiering{"WebAssemblyTi base::FEATURE_ENABLED_BY_DEFAULT}; // Enable WebAssembly trap handler. @@ -36,7 +36,7 @@ defined(ARCH_CPU_X86_64) const base::Feature kWebAssemblyTrapHandler{"WebAssemblyTrapHandler", base::FEATURE_ENABLED_BY_DEFAULT}; -@@ -896,7 +896,7 @@ const base::Feature kWebAuthCable { +@@ -932,7 +932,7 @@ const base::Feature kWebAuthCable { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. // If updating this, also update kWebAuthCableServerLink. diff --git a/www/chromium/files/patch-content_public_common_content__features.h b/www/chromium/files/patch-content_public_common_content__features.h index 6774c4dd01ec..27f43837200f 100644 --- a/www/chromium/files/patch-content_public_common_content__features.h +++ b/www/chromium/files/patch-content_public_common_content__features.h @@ -1,14 +1,14 @@ ---- content/public/common/content_features.h.orig 2021-07-29 12:15:43 UTC +--- content/public/common/content_features.h.orig 2021-09-24 04:26:06 UTC +++ content/public/common/content_features.h -@@ -219,9 +219,9 @@ CONTENT_EXPORT extern const base::Feature +@@ -228,9 +228,9 @@ CONTENT_EXPORT extern const base::Feature CONTENT_EXPORT extern const base::Feature kWebAppWindowControlsOverlay; CONTENT_EXPORT extern const base::Feature kWebAssemblyBaseline; CONTENT_EXPORT extern const base::Feature kWebAssemblyCodeProtection; --#if defined(OS_LINUX) && defined(ARCH_CPU_X86_64) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(ARCH_CPU_X86_64) +-#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(ARCH_CPU_X86_64) ++#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(ARCH_CPU_X86_64) CONTENT_EXPORT extern const base::Feature kWebAssemblyCodeProtectionPku; --#endif // defined(OS_LINUX) && defined(ARCH_CPU_X86_64) -+#endif // (defined(OS_LINUX) || defined(OS_BSD)) && defined(ARCH_CPU_X86_64) +-#endif // (defined(OS_LINUX) || defined(OS_CHROMEOS)) && ++#endif // (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && + // defined(ARCH_CPU_X86_64) CONTENT_EXPORT extern const base::Feature kWebAssemblyLazyCompilation; CONTENT_EXPORT extern const base::Feature kWebAssemblySimd; - CONTENT_EXPORT extern const base::Feature kWebAssemblyTiering; diff --git a/www/chromium/files/patch-content_public_common_content__switches.cc b/www/chromium/files/patch-content_public_common_content__switches.cc index 9cd0a6561e80..3e08c4af6636 100644 --- a/www/chromium/files/patch-content_public_common_content__switches.cc +++ b/www/chromium/files/patch-content_public_common_content__switches.cc @@ -1,6 +1,6 @@ ---- content/public/common/content_switches.cc.orig 2021-07-19 18:45:16 UTC +--- content/public/common/content_switches.cc.orig 2021-09-24 04:26:06 UTC +++ content/public/common/content_switches.cc -@@ -985,7 +985,7 @@ const char kEnableAutomation[] = "enable-automation"; +@@ -997,7 +997,7 @@ const char kEnableAutomation[] = "enable-automation"; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-content_public_common_content__switches.h b/www/chromium/files/patch-content_public_common_content__switches.h index e30459b60233..9b2f560938f5 100644 --- a/www/chromium/files/patch-content_public_common_content__switches.h +++ b/www/chromium/files/patch-content_public_common_content__switches.h @@ -1,6 +1,6 @@ ---- content/public/common/content_switches.h.orig 2021-07-19 18:45:16 UTC +--- content/public/common/content_switches.h.orig 2021-09-24 04:26:06 UTC +++ content/public/common/content_switches.h -@@ -270,7 +270,7 @@ CONTENT_EXPORT extern const char kRendererWaitForJavaD +@@ -272,7 +272,7 @@ CONTENT_EXPORT extern const char kRendererWaitForJavaD // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-content_public_test_browser__test__base.cc b/www/chromium/files/patch-content_public_test_browser__test__base.cc index 9173cc5a0f53..daecb86a240c 100644 --- a/www/chromium/files/patch-content_public_test_browser__test__base.cc +++ b/www/chromium/files/patch-content_public_test_browser__test__base.cc @@ -1,6 +1,6 @@ ---- content/public/test/browser_test_base.cc.orig 2021-07-19 18:45:16 UTC +--- content/public/test/browser_test_base.cc.orig 2021-09-14 01:51:57 UTC +++ content/public/test/browser_test_base.cc -@@ -112,6 +112,10 @@ +@@ -113,6 +113,10 @@ #include "ui/views/test/event_generator_delegate_mac.h" #endif diff --git a/www/chromium/files/patch-content_public_test_content__browser__test.cc b/www/chromium/files/patch-content_public_test_content__browser__test.cc index 649947465b9d..9d4d81709a75 100644 --- a/www/chromium/files/patch-content_public_test_content__browser__test.cc +++ b/www/chromium/files/patch-content_public_test_content__browser__test.cc @@ -1,6 +1,6 @@ ---- content/public/test/content_browser_test.cc.orig 2021-04-14 18:41:03 UTC +--- content/public/test/content_browser_test.cc.orig 2021-09-14 01:51:57 UTC +++ content/public/test/content_browser_test.cc -@@ -29,7 +29,7 @@ +@@ -30,7 +30,7 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ #include "ui/base/ime/init/input_method_initializer.h" #endif -@@ -92,7 +92,7 @@ void ContentBrowserTest::SetUp() { +@@ -93,7 +93,7 @@ void ContentBrowserTest::SetUp() { // LinuxInputMethodContextFactory has to be initialized. // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -18,7 +18,7 @@ ui::InitializeInputMethodForTesting(); #endif -@@ -107,7 +107,7 @@ void ContentBrowserTest::TearDown() { +@@ -108,7 +108,7 @@ void ContentBrowserTest::TearDown() { // LinuxInputMethodContextFactory has to be shutdown. // 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_renderer_render__process__impl.cc b/www/chromium/files/patch-content_renderer_render__process__impl.cc index c37b958aafe1..8cd43a4cb300 100644 --- a/www/chromium/files/patch-content_renderer_render__process__impl.cc +++ b/www/chromium/files/patch-content_renderer_render__process__impl.cc @@ -1,4 +1,4 @@ ---- content/renderer/render_process_impl.cc.orig 2021-07-19 18:45:16 UTC +--- content/renderer/render_process_impl.cc.orig 2021-09-24 04:26:06 UTC +++ content/renderer/render_process_impl.cc @@ -48,7 +48,7 @@ #if defined(OS_WIN) @@ -13,21 +13,21 @@ SetV8FlagIfNotFeature(features::kWebAssemblyCodeProtection, "--no-wasm-write-protect-code-memory"); --#if defined(OS_LINUX) && defined(ARCH_CPU_X86_64) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(ARCH_CPU_X86_64) +-#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(ARCH_CPU_X86_64) ++#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(ARCH_CPU_X86_64) SetV8FlagIfFeature(features::kWebAssemblyCodeProtectionPku, "--wasm-memory-protection-keys"); SetV8FlagIfNotFeature(features::kWebAssemblyCodeProtectionPku, "--no-wasm-memory-protection-keys"); --#endif // defined(OS_LINUX) && defined(ARCH_CPU_X86_64) -+#endif // (defined(OS_LINUX) || defined(OS_BSD)) && defined(ARCH_CPU_X86_64) +-#endif // (defined(OS_LINUX) || defined(OS_CHROMEOS)) && ++#endif // (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && + // defined(ARCH_CPU_X86_64) SetV8FlagIfFeature(features::kWebAssemblyLazyCompilation, - "--wasm-lazy-compilation"); -@@ -207,7 +207,7 @@ RenderProcessImpl::RenderProcessImpl() +@@ -228,7 +228,7 @@ RenderProcessImpl::RenderProcessImpl() + SetV8FlagIfFeature(features::kWebAssemblyTiering, "--wasm-tier-up"); + SetV8FlagIfNotFeature(features::kWebAssemblyTiering, "--no-wasm-tier-up"); - SetV8FlagIfNotFeature(features::kWebAssemblyTrapHandler, - "--no-wasm-trap-handler"); -#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(ARCH_CPU_X86_64) +#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(ARCH_CPU_X86_64) if (base::FeatureList::IsEnabled(features::kWebAssemblyTrapHandler)) { diff --git a/www/chromium/files/patch-content_renderer_render__thread__impl.cc b/www/chromium/files/patch-content_renderer_render__thread__impl.cc index ebab58016b00..e38725fffb55 100644 --- a/www/chromium/files/patch-content_renderer_render__thread__impl.cc +++ b/www/chromium/files/patch-content_renderer_render__thread__impl.cc @@ -1,6 +1,6 @@ ---- content/renderer/render_thread_impl.cc.orig 2021-07-19 18:45:16 UTC +--- content/renderer/render_thread_impl.cc.orig 2021-10-08 06:25:49 UTC +++ content/renderer/render_thread_impl.cc -@@ -180,7 +180,7 @@ +@@ -185,7 +185,7 @@ #if defined(OS_MAC) #include <malloc/malloc.h> @@ -9,7 +9,7 @@ #include <malloc.h> #endif -@@ -695,7 +695,7 @@ void RenderThreadImpl::Init() { +@@ -702,7 +702,7 @@ void RenderThreadImpl::Init() { compositor_thread_pipeline_.get())); } @@ -18,7 +18,7 @@ categorized_worker_pool_->SetBackgroundingCallback( main_thread_scheduler_->DefaultTaskRunner(), base::BindOnce( -@@ -718,7 +718,7 @@ void RenderThreadImpl::Init() { +@@ -725,7 +725,7 @@ void RenderThreadImpl::Init() { base::DiscardableMemoryAllocator::SetInstance( discardable_memory_allocator_.get()); @@ -27,7 +27,7 @@ if (base::FeatureList::IsEnabled( blink::features::kBlinkCompositorUseDisplayThreadPriority)) { render_message_filter()->SetThreadPriority( -@@ -1040,11 +1040,11 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1059,11 +1059,11 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: const bool enable_video_accelerator = @@ -41,7 +41,7 @@ (gpu_channel_host->gpu_feature_info() .status_values[gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE] == gpu::kGpuFeatureStatusEnabled); -@@ -1054,7 +1054,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1073,7 +1073,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: !cmd_line->HasSwitch(switches::kDisableGpuMemoryBufferVideoFrames); #else cmd_line->HasSwitch(switches::kEnableGpuMemoryBufferVideoFrames); diff --git a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc index 498f7cad0759..a71ccf5ff455 100644 --- a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc +++ b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc</ |