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 @@ -1,6 +1,6 @@ ---- content/renderer/renderer_blink_platform_impl.cc.orig 2021-07-19 18:45:16 UTC +--- content/renderer/renderer_blink_platform_impl.cc.orig 2021-09-14 01:51:57 UTC +++ content/renderer/renderer_blink_platform_impl.cc -@@ -106,7 +106,7 @@ +@@ -107,7 +107,7 @@ #if defined(OS_MAC) #include "content/child/child_process_sandbox_support_impl_mac.h" @@ -9,7 +9,7 @@ #include "content/child/child_process_sandbox_support_impl_linux.h" #endif -@@ -175,7 +175,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -176,7 +176,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( main_thread_scheduler_(main_thread_scheduler) { // RenderThread may not exist in some tests. if (RenderThreadImpl::current()) { @@ -18,7 +18,7 @@ mojo::PendingRemote<font_service::mojom::FontService> font_service; RenderThreadImpl::current()->BindHostReceiver( font_service.InitWithNewPipeAndPassReceiver()); -@@ -185,7 +185,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -186,7 +186,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( #endif } @@ -27,7 +27,7 @@ if (sandboxEnabled()) { #if defined(OS_MAC) sandbox_support_ = std::make_unique<WebSandboxSupportMac>(); -@@ -253,7 +253,7 @@ RendererBlinkPlatformImpl::WrapSharedURLLoaderFactory( +@@ -249,7 +249,7 @@ RendererBlinkPlatformImpl::WrapSharedURLLoaderFactory( /*terminate_sync_load_event=*/nullptr); } @@ -36,7 +36,7 @@ void RendererBlinkPlatformImpl::SetDisplayThreadPriority( base::PlatformThreadId thread_id) { if (RenderThreadImpl* render_thread = RenderThreadImpl::current()) { -@@ -268,7 +268,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop +@@ -264,7 +264,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop } blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() { diff --git a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h index 86a40be7d41c..a62a2c025bcb 100644 --- a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h +++ b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h @@ -1,4 +1,4 @@ ---- content/renderer/renderer_blink_platform_impl.h.orig 2021-07-19 18:45:16 UTC +--- content/renderer/renderer_blink_platform_impl.h.orig 2021-09-14 01:51:57 UTC +++ content/renderer/renderer_blink_platform_impl.h @@ -29,7 +29,7 @@ #include "third_party/blink/public/mojom/cache_storage/cache_storage.mojom.h" @@ -18,7 +18,7 @@ void SetDisplayThreadPriority(base::PlatformThreadId thread_id) override; #endif blink::BlameContext* GetTopLevelBlameContext() override; -@@ -268,7 +268,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -271,7 +271,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi void Collect3DContextInformation(blink::Platform::GraphicsInfo* gl_info, const gpu::GPUInfo& gpu_info) const; @@ -27,7 +27,7 @@ std::unique_ptr<blink::WebSandboxSupport> sandbox_support_; #endif -@@ -289,7 +289,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -292,7 +292,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi mojo::PendingRemote<blink::mojom::CodeCacheHost> code_cache_host_remote_; mojo::SharedRemote<blink::mojom::CodeCacheHost> code_cache_host_; diff --git a/www/chromium/files/patch-content_shell_BUILD.gn b/www/chromium/files/patch-content_shell_BUILD.gn index bd858193b96e..d9240fd207da 100644 --- a/www/chromium/files/patch-content_shell_BUILD.gn +++ b/www/chromium/files/patch-content_shell_BUILD.gn @@ -1,6 +1,6 @@ ---- content/shell/BUILD.gn.orig 2021-07-19 18:45:16 UTC +--- content/shell/BUILD.gn.orig 2021-09-24 04:26:06 UTC +++ content/shell/BUILD.gn -@@ -87,7 +87,7 @@ static_library("content_shell_app") { +@@ -90,7 +90,7 @@ static_library("content_shell_app") { "//content/web_test:web_test_renderer", ] } @@ -9,7 +9,7 @@ deps += [ "//components/crash/core/app", "//components/crash/core/app:test_support", -@@ -268,7 +268,7 @@ static_library("content_shell_lib") { +@@ -275,7 +275,7 @@ static_library("content_shell_lib") { if (is_fuchsia) { deps += [ "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.ui.policy" ] @@ -18,16 +18,16 @@ deps += [ "//components/crash/content/browser", "//components/crash/core/app", -@@ -523,7 +523,7 @@ if (is_android) { - } - } - -- if (is_win || is_linux || is_chromeos) { -+ if ((is_win || is_linux || is_chromeos) && !is_bsd) { +@@ -541,7 +541,7 @@ if (is_android) { + if (is_win) { data_deps += [ "//third_party/crashpad/crashpad/handler:crashpad_handler" ] +- } else if (is_linux || is_chromeos) { ++ } else if ((is_linux || is_chromeos) && !is_bsd) { + data_deps += [ "//components/crash/core/app:chrome_crashpad_handler" ] } -@@ -837,7 +837,7 @@ group("content_shell_crash_test") { + +@@ -848,7 +848,7 @@ group("content_shell_crash_test") { mac_bin_path + "otool-classic", ] } @@ -36,7 +36,7 @@ data += [ "//components/crash/content/tools/generate_breakpad_symbols.py", "//components/crash/content/tools/dmp2minidump.py", -@@ -846,7 +846,7 @@ group("content_shell_crash_test") { +@@ -857,7 +857,7 @@ group("content_shell_crash_test") { if (is_win) { data_deps += [ "//build/win:copy_cdb_to_output" ] } diff --git a/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc b/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc index 1c57851a68d5..a5bc977f9f4c 100644 --- a/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc +++ b/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc @@ -1,6 +1,6 @@ ---- content/shell/app/shell_main_delegate.cc.orig 2021-04-14 18:41:03 UTC +--- content/shell/app/shell_main_delegate.cc.orig 2021-09-14 01:51:57 UTC +++ content/shell/app/shell_main_delegate.cc -@@ -186,7 +186,7 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit +@@ -193,7 +193,7 @@ bool ShellMainDelegate::ShouldCreateFeatureList() { void ShellMainDelegate::PreSandboxStartup() { #if defined(ARCH_CPU_ARM_FAMILY) && \ @@ -9,16 +9,16 @@ // Create an instance of the CPU class to parse /proc/cpuinfo and cache // cpu_brand info. base::CPU cpu_info; -@@ -195,7 +195,7 @@ void ShellMainDelegate::PreSandboxStartup() { +@@ -202,7 +202,7 @@ void ShellMainDelegate::PreSandboxStartup() { // Disable platform crash handling and initialize the crash reporter, if // requested. - // TODO(crbug.com/753619): Implement crash reporter integration for Fuchsia. + // TODO(crbug.com/1226159): Implement crash reporter integration for Fuchsia. -#if !defined(OS_FUCHSIA) +#if !defined(OS_FUCHSIA) && !defined(OS_BSD) if (base::CommandLine::ForCurrentProcess()->HasSwitch( switches::kEnableCrashReporter)) { std::string process_type = -@@ -211,7 +211,7 @@ void ShellMainDelegate::PreSandboxStartup() { +@@ -218,7 +218,7 @@ void ShellMainDelegate::PreSandboxStartup() { #endif } } diff --git a/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc b/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc index fe1b5be5b752..59ca0cdeda21 100644 --- a/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc +++ b/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc @@ -1,15 +1,15 @@ ---- content/shell/browser/shell_browser_main_parts.cc.orig 2021-07-19 18:45:16 UTC +--- content/shell/browser/shell_browser_main_parts.cc.orig 2021-09-14 01:51:57 UTC +++ content/shell/browser/shell_browser_main_parts.cc -@@ -57,7 +57,7 @@ - #if defined(USE_AURA) && defined(USE_X11) +@@ -60,7 +60,7 @@ #include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck #endif + -#if defined(USE_AURA) && (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+#if defined(USE_AURA) && (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) ++#if defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD) || BUILDFLAG(IS_CHROMEOS_LACROS)) #include "ui/base/ime/init/input_method_initializer.h" #endif - #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -137,7 +137,7 @@ void ShellBrowserMainParts::PostCreateMainMessageLoop( + +@@ -148,7 +148,7 @@ void ShellBrowserMainParts::PostCreateMainMessageLoop( } int ShellBrowserMainParts::PreEarlyInitialization() { diff --git a/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc b/www/chromium/files/patch-content_shell_browser_shell__paths.cc index d8501b474102..0c22bf6aa031 100644 --- a/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc +++ b/www/chromium/files/patch-content_shell_browser_shell__paths.cc @@ -1,6 +1,6 @@ ---- content/shell/browser/shell_browser_context.cc.orig 2021-05-12 22:05:53 UTC -+++ content/shell/browser/shell_browser_context.cc -@@ -32,7 +32,7 @@ +--- content/shell/browser/shell_paths.cc.orig 2021-09-24 18:48:29 UTC ++++ content/shell/browser/shell_paths.cc +@@ -12,7 +12,7 @@ #if defined(OS_WIN) #include "base/base_paths_win.h" @@ -9,12 +9,12 @@ #include "base/nix/xdg_util.h" #elif defined(OS_MAC) #include "base/base_paths_mac.h" -@@ -105,7 +105,7 @@ void ShellBrowserContext::InitWhileIOAllowed() { +@@ -28,7 +28,7 @@ bool GetDefaultUserDataDirectory(base::FilePath* resul #if defined(OS_WIN) - CHECK(base::PathService::Get(base::DIR_LOCAL_APP_DATA, &path_)); - path_ = path_.Append(std::wstring(L"content_shell")); + CHECK(base::PathService::Get(base::DIR_LOCAL_APP_DATA, result)); + *result = result->Append(std::wstring(L"content_shell")); -#elif defined(OS_LINUX) || defined(OS_CHROMEOS) +#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) std::unique_ptr<base::Environment> env(base::Environment::Create()); - base::FilePath config_dir( - base::nix::GetXDGDirectory(env.get(), + base::FilePath config_dir(base::nix::GetXDGDirectory( + env.get(), base::nix::kXdgConfigHomeEnvVar, base::nix::kDotConfigDir)); diff --git a/www/chromium/files/patch-content_test_BUILD.gn b/www/chromium/files/patch-content_test_BUILD.gn index 89c0d21fa25f..a3411c548d69 100644 --- a/www/chromium/files/patch-content_test_BUILD.gn +++ b/www/chromium/files/patch-content_test_BUILD.gn @@ -1,6 +1,6 @@ ---- content/test/BUILD.gn.orig 2021-07-19 18:45:16 UTC +--- content/test/BUILD.gn.orig 2021-09-24 04:26:06 UTC +++ content/test/BUILD.gn -@@ -1528,10 +1528,12 @@ test("content_browsertests") { +@@ -1584,10 +1584,12 @@ test("content_browsertests") { } if (is_linux || is_chromeos) { @@ -17,7 +17,7 @@ deps += [ "//printing/buildflags", "//ui/gfx:test_support", -@@ -1786,7 +1788,7 @@ static_library("run_all_unittests") { +@@ -1845,7 +1847,7 @@ static_library("run_all_unittests") { ":test_support", "//base/test:test_support", ] @@ -26,7 +26,7 @@ deps += [ "//content/common:set_process_title_linux" ] } } -@@ -2674,7 +2676,7 @@ test("content_unittests") { +@@ -2755,7 +2757,7 @@ test("content_unittests") { deps += [ "//ui/gfx/x" ] } diff --git a/www/chromium/files/patch-content_zygote_zygote__linux.cc b/www/chromium/files/patch-content_zygote_zygote__linux.cc index 6e7a9e1260aa..a7434c704502 100644 --- a/www/chromium/files/patch-content_zygote_zygote__linux.cc +++ b/www/chromium/files/patch-content_zygote_zygote__linux.cc @@ -1,4 +1,4 @@ ---- content/zygote/zygote_linux.cc.orig 2021-04-14 18:41:03 UTC +--- content/zygote/zygote_linux.cc.orig 2021-09-24 04:26:06 UTC +++ content/zygote/zygote_linux.cc @@ -1,7 +1,7 @@ // Copyright (c) 2012 The Chromium Authors. All rights reserved. @@ -9,7 +9,7 @@ #include "content/zygote/zygote_linux.h" #include <errno.h> -@@ -651,3 +651,4 @@ bool Zygote::HandleGetSandboxStatus(int fd, base::Pick +@@ -650,3 +650,4 @@ bool Zygote::HandleGetSandboxStatus(int fd, base::Pick } } // namespace content diff --git a/www/chromium/files/patch-device_bluetooth_BUILD.gn b/www/chromium/files/patch-device_bluetooth_BUILD.gn index c48e7a1af366..a9abc7b2421d 100644 --- a/www/chromium/files/patch-device_bluetooth_BUILD.gn +++ b/www/chromium/files/patch-device_bluetooth_BUILD.gn @@ -1,6 +1,6 @@ ---- device/bluetooth/BUILD.gn.orig 2021-04-14 18:41:03 UTC +--- device/bluetooth/BUILD.gn.orig 2021-09-24 04:26:06 UTC +++ device/bluetooth/BUILD.gn -@@ -9,7 +9,7 @@ if (is_android) { +@@ -10,7 +10,7 @@ if (is_android) { } if (is_chromeos_ash) { import("//chromeos/dbus/use_real_dbus_clients.gni") @@ -9,12 +9,12 @@ use_real_dbus_clients = false } -@@ -303,7 +303,7 @@ component("bluetooth") { +@@ -308,7 +308,7 @@ component("bluetooth") { ] } - if (is_chromeos || is_linux) { + if (is_chromeos || (is_linux && !is_bsd)) { if (use_dbus) { - sources += [ - "bluez/bluetooth_adapter_bluez.cc", + if (!force_cast_bluetooth) { + sources += [ "bluetooth_adapter_chromeos.cc" ] diff --git a/www/chromium/files/patch-device_fido_features.cc b/www/chromium/files/patch-device_fido_features.cc index 0dcdbf16ab9b..1e79feba2538 100644 --- a/www/chromium/files/patch-device_fido_features.cc +++ b/www/chromium/files/patch-device_fido_features.cc @@ -1,4 +1,4 @@ ---- device/fido/features.cc.orig 2021-06-11 09:50:47 UTC +--- device/fido/features.cc.orig 2021-09-24 04:26:06 UTC +++ device/fido/features.cc @@ -26,7 +26,7 @@ extern const base::Feature kWebAuthCableServerLink { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch @@ -9,3 +9,12 @@ base::FEATURE_DISABLED_BY_DEFAULT #else base::FEATURE_ENABLED_BY_DEFAULT +@@ -35,7 +35,7 @@ extern const base::Feature kWebAuthCableServerLink { + + extern const base::Feature kWebAuthCableSecondFactor { + "WebAuthenticationCableSecondFactor", +-#if BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_LINUX) || defined(OS_ANDROID) ++#if BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + // This is default-disabled on Android because it involves changes that + // alter the interaction with the Sync service and thus needs to be rolled + // out gradually. diff --git a/www/chromium/files/patch-device_gamepad_gamepad__provider.cc b/www/chromium/files/patch-device_gamepad_gamepad__provider.cc index 02802f18f9d9..7e9f068dbcef 100644 --- a/www/chromium/files/patch-device_gamepad_gamepad__provider.cc +++ b/www/chromium/files/patch-device_gamepad_gamepad__provider.cc @@ -1,6 +1,6 @@ ---- device/gamepad/gamepad_provider.cc.orig 2021-05-12 22:05:53 UTC +--- device/gamepad/gamepad_provider.cc.orig 2021-09-14 01:51:57 UTC +++ device/gamepad/gamepad_provider.cc -@@ -150,7 +150,7 @@ void GamepadProvider::Initialize(std::unique_ptr<Gamep +@@ -217,7 +217,7 @@ void GamepadProvider::Initialize(std::unique_ptr<Gamep if (!polling_thread_) polling_thread_ = std::make_unique<base::Thread>("Gamepad polling thread"); diff --git a/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc b/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc index aa311d889677..f09769f53f12 100644 --- a/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc +++ b/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc @@ -1,6 +1,6 @@ ---- extensions/browser/api/messaging/message_service.cc.orig 2021-07-19 18:45:16 UTC +--- extensions/browser/api/messaging/message_service.cc.orig 2021-09-24 04:26:06 UTC +++ extensions/browser/api/messaging/message_service.cc -@@ -65,7 +65,7 @@ namespace { +@@ -68,7 +68,7 @@ namespace { const char kReceivingEndDoesntExistError[] = "Could not establish connection. Receiving end does not exist."; @@ -9,7 +9,7 @@ defined(OS_CHROMEOS) const char kMissingPermissionError[] = "Access to native messaging requires nativeMessaging permission."; -@@ -404,7 +404,7 @@ void MessageService::OpenChannelToNativeApp( +@@ -406,7 +406,7 @@ void MessageService::OpenChannelToNativeApp( if (!opener_port->IsValidPort()) return; @@ -18,7 +18,7 @@ defined(OS_CHROMEOS) bool has_permission = extension->permissions_data()->HasAPIPermission( mojom::APIPermissionID::kNativeMessaging); -@@ -459,12 +459,12 @@ void MessageService::OpenChannelToNativeApp( +@@ -460,12 +460,12 @@ void MessageService::OpenChannelToNativeApp( channel->opener->IncrementLazyKeepaliveCount(); AddChannel(std::move(channel), receiver_port_id); diff --git a/www/chromium/files/patch-extensions_common_api_runtime.json b/www/chromium/files/patch-extensions_common_api_runtime.json index 554c85e93aeb..2a0df60736a6 100644 --- a/www/chromium/files/patch-extensions_common_api_runtime.json +++ b/www/chromium/files/patch-extensions_common_api_runtime.json @@ -1,9 +1,9 @@ ---- extensions/common/api/runtime.json.orig 2021-05-12 22:05:54 UTC +--- extensions/common/api/runtime.json.orig 2021-09-24 04:26:06 UTC +++ extensions/common/api/runtime.json @@ -77,7 +77,7 @@ "id": "PlatformOs", "type": "string", - "description": "The operating system chrome is running on.", + "description": "The operating system Chrome is running on.", - "enum": ["mac", "win", "android", "cros", "linux", "openbsd"] + "enum": ["mac", "win", "android", "cros", "linux", "freebsd", "openbsd"] }, diff --git a/www/chromium/files/patch-extensions_common_feature__switch.cc b/www/chromium/files/patch-extensions_common_feature__switch.cc deleted file mode 100644 index bee09f3f7069..000000000000 --- a/www/chromium/files/patch-extensions_common_feature__switch.cc +++ /dev/null @@ -1,16 +0,0 @@ ---- extensions/common/feature_switch.cc.orig 2021-04-14 18:41:04 UTC -+++ extensions/common/feature_switch.cc -@@ -39,11 +39,11 @@ class CommonSwitches { - FeatureSwitch::DEFAULT_ENABLED), - load_media_router_component_extension( - kLoadMediaRouterComponentExtensionFlag, --#if BUILDFLAG(GOOGLE_CHROME_BRANDING) -+#if BUILDFLAG(GOOGLE_CHROME_BRANDING) || defined(OS_BSD) - FeatureSwitch::DEFAULT_ENABLED) - #else - FeatureSwitch::DEFAULT_DISABLED) --#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) -+#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) || defined(OS_BSD) - { - } - diff --git a/www/chromium/files/patch-extensions_renderer_bindings_api__binding__util.cc b/www/chromium/files/patch-extensions_renderer_bindings_api__binding__util.cc index a35b52308bc9..e33fb4b56fdf 100644 --- a/www/chromium/files/patch-extensions_renderer_bindings_api__binding__util.cc +++ b/www/chromium/files/patch-extensions_renderer_bindings_api__binding__util.cc @@ -1,6 +1,6 @@ ---- extensions/renderer/bindings/api_binding_util.cc.orig 2021-04-14 18:41:04 UTC +--- extensions/renderer/bindings/api_binding_util.cc.orig 2021-09-14 01:51:57 UTC +++ extensions/renderer/bindings/api_binding_util.cc -@@ -131,6 +131,8 @@ std::string GetPlatformString() { +@@ -136,6 +136,8 @@ std::string GetPlatformString() { return "mac"; #elif defined(OS_WIN) return "win"; diff --git a/www/chromium/files/patch-extensions_shell_app_shell__main__delegate.cc b/www/chromium/files/patch-extensions_shell_app_shell__main__delegate.cc index 445b35ca0ca0..b20ddae3a8c0 100644 --- a/www/chromium/files/patch-extensions_shell_app_shell__main__delegate.cc +++ b/www/chromium/files/patch-extensions_shell_app_shell__main__delegate.cc @@ -1,6 +1,6 @@ ---- extensions/shell/app/shell_main_delegate.cc.orig 2021-04-14 18:41:04 UTC +--- extensions/shell/app/shell_main_delegate.cc.orig 2021-09-14 01:51:57 UTC +++ extensions/shell/app/shell_main_delegate.cc -@@ -39,7 +39,7 @@ +@@ -42,7 +42,7 @@ #if defined(OS_WIN) #include "base/base_paths_win.h" @@ -9,7 +9,7 @@ #include "base/nix/xdg_util.h" #elif defined(OS_MAC) #include "base/base_paths_mac.h" -@@ -75,7 +75,7 @@ base::FilePath GetDataPath() { +@@ -78,7 +78,7 @@ base::FilePath GetDataPath() { return cmd_line->GetSwitchValuePath(switches::kContentShellDataPath); base::FilePath data_dir; diff --git a/www/chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc b/www/chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc index e3d589c30c53..7bb2d8c90547 100644 --- a/www/chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc +++ b/www/chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/common/gpu_memory_buffer_support.cc.orig 2021-07-19 18:45:17 UTC +--- gpu/command_buffer/common/gpu_memory_buffer_support.cc.orig 2021-09-14 01:51:57 UTC +++ gpu/command_buffer/common/gpu_memory_buffer_support.cc -@@ -119,7 +119,7 @@ gfx::BufferFormat GetPlaneBufferFormat(gfx::BufferPlan +@@ -124,7 +124,7 @@ gfx::BufferFormat GetPlaneBufferFormat(gfx::BufferPlan uint32_t GetPlatformSpecificTextureTarget() { #if defined(OS_MAC) return macos_specific_texture_target; @@ -9,7 +9,7 @@ defined(OS_WIN) return GL_TEXTURE_EXTERNAL_OES; #elif defined(OS_FUCHSIA) -@@ -150,7 +150,7 @@ GPU_EXPORT uint32_t GetBufferTextureTarget(gfx::Buffer +@@ -155,7 +155,7 @@ GPU_EXPORT uint32_t GetBufferTextureTarget(gfx::Buffer GPU_EXPORT bool NativeBufferNeedsPlatformSpecificTextureTarget( gfx::BufferFormat format) { diff --git a/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc b/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc index f0e13f27d8d5..d47a02c0adef 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/external_vk_image_backing.cc.orig 2021-07-19 18:45:17 UTC +--- gpu/command_buffer/service/external_vk_image_backing.cc.orig 2021-09-14 01:51:57 UTC +++ gpu/command_buffer/service/external_vk_image_backing.cc -@@ -30,7 +30,7 @@ +@@ -31,7 +31,7 @@ #include "ui/gl/gl_version_info.h" #include "ui/gl/scoped_binders.h" @@ -9,16 +9,16 @@ #include "gpu/command_buffer/service/external_vk_image_dawn_representation.h" #endif -@@ -601,7 +601,7 @@ std::unique_ptr<SharedImageRepresentationDawn> - ExternalVkImageBacking::ProduceDawn(SharedImageManager* manager, +@@ -557,7 +557,7 @@ ExternalVkImageBacking::ProduceDawn(SharedImageManager MemoryTypeTracker* tracker, - WGPUDevice wgpuDevice) { + WGPUDevice wgpuDevice, + WGPUBackendType backend_type) { -#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && BUILDFLAG(USE_DAWN) +#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && BUILDFLAG(USE_DAWN) auto wgpu_format = viz::ToWGPUFormat(format()); if (wgpu_format == WGPUTextureFormat_Undefined) { -@@ -620,7 +620,7 @@ ExternalVkImageBacking::ProduceDawn(SharedImageManager +@@ -576,7 +576,7 @@ ExternalVkImageBacking::ProduceDawn(SharedImageManager return std::make_unique<ExternalVkImageDawnRepresentation>( manager, this, tracker, wgpuDevice, wgpu_format, std::move(memory_fd)); @@ -27,7 +27,7 @@ NOTIMPLEMENTED_LOG_ONCE(); return nullptr; #endif -@@ -633,7 +633,7 @@ GLuint ExternalVkImageBacking::ProduceGLTextureInterna +@@ -589,7 +589,7 @@ GLuint ExternalVkImageBacking::ProduceGLTextureInterna gl::GLApi* api = gl::g_current_gl_context; absl::optional<ScopedDedicatedMemoryObject> memory_object; if (!use_separate_gl_texture()) { diff --git a/www/chromium/files/patch-gpu_command__buffer_service_shared__image__factory.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__image__factory.cc index f94010069ac4..9ba1e35f53d4 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_shared__image__factory.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_shared__image__factory.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/shared_image_factory.cc.orig 2021-07-19 18:45:17 UTC +--- gpu/command_buffer/service/shared_image_factory.cc.orig 2021-09-24 04:26:07 UTC +++ gpu/command_buffer/service/shared_image_factory.cc -@@ -28,12 +28,12 @@ +@@ -29,12 +29,12 @@ #include "ui/gl/gl_implementation.h" #include "ui/gl/trace_util.h" @@ -15,7 +15,7 @@ BUILDFLAG(ENABLE_VULKAN) #include "gpu/command_buffer/service/external_vk_image_factory.h" #elif defined(OS_ANDROID) && BUILDFLAG(ENABLE_VULKAN) -@@ -66,8 +66,8 @@ +@@ -68,8 +68,8 @@ namespace gpu { @@ -26,7 +26,7 @@ BUILDFLAG(ENABLE_VULKAN) namespace { -@@ -143,7 +143,7 @@ SharedImageFactory::SharedImageFactory( +@@ -162,7 +162,7 @@ SharedImageFactory::SharedImageFactory( // |gr_context_type|. if (gr_context_type_ == GrContextType::kVulkan) { #if BUILDFLAG(ENABLE_VULKAN) diff --git a/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc b/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc index 2f0dcf323ce1..f4a4ef6f4be3 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc @@ -1,17 +1,17 @@ ---- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2021-07-19 18:45:17 UTC +--- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2021-09-24 04:26:07 UTC +++ gpu/command_buffer/service/webgpu_decoder_impl.cc -@@ -823,12 +823,12 @@ error::Error WebGPUDecoderImpl::HandleRequestAdapter( +@@ -931,12 +931,12 @@ error::Error WebGPUDecoderImpl::HandleRequestAdapter( static_cast<DawnRequestAdapterSerial>(c.request_adapter_serial); if (gr_context_type_ != GrContextType::kVulkan) { --#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) SendAdapterProperties(request_adapter_serial, -1, nullptr, "WebGPU on Linux requires command-line flag " "--enable-features=Vulkan,UseSkiaRenderer"); return error::kNoError; --#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) -+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) } int32_t requested_adapter_index = GetPreferredAdapterIndex(power_preference); diff --git a/www/chromium/files/patch-gpu_config_gpu__control__list.cc b/www/chromium/files/patch-gpu_config_gpu__control__list.cc index da801708bd99..ef3336dc947b 100644 --- a/www/chromium/files/patch-gpu_config_gpu__control__list.cc +++ b/www/chromium/files/patch-gpu_config_gpu__control__list.cc @@ -1,4 +1,4 @@ ---- gpu/config/gpu_control_list.cc.orig 2021-07-19 18:45:17 UTC +--- gpu/config/gpu_control_list.cc.orig 2021-09-24 04:26:07 UTC +++ gpu/config/gpu_control_list.cc @@ -19,7 +19,11 @@ #include "build/build_config.h" @@ -12,7 +12,7 @@ namespace gpu { namespace { -@@ -277,7 +281,7 @@ bool GpuControlList::More::GLVersionInfoMismatch( +@@ -262,7 +266,7 @@ bool GpuControlList::More::GLVersionInfoMismatch( GpuControlList::GLType GpuControlList::More::GetDefaultGLType() { #if BUILDFLAG(IS_CHROMEOS_ASH) return kGLTypeGL; @@ -21,7 +21,7 @@ defined(OS_OPENBSD) return kGLTypeGL; #elif defined(OS_MAC) -@@ -783,7 +787,7 @@ GpuControlList::OsType GpuControlList::GetOsType() { +@@ -768,7 +772,7 @@ GpuControlList::OsType GpuControlList::GetOsType() { return kOsAndroid; #elif defined(OS_FUCHSIA) return kOsFuchsia; diff --git a/www/chromium/files/patch-gpu_config_gpu__util.cc b/www/chromium/files/patch-gpu_config_gpu__util.cc new file mode 100644 index 000000000000..f19fbf3e9502 --- /dev/null +++ b/www/chromium/files/patch-gpu_config_gpu__util.cc @@ -0,0 +1,11 @@ +--- gpu/config/gpu_util.cc.orig 2021-09-24 18:51:11 UTC ++++ gpu/config/gpu_util.cc +@@ -740,7 +740,7 @@ bool EnableSwiftShaderIfNeeded(base::CommandLine* comm + gpu_feature_info.status_values[GPU_FEATURE_TYPE_ACCELERATED_GL] != + kGpuFeatureStatusEnabled) { + bool legacy_software_gl = true; +-#if defined(OS_LINUX) || defined(OS_WIN) ++#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) + // This setting makes WebGL run on SwANGLE instead of SwiftShader GL. + legacy_software_gl = false; + #endif diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc index 85a36bfb0f06..da871c864043 100644 --- a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc +++ b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc @@ -1,4 +1,4 @@ ---- gpu/ipc/service/gpu_init.cc.orig 2021-07-19 18:45:17 UTC +--- gpu/ipc/service/gpu_init.cc.orig 2021-09-24 04:26:07 UTC +++ gpu/ipc/service/gpu_init.cc @@ -119,7 +119,7 @@ void InitializePlatformOverlaySettings(GPUInfo* gpu_in } @@ -27,7 +27,7 @@ if (gpu_info_.gpu.vendor_id == 0x10de && // NVIDIA gpu_info_.gpu.driver_vendor == "NVIDIA" && !CanAccessNvidiaDeviceFile()) return false; -@@ -269,7 +269,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -281,7 +281,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL delayed_watchdog_enable = true; #endif @@ -36,7 +36,7 @@ // PreSandbox is mainly for resource handling and not related to the GPU // driver, it doesn't need the GPU watchdog. The loadLibrary may take long // time that killing and restarting the GPU process will not help. -@@ -309,7 +309,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -321,7 +321,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } bool attempted_startsandbox = false; @@ -45,7 +45,7 @@ // On Chrome OS ARM Mali, GPU driver userspace creates threads when // initializing a GL context, so start the sandbox early. // TODO(zmo): Need to collect OS version before this. -@@ -318,7 +318,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -330,7 +330,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL watchdog_thread_.get(), &gpu_info_, gpu_preferences_); attempted_startsandbox = true; } @@ -54,16 +54,16 @@ base::TimeTicks before_initialize_one_off = base::TimeTicks::Now(); -@@ -360,7 +360,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -372,7 +372,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } if (gl_initialized && gl_use_swiftshader_ && - gl::GetGLImplementation() != gl::kGLImplementationSwiftShaderGL) { + !gl::IsSoftwareGLImplementation(gl::GetGLImplementationParts())) { -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " << "on Linux"; return false; -@@ -368,7 +368,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -380,7 +380,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL SaveHardwareGpuInfoAndGpuFeatureInfo(); gl::init::ShutdownGL(true); gl_initialized = false; @@ -72,7 +72,7 @@ } if (!gl_initialized) { -@@ -394,7 +394,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -406,7 +406,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } } @@ -81,7 +81,7 @@ // The ContentSandboxHelper is currently the only one implementation of // GpuSandboxHelper and it has no dependency. Except on Linux where // VaapiWrapper checks the GL implementation to determine which display -@@ -459,7 +459,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -473,7 +473,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL command_line, gpu_feature_info_, gpu_preferences_.disable_software_rasterizer, false); if (gl_use_swiftshader_) { @@ -90,7 +90,7 @@ VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " << "on Linux"; return false; -@@ -474,7 +474,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -488,7 +488,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL << "failed"; return false; } @@ -99,7 +99,7 @@ } } else { // gl_use_swiftshader_ == true switch (gpu_preferences_.use_vulkan) { -@@ -550,7 +550,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -564,7 +564,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_); @@ -108,7 +108,7 @@ // Driver may create a compatibility profile context when collect graphics // information on Linux platform. Try to collect graphics information // based on core profile context after disabling platform extensions. -@@ -569,7 +569,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -583,7 +583,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL return false; } } @@ -117,7 +117,7 @@ if (gl_use_swiftshader_) { AdjustInfoToSwiftShader(); -@@ -761,7 +761,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -795,7 +795,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_); @@ -126,7 +126,7 @@ // Driver may create a compatibility profile context when collect graphics // information on Linux platform. Try to collect graphics information // based on core profile context after disabling platform extensions. -@@ -782,7 +782,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -816,7 +816,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c } } } diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc b/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc index 928d1511ba43..c7da2053d392 100644 --- a/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc +++ b/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc @@ -1,6 +1,6 @@ ---- gpu/ipc/service/gpu_watchdog_thread.cc.orig 2021-07-19 18:45:17 UTC +--- gpu/ipc/service/gpu_watchdog_thread.cc.orig 2021-09-24 04:26:07 UTC +++ gpu/ipc/service/gpu_watchdog_thread.cc -@@ -88,7 +88,7 @@ GpuWatchdogThread::GpuWatchdogThread(base::TimeDelta t +@@ -91,7 +91,7 @@ GpuWatchdogThread::GpuWatchdogThread(base::TimeDelta t } #endif @@ -9,7 +9,7 @@ tty_file_ = base::OpenFile( base::FilePath(FILE_PATH_LITERAL("/sys/class/tty/tty0/active")), "r"); UpdateActiveTTY(); -@@ -116,7 +116,7 @@ GpuWatchdogThread::~GpuWatchdogThread() { +@@ -119,7 +119,7 @@ GpuWatchdogThread::~GpuWatchdogThread() { CloseHandle(watched_thread_handle_); #endif @@ -18,7 +18,7 @@ if (tty_file_) fclose(tty_file_); #endif -@@ -449,7 +449,7 @@ void GpuWatchdogThread::OnWatchdogTimeout() { +@@ -471,7 +471,7 @@ void GpuWatchdogThread::OnWatchdogTimeout() { if (foregrounded_event_) num_of_timeout_after_foregrounded_++; @@ -27,7 +27,7 @@ UpdateActiveTTY(); #endif -@@ -782,7 +782,7 @@ bool GpuWatchdogThread::WithinOneMinFromForegrounded() +@@ -803,7 +803,7 @@ bool GpuWatchdogThread::WithinOneMinFromForegrounded() return foregrounded_event_ && num_of_timeout_after_foregrounded_ <= count; } @@ -36,7 +36,7 @@ void GpuWatchdogThread::UpdateActiveTTY() { last_active_tty_ = active_tty_; -@@ -799,7 +799,7 @@ void GpuWatchdogThread::UpdateActiveTTY() { +@@ -820,7 +820,7 @@ void GpuWatchdogThread::UpdateActiveTTY() { #endif bool GpuWatchdogThread::ContinueOnNonHostX11ServerTty() { diff --git a/www/chromium/files/patch-gpu_vulkan_generate__bindings.py b/www/chromium/files/patch-gpu_vulkan_generate__bindings.py index edd72c62d052..81c7d1672f24 100644 --- a/www/chromium/files/patch-gpu_vulkan_generate__bindings.py +++ b/www/chromium/files/patch-gpu_vulkan_generate__bindings.py @@ -1,6 +1,6 @@ ---- gpu/vulkan/generate_bindings.py.orig 2021-06-11 09:51:44 UTC +--- gpu/vulkan/generate_bindings.py.orig 2021-09-14 01:51:58 UTC +++ gpu/vulkan/generate_bindings.py -@@ -183,7 +183,7 @@ VULKAN_DEVICE_FUNCTIONS = [ +@@ -184,7 +184,7 @@ VULKAN_DEVICE_FUNCTIONS = [ ] }, { @@ -9,7 +9,7 @@ 'extension': 'VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME', 'functions': [ 'vkGetSemaphoreFdKHR', -@@ -199,7 +199,7 @@ VULKAN_DEVICE_FUNCTIONS = [ +@@ -200,7 +200,7 @@ VULKAN_DEVICE_FUNCTIONS = [ ] }, { @@ -18,7 +18,7 @@ 'extension': 'VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME', 'functions': [ 'vkGetMemoryFdKHR', -@@ -250,7 +250,7 @@ VULKAN_DEVICE_FUNCTIONS = [ +@@ -251,7 +251,7 @@ VULKAN_DEVICE_FUNCTIONS = [ ] }, { diff --git a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc index 014767c3beef..5ae9937bdf8f 100644 --- a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc +++ b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc @@ -1,6 +1,6 @@ ---- gpu/vulkan/vulkan_function_pointers.cc.orig 2021-04-14 18:41:04 UTC +--- gpu/vulkan/vulkan_function_pointers.cc.orig 2021-09-14 01:51:58 UTC +++ gpu/vulkan/vulkan_function_pointers.cc -@@ -898,7 +898,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer +@@ -906,7 +906,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer } #endif // defined(OS_ANDROID) @@ -9,7 +9,7 @@ if (gfx::HasExtension(enabled_extensions, VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME)) { vkGetSemaphoreFdKHR = reinterpret_cast<PFN_vkGetSemaphoreFdKHR>( -@@ -917,7 +917,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer +@@ -925,7 +925,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer return false; } } @@ -18,7 +18,7 @@ #if defined(OS_WIN) if (gfx::HasExtension(enabled_extensions, -@@ -942,7 +942,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer +@@ -950,7 +950,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer } #endif // defined(OS_WIN) @@ -27,7 +27,7 @@ if (gfx::HasExtension(enabled_extensions, VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME)) { vkGetMemoryFdKHR = reinterpret_cast<PFN_vkGetMemoryFdKHR>( -@@ -962,7 +962,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer +@@ -970,7 +970,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer return false; } } @@ -36,7 +36,7 @@ #if defined(OS_WIN) if (gfx::HasExtension(enabled_extensions, -@@ -1111,7 +1111,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer +@@ -1119,7 +1119,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer } } @@ -45,7 +45,7 @@ if (gfx::HasExtension(enabled_extensions, VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_EXTENSION_NAME)) { vkGetImageDrmFormatModifierPropertiesEXT = -@@ -1124,7 +1124,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer +@@ -1132,7 +1132,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer return false; } } diff --git a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h index bfa3f2afe9fe..196d90be0302 100644 --- a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h +++ b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h @@ -1,6 +1,6 @@ ---- gpu/vulkan/vulkan_function_pointers.h.orig 2021-05-12 22:05:54 UTC +--- gpu/vulkan/vulkan_function_pointers.h.orig 2021-09-14 01:51:58 UTC +++ gpu/vulkan/vulkan_function_pointers.h -@@ -241,10 +241,10 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers +@@ -242,10 +242,10 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers vkGetAndroidHardwareBufferPropertiesANDROID; #endif // defined(OS_ANDROID) @@ -13,7 +13,7 @@ #if defined(OS_WIN) VulkanFunction<PFN_vkGetSemaphoreWin32HandleKHR> vkGetSemaphoreWin32HandleKHR; -@@ -252,10 +252,10 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers +@@ -253,10 +253,10 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers vkImportSemaphoreWin32HandleKHR; #endif // defined(OS_WIN) @@ -26,7 +26,7 @@ #if defined(OS_WIN) VulkanFunction<PFN_vkGetMemoryWin32HandleKHR> vkGetMemoryWin32HandleKHR; -@@ -292,10 +292,10 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers +@@ -293,10 +293,10 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers VulkanFunction<PFN_vkGetSwapchainImagesKHR> vkGetSwapchainImagesKHR; VulkanFunction<PFN_vkQueuePresentKHR> vkQueuePresentKHR; @@ -39,7 +39,7 @@ }; } // namespace gpu -@@ -997,7 +997,7 @@ ALWAYS_INLINE VkResult vkGetAndroidHardwareBufferPrope +@@ -1008,7 +1008,7 @@ ALWAYS_INLINE VkResult vkGetAndroidHardwareBufferPrope } #endif // defined(OS_ANDROID) @@ -48,7 +48,7 @@ ALWAYS_INLINE VkResult vkGetSemaphoreFdKHR(VkDevice device, const VkSemaphoreGetFdInfoKHR* pGetFdInfo, -@@ -1011,7 +1011,7 @@ ALWAYS_INLINE VkResult vkImportSemaphoreFdKHR( +@@ -1022,7 +1022,7 @@ ALWAYS_INLINE VkResult vkImportSemaphoreFdKHR( return gpu::GetVulkanFunctionPointers()->vkImportSemaphoreFdKHR( device, pImportSemaphoreFdInfo); } @@ -57,7 +57,7 @@ #if defined(OS_WIN) ALWAYS_INLINE VkResult vkGetSemaphoreWin32HandleKHR( -@@ -1030,7 +1030,7 @@ vkImportSemaphoreWin32HandleKHR(VkDevice device, +@@ -1041,7 +1041,7 @@ vkImportSemaphoreWin32HandleKHR(VkDevice device, } #endif // defined(OS_WIN) @@ -66,7 +66,7 @@ ALWAYS_INLINE VkResult vkGetMemoryFdKHR(VkDevice device, const VkMemoryGetFdInfoKHR* pGetFdInfo, int* pFd) { -@@ -1045,7 +1045,7 @@ vkGetMemoryFdPropertiesKHR(VkDevice device, +@@ -1056,7 +1056,7 @@ vkGetMemoryFdPropertiesKHR(VkDevice device, return gpu::GetVulkanFunctionPointers()->vkGetMemoryFdPropertiesKHR( device, handleType, fd, pMemoryFdProperties); } @@ -75,7 +75,7 @@ #if defined(OS_WIN) ALWAYS_INLINE VkResult vkGetMemoryWin32HandleKHR( -@@ -1140,7 +1140,7 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue +@@ -1151,7 +1151,7 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue pPresentInfo); } @@ -84,7 +84,7 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierPropertiesEXT( VkDevice device, VkImage image, -@@ -1148,6 +1148,6 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierProp +@@ -1159,6 +1159,6 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierProp return gpu::GetVulkanFunctionPointers() ->vkGetImageDrmFormatModifierPropertiesEXT(device, image, pProperties); } diff --git a/www/chromium/files/patch-gpu_vulkan_vulkan__image.cc b/www/chromium/files/patch-gpu_vulkan_vulkan__image.cc index aa41b9ba8f84..43fae053a0c2 100644 --- a/www/chromium/files/patch-gpu_vulkan_vulkan__image.cc +++ b/www/chromium/files/patch-gpu_vulkan_vulkan__image.cc @@ -1,6 +1,6 @@ ---- gpu/vulkan/vulkan_image.cc.orig 2021-04-14 18:41:04 UTC +--- gpu/vulkan/vulkan_image.cc.orig 2021-09-14 01:51:58 UTC +++ gpu/vulkan/vulkan_image.cc -@@ -325,7 +325,7 @@ bool VulkanImage::InitializeWithExternalMemory( +@@ -326,7 +326,7 @@ bool VulkanImage::InitializeWithExternalMemory( // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/chromium/files/patch-gpu_vulkan_vulkan__image.h b/www/chromium/files/patch-gpu_vulkan_vulkan__image.h index abfe487ebf18..842790f888f5 100644 --- a/www/chromium/files/patch-gpu_vulkan_vulkan__image.h +++ b/www/chromium/files/patch-gpu_vulkan_vulkan__image.h @@ -1,6 +1,6 @@ ---- gpu/vulkan/vulkan_image.h.orig 2021-04-14 18:41:04 UTC +--- gpu/vulkan/vulkan_image.h.orig 2021-09-14 01:51:58 UTC +++ gpu/vulkan/vulkan_image.h -@@ -84,7 +84,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanImage { +@@ -85,7 +85,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanImage { VkImageUsageFlags usage, VkImageCreateFlags flags); @@ -9,9 +9,9 @@ static std::unique_ptr<VulkanImage> CreateWithExternalMemoryAndModifiers( VulkanDeviceQueue* device_queue, const gfx::Size& size, -@@ -166,7 +166,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanImage { - VkImageCreateFlags flags, - VkImageTiling image_tiling); +@@ -168,7 +168,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanImage { + VkImageTiling image_tiling, + uint32_t queue_family_index); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) diff --git a/www/chromium/files/patch-harfbuzz-3.0.0 b/www/chromium/files/patch-harfbuzz-3.0.0 deleted file mode 100644 index a4b74cbfe796..000000000000 --- a/www/chromium/files/patch-harfbuzz-3.0.0 +++ /dev/null @@ -1,98 +0,0 @@ -https://github.com/chromium/chromium/commit/b289f6f3fcbc -https://github.com/google/skia/commit/66684b17b382 -https://github.com/google/skia/commit/51d83abcd24a - ---- components/paint_preview/common/subset_font.cc.orig 2021-08-17 00:16:02 UTC -+++ components/paint_preview/common/subset_font.cc -@@ -71,9 +71,11 @@ sk_sp<SkData> SubsetFont(SkTypeface* typeface, const G - hb_set_t* glyphs = - hb_subset_input_glyph_set(input.get()); // Owned by |input|. - usage.ForEach(base::BindRepeating(&AddGlyphs, base::Unretained(glyphs))); -- hb_subset_input_set_retain_gids(input.get(), true); -+ hb_subset_input_set_flags(input.get(), HB_SUBSET_FLAGS_RETAIN_GIDS); - -- HbScoped<hb_face_t> subset_face(hb_subset(face.get(), input.get())); -+ HbScoped<hb_face_t> subset_face(hb_subset_or_fail(face.get(), input.get())); -+ if (!subset_face) -+ return nullptr; - HbScoped<hb_blob_t> subset_blob(hb_face_reference_blob(subset_face.get())); - if (!subset_blob) - return nullptr; ---- third_party/skia/gn/skia.gni.orig 2021-08-17 00:18:55 UTC -+++ third_party/skia/gn/skia.gni -@@ -33,8 +33,6 @@ declare_args() { - skia_include_multiframe_procs = false - skia_lex = false - skia_libgifcodec_path = "third_party/externals/libgifcodec" -- skia_pdf_subset_harfbuzz = -- false # TODO: set skia_pdf_subset_harfbuzz to skia_use_harfbuzz. - skia_qt_path = getenv("QT_PATH") - skia_skqp_global_error_tolerance = 0 - skia_tools_require_resources = false -@@ -97,6 +95,10 @@ declare_args() { - - skia_build_fuzzers = is_clang && is_linux && target_cpu == "x64" - skia_use_libfuzzer_defaults = true -+} -+ -+declare_args() { -+ skia_pdf_subset_harfbuzz = skia_use_harfbuzz - } - - declare_args() { ---- third_party/skia/src/pdf/SkPDFSubsetFont.cpp.orig 2021-08-17 00:18:56 UTC -+++ third_party/skia/src/pdf/SkPDFSubsetFont.cpp -@@ -49,6 +49,37 @@ static sk_sp<SkData> to_data(HBBlob blob) { - blob.release()); - } - -+template<typename...> using void_t = void; -+template<typename T, typename = void> -+struct SkPDFHarfBuzzSubset { -+ // This is the HarfBuzz 3.0 interface. -+ // hb_subset_flags_t does not exist in 2.0. It isn't dependent on T, so inline the value of -+ // HB_SUBSET_FLAGS_RETAIN_GIDS until 2.0 is no longer supported. -+ static HBFace Make(T input, hb_face_t* face) { -+ // TODO: When possible, check if a font is 'tricky' with FT_IS_TRICKY. -+ // If it isn't known if a font is 'tricky', retain the hints. -+ hb_subset_input_set_flags(input, 2/*HB_SUBSET_FLAGS_RETAIN_GIDS*/); -+ return HBFace(hb_subset_or_fail(face, input)); -+ } -+}; -+template<typename T> -+struct SkPDFHarfBuzzSubset<T, void_t< -+ decltype(hb_subset_input_set_retain_gids(std::declval<T>(), std::declval<bool>())), -+ decltype(hb_subset_input_set_drop_hints(std::declval<T>(), std::declval<bool>())), -+ decltype(hb_subset(std::declval<hb_face_t*>(), std::declval<T>())) -+ >> -+{ -+ // This is the HarfBuzz 2.0 (non-public) interface, used if it exists. -+ // This code should be removed as soon as all users are migrated to the newer API. -+ static HBFace Make(T input, hb_face_t* face) { -+ hb_subset_input_set_retain_gids(input, true); -+ // TODO: When possible, check if a font is 'tricky' with FT_IS_TRICKY. -+ // If it isn't known if a font is 'tricky', retain the hints. -+ hb_subset_input_set_drop_hints(input, false); -+ return HBFace(hb_subset(face, input)); -+ } -+}; -+ - static sk_sp<SkData> subset_harfbuzz(sk_sp<SkData> fontData, - const SkPDFGlyphUse& glyphUsage, - int ttcIndex) { -@@ -71,11 +102,10 @@ static sk_sp<SkData> subset_harfbuzz(sk_sp<SkData> fon - hb_set_t* glyphs = hb_subset_input_glyph_set(input.get()); - glyphUsage.getSetValues([&glyphs](unsigned gid) { hb_set_add(glyphs, gid);}); - -- hb_subset_input_set_retain_gids(input.get(), true); -- // TODO: When possible, check if a font is 'tricky' with FT_IS_TRICKY. -- // If it isn't known if a font is 'tricky', retain the hints. -- hb_subset_input_set_drop_hints(input.get(), false); -- HBFace subset(hb_subset(face.get(), input.get())); -+ HBFace subset = SkPDFHarfBuzzSubset<hb_subset_input_t*>::Make(input.get(), face.get()); -+ if (!subset) { -+ return nullptr; -+ } - HBBlob result(hb_face_reference_blob(subset.get())); - return to_data(std::move(result)); - } diff --git a/www/chromium/files/patch-headless_BUILD.gn b/www/chromium/files/patch-headless_BUILD.gn index 05d8956f1945..37766f3f9e38 100644 --- a/www/chromium/files/patch-headless_BUILD.gn +++ b/www/chromium/files/patch-headless_BUILD.gn @@ -1,4 +1,4 @@ ---- headless/BUILD.gn.orig 2021-07-19 18:45:17 UTC +--- headless/BUILD.gn.orig 2021-09-24 04:26:07 UTC +++ headless/BUILD.gn @@ -289,7 +289,7 @@ source_set("headless_shared_sources") { sources += generated_devtools_api @@ -15,19 +15,28 @@ - if (!is_fuchsia) { + if (!is_fuchsia && !is_bsd) { - deps += [ "//components/crash/content/browser" ] - } - if (is_component_build && is_win) { -@@ -488,7 +488,7 @@ component("headless_non_renderer") { + deps += [ + "//components/crash/content/browser", + "//components/crash/core/app", +@@ -504,7 +504,7 @@ component("headless_non_renderer") { "//v8", ] - if (!is_fuchsia) { + if (!is_fuchsia && !is_bsd) { - deps += [ "//components/crash/content/browser" ] + deps += [ + "//components/crash/content/browser", + "//components/crash/core/app", +@@ -648,7 +648,7 @@ if (!is_component_build) { + ] } - if (is_win) { -@@ -817,7 +817,7 @@ static_library("headless_shell_lib") { + +- if (is_mac || is_win || is_linux || is_chromeos) { ++ if ((is_mac || is_win || is_linux || is_chromeos) && !is_bsd) { + deps += [ "//components/crash/core/app" ] + } + } +@@ -877,7 +877,7 @@ static_library("headless_shell_lib") { public_deps += [ ":headless_non_renderer" ] } @@ -36,3 +45,12 @@ deps += [ "//components/crash/content/browser" ] } +@@ -908,7 +908,7 @@ static_library("headless_shell_lib") { + deps += [ "//components/os_crypt" ] + } + +- if (is_win || (is_posix && !is_mac)) { ++ if (is_win || (is_posix && !is_mac && !is_bsd)) { + deps += [ "//components/crash/core/app" ] + } + diff --git a/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc b/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc index 539d8f34c5bd..2d6bff85839a 100644 --- a/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc +++ b/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc @@ -1,6 +1,6 @@ ---- headless/lib/browser/headless_content_browser_client.cc.orig 2021-07-19 18:45:17 UTC +--- headless/lib/browser/headless_content_browser_client.cc.orig 2021-09-24 04:26:07 UTC +++ headless/lib/browser/headless_content_browser_client.cc -@@ -288,7 +288,7 @@ void HeadlessContentBrowserClient::AppendExtraCommandL +@@ -309,7 +309,7 @@ void HeadlessContentBrowserClient::AppendExtraCommandL process_type, child_process_id); } diff --git a/www/chromium/files/patch-headless_lib_browser_headless__web__contents__impl.cc b/www/chromium/files/patch-headless_lib_browser_headless__web__contents__impl.cc index 7f4508384081..6b8e4e8c8f88 100644 --- a/www/chromium/files/patch-headless_lib_browser_headless__web__contents__impl.cc +++ b/www/chromium/files/patch-headless_lib_browser_headless__web__contents__impl.cc @@ -1,6 +1,6 @@ ---- headless/lib/browser/headless_web_contents_impl.cc.orig 2021-04-22 08:19:36 UTC +--- headless/lib/browser/headless_web_contents_impl.cc.orig 2021-09-14 01:51:58 UTC +++ headless/lib/browser/headless_web_contents_impl.cc -@@ -60,7 +60,7 @@ namespace headless { +@@ -59,7 +59,7 @@ namespace headless { namespace { void UpdatePrefsFromSystemSettings(blink::RendererPreferences* prefs) { diff --git a/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc b/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc index 891f0409a690..5a9dc1aee137 100644 --- a/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc +++ b/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc @@ -1,11 +1,11 @@ ---- headless/lib/headless_content_main_delegate.cc.orig 2021-07-19 18:45:17 UTC +--- headless/lib/headless_content_main_delegate.cc.orig 2021-09-14 01:51:58 UTC +++ headless/lib/headless_content_main_delegate.cc -@@ -327,7 +327,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( +@@ -325,7 +325,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( const base::CommandLine& command_line) { if (command_line.HasSwitch(::switches::kDisableBreakpad)) return; -#if defined(OS_FUCHSIA) +#if defined(OS_FUCHSIA) || defined(OS_BSD) - // TODO(fuchsia): Implement this when crash reporting/Breakpad are available - // in Fuchsia. (crbug.com/753619) + // TODO(crbug.com/1226159): Implement this when crash reporting/Breakpad are + // available in Fuchsia. NOTIMPLEMENTED(); diff --git a/www/chromium/files/patch-headless_public_headless__browser.cc b/www/chromium/files/patch-headless_public_headless__browser.cc new file mode 100644 index 000000000000..1859e779eccb --- /dev/null +++ b/www/chromium/files/patch-headless_public_headless__browser.cc @@ -0,0 +1,11 @@ +--- headless/public/headless_browser.cc.orig 2021-09-24 18:51:42 UTC ++++ headless/public/headless_browser.cc +@@ -42,7 +42,7 @@ Options::Options(int argc, const char** argv) + user_agent(content::BuildUserAgentFromProduct(product_name_and_version)), + window_size(kDefaultWindowSize), + font_render_hinting(kDefaultFontRenderHinting) { +-#if (defined(OS_LINUX) && !defined(USE_OZONE)) || defined(OS_WIN) ++#if ((defined(OS_LINUX) || defined(OS_BSD)) && !defined(USE_OZONE)) || defined(OS_WIN) + gl_implementation = gl::kGLImplementationANGLEName; + angle_implementation = gl::kANGLEImplementationSwiftShaderForWebGLName; + #endif diff --git a/www/chromium/files/patch-ipc_ipc__channel.h b/www/chromium/files/patch-ipc_ipc__channel.h index 554c7deffd33..ac2f0645c5d5 100644 --- a/www/chromium/files/patch-ipc_ipc__channel.h +++ b/www/chromium/files/patch-ipc_ipc__channel.h @@ -1,6 +1,6 @@ ---- ipc/ipc_channel.h.orig 2021-04-14 18:41:05 UTC +--- ipc/ipc_channel.h.orig 2021-09-14 01:51:58 UTC +++ ipc/ipc_channel.h -@@ -244,7 +244,7 @@ class COMPONENT_EXPORT(IPC) Channel : public Sender { +@@ -236,7 +236,7 @@ class COMPONENT_EXPORT(IPC) Channel : public Sender { static std::string GenerateUniqueRandomChannelID(); #endif diff --git a/www/chromium/files/patch-ipc_ipc__channel__mojo.cc b/www/chromium/files/patch-ipc_ipc__channel__mojo.cc index 06974ddfbe06..bd3d40f22a3a 100644 --- a/www/chromium/files/patch-ipc_ipc__channel__mojo.cc +++ b/www/chromium/files/patch-ipc_ipc__channel__mojo.cc @@ -1,6 +1,6 @@ ---- ipc/ipc_channel_mojo.cc.orig 2021-07-19 18:45:18 UTC +--- ipc/ipc_channel_mojo.cc.orig 2021-09-14 01:51:58 UTC +++ ipc/ipc_channel_mojo.cc -@@ -111,10 +111,10 @@ class ThreadSafeChannelProxy : public mojo::ThreadSafe +@@ -112,10 +112,10 @@ class ThreadSafeChannelProxy : public mojo::ThreadSafe }; base::ProcessId GetSelfPID() { diff --git a/www/chromium/files/patch-ipc_ipc__message__utils.cc b/www/chromium/files/patch-ipc_ipc__message__utils.cc index 4320772145da..6eba7fed6598 100644 --- a/www/chromium/files/patch-ipc_ipc__message__utils.cc +++ b/www/chromium/files/patch-ipc_ipc__message__utils.cc @@ -1,6 +1,6 @@ ---- ipc/ipc_message_utils.cc.orig 2021-07-19 18:45:18 UTC +--- ipc/ipc_message_utils.cc.orig 2021-09-14 01:51:58 UTC +++ ipc/ipc_message_utils.cc -@@ -353,7 +353,7 @@ void ParamTraits<unsigned int>::Log(const param_type& +@@ -351,7 +351,7 @@ void ParamTraits<unsigned int>::Log(const param_type& l->append(base::NumberToString(p)); } diff --git a/www/chromium/files/patch-media_BUILD.gn b/www/chromium/files/patch-media_BUILD.gn index e7057f7c8aee..caf4551ce771 100644 --- a/www/chromium/files/patch-media_BUILD.gn +++ b/www/chromium/files/patch-media_BUILD.gn @@ -1,6 +1,6 @@ ---- media/BUILD.gn.orig 2021-04-14 18:41:05 UTC +--- media/BUILD.gn.orig 2021-09-24 04:26:07 UTC +++ media/BUILD.gn -@@ -66,6 +66,9 @@ config("media_config") { +@@ -70,6 +70,9 @@ config("media_config") { defines += [ "DLOPEN_PULSEAUDIO" ] } } diff --git a/www/chromium/files/patch-media_base_media__switches.cc b/www/chromium/files/patch-media_base_media__switches.cc index f05a9c5e74f7..1435e4a50daf 100644 --- a/www/chromium/files/patch-media_base_media__switches.cc +++ b/www/chromium/files/patch-media_base_media__switches.cc @@ -1,4 +1,4 @@ ---- media/base/media_switches.cc.orig 2021-07-19 18:45:18 UTC +--- media/base/media_switches.cc.orig 2021-09-24 04:26:07 UTC +++ media/base/media_switches.cc @@ -9,7 +9,7 @@ #include "build/chromeos_buildflags.h" @@ -9,7 +9,7 @@ #include "base/cpu.h" #endif -@@ -388,7 +388,7 @@ const base::Feature kGav1VideoDecoder{"Gav1VideoDecode +@@ -420,7 +420,7 @@ const base::Feature kGav1VideoDecoder{"Gav1VideoDecode // Show toolbar button that opens dialog for controlling media sessions. const base::Feature kGlobalMediaControls { "GlobalMediaControls", @@ -18,16 +18,16 @@ BUILDFLAG(IS_CHROMEOS_LACROS) base::FEATURE_ENABLED_BY_DEFAULT #else -@@ -430,7 +430,7 @@ const base::Feature kGlobalMediaControlsOverlayControl +@@ -462,7 +462,7 @@ const base::Feature kGlobalMediaControlsOverlayControl // Show picture-in-picture button in Global Media Controls. const base::Feature kGlobalMediaControlsPictureInPicture { "GlobalMediaControlsPictureInPicture", -#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) + defined(OS_CHROMEOS) || BUILDFLAG(IS_CHROMEOS_LACROS) base::FEATURE_ENABLED_BY_DEFAULT #else -@@ -472,7 +472,7 @@ const base::Feature kUseR16Texture{"use-r16-texture", +@@ -504,7 +504,7 @@ const base::Feature kUseR16Texture{"use-r16-texture", const base::Feature kUnifiedAutoplay{"UnifiedAutoplay", base::FEATURE_ENABLED_BY_DEFAULT}; @@ -36,7 +36,7 @@ // Enable vaapi video decoding on linux. This is already enabled by default on // chromeos, but needs an experiment on linux. const base::Feature kVaapiVideoDecodeLinux{"VaapiVideoDecoder", -@@ -480,7 +480,7 @@ const base::Feature kVaapiVideoDecodeLinux{"VaapiVideo +@@ -512,7 +512,7 @@ const base::Feature kVaapiVideoDecodeLinux{"VaapiVideo const base::Feature kVaapiVideoEncodeLinux{"VaapiVideoEncoder", base::FEATURE_DISABLED_BY_DEFAULT}; @@ -45,7 +45,7 @@ // Enable VA-API hardware decode acceleration for AV1. const base::Feature kVaapiAV1Decoder{"VaapiAV1Decoder", -@@ -884,7 +884,7 @@ bool IsLiveCaptionFeatureEnabled() { +@@ -938,7 +938,7 @@ bool IsLiveCaptionFeatureEnabled() { return false; #endif diff --git a/www/chromium/files/patch-media_base_media__switches.h b/www/chromium/files/patch-media_base_media__switches.h index a752d349f688..5a41c1f020af 100644 --- a/www/chromium/files/patch-media_base_media__switches.h +++ b/www/chromium/files/patch-media_base_media__switches.h @@ -1,6 +1,6 @@ ---- media/base/media_switches.h.orig 2021-07-19 18:45:18 UTC +--- media/base/media_switches.h.orig 2021-09-24 04:26:07 UTC +++ media/base/media_switches.h -@@ -181,10 +181,10 @@ MEDIA_EXPORT extern const base::Feature kUseFakeDevice +@@ -194,10 +194,10 @@ MEDIA_EXPORT extern const base::Feature kUseFakeDevice MEDIA_EXPORT extern const base::Feature kUseMediaHistoryStore; MEDIA_EXPORT extern const base::Feature kUseR16Texture; MEDIA_EXPORT extern const base::Feature kUseSodaForLiveCaption; diff --git a/www/chromium/files/patch-media_base_video__frame.cc b/www/chromium/files/patch-media_base_video__frame.cc index 70aa9955ae86..3344b52fbd22 100644 --- a/www/chromium/files/patch-media_base_video__frame.cc +++ b/www/chromium/files/patch-media_base_video__frame.cc @@ -1,6 +1,6 @@ ---- media/base/video_frame.cc.orig 2021-07-19 18:45:18 UTC +--- media/base/video_frame.cc.orig 2021-09-24 04:26:08 UTC +++ media/base/video_frame.cc -@@ -60,7 +60,7 @@ std::string VideoFrame::StorageTypeToString( +@@ -74,7 +74,7 @@ std::string VideoFrame::StorageTypeToString( return "OWNED_MEMORY"; case VideoFrame::STORAGE_SHMEM: return "SHMEM"; @@ -9,7 +9,7 @@ case VideoFrame::STORAGE_DMABUFS: return "DMABUFS"; #endif -@@ -77,7 +77,7 @@ std::string VideoFrame::StorageTypeToString( +@@ -91,7 +91,7 @@ std::string VideoFrame::StorageTypeToString( // static bool VideoFrame::IsStorageTypeMappable(VideoFrame::StorageType storage_type) { return @@ -18,7 +18,7 @@ // This is not strictly needed but makes explicit that, at VideoFrame // level, DmaBufs are not mappable from userspace. storage_type != VideoFrame::STORAGE_DMABUFS && -@@ -265,7 +265,7 @@ static absl::optional<VideoFrameLayout> GetDefaultLayo +@@ -279,7 +279,7 @@ static absl::optional<VideoFrameLayout> GetDefaultLayo return VideoFrameLayout::CreateWithPlanes(format, coded_size, planes); } @@ -27,7 +27,7 @@ // This class allows us to embed a vector<ScopedFD> into a scoped_refptr, and // thus to have several VideoFrames share the same set of DMABUF FDs. class VideoFrame::DmabufHolder -@@ -283,7 +283,7 @@ class VideoFrame::DmabufHolder +@@ -297,7 +297,7 @@ class VideoFrame::DmabufHolder friend class base::RefCountedThreadSafe<DmabufHolder>; ~DmabufHolder() = default; }; @@ -36,7 +36,7 @@ // static bool VideoFrame::IsValidConfig(VideoPixelFormat format, -@@ -598,7 +598,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM +@@ -617,7 +617,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM for (size_t i = 0; i < num_planes; ++i) planes[i].stride = gpu_memory_buffer->stride(i); uint64_t modifier = gfx::NativePixmapHandle::kNoModifier; @@ -45,7 +45,7 @@ if (gpu_memory_buffer->GetType() == gfx::NATIVE_PIXMAP) { const auto gmb_handle = gpu_memory_buffer->CloneHandle(); if (gmb_handle.is_null() || -@@ -643,7 +643,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM +@@ -663,7 +663,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM return frame; } @@ -54,7 +54,7 @@ // static scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs( const VideoFrameLayout& layout, -@@ -866,7 +866,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame( +@@ -887,7 +887,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame( } } @@ -63,7 +63,7 @@ DCHECK(frame->dmabuf_fds_); // If there are any |dmabuf_fds_| plugged in, we should refer them too. wrapping_frame->dmabuf_fds_ = frame->dmabuf_fds_; -@@ -1218,7 +1218,7 @@ const gpu::MailboxHolder& VideoFrame::mailbox_holder( +@@ -1243,7 +1243,7 @@ const gpu::MailboxHolder& VideoFrame::mailbox_holder( : mailbox_holders_[texture_index]; } @@ -72,7 +72,7 @@ const std::vector<base::ScopedFD>& VideoFrame::DmabufFds() const { DCHECK_EQ(storage_type_, STORAGE_DMABUFS); -@@ -1304,7 +1304,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout, +@@ -1355,7 +1355,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout, storage_type_(storage_type), visible_rect_(Intersection(visible_rect, gfx::Rect(layout.coded_size()))), natural_size_(natural_size), diff --git a/www/chromium/files/patch-media_base_video__frame.h b/www/chromium/files/patch-media_base_video__frame.h index 5b8e1ce39807..18e2c7c931c3 100644 --- a/www/chromium/files/patch-media_base_video__frame.h +++ b/www/chromium/files/patch-media_base_video__frame.h @@ -1,4 +1,4 @@ ---- media/base/video_frame.h.orig 2021-07-19 18:45:18 UTC +--- media/base/video_frame.h.orig 2021-09-24 04:26:08 UTC +++ media/base/video_frame.h @@ -39,9 +39,9 @@ #include "base/mac/scoped_cftyperef.h" @@ -21,8 +21,8 @@ // TODO(mcasas): Consider turning this type into STORAGE_NATIVE // based on the idea of using this same enum value for both DMA // buffers on Linux and CVPixelBuffers on Mac (which currently use -@@ -263,7 +263,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte - ReleaseMailboxCB mailbox_holder_release_cb, +@@ -268,7 +268,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte + ReleaseMailboxAndGpuMemoryBufferCB mailbox_holder_and_gmb_release_cb, base::TimeDelta timestamp); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) @@ -30,7 +30,7 @@ // Wraps provided dmabufs // (https://www.kernel.org/doc/html/latest/driver-api/dma-buf.html) with a // VideoFrame. The frame will take ownership of |dmabuf_fds|, and will -@@ -519,7 +519,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -527,7 +527,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte // mailbox, the caller must wait for the included sync point. const gpu::MailboxHolder& mailbox_holder(size_t texture_index) const; @@ -39,7 +39,7 @@ // Returns a vector containing the backing DmaBufs for this frame. The number // of returned DmaBufs will be equal or less than the number of planes of // the frame. If there are less, this means that the last FD contains the -@@ -718,7 +718,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -734,7 +734,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte // GPU memory buffer, if this frame is STORAGE_GPU_MEMORY_BUFFER. std::unique_ptr<gfx::GpuMemoryBuffer> gpu_memory_buffer_; diff --git a/www/chromium/files/patch-media_capture_video_create__video__capture__device__factory.cc b/www/chromium/files/patch-media_capture_video_create__video__capture__device__factory.cc index 5b9d79680945..d4bbc8e2df7e 100644 --- a/www/chromium/files/patch-media_capture_video_create__video__capture__device__factory.cc +++ b/www/chromium/files/patch-media_capture_video_create__video__capture__device__factory.cc @@ -1,4 +1,4 @@ ---- media/capture/video/create_video_capture_device_factory.cc.orig 2021-07-19 18:45:18 UTC +--- media/capture/video/create_video_capture_device_factory.cc.orig 2021-09-14 01:51:58 UTC +++ media/capture/video/create_video_capture_device_factory.cc @@ -11,7 +11,7 @@ #include "media/capture/video/fake_video_capture_device_factory.h" @@ -9,7 +9,7 @@ #include "media/capture/video/linux/video_capture_device_factory_linux.h" #elif BUILDFLAG(IS_CHROMEOS_ASH) #include "media/capture/video/chromeos/public/cros_features.h" -@@ -58,7 +58,7 @@ CreateFakeVideoCaptureDeviceFactory() { +@@ -53,7 +53,7 @@ CreateFakeVideoCaptureDeviceFactory() { std::unique_ptr<VideoCaptureDeviceFactory> CreatePlatformSpecificVideoCaptureDeviceFactory( scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) { diff --git a/www/chromium/files/patch-media_capture_video_video__capture__buffer__pool__impl.cc b/www/chromium/files/patch-media_capture_video_video__capture__buffer__pool__impl.cc index 4204027d1e5e..718fd24f6dad 100644 --- a/www/chromium/files/patch-media_capture_video_video__capture__buffer__pool__impl.cc +++ b/www/chromium/files/patch-media_capture_video_video__capture__buffer__pool__impl.cc @@ -1,6 +1,6 @@ ---- media/capture/video/video_capture_buffer_pool_impl.cc.orig 2021-04-14 18:41:05 UTC +--- media/capture/video/video_capture_buffer_pool_impl.cc.orig 2021-09-14 01:51:58 UTC +++ media/capture/video/video_capture_buffer_pool_impl.cc -@@ -68,7 +68,7 @@ VideoCaptureBufferPoolImpl::CreateSharedMemoryViaRawFi +@@ -74,7 +74,7 @@ VideoCaptureBufferPoolImpl::CreateSharedMemoryViaRawFi int buffer_id) { // This requires platforms where base::SharedMemoryHandle is backed by a // file descriptor. diff --git a/www/chromium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc b/www/chromium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc index d5d8b24bd348..7ff4a4950951 100644 --- a/www/chromium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc +++ b/www/chromium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc @@ -1,6 +1,6 @@ ---- media/gpu/gpu_video_encode_accelerator_factory.cc.orig 2021-04-22 08:21:56 UTC +--- media/gpu/gpu_video_encode_accelerator_factory.cc.orig 2021-09-14 01:51:59 UTC +++ media/gpu/gpu_video_encode_accelerator_factory.cc -@@ -93,7 +93,7 @@ std::vector<VEAFactoryFunction> GetVEAFactoryFunctions +@@ -94,7 +94,7 @@ std::vector<VEAFactoryFunction> GetVEAFactoryFunctions return vea_factory_functions; #if BUILDFLAG(USE_VAAPI) diff --git a/www/chromium/files/patch-media_media__options.gni b/www/chromium/files/patch-media_media__options.gni index 8303f4963f63..4df038aefc52 100644 --- a/www/chromium/files/patch-media_media__options.gni +++ b/www/chromium/files/patch-media_media__options.gni @@ -1,6 +1,6 @@ ---- media/media_options.gni.orig 2021-05-12 22:05:56 UTC +--- media/media_options.gni.orig 2021-09-24 04:26:08 UTC +++ media/media_options.gni -@@ -94,6 +94,9 @@ declare_args() { +@@ -113,6 +113,9 @@ declare_args() { # Enables runtime selection of ALSA library for audio. use_alsa = false diff --git a/www/chromium/files/patch-media_mojo_services_gpu__mojo__media__client.cc b/www/chromium/files/patch-media_mojo_services_gpu__mojo__media__client.cc deleted file mode 100644 index ddfbd4091cba..000000000000 --- a/www/chromium/files/patch-media_mojo_services_gpu__mojo__media__client.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- media/mojo/services/gpu_mojo_media_client.cc.orig 2021-04-14 18:41:05 UTC -+++ media/mojo/services/gpu_mojo_media_client.cc -@@ -67,7 +67,7 @@ namespace media { - namespace { - - #if defined(OS_ANDROID) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ -- defined(OS_WIN) || defined(OS_LINUX) -+ defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) - gpu::CommandBufferStub* GetCommandBufferStub( - scoped_refptr<base::SingleThreadTaskRunner> gpu_task_runner, - base::WeakPtr<MediaGpuChannelManager> media_gpu_channel_manager, -@@ -289,7 +289,7 @@ std::unique_ptr<VideoDecoder> GpuMojoMediaClient::Crea - command_buffer_id->route_id)); - } - --#elif defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || \ -+#elif defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ - defined(OS_CHROMEOS) - #if defined(OS_WIN) - // Don't instantiate the DXVA decoder if it's not supported. diff --git a/www/chromium/files/patch-media_video_fake__gpu__memory__buffer.cc b/www/chromium/files/patch-media_video_fake__gpu__memory__buffer.cc index 925dd160ffed..c62e63479ada 100644 --- a/www/chromium/files/patch-media_video_fake__gpu__memory__buffer.cc +++ b/www/chromium/files/patch-media_video_fake__gpu__memory__buffer.cc @@ -1,4 +1,4 @@ ---- media/video/fake_gpu_memory_buffer.cc.orig 2021-04-14 18:41:06 UTC +--- media/video/fake_gpu_memory_buffer.cc.orig 2021-09-14 01:51:59 UTC +++ media/video/fake_gpu_memory_buffer.cc @@ -10,7 +10,7 @@ #include "media/base/format_utils.h" @@ -19,8 +19,8 @@ base::ScopedFD fd(open("/dev/zero", O_RDWR)); DCHECK(fd.is_valid()); @@ -78,7 +78,7 @@ FakeGpuMemoryBuffer::FakeGpuMemoryBuffer(const gfx::Si - static base::NoDestructor<base::AtomicSequenceNumber> buffer_id_generator; - handle_.id = gfx::GpuMemoryBufferId(buffer_id_generator->GetNext()); + static base::AtomicSequenceNumber buffer_id_generator; + handle_.id = gfx::GpuMemoryBufferId(buffer_id_generator.GetNext()); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) diff --git a/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc b/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc index e76a07f84f8b..4ab0d1a653a3 100644 --- a/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc +++ b/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc @@ -1,6 +1,6 @@ ---- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2021-07-19 18:45:18 UTC +--- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2021-09-24 04:26:08 UTC +++ media/video/gpu_memory_buffer_video_frame_pool.cc -@@ -648,7 +648,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa +@@ -721,7 +721,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa } bool is_software_backed_video_frame = !video_frame->HasTextures(); diff --git a/www/chromium/files/patch-media_video_video__encode__accelerator__adapter.cc b/www/chromium/files/patch-media_video_video__encode__accelerator__adapter.cc index e43603f4e54d..aa1102b14ebb 100644 --- a/www/chromium/files/patch-media_video_video__encode__accelerator__adapter.cc +++ b/www/chromium/files/patch-media_video_video__encode__accelerator__adapter.cc @@ -1,6 +1,6 @@ ---- media/video/video_encode_accelerator_adapter.cc.orig 2021-07-19 18:45:18 UTC +--- media/video/video_encode_accelerator_adapter.cc.orig 2021-09-24 04:26:08 UTC +++ media/video/video_encode_accelerator_adapter.cc -@@ -69,7 +69,7 @@ VideoEncodeAccelerator::Config SetUpVeaConfig( +@@ -73,7 +73,7 @@ VideoEncodeAccelerator::Config SetUpVeaConfig( if (is_rgb) config.input_format = PIXEL_FORMAT_I420; @@ -9,7 +9,7 @@ if (storage_type == VideoFrame::STORAGE_DMABUFS || storage_type == VideoFrame::STORAGE_GPU_MEMORY_BUFFER) { if (is_rgb) -@@ -211,7 +211,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal +@@ -213,7 +213,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal auto vea_config = SetUpVeaConfig(profile_, options_, format, first_frame->storage_type()); diff --git a/www/chromium/files/patch-media_video_video__encode__accelerator__adapter__test.cc b/www/chromium/files/patch-media_video_video__encode__accelerator__adapter__test.cc index 55a1edd588de..0d8ccfe067b2 100644 --- a/www/chromium/files/patch-media_video_video__encode__accelerator__adapter__test.cc +++ b/www/chromium/files/patch-media_video_video__encode__accelerator__adapter__test.cc @@ -1,6 +1,6 @@ ---- media/video/video_encode_accelerator_adapter_test.cc.orig 2021-07-19 18:45:18 UTC +--- media/video/video_encode_accelerator_adapter_test.cc.orig 2021-09-24 04:26:08 UTC +++ media/video/video_encode_accelerator_adapter_test.cc -@@ -328,7 +328,7 @@ TEST_P(VideoEncodeAcceleratorAdapterTest, TwoFramesRes +@@ -337,7 +337,7 @@ TEST_P(VideoEncodeAcceleratorAdapterTest, TwoFramesRes vea()->SetEncodingCallback(base::BindLambdaForTesting( [&](BitstreamBuffer&, bool keyframe, scoped_refptr<VideoFrame> frame) { diff --git a/www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd b/www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd index efe70eda6459..04f67ce7734d 100644 --- a/www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd +++ b/www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd @@ -1,6 +1,6 @@ ---- mojo/public/js/mojo_bindings_resources.grd.orig 2021-07-19 18:45:18 UTC +--- mojo/public/js/mojo_bindings_resources.grd.orig 2021-09-14 01:51:59 UTC +++ mojo/public/js/mojo_bindings_resources.grd -@@ -95,7 +95,7 @@ +@@ -105,7 +105,7 @@ use_base_dir="false" resource_path="mojo/mojo/public/mojom/base/unguessable_token.mojom-webui.js" type="BINDATA" /> diff --git a/www/chromium/files/patch-net_BUILD.gn b/www/chromium/files/patch-net_BUILD.gn index 1fdcf32f98fa..f901c63c4345 100644 --- a/www/chromium/files/patch-net_BUILD.gn +++ b/www/chromium/files/patch-net_BUILD.gn @@ -1,6 +1,6 @@ ---- net/BUILD.gn.orig 2021-07-19 18:45:19 UTC +--- net/BUILD.gn.orig 2021-09-24 04:26:08 UTC +++ net/BUILD.gn -@@ -100,7 +100,7 @@ net_configs = [ +@@ -101,7 +101,7 @@ net_configs = [ "//build/config/compiler:wexit_time_destructors", ] @@ -9,7 +9,7 @@ net_configs += [ "//build/config/linux:libresolv" ] } -@@ -1208,7 +1208,7 @@ component("net") { +@@ -1206,7 +1206,7 @@ component("net") { ] } @@ -18,7 +18,7 @@ sources += [ "base/address_tracker_linux.cc", "base/address_tracker_linux.h", -@@ -1218,6 +1218,12 @@ component("net") { +@@ -1216,6 +1216,12 @@ component("net") { ] } @@ -31,7 +31,7 @@ if (is_mac) { sources += [ "base/network_notification_thread_mac.cc", -@@ -1354,7 +1360,7 @@ component("net") { +@@ -1352,7 +1358,7 @@ component("net") { } } @@ -40,7 +40,7 @@ sources += [ "base/network_change_notifier_posix.cc", "base/network_change_notifier_posix.h", -@@ -1387,7 +1393,7 @@ component("net") { +@@ -1385,7 +1391,7 @@ component("net") { } # Use getifaddrs() on POSIX platforms, except Linux. @@ -49,7 +49,7 @@ sources += [ "base/network_interfaces_getifaddrs.cc", "base/network_interfaces_getifaddrs.h", -@@ -4708,7 +4714,7 @@ test("net_unittests") { +@@ -4734,7 +4740,7 @@ test("net_unittests") { } # Use getifaddrs() on POSIX platforms, except Linux and Android. diff --git a/www/chromium/files/patch-net_base_address__tracker__linux.cc b/www/chromium/files/patch-net_base_address__tracker__linux.cc index 21116f7524a7..119d45df71da 100644 --- a/www/chromium/files/patch-net_base_address__tracker__linux.cc +++ b/www/chromium/files/patch-net_base_address__tracker__linux.cc @@ -1,4 +1,4 @@ ---- net/base/address_tracker_linux.cc.orig 2021-04-14 18:41:06 UTC +--- net/base/address_tracker_linux.cc.orig 2021-09-24 04:26:08 UTC +++ net/base/address_tracker_linux.cc @@ -5,7 +5,9 @@ #include "net/base/address_tracker_linux.h" @@ -10,7 +10,7 @@ #include <stdint.h> #include <sys/ioctl.h> #include <utility> -@@ -190,6 +192,7 @@ void AddressTrackerLinux::Init() { +@@ -191,6 +193,7 @@ void AddressTrackerLinux::Init() { DCHECK_LT(base::android::BuildInfo::GetInstance()->sdk_int(), base::android::SDK_VERSION_P); #endif @@ -18,7 +18,7 @@ netlink_fd_.reset(socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE)); if (!netlink_fd_.is_valid()) { PLOG(ERROR) << "Could not create NETLINK socket"; -@@ -274,6 +277,10 @@ void AddressTrackerLinux::Init() { +@@ -275,6 +278,10 @@ void AddressTrackerLinux::Init() { base::BindRepeating(&AddressTrackerLinux::OnFileCanReadWithoutBlocking, base::Unretained(this))); } @@ -28,8 +28,8 @@ +#endif // !OS_FREEBSD } - void AddressTrackerLinux::AbortAndForceOnline() { -@@ -285,6 +292,7 @@ void AddressTrackerLinux::AbortAndForceOnline() { + bool AddressTrackerLinux::DidTrackingInitSucceedForTesting() const { +@@ -291,6 +298,7 @@ void AddressTrackerLinux::AbortAndForceOnline() { connection_type_initialized_cv_.Broadcast(); } @@ -37,7 +37,7 @@ AddressTrackerLinux::AddressMap AddressTrackerLinux::GetAddressMap() const { AddressTrackerAutoLock lock(*this, address_map_lock_); return address_map_; -@@ -303,6 +311,7 @@ bool AddressTrackerLinux::IsInterfaceIgnored(int inter +@@ -309,6 +317,7 @@ bool AddressTrackerLinux::IsInterfaceIgnored(int inter const char* interface_name = get_interface_name_(interface_index, buf); return ignored_interfaces_.find(interface_name) != ignored_interfaces_.end(); } @@ -45,7 +45,7 @@ NetworkChangeNotifier::ConnectionType AddressTrackerLinux::GetCurrentConnectionType() { -@@ -361,6 +370,7 @@ void AddressTrackerLinux::HandleMessage(const char* bu +@@ -367,6 +376,7 @@ void AddressTrackerLinux::HandleMessage(const char* bu bool* address_changed, bool* link_changed, bool* tunnel_changed) { @@ -53,7 +53,7 @@ DCHECK(buffer); // Note that NLMSG_NEXT decrements |length| to reflect the number of bytes // remaining in |buffer|. -@@ -473,6 +483,9 @@ void AddressTrackerLinux::HandleMessage(const char* bu +@@ -479,6 +489,9 @@ void AddressTrackerLinux::HandleMessage(const char* bu break; } } @@ -63,7 +63,7 @@ } void AddressTrackerLinux::OnFileCanReadWithoutBlocking() { -@@ -500,6 +513,7 @@ bool AddressTrackerLinux::IsTunnelInterfaceName(const +@@ -506,6 +519,7 @@ bool AddressTrackerLinux::IsTunnelInterfaceName(const } void AddressTrackerLinux::UpdateCurrentConnectionType() { @@ -71,7 +71,7 @@ AddressTrackerLinux::AddressMap address_map = GetAddressMap(); std::unordered_set<int> online_links = GetOnlineLinks(); -@@ -525,6 +539,9 @@ void AddressTrackerLinux::UpdateCurrentConnectionType( +@@ -531,6 +545,9 @@ void AddressTrackerLinux::UpdateCurrentConnectionType( AddressTrackerAutoLock lock(*this, connection_type_lock_); current_connection_type_ = type; diff --git a/www/chromium/files/patch-net_base_address__tracker__linux__unittest.cc b/www/chromium/files/patch-net_base_address__tracker__linux__unittest.cc index 1f3db9add112..a90f63f3db2a 100644 --- a/www/chromium/files/patch-net_base_address__tracker__linux__unittest.cc +++ b/www/chromium/files/patch-net_base_address__tracker__linux__unittest.cc @@ -1,14 +1,14 @@ ---- net/base/address_tracker_linux_unittest.cc.orig 2021-04-14 18:41:06 UTC +--- net/base/address_tracker_linux_unittest.cc.orig 2021-09-24 04:26:08 UTC +++ net/base/address_tracker_linux_unittest.cc @@ -4,7 +4,11 @@ #include "net/base/address_tracker_linux.h" -+#if defined(__linux__) ++#if defined(OS_LINUX) #include <linux/if.h> +#else +#include <net/if.h> +#endif + #include <sched.h> #include <memory> - #include <unordered_set> diff --git a/www/chromium/files/patch-net_cert_cert__verify__proc.cc b/www/chromium/files/patch-net_cert_cert__verify__proc.cc index c25aaa3115be..d3cb19ae14e2 100644 --- a/www/chromium/files/patch-net_cert_cert__verify__proc.cc +++ b/www/chromium/files/patch-net_cert_cert__verify__proc.cc @@ -1,6 +1,6 @@ ---- net/cert/cert_verify_proc.cc.orig 2021-07-19 18:45:19 UTC +--- net/cert/cert_verify_proc.cc.orig 2021-09-14 01:51:59 UTC +++ net/cert/cert_verify_proc.cc -@@ -494,7 +494,7 @@ base::Value CertVerifyParams(X509Certificate* cert, +@@ -468,7 +468,7 @@ base::Value CertVerifyParams(X509Certificate* cert, } // namespace diff --git a/www/chromium/files/patch-net_nqe_network__quality__estimator.cc b/www/chromium/files/patch-net_nqe_network__quality__estimator.cc deleted file mode 100644 index 4107f2f5eda2..000000000000 --- a/www/chromium/files/patch-net_nqe_network__quality__estimator.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- net/nqe/network_quality_estimator.cc.orig 2021-07-19 18:45:19 UTC -+++ net/nqe/network_quality_estimator.cc -@@ -109,7 +109,7 @@ nqe::internal::NetworkID DoGetCurrentNetworkID( - case NetworkChangeNotifier::ConnectionType::CONNECTION_ETHERNET: - break; - case NetworkChangeNotifier::ConnectionType::CONNECTION_WIFI: --#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ - defined(OS_WIN) - network_id.id = GetWifiSSID(); - #endif diff --git a/www/chromium/files/patch-net_nqe_network__quality__estimator__unittest.cc b/www/chromium/files/patch-net_nqe_network__quality__estimator__unittest.cc index 2167ed2dda03..d842d4a19cb6 100644 --- a/www/chromium/files/patch-net_nqe_network__quality__estimator__unittest.cc +++ b/www/chromium/files/patch-net_nqe_network__quality__estimator__unittest.cc @@ -1,6 +1,6 @@ ---- net/nqe/network_quality_estimator_unittest.cc.orig 2021-05-12 22:05:57 UTC +--- net/nqe/network_quality_estimator_unittest.cc.orig 2021-09-24 04:26:09 UTC +++ net/nqe/network_quality_estimator_unittest.cc -@@ -2097,9 +2097,9 @@ TEST_F(NetworkQualityEstimatorTest, TestGlobalSocketWa +@@ -2007,9 +2007,9 @@ TEST_F(NetworkQualityEstimatorTest, TestGlobalSocketWa // ChromeOS is disabled due to crbug.com/986904 // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc b/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc index ecfe40f88d54..aa1bff40c130 100644 --- a/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc +++ b/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc @@ -1,4 +1,4 @@ ---- net/proxy_resolution/proxy_config_service_linux.cc.orig 2021-07-19 18:45:19 UTC +--- net/proxy_resolution/proxy_config_service_linux.cc.orig 2021-09-14 01:52:00 UTC +++ net/proxy_resolution/proxy_config_service_linux.cc @@ -6,7 +6,9 @@ @@ -18,7 +18,7 @@ // Converts |value| from a decimal string to an int. If there was a failure // parsing, returns |default_value|. int StringToIntOrDefault(base::StringPiece value, int default_value) { -@@ -1003,6 +1006,7 @@ class SettingGetterImplKDE : public ProxyConfigService +@@ -1004,6 +1007,7 @@ class SettingGetterImplKDE : public ProxyConfigService DISALLOW_COPY_AND_ASSIGN(SettingGetterImplKDE); }; @@ -26,7 +26,7 @@ } // namespace -@@ -1217,9 +1221,11 @@ ProxyConfigServiceLinux::Delegate::Delegate( +@@ -1218,9 +1222,11 @@ ProxyConfigServiceLinux::Delegate::Delegate( case base::nix::DESKTOP_ENVIRONMENT_KDE3: case base::nix::DESKTOP_ENVIRONMENT_KDE4: case base::nix::DESKTOP_ENVIRONMENT_KDE5: diff --git a/www/chromium/files/patch-net_url__request_url__fetcher.h b/www/chromium/files/patch-net_url__request_url__fetcher.h index 7b3e09540568..984c53f3063c 100644 --- a/www/chromium/files/patch-net_url__request_url__fetcher.h +++ b/www/chromium/files/patch-net_url__request_url__fetcher.h @@ -1,6 +1,6 @@ ---- net/url_request/url_fetcher.h.orig 2021-04-14 18:41:07 UTC +--- net/url_request/url_fetcher.h.orig 2021-09-14 01:52:00 UTC +++ net/url_request/url_fetcher.h -@@ -352,8 +352,8 @@ class NET_EXPORT URLFetcher { +@@ -353,8 +353,8 @@ class NET_EXPORT URLFetcher { // annotations on Linux & Windows. // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/chromium/files/patch-net_url__request_url__request__context.cc b/www/chromium/files/patch-net_url__request_url__request__context.cc index 4a5a9d1dd74e..af1a8c166b53 100644 --- a/www/chromium/files/patch-net_url__request_url__request__context.cc +++ b/www/chromium/files/patch-net_url__request_url__request__context.cc @@ -1,6 +1,6 @@ ---- net/url_request/url_request_context.cc.orig 2021-04-14 18:41:07 UTC +--- net/url_request/url_request_context.cc.orig 2021-09-24 04:26:09 UTC +++ net/url_request/url_request_context.cc -@@ -93,7 +93,7 @@ const HttpNetworkSession::Context* URLRequestContext:: +@@ -94,7 +94,7 @@ const HttpNetworkSessionContext* URLRequestContext::Ge // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/chromium/files/patch-net_url__request_url__request__context.h b/www/chromium/files/patch-net_url__request_url__request__context.h index 4549be76f8a4..ef8ba73a4149 100644 --- a/www/chromium/files/patch-net_url__request_url__request__context.h +++ b/www/chromium/files/patch-net_url__request_url__request__context.h @@ -1,6 +1,6 @@ ---- net/url_request/url_request_context.h.orig 2021-04-14 18:41:07 UTC +--- net/url_request/url_request_context.h.orig 2021-09-24 04:26:09 UTC +++ net/url_request/url_request_context.h -@@ -85,7 +85,7 @@ class NET_EXPORT URLRequestContext +@@ -86,7 +86,7 @@ class NET_EXPORT URLRequestContext // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/chromium/files/patch-net_url__request_url__request__context__builder.cc b/www/chromium/files/patch-net_url__request_url__request__context__builder.cc index 8cb672cc38d1..c5f3cad5ed0a 100644 --- a/www/chromium/files/patch-net_url__request_url__request__context__builder.cc +++ b/www/chromium/files/patch-net_url__request_url__request__context__builder.cc @@ -1,6 +1,6 @@ ---- net/url_request/url_request_context_builder.cc.orig 2021-05-12 22:05:58 UTC +--- net/url_request/url_request_context_builder.cc.orig 2021-09-24 04:26:09 UTC +++ net/url_request/url_request_context_builder.cc -@@ -485,7 +485,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu +@@ -431,7 +431,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu } if (!proxy_resolution_service_) { @@ -9,7 +9,7 @@ // TODO(willchan): Switch to using this code when // ConfiguredProxyResolutionService::CreateSystemProxyConfigService()'s // signature doesn't suck. -@@ -494,7 +494,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu +@@ -440,7 +440,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu ConfiguredProxyResolutionService::CreateSystemProxyConfigService( base::ThreadTaskRunnerHandle::Get().get()); } diff --git a/www/chromium/files/patch-pdf_font__table__linux.cc b/www/chromium/files/patch-pdf_font__table__linux.cc new file mode 100644 index 000000000000..7092421e28b7 --- /dev/null +++ b/www/chromium/files/patch-pdf_font__table__linux.cc @@ -0,0 +1,10 @@ +--- pdf/font_table_linux.cc.orig 2021-09-28 13:14:28 UTC ++++ pdf/font_table_linux.cc +@@ -4,6 +4,7 @@ + + #include "pdf/font_table_linux.h" + ++#include <unistd.h> + #include <sys/stat.h> + + #include <limits> diff --git a/www/chromium/files/patch-pdf_out__of__process__instance.cc b/www/chromium/files/patch-pdf_out__of__process__instance.cc new file mode 100644 index 000000000000..29ccd7aa73f2 --- /dev/null +++ b/www/chromium/files/patch-pdf_out__of__process__instance.cc @@ -0,0 +1,20 @@ +--- pdf/out_of_process_instance.cc.orig 2021-09-24 18:53:06 UTC ++++ pdf/out_of_process_instance.cc +@@ -72,7 +72,7 @@ + #include "ui/gfx/geometry/rect.h" + #include "ui/gfx/geometry/size.h" + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + #include "pdf/ppapi_migration/pdfium_font_linux.h" + #endif + +@@ -846,7 +846,7 @@ void OutOfProcessInstance::RotateCounterclockwise() { + } + + void OutOfProcessInstance::SetLastPluginInstance() { +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + SetLastPepperInstance(this); + #endif + } diff --git a/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc b/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc index bbae0e27e20a..a31b521f3cef 100644 --- a/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc +++ b/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc @@ -1,7 +1,7 @@ ---- pdf/pdfium/pdfium_engine.cc.orig 2021-07-19 18:45:19 UTC +--- pdf/pdfium/pdfium_engine.cc.orig 2021-09-24 04:26:09 UTC +++ pdf/pdfium/pdfium_engine.cc @@ -84,7 +84,7 @@ - #include "v8/include/cppgc/platform.h" + #include "gin/public/cppgc.h" #endif -#if defined(OS_LINUX) || defined(OS_CHROMEOS) @@ -9,48 +9,12 @@ #include "pdf/pdfium/pdfium_font_linux.h" #endif -@@ -514,7 +514,7 @@ void InitializeSDK(bool enable_v8) { +@@ -521,7 +521,7 @@ void InitializeSDK(bool enable_v8, FontMappingMode fon FPDF_InitLibraryWithConfig(&config); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + g_font_mapping_mode = font_mapping_mode; InitializeLinuxFontMapper(); #endif - -@@ -545,7 +545,7 @@ PDFiumEngine::PDFiumEngine(PDFEngine::Client* client, - IFSDK_PAUSE::user = nullptr; - IFSDK_PAUSE::NeedToPauseNow = Pause_NeedToPauseNow; - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - // PreviewModeClient does not know its pp::Instance. - SetLastInstance(client_->GetPluginInstance()); - #endif -@@ -1003,7 +1003,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesAsRasterPdf( - - KillFormFocus(); - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - SetLastInstance(client_->GetPluginInstance()); - #endif - -@@ -3154,7 +3154,7 @@ bool PDFiumEngine::ContinuePaint(int progressive_index - DCHECK_LT(static_cast<size_t>(progressive_index), progressive_paints_.size()); - - last_progressive_start_time_ = base::Time::Now(); --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - SetLastInstance(client_->GetPluginInstance()); - #endif - -@@ -3643,7 +3643,7 @@ void PDFiumEngine::SetCurrentPage(int index) { - FORM_DoPageAAction(old_page, form(), FPDFPAGE_AACTION_CLOSE); - } - most_visible_page_ = index; --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - SetLastInstance(client_->GetPluginInstance()); - #endif - if (most_visible_page_ != -1 && called_do_document_action_) { diff --git a/www/chromium/files/patch-printing_print__settings.cc b/www/chromium/files/patch-printing_print__settings.cc index 0a9f0f14cc02..bf548dc3cbc4 100644 --- a/www/chromium/files/patch-printing_print__settings.cc +++ b/www/chromium/files/patch-printing_print__settings.cc @@ -1,6 +1,6 @@ ---- printing/print_settings.cc.orig 2021-07-19 18:45:19 UTC +--- printing/print_settings.cc.orig 2021-09-24 04:26:09 UTC +++ printing/print_settings.cc -@@ -278,9 +278,9 @@ void PrintSettings::Clear() { +@@ -283,9 +283,9 @@ void PrintSettings::Clear() { #endif is_modifiable_ = true; pages_per_sheet_ = 1; diff --git a/www/chromium/files/patch-printing_print__settings.h b/www/chromium/files/patch-printing_print__settings.h index b68fcc21d6ac..210c77c826cf 100644 --- a/www/chromium/files/patch-printing_print__settings.h +++ b/www/chromium/files/patch-printing_print__settings.h @@ -1,4 +1,4 @@ ---- printing/print_settings.h.orig 2021-07-19 18:45:19 UTC +--- printing/print_settings.h.orig 2021-09-24 04:26:09 UTC +++ printing/print_settings.h @@ -19,11 +19,11 @@ #include "ui/gfx/geometry/rect.h" @@ -14,7 +14,7 @@ namespace printing { -@@ -82,9 +82,9 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings { +@@ -72,9 +72,9 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings { } }; @@ -26,7 +26,7 @@ PrintSettings(); PrintSettings(const PrintSettings&) = delete; -@@ -223,12 +223,12 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings { +@@ -222,12 +222,12 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings { pages_per_sheet_ = pages_per_sheet; } @@ -41,7 +41,7 @@ #if defined(OS_CHROMEOS) void set_send_user_info(bool send_user_info) { -@@ -322,10 +322,10 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings { +@@ -326,10 +326,10 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings { // Number of pages per sheet. int pages_per_sheet_; diff --git a/www/chromium/files/patch-printing_print__settings__conversion.cc b/www/chromium/files/patch-printing_print__settings__conversion.cc index a1cc46f226d9..3f4093e5ad99 100644 --- a/www/chromium/files/patch-printing_print__settings__conversion.cc +++ b/www/chromium/files/patch-printing_print__settings__conversion.cc @@ -1,6 +1,6 @@ ---- printing/print_settings_conversion.cc.orig 2021-07-19 18:45:19 UTC +--- printing/print_settings_conversion.cc.orig 2021-09-24 04:26:09 UTC +++ printing/print_settings_conversion.cc -@@ -211,14 +211,14 @@ std::unique_ptr<PrintSettings> PrintSettingsFromJobSet +@@ -217,14 +217,14 @@ std::unique_ptr<PrintSettings> PrintSettingsFromJobSet #endif } @@ -9,7 +9,7 @@ const base::Value* advanced_settings = job_settings.FindDictKey(kSettingAdvancedSettings); if (advanced_settings) { - for (const auto& item : advanced_settings->DictItems()) + for (const auto item : advanced_settings->DictItems()) settings->advanced_settings().emplace(item.first, item.second.Clone()); } -#endif // defined(OS_CHROMEOS) || (defined(OS_LINUX) && defined(USE_CUPS)) diff --git a/www/chromium/files/patch-remoting_host_heartbeat__sender.cc b/www/chromium/files/patch-remoting_host_heartbeat__sender.cc index f468433ef2a1..27ee01a8ac68 100644 --- a/www/chromium/files/patch-remoting_host_heartbeat__sender.cc +++ b/www/chromium/files/patch-remoting_host_heartbeat__sender.cc @@ -1,6 +1,6 @@ ---- remoting/host/heartbeat_sender.cc.orig 2021-04-14 18:41:08 UTC +--- remoting/host/heartbeat_sender.cc.orig 2021-09-14 01:52:00 UTC +++ remoting/host/heartbeat_sender.cc -@@ -112,7 +112,7 @@ const net::BackoffEntry::Policy kBackoffPolicy = { +@@ -115,7 +115,7 @@ const net::BackoffEntry::Policy kBackoffPolicy = { std::string GetHostname() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag // switch of lacros-chrome is complete. diff --git a/www/chromium/files/patch-remoting_host_host__main.cc b/www/chromium/files/patch-remoting_host_host__main.cc index 53d915bac659..bbcac8b69fd5 100644 --- a/www/chromium/files/patch-remoting_host_host__main.cc +++ b/www/chromium/files/patch-remoting_host_host__main.cc @@ -1,8 +1,8 @@ ---- remoting/host/host_main.cc.orig 2021-07-19 18:45:20 UTC +--- remoting/host/host_main.cc.orig 2021-09-24 04:26:09 UTC +++ remoting/host/host_main.cc -@@ -47,9 +47,9 @@ int DesktopProcessMain(); - int FileChooserMain(); +@@ -50,9 +50,9 @@ int FileChooserMain(); int RdpDesktopSessionMain(); + int UrlForwarderConfiguratorMain(); #endif // defined(OS_WIN) -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) @@ -12,7 +12,7 @@ namespace { -@@ -60,10 +60,14 @@ const char kUsageMessage[] = +@@ -63,10 +63,14 @@ const char kUsageMessage[] = "\n" "Options:\n" @@ -29,9 +29,9 @@ #if defined(OS_APPLE) " --list-audio-devices - List all audio devices and their device " -@@ -147,10 +151,10 @@ MainRoutineFn SelectMainRoutine(const std::string& pro - } else if (process_type == kProcessTypeRdpDesktopSession) { - main_routine = &RdpDesktopSessionMain; +@@ -152,10 +156,10 @@ MainRoutineFn SelectMainRoutine(const std::string& pro + } else if (process_type == kProcessTypeUrlForwarderConfigurator) { + main_routine = &UrlForwarderConfiguratorMain; #endif // defined(OS_WIN) -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) diff --git a/www/chromium/files/patch-remoting_host_host__settings.cc b/www/chromium/files/patch-remoting_host_host__settings.cc index 4e69efa74688..8c05de8b0602 100644 --- a/www/chromium/files/patch-remoting_host_host__settings.cc +++ b/www/chromium/files/patch-remoting_host_host__settings.cc @@ -1,4 +1,4 @@ ---- remoting/host/host_settings.cc.orig 2021-07-28 08:16:52 UTC +--- remoting/host/host_settings.cc.orig 2021-09-14 01:52:00 UTC +++ remoting/host/host_settings.cc @@ -13,9 +13,9 @@ #include "remoting/host/mac/constants_mac.h" @@ -12,7 +12,7 @@ namespace remoting { -@@ -46,7 +46,7 @@ HostSettings* HostSettings::GetInstance() { +@@ -48,7 +48,7 @@ HostSettings* HostSettings::GetInstance() { #if defined(OS_APPLE) static const base::FilePath settings_file(kHostSettingsFilePath); static base::NoDestructor<FileHostSettings> instance(settings_file); diff --git a/www/chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc b/www/chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc index 4812b1888918..ec511e1f3d4a 100644 --- a/www/chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc +++ b/www/chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc @@ -1,4 +1,4 @@ ---- remoting/host/it2me/it2me_native_messaging_host_main.cc.orig 2021-05-12 22:05:58 UTC +--- remoting/host/it2me/it2me_native_messaging_host_main.cc.orig 2021-09-14 01:52:00 UTC +++ remoting/host/it2me/it2me_native_messaging_host_main.cc @@ -30,13 +30,13 @@ #include "remoting/host/switches.h" @@ -16,7 +16,7 @@ #if defined(OS_APPLE) #include "base/mac/mac_util.h" -@@ -76,11 +76,11 @@ bool CurrentProcessHasUiAccess() { +@@ -78,11 +78,11 @@ bool CurrentProcessHasUiAccess() { // Creates a It2MeNativeMessagingHost instance, attaches it to stdin/stdout and // runs the task executor until It2MeNativeMessagingHost signals shutdown. int It2MeNativeMessagingHostMain(int argc, char** argv) { @@ -30,7 +30,7 @@ // This object instance is required by Chrome code (such as // SingleThreadTaskExecutor). -@@ -121,7 +121,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv +@@ -123,7 +123,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv remoting::LoadResources(""); @@ -39,7 +39,7 @@ // Required for any calls into GTK functions, such as the Disconnect and // Continue windows. Calling with nullptr arguments because we don't have // any command line arguments for gtk to consume. -@@ -134,7 +134,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv +@@ -136,7 +136,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv // Need to prime the host OS version value for linux to prevent IO on the // network thread. base::GetLinuxDistro() caches the result. base::GetLinuxDistro(); @@ -48,7 +48,7 @@ base::File read_file; base::File write_file; -@@ -253,7 +253,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv +@@ -255,7 +255,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv std::unique_ptr<PolicyWatcher> policy_watcher = PolicyWatcher::CreateWithTaskRunner(context->file_task_runner()); @@ -57,7 +57,7 @@ // Create an X11EventSource on all UI threads, so the global X11 connection // (x11::Connection::Get()) can dispatch X events. auto event_source = -@@ -262,7 +262,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv +@@ -264,7 +264,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv input_task_runner->PostTask(FROM_HERE, base::BindOnce([]() { new ui::X11EventSource(x11::Connection::Get()); })); @@ -66,7 +66,7 @@ std::unique_ptr<extensions::NativeMessageHost> host( new It2MeNativeMessagingHost(is_process_elevated_, -@@ -275,11 +275,11 @@ int It2MeNativeMessagingHostMain(int argc, char** argv +@@ -277,11 +277,11 @@ int It2MeNativeMessagingHostMain(int argc, char** argv // Run the loop until channel is alive. run_loop.Run(); diff --git a/www/chromium/files/patch-remoting_host_me2me__desktop__environment.cc b/www/chromium/files/patch-remoting_host_me2me__desktop__environment.cc index 40df04517d44..e6fb037a6787 100644 --- a/www/chromium/files/patch-remoting_host_me2me__desktop__environment.cc +++ b/www/chromium/files/patch-remoting_host_me2me__desktop__environment.cc @@ -1,18 +1,5 @@ ---- remoting/host/me2me_desktop_environment.cc.orig 2021-07-19 18:45:20 UTC +--- remoting/host/me2me_desktop_environment.cc.orig 2021-09-24 04:26:09 UTC +++ remoting/host/me2me_desktop_environment.cc -@@ -86,10 +86,10 @@ std::string Me2MeDesktopEnvironment::GetCapabilities() - } - #endif // defined(OS_WIN) - --#if !defined(NDEBUG) && defined(OS_LINUX) -+#if !defined(NDEBUG) && (defined(OS_LINUX) || defined(OS_BSD)) - capabilities += " "; - capabilities += protocol::kRemoteOpenUrlCapability; --#endif // !defined(NDEBUG) && defined(OS_LINUX) -+#endif // !defined(NDEBUG) && (defined(OS_LINUX) || defined(OS_BSD)) - - return capabilities; - } @@ -136,7 +136,7 @@ bool Me2MeDesktopEnvironment::InitializeSecurity( // Otherwise, if the session is shared with the local user start monitoring diff --git a/www/chromium/files/patch-remoting_host_mojo__ipc__server.cc b/www/chromium/files/patch-remoting_host_mojo__ipc__server.cc deleted file mode 100644 index 6b2618134aec..000000000000 --- a/www/chromium/files/patch-remoting_host_mojo__ipc__server.cc +++ /dev/null @@ -1,32 +0,0 @@ ---- remoting/host/mojo_ipc_server.cc.orig 2021-07-28 08:18:06 UTC -+++ remoting/host/mojo_ipc_server.cc -@@ -12,9 +12,9 @@ - #include "build/build_config.h" - #include "mojo/public/cpp/system/invitation.h" - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - #include "base/files/file_util.h" --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) - - #if defined(OS_WIN) - #include "base/strings/stringprintf.h" -@@ -101,7 +101,7 @@ void MojoIpcServerBase::StopServer() { - server_started_ = false; - CloseAllConnections(); - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - // Any pending invitations will become orphaned, and a client that accepts an - // orphaned invitation may incorrectly believe that the server is still alive, - // so we just simply delete the socket file to prevent clients from -@@ -109,7 +109,7 @@ void MojoIpcServerBase::StopServer() { - io_sequence_->PostTask(FROM_HERE, - base::BindOnce(base::IgnoreResult(&base::DeleteFile), - base::FilePath(server_name_))); --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) - } - - void MojoIpcServerBase::SendInvitation() { diff --git a/www/chromium/files/patch-remoting_host_remote__open__url__client.cc b/www/chromium/files/patch-remoting_host_remote__open__url__client.cc new file mode 100644 index 000000000000..065dddf80694 --- /dev/null +++ b/www/chromium/files/patch-remoting_host_remote__open__url__client.cc @@ -0,0 +1,20 @@ +--- remoting/host/remote_open_url_client.cc.orig 2021-09-24 18:53:54 UTC ++++ remoting/host/remote_open_url_client.cc +@@ -14,7 +14,7 @@ + #include "remoting/base/logging.h" + #include "remoting/host/remote_open_url_constants.h" + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "remoting/host/remote_open_url_client_delegate_linux.h" + #elif defined(OS_WIN) + #include "remoting/host/remote_open_url_client_delegate_win.h" +@@ -27,7 +27,7 @@ namespace { + constexpr base::TimeDelta kRequestTimeout = base::TimeDelta::FromSeconds(5); + + std::unique_ptr<RemoteOpenUrlClient::Delegate> CreateDelegate() { +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + return std::make_unique<RemoteOpenUrlClientDelegateLinux>(); + #elif defined(OS_WIN) + return std::make_unique<RemoteOpenUrlClientDelegateWin>(); diff --git a/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc b/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc index 4472794eda80..ffa8b64aa446 100644 --- a/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc +++ b/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc @@ -1,6 +1,6 @@ ---- remoting/host/remoting_me2me_host.cc.orig 2021-07-19 18:45:20 UTC +--- remoting/host/remoting_me2me_host.cc.orig 2021-09-24 04:26:09 UTC +++ remoting/host/remoting_me2me_host.cc -@@ -119,7 +119,7 @@ +@@ -118,7 +118,7 @@ #include "remoting/host/mac/permission_utils.h" #endif // defined(OS_APPLE) @@ -9,7 +9,7 @@ #include <gtk/gtk.h> #include "base/linux_util.h" -@@ -127,7 +127,7 @@ +@@ -126,7 +126,7 @@ #include "remoting/host/linux/certificate_watcher.h" #include "ui/events/platform/x11/x11_event_source.h" #include "ui/gfx/x/xlib_support.h" @@ -77,7 +77,16 @@ // Cause the global AudioPipeReader to be freed, otherwise the audio // thread will remain in-use and prevent the process from exiting. // TODO(wez): DesktopEnvironmentFactory should own the pipe reader. -@@ -1764,7 +1764,7 @@ void HostProcess::OnCrash(const std::string& function_ +@@ -1581,7 +1581,7 @@ void HostProcess::StartHost() { + + // Remote open URL is fully supported on Linux and still in development for + // Windows. +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + desktop_environment_options_.set_enable_remote_open_url(true); + #elif !defined(NDEBUG) && defined(OS_WIN) + // The modern default apps settings dialog is only available to Windows 8+. +@@ -1771,7 +1771,7 @@ void HostProcess::OnCrash(const std::string& function_ int HostProcessMain() { HOST_LOG << "Starting host process: version " << STRINGIZE(VERSION); @@ -86,7 +95,7 @@ // Initialize Xlib for multi-threaded use, allowing non-Chromium code to // use X11 safely (such as the WebRTC capturer, GTK ...) x11::InitXlib(); -@@ -1801,7 +1801,7 @@ int HostProcessMain() { +@@ -1808,7 +1808,7 @@ int HostProcessMain() { std::unique_ptr<net::NetworkChangeNotifier> network_change_notifier( net::NetworkChangeNotifier::CreateIfNeeded()); @@ -95,7 +104,7 @@ // Create an X11EventSource on all UI threads, so the global X11 connection // (x11::Connection::Get()) can dispatch X events. auto event_source = -@@ -1810,7 +1810,7 @@ int HostProcessMain() { +@@ -1817,7 +1817,7 @@ int HostProcessMain() { input_task_runner->PostTask(FROM_HERE, base::BindOnce([]() { new ui::X11EventSource(x11::Connection::Get()); })); @@ -104,7 +113,7 @@ // Create & start the HostProcess using these threads. // TODO(wez): The HostProcess holds a reference to itself until Shutdown(). -@@ -1823,11 +1823,11 @@ int HostProcessMain() { +@@ -1830,11 +1830,11 @@ int HostProcessMain() { // Run the main (also UI) task executor until the host no longer needs it. run_loop.Run(); diff --git a/www/chromium/files/patch-remoting_host_scoped__url__forwarder.cc b/www/chromium/files/patch-remoting_host_scoped__url__forwarder.cc deleted file mode 100644 index c8ac0b25f86f..000000000000 --- a/www/chromium/files/patch-remoting_host_scoped__url__forwarder.cc +++ /dev/null @@ -1,19 +0,0 @@ ---- remoting/host/scoped_url_forwarder.cc.orig 2021-07-28 08:18:58 UTC -+++ remoting/host/scoped_url_forwarder.cc -@@ -13,7 +13,7 @@ ScopedUrlForwarder::ScopedUrlForwarder() = default; - - ScopedUrlForwarder::~ScopedUrlForwarder() = default; - --#if !defined(OS_LINUX) -+#if !defined(OS_LINUX) && !defined(OS_BSD) - - // static - std::unique_ptr<ScopedUrlForwarder> ScopedUrlForwarder::Create() { -@@ -22,6 +22,6 @@ std::unique_ptr<ScopedUrlForwarder> ScopedUrlForwarder - return base::WrapUnique(new ScopedUrlForwarder()); - } - --#endif // !defined(OS_LINUX) -+#endif // !defined(OS_LINUX) && !defined(OS_BSD) - - } // namespace remoting diff --git a/www/chromium/files/patch-remoting_host_setup_start__host__main.cc b/www/chromium/files/patch-remoting_host_setup_start__host__main.cc index 4e79015c11c4..9a284076579c 100644 --- a/www/chromium/files/patch-remoting_host_setup_start__host__main.cc +++ b/www/chromium/files/patch-remoting_host_setup_start__host__main.cc @@ -1,4 +1,4 @@ ---- remoting/host/setup/start_host_main.cc.orig 2021-07-28 08:19:29 UTC +--- remoting/host/setup/start_host_main.cc.orig 2021-09-24 04:26:09 UTC +++ remoting/host/setup/start_host_main.cc @@ -32,10 +32,10 @@ #include <unistd.h> @@ -13,7 +13,7 @@ #if defined(OS_WIN) #include "base/process/process_info.h" -@@ -124,12 +124,12 @@ void OnDone(HostStarter::Result result) { +@@ -126,12 +126,12 @@ void OnDone(HostStarter::Result result) { } // namespace int StartHostMain(int argc, char** argv) { @@ -28,7 +28,7 @@ // google_apis::GetOAuth2ClientID/Secret need a static CommandLine. base::CommandLine::Init(argc, argv); -@@ -161,7 +161,7 @@ int StartHostMain(int argc, char** argv) { +@@ -163,7 +163,7 @@ int StartHostMain(int argc, char** argv) { // for the account which generated |code|. std::string host_owner = command_line->GetSwitchValueASCII("host-owner"); @@ -37,7 +37,7 @@ if (command_line->HasSwitch("no-start")) { // On Linux, registering the host with systemd and starting it is the only // reason start_host requires root. The --no-start options skips that final -@@ -171,7 +171,7 @@ int StartHostMain(int argc, char** argv) { +@@ -173,7 +173,7 @@ int StartHostMain(int argc, char** argv) { // controller code, and must be configured on the Linux delegate explicitly. DaemonControllerDelegateLinux::set_start_host_after_setup(false); } diff --git a/www/chromium/files/patch-remoting_host_switches.cc b/www/chromium/files/patch-remoting_host_switches.cc index 581c6e04fe6e..87e05bf9de7e 100644 --- a/www/chromium/files/patch-remoting_host_switches.cc +++ b/www/chromium/files/patch-remoting_host_switches.cc @@ -1,9 +1,9 @@ ---- remoting/host/switches.cc.orig 2021-04-14 18:41:08 UTC +--- remoting/host/switches.cc.orig 2021-09-24 04:26:09 UTC +++ remoting/host/switches.cc -@@ -21,9 +21,9 @@ const char kProcessTypeHost[] = "host"; - const char kProcessTypeRdpDesktopSession[] = "rdp_desktop_session"; - const char kProcessTypeEvaluateCapability[] = "evaluate_capability"; +@@ -23,9 +23,9 @@ const char kProcessTypeEvaluateCapability[] = "evaluat const char kProcessTypeFileChooser[] = "file_chooser"; + const char kProcessTypeUrlForwarderConfigurator[] = + "url_forwarder_configurator"; -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) const char kProcessTypeXSessionChooser[] = "xsession_chooser"; diff --git a/www/chromium/files/patch-remoting_host_switches.h b/www/chromium/files/patch-remoting_host_switches.h index 7e3c1efbb542..452d306351c4 100644 --- a/www/chromium/files/patch-remoting_host_switches.h +++ b/www/chromium/files/patch-remoting_host_switches.h @@ -1,9 +1,9 @@ ---- remoting/host/switches.h.orig 2021-04-14 18:41:08 UTC +--- remoting/host/switches.h.orig 2021-09-24 04:26:09 UTC +++ remoting/host/switches.h -@@ -34,9 +34,9 @@ extern const char kProcessTypeHost[]; - extern const char kProcessTypeRdpDesktopSession[]; +@@ -35,9 +35,9 @@ extern const char kProcessTypeRdpDesktopSession[]; extern const char kProcessTypeEvaluateCapability[]; extern const char kProcessTypeFileChooser[]; + extern const char kProcessTypeUrlForwarderConfigurator[]; -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) extern const char kProcessTypeXSessionChooser[]; diff --git a/www/chromium/files/patch-remoting_host_url__forwarder__configurator.cc b/www/chromium/files/patch-remoting_host_url__forwarder__configurator.cc new file mode 100644 index 000000000000..bf3dcb8419e1 --- /dev/null +++ b/www/chromium/files/patch-remoting_host_url__forwarder__configurator.cc @@ -0,0 +1,19 @@ +--- remoting/host/url_forwarder_configurator.cc.orig 2021-09-24 18:54:47 UTC ++++ remoting/host/url_forwarder_configurator.cc +@@ -13,7 +13,7 @@ UrlForwarderConfigurator::UrlForwarderConfigurator() = + + UrlForwarderConfigurator::~UrlForwarderConfigurator() = default; + +-#if !defined(OS_LINUX) && !defined(OS_WIN) ++#if !defined(OS_LINUX) && !defined(OS_WIN) && !defined(OS_BSD) + + // static + std::unique_ptr<UrlForwarderConfigurator> UrlForwarderConfigurator::Create() { +@@ -22,6 +22,6 @@ std::unique_ptr<UrlForwarderConfigurator> UrlForwarder + return nullptr; + } + +-#endif // !defined(OS_LINUX) && !defined(OS_WIN) ++#endif // !defined(OS_LINUX) && !defined(OS_WIN) && !defined(OS_BSD) + + } // namespace remoting diff --git a/www/chromium/files/patch-remoting_resources_remoting__strings.grd b/www/chromium/files/patch-remoting_resources_remoting__strings.grd index 0f4f3c397925..d50a9373e23b 100644 --- a/www/chromium/files/patch-remoting_resources_remoting__strings.grd +++ b/www/chromium/files/patch-remoting_resources_remoting__strings.grd @@ -1,15 +1,15 @@ ---- remoting/resources/remoting_strings.grd.orig 2021-05-12 22:05:58 UTC +--- remoting/resources/remoting_strings.grd.orig 2021-09-24 04:26:09 UTC +++ remoting/resources/remoting_strings.grd -@@ -894,7 +894,7 @@ If '<ph name="SERVICE_SCRIPT_NAME">$3<ex>org.chromium. - Open Screen Recording Preferences - </message> - </if> +@@ -918,7 +918,7 @@ If '<ph name="SERVICE_SCRIPT_NAME">$3<ex>org.chromium. + <message name="IDS_BROWSER_IS_INVALID" desc="Message shown when the user has chosen an invalid app as the browser to open URLs locally."> + The chosen browser cannot be used to open URLs on the local machine. + </message> - <if expr="is_linux"> + <if expr="is_posix"> <message name="IDS_SESSION_DIALOG_MESSAGE" desc="The message to show at the top of the session-selection dialog."> Select a session to launch within your Chrome Remote Desktop environment. (Note that some session types may not support running within Chrome Remote Desktop and on the local console simultaneously.) </message> -@@ -910,7 +910,7 @@ If '<ph name="SERVICE_SCRIPT_NAME">$3<ex>org.chromium. +@@ -934,7 +934,7 @@ If '<ph name="SERVICE_SCRIPT_NAME">$3<ex>org.chromium. <message name="IDS_SESSION_DIALOG_DEFAULT_SESSION_COMMENT" desc="The comment for the entry to launch the default session."> Launch the default XSession </message> diff --git a/www/chromium/files/patch-sandbox_linux_services_libc__interceptor.cc b/www/chromium/files/patch-sandbox_linux_services_libc__interceptor.cc index e359e5ea66fc..8644dc664732 100644 --- a/www/chromium/files/patch-sandbox_linux_services_libc__interceptor.cc +++ b/www/chromium/files/patch-sandbox_linux_services_libc__interceptor.cc @@ -1,4 +1,4 @@ ---- sandbox/linux/services/libc_interceptor.cc.orig 2021-04-14 18:41:08 UTC +--- sandbox/linux/services/libc_interceptor.cc.orig 2021-09-14 01:52:00 UTC +++ sandbox/linux/services/libc_interceptor.cc @@ -11,7 +11,9 @@ #include <stddef.h> @@ -10,7 +10,7 @@ #include <sys/socket.h> #include <sys/types.h> #include <time.h> -@@ -93,7 +95,7 @@ bool ReadTimeStruct(base::PickleIterator* iter, +@@ -96,7 +98,7 @@ bool ReadTimeStruct(base::PickleIterator* iter, } else { base::AutoLock lock(g_timezones_lock.Get()); auto ret_pair = g_timezones.Get().insert(timezone); diff --git a/www/chromium/files/patch-sandbox_policy_BUILD.gn b/www/chromium/files/patch-sandbox_policy_BUILD.gn index fa4576ca7f0c..bd937138ca22 100644 --- a/www/chromium/files/patch-sandbox_policy_BUILD.gn +++ b/www/chromium/files/patch-sandbox_policy_BUILD.gn @@ -1,7 +1,7 @@ ---- sandbox/policy/BUILD.gn.orig 2021-07-19 18:45:20 UTC +--- sandbox/policy/BUILD.gn.orig 2021-09-24 04:26:09 UTC +++ sandbox/policy/BUILD.gn -@@ -32,7 +32,7 @@ component("policy") { - "//sandbox:common", +@@ -34,7 +34,7 @@ component("policy") { + "//sandbox/policy/mojom", ] public_deps = [] - if (is_linux || is_chromeos) { @@ -9,7 +9,7 @@ sources += [ "linux/bpf_audio_policy_linux.cc", "linux/bpf_audio_policy_linux.h", -@@ -81,6 +81,15 @@ component("policy") { +@@ -83,6 +83,15 @@ component("policy") { "//sandbox/linux:sandbox_services", "//sandbox/linux:seccomp_bpf", "//sandbox/linux:suid_sandbox_client", diff --git a/www/chromium/files/patch-services_audio_BUILD.gn b/www/chromium/files/patch-services_audio_BUILD.gn index 83a114c79175..ab3bb5024171 100644 --- a/www/chromium/files/patch-services_audio_BUILD.gn +++ b/www/chromium/files/patch-services_audio_BUILD.gn @@ -1,6 +1,6 @@ ---- services/audio/BUILD.gn.orig 2021-05-12 22:05:58 UTC +--- services/audio/BUILD.gn.orig 2021-09-14 01:52:00 UTC +++ services/audio/BUILD.gn -@@ -76,7 +76,7 @@ source_set("audio") { +@@ -78,7 +78,7 @@ source_set("audio") { "//services/audio/public/mojom", ] diff --git a/www/chromium/files/patch-services_cert__verifier_cert__verifier__creation.cc b/www/chromium/files/patch-services_cert__verifier_cert__verifier__creation.cc index a2642fa8ca78..1ee4ec3b67eb 100644 --- a/www/chromium/files/patch-services_cert__verifier_cert__verifier__creation.cc +++ b/www/chromium/files/patch-services_cert__verifier_cert__verifier__creation.cc @@ -1,11 +1,20 @@ ---- services/cert_verifier/cert_verifier_creation.cc.orig 2021-04-22 08:26:10 UTC +--- services/cert_verifier/cert_verifier_creation.cc.orig 2021-09-24 18:55:25 UTC +++ services/cert_verifier/cert_verifier_creation.cc -@@ -71,7 +71,7 @@ scoped_refptr<net::CertVerifyProc> CreateCertVerifyPro - - bool IsUsingCertNetFetcher() { - #if defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_CHROMEOS) || \ -- defined(OS_LINUX) || \ -+ defined(OS_LINUX) || defined(OS_BSD) || \ - BUILDFLAG(TRIAL_COMPARISON_CERT_VERIFIER_SUPPORTED) || \ - BUILDFLAG(BUILTIN_CERT_VERIFIER_FEATURE_SUPPORTED) - return true; +@@ -86,7 +86,7 @@ scoped_refptr<net::CertVerifyProc> CreateCertVerifyPro + scoped_refptr<net::CertVerifyProc> CreateOldDefaultWithoutCaching( + scoped_refptr<net::CertNetFetcher> cert_net_fetcher) { + scoped_refptr<net::CertVerifyProc> verify_proc; +-#if defined(OS_FUCHSIA) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_FUCHSIA) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + verify_proc = + net::CertVerifyProc::CreateBuiltinVerifyProc(std::move(cert_net_fetcher)); + #else +@@ -103,7 +103,7 @@ scoped_refptr<net::CertVerifyProc> CreateOldDefaultWit + scoped_refptr<net::CertVerifyProc> CreateNewDefaultWithoutCaching( + scoped_refptr<net::CertNetFetcher> cert_net_fetcher) { + scoped_refptr<net::CertVerifyProc> verify_proc; +-#if BUILDFLAG(CHROME_ROOT_STORE_SUPPORTED) && defined(OS_LINUX) ++#if BUILDFLAG(CHROME_ROOT_STORE_SUPPORTED) && (defined(OS_LINUX) || defined(OS_BSD)) + verify_proc = net::CreateCertVerifyProcBuiltin( + std::move(cert_net_fetcher), net::CreateSslSystemTrustStoreChromeRoot()); + #elif BUILDFLAG(BUILTIN_CERT_VERIFIER_FEATURE_SUPPORTED) diff --git a/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.cc b/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.cc index a975412af2cb..6159742cd417 100644 --- a/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.cc +++ b/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.cc @@ -1,6 +1,6 @@ ---- services/device/hid/hid_connection_freebsd.cc.orig 2021-07-28 08:43:36 UTC +--- services/device/hid/hid_connection_freebsd.cc.orig 2021-09-29 12:19:04 UTC +++ services/device/hid/hid_connection_freebsd.cc -@@ -0,0 +1,241 @@ +@@ -0,0 +1,242 @@ +// Copyright (c) 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -183,8 +183,9 @@ + scoped_refptr<HidDeviceInfo> device_info, + base::ScopedFD fd, + scoped_refptr<base::SequencedTaskRunner> blocking_task_runner, -+ bool allow_protected_reports) -+ : HidConnection(device_info, allow_protected_reports), ++ bool allow_protected_reports, ++ bool allow_fido_reports) ++ : HidConnection(device_info, allow_protected_reports, allow_fido_reports), + helper_(nullptr, base::OnTaskRunnerDeleter(blocking_task_runner)), + blocking_task_runner_(std::move(blocking_task_runner)) { + helper_.reset(new BlockingTaskRunnerHelper(std::move(fd), device_info, diff --git a/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.h b/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.h index bbb4428e897c..0962fe36d920 100644 --- a/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.h +++ b/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.h @@ -1,6 +1,6 @@ ---- services/device/hid/hid_connection_freebsd.h.orig 2021-04-15 08:13:27 UTC +--- services/device/hid/hid_connection_freebsd.h.orig 2021-09-29 12:19:04 UTC +++ services/device/hid/hid_connection_freebsd.h -@@ -0,0 +1,66 @@ +@@ -0,0 +1,67 @@ +// Copyright (c) 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -34,7 +34,8 @@ + scoped_refptr<HidDeviceInfo> device_info, + base::ScopedFD fd, + scoped_refptr<base::SequencedTaskRunner> blocking_task_runner, -+ bool allow_protected_reports); ++ bool allow_protected_reports, ++ bool allow_fido_reports); + + private: + friend class base::RefCountedThreadSafe<HidConnectionFreeBSD>; diff --git a/www/chromium/files/patch-services_device_hid_hid__service__freebsd.cc b/www/chromium/files/patch-services_device_hid_hid__service__freebsd.cc index f37a3466fcdb..271a3c9a74e6 100644 --- a/www/chromium/files/patch-services_device_hid_hid__service__freebsd.cc +++ b/www/chromium/files/patch-services_device_hid_hid__service__freebsd.cc @@ -1,6 +1,6 @@ ---- services/device/hid/hid_service_freebsd.cc.orig 2021-07-28 08:43:36 UTC +--- services/device/hid/hid_service_freebsd.cc.orig 2021-09-29 12:19:04 UTC +++ services/device/hid/hid_service_freebsd.cc -@@ -0,0 +1,391 @@ +@@ -0,0 +1,397 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -46,9 +46,11 @@ +struct HidServiceFreeBSD::ConnectParams { + ConnectParams(scoped_refptr<HidDeviceInfo> device_info, + bool allow_protected_reports, ++ bool allow_fido_reports, + ConnectCallback callback) + : device_info(std::move(device_info)), + allow_protected_reports(allow_protected_reports), ++ allow_fido_reports(allow_fido_reports), + callback(std::move(callback)), + task_runner(base::ThreadTaskRunnerHandle::Get()), + blocking_task_runner( @@ -57,6 +59,7 @@ + + scoped_refptr<HidDeviceInfo> device_info; + bool allow_protected_reports; ++ bool allow_fido_reports; + ConnectCallback callback; + scoped_refptr<base::SequencedTaskRunner> task_runner; + scoped_refptr<base::SequencedTaskRunner> blocking_task_runner; @@ -351,6 +354,7 @@ + +void HidServiceFreeBSD::Connect(const std::string& device_guid, + bool allow_protected_reports, ++ bool allow_fido_reports, + ConnectCallback callback) { + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); + @@ -365,6 +369,7 @@ + + auto params = std::make_unique<ConnectParams>(device_info, + allow_protected_reports, ++ allow_fido_reports, + std::move(callback)); + scoped_refptr<base::SequencedTaskRunner> blocking_task_runner = + params->blocking_task_runner; @@ -387,7 +392,8 @@ + std::move(params->device_info), + std::move(params->fd), + std::move(params->blocking_task_runner), -+ params->allow_protected_reports ++ params->allow_protected_reports, ++ params->allow_fido_reports + )); +} + diff --git a/www/chromium/files/patch-services_device_hid_hid__service__freebsd.h b/www/chromium/files/patch-services_device_hid_hid__service__freebsd.h index 068627df801a..ac4c0de00842 100644 --- a/www/chromium/files/patch-services_device_hid_hid__service__freebsd.h +++ b/www/chromium/files/patch-services_device_hid_hid__service__freebsd.h @@ -1,6 +1,6 @@ ---- services/device/hid/hid_service_freebsd.h.orig 2021-04-15 08:13:27 UTC +--- services/device/hid/hid_service_freebsd.h.orig 2021-09-29 12:19:04 UTC +++ services/device/hid/hid_service_freebsd.h -@@ -0,0 +1,47 @@ +@@ -0,0 +1,48 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -26,6 +26,7 @@ + + void Connect(const std::string& device_guid, + bool allow_protected_reports, ++ bool allow_fido_reports, + ConnectCallback connect) override; + base::WeakPtr<HidService> GetWeakPtr() override; + diff --git a/www/chromium/files/patch-services_network_BUILD.gn b/www/chromium/files/patch-services_network_BUILD.gn index 25f4ab14f1d0..570ee60c99b3 100644 --- a/www/chromium/files/patch-services_network_BUILD.gn +++ b/www/chromium/files/patch-services_network_BUILD.gn @@ -1,6 +1,6 @@ ---- services/network/BUILD.gn.orig 2021-06-09 22:14:06 UTC +--- services/network/BUILD.gn.orig 2021-09-24 04:26:09 UTC +++ services/network/BUILD.gn -@@ -249,7 +249,7 @@ component("network_service") { +@@ -247,7 +247,7 @@ component("network_service") { "//url", ] @@ -9,7 +9,7 @@ deps += [ ":network_sandbox_hook" ] } -@@ -282,7 +282,7 @@ component("network_service") { +@@ -287,7 +287,7 @@ component("network_service") { defines = [ "IS_NETWORK_SERVICE_IMPL" ] } diff --git a/www/chromium/files/patch-services_network_network__context.cc b/www/chromium/files/patch-services_network_network__context.cc index 44a757711a14..889db8d625e9 100644 --- a/www/chromium/files/patch-services_network_network__context.cc +++ b/www/chromium/files/patch-services_network_network__context.cc @@ -1,11 +1,11 @@ ---- services/network/network_context.cc.orig 2021-07-19 18:45:20 UTC +--- services/network/network_context.cc.orig 2021-09-24 04:26:09 UTC +++ services/network/network_context.cc -@@ -2333,7 +2333,7 @@ NetworkContext::MakeSessionCleanupCookieStore() const +@@ -2384,7 +2384,7 @@ NetworkContext::MakeSessionCleanupCookieStore() const net::CookieCryptoDelegate* crypto_delegate = nullptr; if (params_->enable_encrypted_cookies) { --#if (defined(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ -+#if (defined(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) && \ +-#if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ ++#if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) && \ !BUILDFLAG(IS_CHROMECAST) DCHECK(network_service_->os_crypt_config_set()) << "NetworkService::SetCryptConfig must be called before creating a " diff --git a/www/chromium/files/patch-services_network_network__service.cc b/www/chromium/files/patch-services_network_network__service.cc index 58e10dbe2c29..100cecbaf43f 100644 --- a/www/chromium/files/patch-services_network_network__service.cc +++ b/www/chromium/files/patch-services_network_network__service.cc @@ -1,6 +1,6 @@ ---- services/network/network_service.cc.orig 2021-07-19 18:45:20 UTC +--- services/network/network_service.cc.orig 2021-09-14 01:52:01 UTC +++ services/network/network_service.cc -@@ -72,7 +72,7 @@ +@@ -73,7 +73,7 @@ #include "third_party/boringssl/src/include/openssl/cpu.h" #endif @@ -9,7 +9,7 @@ !BUILDFLAG(IS_CHROMECAST) #include "components/os_crypt/key_storage_config_linux.h" #endif -@@ -616,7 +616,7 @@ void NetworkService::OnCertDBChanged() { +@@ -623,7 +623,7 @@ void NetworkService::OnCertDBChanged() { net::CertDatabase::GetInstance()->NotifyObserversCertDBChanged(); } diff --git a/www/chromium/files/patch-services_network_network__service.h b/www/chromium/files/patch-services_network_network__service.h index aa7844c7dd09..a89b1bd94995 100644 --- a/www/chromium/files/patch-services_network_network__service.h +++ b/www/chromium/files/patch-services_network_network__service.h @@ -1,6 +1,6 @@ ---- services/network/network_service.h.orig 2021-07-19 18:45:20 UTC +--- services/network/network_service.h.orig 2021-09-24 04:26:09 UTC +++ services/network/network_service.h -@@ -156,7 +156,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService +@@ -162,7 +162,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService base::span<const uint8_t> crl_set, mojom::NetworkService::UpdateCRLSetCallback callback) override; void OnCertDBChanged() override; diff --git a/www/chromium/files/patch-services_tracing_public_cpp_perfetto_perfetto__config.cc b/www/chromium/files/patch-services_tracing_public_cpp_perfetto_perfetto__config.cc index eea94a36b2c6..601283afea7b 100644 --- a/www/chromium/files/patch-services_tracing_public_cpp_perfetto_perfetto__config.cc +++ b/www/chromium/files/patch-services_tracing_public_cpp_perfetto_perfetto__config.cc @@ -1,6 +1,6 @@ ---- services/tracing/public/cpp/perfetto/perfetto_config.cc.orig 2021-06-11 09:57:05 UTC +--- services/tracing/public/cpp/perfetto/perfetto_config.cc.orig 2021-09-24 04:26:09 UTC +++ services/tracing/public/cpp/perfetto/perfetto_config.cc -@@ -88,7 +88,7 @@ void AddDataSourceConfigs( +@@ -120,7 +120,7 @@ void AddDataSourceConfigs( // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. #if BUILDFLAG(IS_CHROMEOS_ASH) || \ diff --git a/www/chromium/files/patch-services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc b/www/chromium/files/patch-services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc index 4838791a7d6a..8084af2efff5 100644 --- a/www/chromium/files/patch-services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc +++ b/www/chromium/files/patch-services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc @@ -1,6 +1,6 @@ ---- services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc.orig 2021-07-19 18:45:20 UTC +--- services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc.orig 2021-09-14 01:52:01 UTC +++ services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc -@@ -588,7 +588,7 @@ TracingSamplerProfiler::TracingProfileBuilder::GetCall +@@ -596,7 +596,7 @@ void TracingSamplerProfiler::StackProfileWriter::Reset // static void TracingSamplerProfiler::MangleModuleIDIfNeeded(std::string* module_id) { diff --git a/www/chromium/files/patch-services_video__capture_broadcasting__receiver.cc b/www/chromium/files/patch-services_video__capture_broadcasting__receiver.cc index 2c5e42022317..cccbaff8d3b5 100644 --- a/www/chromium/files/patch-services_video__capture_broadcasting__receiver.cc +++ b/www/chromium/files/patch-services_video__capture_broadcasting__receiver.cc @@ -1,6 +1,6 @@ ---- services/video_capture/broadcasting_receiver.cc.orig 2021-04-14 18:41:08 UTC +--- services/video_capture/broadcasting_receiver.cc.orig 2021-09-14 01:52:01 UTC +++ services/video_capture/broadcasting_receiver.cc -@@ -39,7 +39,7 @@ void CloneSharedBufferHandle(const mojo::ScopedSharedB +@@ -28,7 +28,7 @@ void CloneSharedBufferHandle(const mojo::ScopedSharedB void CloneSharedBufferToRawFileDescriptorHandle( const mojo::ScopedSharedBufferHandle& source, media::mojom::VideoBufferHandlePtr* target) { @@ -9,7 +9,7 @@ // |source| is unwrapped to a |PlatformSharedMemoryRegion|, from whence a file // descriptor can be extracted which is then mojo-wrapped. base::subtle::PlatformSharedMemoryRegion platform_region = -@@ -184,7 +184,7 @@ void BroadcastingReceiver::BufferContext:: +@@ -232,7 +232,7 @@ void BroadcastingReceiver::BufferContext:: ConvertRawFileDescriptorToSharedBuffer() { DCHECK(buffer_handle_->is_shared_memory_via_raw_file_descriptor()); diff --git a/www/chromium/files/patch-third__party_angle_BUILD.gn b/www/chromium/files/patch-third__party_angle_BUILD.gn index b4d9ecfc47e1..826e5a6b6e46 100644 --- a/www/chromium/files/patch-third__party_angle_BUILD.gn +++ b/www/chromium/files/patch-third__party_angle_BUILD.gn @@ -1,7 +1,15 @@ ---- third_party/angle/BUILD.gn.orig 2021-07-19 18:47:19 UTC +--- third_party/angle/BUILD.gn.orig 2021-09-24 04:28:03 UTC +++ third_party/angle/BUILD.gn -@@ -206,7 +206,7 @@ config("extra_warnings") { - "-Wunreachable-code", +@@ -200,7 +200,6 @@ config("extra_warnings") { + "-Wundefined-reinterpret-cast", + "-Wunneeded-internal-declaration", + "-Wweak-template-vtables", +- "-Wunused-but-set-variable", + + # The below warnings are used by WebKit. We enable them to make rolling + # ANGLE in WebKit easier. +@@ -210,11 +209,12 @@ config("extra_warnings") { + "-Wunreachable-code-aggressive", "-Wshorten-64-to-32", ] - if (!use_xcode_clang) { @@ -9,7 +17,12 @@ # Mac catalyst uses a clang version that doesn't have these. cflags += [ "-Wsuggest-destructor-override", -@@ -470,6 +470,7 @@ angle_static_library("angle_gpu_info_util") { + "-Wsuggest-override", ++ "-Wunused-but-set-variable", + ] + } + } +@@ -486,6 +486,7 @@ angle_static_library("angle_gpu_info_util") { "X11", "Xi", "Xext", diff --git a/www/chromium/files/patch-third__party_angle_src_common_debug.h b/www/chromium/files/patch-third__party_angle_src_common_debug.h index ad1bd3ff78fa..600dd71fb0dc 100644 --- a/www/chromium/files/patch-third__party_angle_src_common_debug.h +++ b/www/chromium/files/patch-third__party_angle_src_common_debug.h @@ -1,6 +1,6 @@ ---- third_party/angle/src/common/debug.h.orig 2021-04-14 18:42:58 UTC +--- third_party/angle/src/common/debug.h.orig 2021-09-24 04:28:03 UTC +++ third_party/angle/src/common/debug.h -@@ -392,7 +392,7 @@ std::ostream &FmtHex(std::ostream &os, T value) +@@ -393,7 +393,7 @@ std::ostream &FmtHex(std::ostream &os, T value) # define ANGLE_DISABLE_STRUCT_PADDING_WARNINGS #endif diff --git a/www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__linux.cpp b/www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__linux.cpp index 1ab26752d412..ec7dfd41baf9 100644 --- a/www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__linux.cpp +++ b/www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__linux.cpp @@ -1,6 +1,6 @@ ---- third_party/angle/src/gpu_info_util/SystemInfo_linux.cpp.orig 2021-07-19 18:47:19 UTC +--- third_party/angle/src/gpu_info_util/SystemInfo_linux.cpp.orig 2021-10-01 01:38:41 UTC +++ third_party/angle/src/gpu_info_util/SystemInfo_linux.cpp -@@ -71,6 +71,15 @@ bool GetPCIDevicesWithLibPCI(std::vector<GPUDeviceInfo +@@ -71,10 +71,20 @@ bool GetPCIDevicesWithLibPCI(std::vector<GPUDeviceInfo bool GetSystemInfo(SystemInfo *info) { @@ -15,10 +15,7 @@ +#else if (!GetPCIDevicesWithLibPCI(&(info->gpus))) { - #if defined(ANGLE_HAS_VULKAN_SYSTEM_INFO) -@@ -80,6 +89,7 @@ bool GetSystemInfo(SystemInfo *info) return false; - #endif // defined(ANGLE_HAS_VULKAN_SYSTEM_INFO) } +#endif diff --git a/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp b/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp index 16c6013b2407..ae2f013306c2 100644 --- a/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp +++ b/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp @@ -1,4 +1,4 @@ ---- third_party/angle/src/libANGLE/Display.cpp.orig 2021-07-19 18:47:19 UTC +--- third_party/angle/src/libANGLE/Display.cpp.orig 2021-09-14 01:58:21 UTC +++ third_party/angle/src/libANGLE/Display.cpp @@ -55,7 +55,7 @@ # include "libANGLE/renderer/gl/wgl/DisplayWGL.h" @@ -9,7 +9,7 @@ # include "libANGLE/renderer/gl/egl/DisplayEGL.h" # if defined(ANGLE_USE_GBM) # include "libANGLE/renderer/gl/egl/gbm/DisplayGbm.h" -@@ -279,7 +279,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di +@@ -290,7 +290,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di impl = rx::CreateDisplayCGLOrEAGL(state); break; @@ -18,7 +18,7 @@ # if defined(ANGLE_USE_GBM) if (platformType == 0) { -@@ -320,7 +320,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di +@@ -335,7 +335,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di #if defined(ANGLE_ENABLE_OPENGL) # if defined(ANGLE_PLATFORM_WINDOWS) impl = new rx::DisplayWGL(state); @@ -27,16 +27,16 @@ # if defined(ANGLE_USE_GBM) if (platformType == 0) { -@@ -361,7 +361,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di - { +@@ -383,7 +383,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di impl = rx::CreateVulkanWin32Display(state); } + break; -# elif defined(ANGLE_PLATFORM_LINUX) +# elif defined(ANGLE_PLATFORM_POSIX) # if defined(ANGLE_USE_X11) if (platformType == EGL_PLATFORM_X11_EXT && rx::IsVulkanXcbDisplayAvailable()) { -@@ -1675,7 +1675,7 @@ static ClientExtensions GenerateClientExtensions() +@@ -1741,7 +1741,7 @@ static ClientExtensions GenerateClientExtensions() extensions.x11Visual = true; #endif diff --git a/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.cpp b/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.cpp index 3e5ad6ee6a78..b76429729b53 100644 --- a/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.cpp +++ b/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.cpp @@ -1,4 +1,4 @@ ---- third_party/angle/src/libANGLE/renderer/driver_utils.cpp.orig 2021-07-19 18:47:19 UTC +--- third_party/angle/src/libANGLE/renderer/driver_utils.cpp.orig 2021-09-24 04:28:04 UTC +++ third_party/angle/src/libANGLE/renderer/driver_utils.cpp @@ -17,7 +17,7 @@ # include <sys/system_properties.h> @@ -9,7 +9,7 @@ # include <sys/utsname.h> #endif -@@ -235,7 +235,7 @@ OSVersion GetMacOSVersion() +@@ -228,7 +228,7 @@ OSVersion GetiOSVersion() } #endif @@ -18,7 +18,7 @@ bool ParseLinuxOSVersion(const char *version, int *major, int *minor, int *patch) { errno = 0; // reset global error flag. -@@ -247,6 +247,14 @@ bool ParseLinuxOSVersion(const char *version, int *maj +@@ -240,6 +240,14 @@ bool ParseLinuxOSVersion(const char *version, int *maj } *minor = static_cast<int>(strtol(next + 1, &next, 10)); @@ -33,7 +33,7 @@ if (next == nullptr || *next != '.' || errno != 0) { return false; -@@ -257,6 +265,7 @@ bool ParseLinuxOSVersion(const char *version, int *maj +@@ -250,6 +258,7 @@ bool ParseLinuxOSVersion(const char *version, int *maj { return false; } @@ -41,7 +41,7 @@ return true; } -@@ -264,7 +273,7 @@ bool ParseLinuxOSVersion(const char *version, int *maj +@@ -257,7 +266,7 @@ bool ParseLinuxOSVersion(const char *version, int *maj OSVersion GetLinuxOSVersion() { diff --git a/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h b/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h index c6c9b8f2302d..31231104df4f 100644 --- a/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h +++ b/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h @@ -1,6 +1,6 @@ ---- third_party/angle/src/libANGLE/renderer/driver_utils.h.orig 2021-07-19 18:47:19 UTC +--- third_party/angle/src/libANGLE/renderer/driver_utils.h.orig 2021-09-24 04:28:04 UTC +++ third_party/angle/src/libANGLE/renderer/driver_utils.h -@@ -166,7 +166,7 @@ inline bool IsWindows() +@@ -173,7 +173,7 @@ inline bool IsWindows() inline bool IsLinux() { diff --git a/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h b/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h index a808d3710214..77ae108ebe25 100644 --- a/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h +++ b/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h @@ -1,6 +1,6 @@ ---- third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk_api.h.orig 2021-04-14 18:42:58 UTC +--- third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk_api.h.orig 2021-09-14 01:58:21 UTC +++ third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk_api.h -@@ -19,7 +19,7 @@ bool IsVulkanWin32DisplayAvailable(); +@@ -23,7 +23,7 @@ bool IsVulkanWin32DisplayAvailable(); DisplayImpl *CreateVulkanWin32Display(const egl::DisplayState &state); #endif // defined(ANGLE_PLATFORM_WINDOWS) @@ -9,7 +9,7 @@ bool IsVulkanXcbDisplayAvailable(); DisplayImpl *CreateVulkanXcbDisplay(const egl::DisplayState &state); -@@ -28,7 +28,7 @@ DisplayImpl *CreateVulkanSimpleDisplay(const egl::Disp +@@ -32,7 +32,7 @@ DisplayImpl *CreateVulkanSimpleDisplay(const egl::Disp bool IsVulkanHeadlessDisplayAvailable(); DisplayImpl *CreateVulkanHeadlessDisplay(const egl::DisplayState &state); diff --git a/www/chromium/files/patch-third__party_blink_public_platform_platform.h b/www/chromium/files/patch-third__party_blink_public_platform_platform.h index 4eac705578d9..3c1cbccc833e 100644 --- a/www/chromium/files/patch-third__party_blink_public_platform_platform.h +++ b/www/chromium/files/patch-third__party_blink_public_platform_platform.h @@ -1,6 +1,6 @@ ---- third_party/blink/public/platform/platform.h.orig 2021-07-19 18:45:21 UTC +--- third_party/blink/public/platform/platform.h.orig 2021-09-14 01:52:02 UTC +++ third_party/blink/public/platform/platform.h -@@ -430,7 +430,7 @@ class BLINK_PLATFORM_EXPORT Platform { +@@ -421,7 +421,7 @@ class BLINK_PLATFORM_EXPORT Platform { return nullptr; } diff --git a/www/chromium/files/patch-third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py b/www/chromium/files/patch-third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py index f12e81013ccb..4d0b8892c93e 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py +++ b/www/chromium/files/patch-third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py.orig 2021-04-14 18:41:09 UTC +--- third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py.orig 2021-09-14 01:52:02 UTC +++ third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py -@@ -29,6 +29,9 @@ def init(root_src_dir): +@@ -37,6 +37,9 @@ def init(root_src_dir, enable_style_format=True): elif sys.platform.startswith(("cygwin", "win")): platform = "win" exe_suffix = ".exe" diff --git a/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc b/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc index e261d16aa845..70cb1443f06c 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/controller/blink_initializer.cc.orig 2021-07-19 18:45:21 UTC +--- third_party/blink/renderer/controller/blink_initializer.cc.orig 2021-09-24 04:26:11 UTC +++ third_party/blink/renderer/controller/blink_initializer.cc @@ -65,11 +65,11 @@ #include "third_party/blink/renderer/controller/oom_intervention_impl.h" @@ -14,7 +14,7 @@ defined(OS_MAC) || defined(OS_WIN) #include "third_party/blink/renderer/controller/highest_pmf_reporter.h" #include "third_party/blink/renderer/controller/user_level_memory_pressure_signal_generator.h" -@@ -146,7 +146,7 @@ void InitializeCommon(Platform* platform, mojo::Binder +@@ -141,7 +141,7 @@ void InitializeCommon(Platform* platform, mojo::Binder CrashMemoryMetricsReporterImpl::Instance(); #endif @@ -23,7 +23,7 @@ defined(OS_MAC) || defined(OS_WIN) // Initialize UserLevelMemoryPressureSignalGenerator so it starts monitoring. if (UserLevelMemoryPressureSignalGenerator::Enabled()) -@@ -218,7 +218,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder +@@ -213,7 +213,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder main_thread->GetTaskRunner()); #endif diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_editing_editing__behavior.cc b/www/chromium/files/patch-third__party_blink_renderer_core_editing_editing__behavior.cc index 090bf822e112..fec1e01e45c0 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_editing_editing__behavior.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_editing_editing__behavior.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/editing/editing_behavior.cc.orig 2021-07-19 18:45:21 UTC +--- third_party/blink/renderer/core/editing/editing_behavior.cc.orig 2021-09-24 04:26:11 UTC +++ third_party/blink/renderer/core/editing/editing_behavior.cc -@@ -273,7 +273,7 @@ bool EditingBehavior::ShouldInsertCharacter(const Keyb +@@ -276,7 +276,7 @@ bool EditingBehavior::ShouldInsertCharacter(const Keyb // unexpected behaviour if (ch < ' ') return false; diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc b/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc index 15bdba549781..19f655ba2fbe 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2021-07-19 18:45:21 UTC +--- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2021-09-24 04:26:11 UTC +++ third_party/blink/renderer/core/exported/web_view_impl.cc -@@ -415,7 +415,7 @@ SkFontHinting RendererPreferencesToSkiaHinting( +@@ -404,7 +404,7 @@ SkFontHinting RendererPreferencesToSkiaHinting( const blink::RendererPreferences& prefs) { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. @@ -9,7 +9,7 @@ if (!prefs.should_antialias_text) { // When anti-aliasing is off, GTK maps all non-zero hinting settings to // 'Normal' hinting so we do the same. Otherwise, folks who have 'Slight' -@@ -3106,12 +3106,12 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs +@@ -3132,12 +3132,12 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs renderer_preferences_.use_subpixel_positioning); // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc b/www/chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc index 236a90384601..672f055fe8b1 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/frame/web_frame_test.cc.orig 2021-07-19 18:45:21 UTC +--- third_party/blink/renderer/core/frame/web_frame_test.cc.orig 2021-09-24 04:26:11 UTC +++ third_party/blink/renderer/core/frame/web_frame_test.cc -@@ -6064,7 +6064,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) { +@@ -6076,7 +6076,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) { EXPECT_EQ(64, ComputeOffset(layout_object, 1000, 1000)); } @@ -9,7 +9,7 @@ TEST_F(WebFrameTest, SelectRangeStaysHorizontallyAlignedWhenMoved) { RegisterMockedHttpURLLoad("move_caret.html"); -@@ -6433,7 +6433,7 @@ TEST_P(CompositedSelectionBoundsTest, SVGBasic) { +@@ -6446,7 +6446,7 @@ TEST_P(CompositedSelectionBoundsTest, SVGBasic) { TEST_P(CompositedSelectionBoundsTest, SVGTextWithFragments) { RunTest("composited_selection_bounds_svg_text_with_fragments.html"); } @@ -17,4 +17,4 @@ +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #if !defined(OS_ANDROID) TEST_P(CompositedSelectionBoundsTest, Input) { - RunTest("composited_selection_bounds_input.html"); + web_view_helper_.GetWebView()->GetSettings()->SetDefaultFontSize(16); diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc b/www/chromium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc index 759373a357e0..5d3ae1fe5306 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/html/forms/internal_popup_menu.cc.orig 2021-05-12 22:06:00 UTC +--- third_party/blink/renderer/core/html/forms/internal_popup_menu.cc.orig 2021-09-14 01:52:02 UTC +++ third_party/blink/renderer/core/html/forms/internal_popup_menu.cc -@@ -154,7 +154,7 @@ class InternalPopupMenu::ItemIterationContext { +@@ -158,7 +158,7 @@ class InternalPopupMenu::ItemIterationContext { is_in_group_(false), buffer_(buffer) { DCHECK(buffer_); diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc b/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc index 220b7df2f883..54284e58b2d7 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc @@ -1,15 +1,15 @@ ---- third_party/blink/renderer/core/layout/layout_view.cc.orig 2021-05-12 22:06:00 UTC +--- third_party/blink/renderer/core/layout/layout_view.cc.orig 2021-09-14 01:52:02 UTC +++ third_party/blink/renderer/core/layout/layout_view.cc -@@ -62,7 +62,7 @@ - #include "third_party/blink/renderer/platform/instrumentation/tracing/traced_value.h" +@@ -64,7 +64,7 @@ #include "third_party/blink/renderer/platform/runtime_enabled_features.h" + #include "ui/display/screen_info.h" -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "third_party/blink/renderer/platform/fonts/font_cache.h" #endif -@@ -345,7 +345,7 @@ void LayoutView::UpdateLayout() { +@@ -347,7 +347,7 @@ void LayoutView::UpdateLayout() { DCHECK(!layout_state_); LayoutState root_layout_state(*this); diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc b/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc index ec89051740cd..0a089d3719ad 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/paint/paint_layer.cc.orig 2021-04-14 18:41:10 UTC +--- third_party/blink/renderer/core/paint/paint_layer.cc.orig 2021-09-14 01:52:02 UTC +++ third_party/blink/renderer/core/paint/paint_layer.cc -@@ -110,7 +110,7 @@ namespace { +@@ -112,7 +112,7 @@ namespace { static CompositingQueryMode g_compositing_query_mode = kCompositingQueriesAreOnlyAllowedInCertainDocumentLifecyclePhases; diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_mediastream_processed__local__audio__source.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_mediastream_processed__local__audio__source.cc index 9ff2a6862d74..bf1177f9e67d 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_modules_mediastream_processed__local__audio__source.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_modules_mediastream_processed__local__audio__source.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/mediastream/processed_local_audio_source.cc.orig 2021-07-19 18:45:22 UTC +--- third_party/blink/renderer/modules/mediastream/processed_local_audio_source.cc.orig 2021-09-14 01:52:02 UTC +++ third_party/blink/renderer/modules/mediastream/processed_local_audio_source.cc -@@ -521,7 +521,7 @@ void ProcessedLocalAudioSource::CaptureUsingProcessor( +@@ -519,7 +519,7 @@ void ProcessedLocalAudioSource::CaptureUsingProcessor( bool key_pressed) { #if defined(OS_WIN) || defined(OS_MAC) DCHECK_LE(volume, 1.0); diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc index 459922a4b5a1..fd5a1f8d94d2 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig 2021-07-19 18:45:22 UTC +--- third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig 2021-09-14 01:52:02 UTC +++ third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc -@@ -287,7 +287,7 @@ TEST_F(MAYBE_WebRtcAudioRendererTest, DISABLED_Multipl +@@ -289,7 +289,7 @@ TEST_F(MAYBE_WebRtcAudioRendererTest, DISABLED_Multipl TEST_F(MAYBE_WebRtcAudioRendererTest, DISABLED_VerifySinkParameters) { SetupRenderer(kDefaultOutputDeviceId); renderer_proxy_->Start(); diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc index 7c6a69dca761..6ed5b92e557e 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2021-07-19 18:45:22 UTC +--- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2021-09-24 04:26:12 UTC +++ third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -@@ -6074,7 +6074,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid +@@ -6090,7 +6090,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid constexpr bool kAllowZeroCopyImages = true; #endif diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__webcodecs__video__frame.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__webcodecs__video__frame.cc index 6bd04d3158c3..28be31d52db6 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__webcodecs__video__frame.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__webcodecs__video__frame.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/webgl/webgl_webcodecs_video_frame.cc.orig 2021-07-19 18:45:22 UTC +--- third_party/blink/renderer/modules/webgl/webgl_webcodecs_video_frame.cc.orig 2021-09-14 01:52:03 UTC +++ third_party/blink/renderer/modules/webgl/webgl_webcodecs_video_frame.cc -@@ -280,7 +280,7 @@ WebGLExtensionName WebGLWebCodecsVideoFrame::GetName() +@@ -98,7 +98,7 @@ WebGLExtensionName WebGLWebCodecsVideoFrame::GetName() bool WebGLWebCodecsVideoFrame::Supported(WebGLRenderingContextBase* context) { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc index e067330f0f04..3501ed7673be 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2021-07-19 18:45:22 UTC +--- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2021-09-24 04:26:12 UTC +++ third_party/blink/renderer/platform/fonts/font_cache.cc -@@ -83,7 +83,7 @@ extern const char kNotoColorEmojiCompat[] = "Noto Colo +@@ -85,7 +85,7 @@ extern const char kNotoColorEmojiCompat[] = "Noto Colo SkFontMgr* FontCache::static_font_manager_ = nullptr; @@ -9,7 +9,7 @@ float FontCache::device_scale_factor_ = 1.0; #endif -@@ -123,7 +123,7 @@ FontCache::FontCache() +@@ -125,7 +125,7 @@ FontCache::FontCache() FontPlatformData* FontCache::SystemFontPlatformData( const FontDescription& font_description) { const AtomicString& family = FontCache::SystemFontFamily(); diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h index e709b681c664..28232d3df6dd 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/platform/fonts/font_cache.h.orig 2021-05-12 22:06:01 UTC +--- third_party/blink/renderer/platform/fonts/font_cache.h.orig 2021-09-24 04:26:12 UTC +++ third_party/blink/renderer/platform/fonts/font_cache.h @@ -58,7 +58,7 @@ #include "third_party/skia/include/core/SkFontMgr.h" @@ -18,8 +18,8 @@ // These are needed for calling QueryRenderStyleForStrike, since // gfx::GetFontRenderParams makes distinctions based on DSF. static float DeviceScaleFactor() { return device_scale_factor_; } -@@ -252,11 +252,11 @@ class PLATFORM_EXPORT FontCache { - const FontDescription&); +@@ -259,11 +259,11 @@ class PLATFORM_EXPORT FontCache { + const char* locale_family_name); #endif // defined(OS_ANDROID) -#if defined(OS_LINUX) || defined(OS_CHROMEOS) @@ -32,7 +32,7 @@ scoped_refptr<SimpleFontData> FontDataFromFontPlatformData( const FontPlatformData*, -@@ -330,12 +330,12 @@ class PLATFORM_EXPORT FontCache { +@@ -339,13 +339,13 @@ class PLATFORM_EXPORT FontCache { const FontFaceCreationParams&, std::string& name); @@ -41,13 +41,14 @@ static AtomicString GetFamilyNameForCharacter(SkFontMgr*, UChar32, const FontDescription&, + const char* family_name, FontFallbackPriority); -#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) scoped_refptr<SimpleFontData> FallbackOnStandardFontStyle( const FontDescription&, -@@ -375,7 +375,7 @@ class PLATFORM_EXPORT FontCache { +@@ -385,7 +385,7 @@ class PLATFORM_EXPORT FontCache { std::unique_ptr<FallbackFamilyStyleCache> fallback_params_cache_; #endif // defined(OS_WIN) diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc index b13952408515..bab404cabf03 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc @@ -1,15 +1,15 @@ ---- third_party/blink/renderer/platform/fonts/font_description.cc.orig 2021-07-19 18:45:22 UTC +--- third_party/blink/renderer/platform/fonts/font_description.cc.orig 2021-09-24 04:26:12 UTC +++ third_party/blink/renderer/platform/fonts/font_description.cc @@ -38,7 +38,7 @@ #include "third_party/blink/renderer/platform/wtf/text/string_hash.h" #include "third_party/blink/renderer/platform/wtf/text/string_hasher.h" --#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_ANDROID) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) #include "third_party/blink/renderer/platform/fonts/font_cache.h" #endif -@@ -257,7 +257,7 @@ FontCacheKey FontDescription::CacheKey( +@@ -256,7 +256,7 @@ FontCacheKey FontDescription::CacheKey( static_cast<unsigned>(fields_.orientation_) << 1 | // bit 2-3 static_cast<unsigned>(fields_.subpixel_text_position_); // bit 1 diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc index 5537c3cd6b4a..7450661e5c84 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/fonts/font_unique_name_lookup.cc.orig 2021-04-14 18:41:10 UTC +--- third_party/blink/renderer/platform/fonts/font_unique_name_lookup.cc.orig 2021-09-14 01:52:03 UTC +++ third_party/blink/renderer/platform/fonts/font_unique_name_lookup.cc -@@ -8,7 +8,7 @@ +@@ -7,7 +7,7 @@ #if defined(OS_ANDROID) #include "third_party/blink/public/mojom/font_unique_name_lookup/font_unique_name_lookup.mojom-blink.h" #include "third_party/blink/renderer/platform/fonts/android/font_unique_name_lookup_android.h" @@ -9,7 +9,7 @@ #include "third_party/blink/renderer/platform/fonts/linux/font_unique_name_lookup_linux.h" #elif defined(OS_WIN) #include "third_party/blink/renderer/platform/fonts/win/font_unique_name_lookup_win.h" -@@ -23,7 +23,7 @@ std::unique_ptr<FontUniqueNameLookup> +@@ -22,7 +22,7 @@ std::unique_ptr<FontUniqueNameLookup> FontUniqueNameLookup::GetPlatformUniqueNameLookup() { #if defined(OS_ANDROID) return std::make_unique<FontUniqueNameLookupAndroid>(); diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc index 1916f4a367c6..46b33e9772b7 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc.orig 2021-07-19 18:45:22 UTC +--- third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc.orig 2021-09-24 04:26:12 UTC +++ third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc @@ -60,7 +60,7 @@ AtomicString ToAtomicString(const SkString& str) { return AtomicString::FromUTF8(str.c_str(), str.size()); @@ -9,7 +9,7 @@ // This function is called on android or when we are emulating android fonts on // linux and the embedder has overriden the default fontManager with // WebFontRendering::setSkiaFontMgr. -@@ -83,7 +83,7 @@ AtomicString FontCache::GetFamilyNameForCharacter( +@@ -84,7 +84,7 @@ AtomicString FontCache::GetFamilyNameForCharacter( typeface->getFamilyName(&skia_family_name); return ToAtomicString(skia_family_name); } @@ -18,7 +18,7 @@ void FontCache::PlatformInit() {} -@@ -228,7 +228,7 @@ sk_sp<SkTypeface> FontCache::CreateTypeface( +@@ -239,7 +239,7 @@ sk_sp<SkTypeface> FontCache::CreateTypeface( } #endif @@ -27,7 +27,7 @@ // On linux if the fontManager has been overridden then we should be calling // the embedder provided font Manager rather than calling // SkTypeface::CreateFromName which may redirect the call to the default font -@@ -255,7 +255,7 @@ std::unique_ptr<FontPlatformData> FontCache::CreateFon +@@ -266,7 +266,7 @@ std::unique_ptr<FontPlatformData> FontCache::CreateFon std::string name; sk_sp<SkTypeface> typeface; diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc index 57c8f5d721ae..d72a17944b25 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc @@ -1,9 +1,9 @@ ---- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig 2021-07-19 18:45:22 UTC +--- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig 2021-09-24 04:26:12 UTC +++ third_party/blink/renderer/platform/graphics/video_frame_submitter.cc -@@ -200,7 +200,7 @@ void VideoFrameSubmitter::OnBeginFrame( - if (viz::FrameTokenGT(pair.key, *next_frame_token_)) +@@ -303,7 +303,7 @@ void VideoFrameSubmitter::OnBeginFrame( continue; - auto& feedback = pair.value.presentation_feedback; + auto& feedback = + timing_details.find(frame_token)->value.presentation_feedback; -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // TODO: On Linux failure flag is unreliable, and perfectly rendered frames diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc index a16ea4cc00dc..a28272b63e7e 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/wtf/stack_util.cc.orig 2021-07-19 18:45:22 UTC +--- third_party/blink/renderer/platform/wtf/stack_util.cc.orig 2021-09-24 04:26:12 UTC +++ third_party/blink/renderer/platform/wtf/stack_util.cc -@@ -17,6 +17,11 @@ +@@ -18,6 +18,11 @@ extern "C" void* __libc_stack_end; // NOLINT #endif diff --git a/www/chromium/files/patch-third__party_crc32c_src_src_crc32c__arm64__linux__check.h b/www/chromium/files/patch-third__party_crc32c_src_src_crc32c__arm64__linux__check.h deleted file mode 100644 index a2a681c5d04a..000000000000 --- a/www/chromium/files/patch-third__party_crc32c_src_src_crc32c__arm64__linux__check.h +++ /dev/null @@ -1,57 +0,0 @@ ---- third_party/crc32c/src/src/crc32c_arm64_linux_check.h.orig 2021-04-14 18:42:58 UTC -+++ third_party/crc32c/src/src/crc32c_arm64_linux_check.h -@@ -7,8 +7,6 @@ - #ifndef CRC32C_CRC32C_ARM_LINUX_CHECK_H_ - #define CRC32C_CRC32C_ARM_LINUX_CHECK_H_ - --// X86-specific code checking for the availability of SSE4.2 instructions. -- - #include <cstddef> - #include <cstdint> - -@@ -16,30 +14,25 @@ - - #if HAVE_ARM64_CRC32C - --#if HAVE_STRONG_GETAUXVAL --#include <sys/auxv.h> --#elif HAVE_WEAK_GETAUXVAL --// getauxval() is not available on Android until API level 20. Link it as a weak --// symbol. --extern "C" unsigned long getauxval(unsigned long type) __attribute__((weak)); -+#include <sys/types.h> -+#include <machine/armreg.h> - --#define AT_HWCAP 16 --#endif // HAVE_STRONG_GETAUXVAL || HAVE_WEAK_GETAUXVAL -+#ifndef ID_AA64ISAR0_AES_VAL -+#define ID_AA64ISAR0_AES_VAL ID_AA64ISAR0_AES -+#endif -+#ifndef ID_AA64ISAR0_CRC32_VAL -+#define ID_AA64ISAR0_CRC32_VAL ID_AA64ISAR0_CRC32 -+#endif - - namespace crc32c { - --inline bool CanUseArm64Linux() { --#if HAVE_STRONG_GETAUXVAL || HAVE_WEAK_GETAUXVAL -- // From 'arch/arm64/include/uapi/asm/hwcap.h' in Linux kernel source code. -- constexpr unsigned long kHWCAP_PMULL = 1 << 4; -- constexpr unsigned long kHWCAP_CRC32 = 1 << 7; -- unsigned long hwcap = (&getauxval != nullptr) ? getauxval(AT_HWCAP) : 0; -- return (hwcap & (kHWCAP_PMULL | kHWCAP_CRC32)) == -- (kHWCAP_PMULL | kHWCAP_CRC32); --#else -- return false; --#endif // HAVE_STRONG_GETAUXVAL || HAVE_WEAK_GETAUXVAL --} -+ inline bool CanUseArm64Linux() { -+ uint64_t id_aa64isar0; -+ -+ id_aa64isar0 = READ_SPECIALREG(id_aa64isar0_el1); -+ return ((ID_AA64ISAR0_AES_VAL(id_aa64isar0) == ID_AA64ISAR0_AES_PMULL) && -+ (ID_AA64ISAR0_CRC32_VAL(id_aa64isar0) == ID_AA64ISAR0_CRC32_BASE)); -+ } - - } // namespace crc32c - diff --git a/www/chromium/files/patch-third__party_ffmpeg_libavutil_mem.c b/www/chromium/files/patch-third__party_ffmpeg_libavutil_mem.c index 547ecd6d6d7f..d7ca72de0d8e 100644 --- a/www/chromium/files/patch-third__party_ffmpeg_libavutil_mem.c +++ b/www/chromium/files/patch-third__party_ffmpeg_libavutil_mem.c @@ -1,12 +1,12 @@ ---- third_party/ffmpeg/libavutil/mem.c.orig 2021-04-14 18:43:02 UTC +--- third_party/ffmpeg/libavutil/mem.c.orig 2021-09-24 04:28:06 UTC +++ third_party/ffmpeg/libavutil/mem.c -@@ -32,9 +32,6 @@ - #include <stdint.h> +@@ -33,9 +33,6 @@ #include <stdlib.h> + #include <stdatomic.h> #include <string.h> -#if HAVE_MALLOC_H -#include <malloc.h> -#endif - #include "avassert.h" #include "avutil.h" + #include "common.h" diff --git a/www/chromium/files/patch-third__party_googletest_src_googletest_include_gtest_internal_gtest-port.h b/www/chromium/files/patch-third__party_googletest_src_googletest_include_gtest_internal_gtest-port.h index d474aa97da81..6db781222fa0 100644 --- a/www/chromium/files/patch-third__party_googletest_src_googletest_include_gtest_internal_gtest-port.h +++ b/www/chromium/files/patch-third__party_googletest_src_googletest_include_gtest_internal_gtest-port.h @@ -1,6 +1,6 @@ ---- third_party/googletest/src/googletest/include/gtest/internal/gtest-port.h.orig 2021-07-19 18:47:23 UTC +--- third_party/googletest/src/googletest/include/gtest/internal/gtest-port.h.orig 2021-09-24 04:28:07 UTC +++ third_party/googletest/src/googletest/include/gtest/internal/gtest-port.h -@@ -1645,6 +1645,8 @@ class ThreadLocal : public ThreadLocalBase { +@@ -1644,6 +1644,8 @@ class ThreadLocal : public ThreadLocalBase { // MutexBase and Mutex implement mutex on pthreads-based platforms. class MutexBase { public: @@ -9,7 +9,7 @@ // Acquires this mutex. void Lock() { GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_lock(&mutex_)); -@@ -1661,6 +1663,7 @@ class MutexBase { +@@ -1660,6 +1662,7 @@ class MutexBase { has_owner_ = false; GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_unlock(&mutex_)); } diff --git a/www/chromium/files/patch-third__party_pdfium_core_fxge_cfx__fontmapper.cpp b/www/chromium/files/patch-third__party_pdfium_core_fxge_cfx__fontmapper.cpp index ffe3d6ab21ff..74eeb4f888d3 100644 --- a/www/chromium/files/patch-third__party_pdfium_core_fxge_cfx__fontmapper.cpp +++ b/www/chromium/files/patch-third__party_pdfium_core_fxge_cfx__fontmapper.cpp @@ -1,6 +1,6 @@ ---- third_party/pdfium/core/fxge/cfx_fontmapper.cpp.orig 2021-04-14 18:43:07 UTC +--- third_party/pdfium/core/fxge/cfx_fontmapper.cpp.orig 2021-09-14 01:58:28 UTC +++ third_party/pdfium/core/fxge/cfx_fontmapper.cpp -@@ -155,13 +155,13 @@ const AltFontFamily g_AltFontFamilies[] = { +@@ -157,13 +157,13 @@ const AltFontFamily g_AltFontFamilies[] = { {"ForteMT", "Forte"}, }; diff --git a/www/chromium/files/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp b/www/chromium/files/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp index 6b00d49763ba..94c0f8aa3ed2 100644 --- a/www/chromium/files/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp +++ b/www/chromium/files/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp @@ -1,8 +1,8 @@ ---- third_party/pdfium/core/fxge/linux/fx_linux_impl.cpp.orig 2021-07-28 09:23:50 UTC +--- third_party/pdfium/core/fxge/linux/fx_linux_impl.cpp.orig 2021-09-14 01:58:28 UTC +++ third_party/pdfium/core/fxge/linux/fx_linux_impl.cpp @@ -17,7 +17,7 @@ #include "third_party/base/check.h" - #include "third_party/base/stl_util.h" + #include "third_party/base/cxx17_backports.h" -#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ASMJS) +#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ASMJS) && !defined(OS_BSD) diff --git a/www/chromium/files/patch-third__party_perfetto_src_base_subprocess__posix.cc b/www/chromium/files/patch-third__party_perfetto_src_base_subprocess__posix.cc index 2b225d430268..c35445a56a82 100644 --- a/www/chromium/files/patch-third__party_perfetto_src_base_subprocess__posix.cc +++ b/www/chromium/files/patch-third__party_perfetto_src_base_subprocess__posix.cc @@ -1,4 +1,4 @@ ---- third_party/perfetto/src/base/subprocess_posix.cc.orig 2021-04-14 18:43:06 UTC +--- third_party/perfetto/src/base/subprocess_posix.cc.orig 2021-09-14 01:58:28 UTC +++ third_party/perfetto/src/base/subprocess_posix.cc @@ -20,7 +20,8 @@ @@ -29,7 +29,7 @@ #endif auto die = [args](const char* err) __attribute__((noreturn)) { -@@ -431,4 +437,4 @@ void Subprocess::KillAndWaitForTermination(int sig_num +@@ -440,4 +446,4 @@ void Subprocess::KillAndWaitForTermination(int sig_num } // namespace base } // namespace perfetto diff --git a/www/chromium/files/patch-third__party_perfetto_src_base_utils.cc b/www/chromium/files/patch-third__party_perfetto_src_base_utils.cc index edadada5d95e..2a0ba9afb7c6 100644 --- a/www/chromium/files/patch-third__party_perfetto_src_base_utils.cc +++ b/www/chromium/files/patch-third__party_perfetto_src_base_utils.cc @@ -1,16 +1,16 @@ ---- third_party/perfetto/src/base/utils.cc.orig 2021-07-19 18:47:28 UTC +--- third_party/perfetto/src/base/utils.cc.orig 2021-09-14 01:58:28 UTC +++ third_party/perfetto/src/base/utils.cc -@@ -22,7 +22,8 @@ - +@@ -25,7 +25,8 @@ #if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \ -- PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) -+ PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) || \ + PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) || \ +- PERFETTO_BUILDFLAG(PERFETTO_OS_FUCHSIA) ++ PERFETTO_BUILDFLAG(PERFETTO_OS_FUCHSIA) || \ + PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD) + #include <limits.h> #include <unistd.h> // For getpagesize() and geteuid() & fork() #endif - -@@ -68,8 +69,9 @@ void MaybeReleaseAllocatorMemToOS() { +@@ -78,8 +79,9 @@ void MaybeReleaseAllocatorMemToOS() { uint32_t GetSysPageSize() { ignore_result(kPageSize); // Just to keep the amalgamated build happy. @@ -22,7 +22,7 @@ static std::atomic<uint32_t> page_size{0}; // This function might be called in hot paths. Avoid calling getpagesize() all // the times, in many implementations getpagesize() calls sysconf() which is -@@ -90,7 +92,8 @@ uint32_t GetSysPageSize() { +@@ -100,7 +102,8 @@ uint32_t GetSysPageSize() { uid_t GetCurrentUserId() { #if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \ @@ -32,3 +32,13 @@ return geteuid(); #else // TODO(primiano): On Windows we could hash the current user SID and derive a +@@ -122,7 +125,8 @@ void SetEnv(const std::string& key, const std::string& + void Daemonize() { + #if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ + PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \ +- PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) ++ PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) || \ ++ PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD) + pid_t pid; + switch (pid = fork()) { + case -1: diff --git a/www/chromium/files/patch-third__party_perfetto_src_trace__processor_trace__processor__shell.cc b/www/chromium/files/patch-third__party_perfetto_src_trace__processor_trace__processor__shell.cc index abede930d035..44bbd2f17e54 100644 --- a/www/chromium/files/patch-third__party_perfetto_src_trace__processor_trace__processor__shell.cc +++ b/www/chromium/files/patch-third__party_perfetto_src_trace__processor_trace__processor__shell.cc @@ -1,6 +1,6 @@ ---- third_party/perfetto/src/trace_processor/trace_processor_shell.cc.orig 2021-04-14 18:43:06 UTC +--- third_party/perfetto/src/trace_processor/trace_processor_shell.cc.orig 2021-09-14 01:58:28 UTC +++ third_party/perfetto/src/trace_processor/trace_processor_shell.cc -@@ -55,7 +55,8 @@ +@@ -57,7 +57,8 @@ #if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \ @@ -10,7 +10,7 @@ #define PERFETTO_HAS_SIGNAL_H() 1 #else #define PERFETTO_HAS_SIGNAL_H() 0 -@@ -103,7 +104,8 @@ std::string GetConfigPath() { +@@ -105,7 +106,8 @@ std::string GetConfigPath() { const char* homedir = getenv("HOME"); #if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \ diff --git a/www/chromium/files/patch-third__party_perfetto_src_traced_service_service.cc b/www/chromium/files/patch-third__party_perfetto_src_traced_service_service.cc index b3069432b40d..6cf8db5fa9d0 100644 --- a/www/chromium/files/patch-third__party_perfetto_src_traced_service_service.cc +++ b/www/chromium/files/patch-third__party_perfetto_src_traced_service_service.cc @@ -1,6 +1,6 @@ ---- third_party/perfetto/src/traced/service/service.cc.orig 2021-07-19 18:47:29 UTC +--- third_party/perfetto/src/traced/service/service.cc.orig 2021-09-14 01:58:28 UTC +++ third_party/perfetto/src/traced/service/service.cc -@@ -29,7 +29,8 @@ +@@ -30,7 +30,8 @@ #include "src/traced/service/builtin_producer.h" #if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ diff --git a/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc b/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc index 93bd3bed91bd..3b4f4ba63300 100644 --- a/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc +++ b/www/chromium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc @@ -1,6 +1,6 @@ ---- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2021-07-19 18:47:29 UTC +--- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2021-09-14 01:58:28 UTC +++ third_party/perfetto/src/tracing/core/tracing_service_impl.cc -@@ -43,7 +43,8 @@ +@@ -44,7 +44,8 @@ #if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \ PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ @@ -10,7 +10,7 @@ #define PERFETTO_HAS_CHMOD #include <sys/stat.h> #endif -@@ -2846,8 +2847,9 @@ bool TracingServiceImpl::SnapshotClocks( +@@ -2872,8 +2873,9 @@ bool TracingServiceImpl::SnapshotClocks( TracingSession::ClockSnapshotData new_snapshot_data; diff --git a/www/chromium/files/patch-third__party_perfetto_src_tracing_ipc_default__socket.cc b/www/chromium/files/patch-third__party_perfetto_src_tracing_ipc_default__socket.cc index 8744abd40fd2..eb45c4a417ff 100644 --- a/www/chromium/files/patch-third__party_perfetto_src_tracing_ipc_default__socket.cc +++ b/www/chromium/files/patch-third__party_perfetto_src_tracing_ipc_default__socket.cc @@ -1,12 +1,21 @@ ---- third_party/perfetto/src/tracing/ipc/default_socket.cc.orig 2021-04-14 18:43:07 UTC +--- third_party/perfetto/src/tracing/ipc/default_socket.cc.orig 2021-09-14 01:58:28 UTC +++ third_party/perfetto/src/tracing/ipc/default_socket.cc -@@ -35,7 +35,8 @@ const char* kRunPerfettoBaseDir = "/run/perfetto/"; - bool UseRunPerfettoBaseDir() { +@@ -26,7 +26,8 @@ + #if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \ - PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) + PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) || \ + PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD) + #include <unistd.h> + #endif + +@@ -38,7 +39,7 @@ const char* kRunPerfettoBaseDir = "/run/perfetto/"; + // On Linux and CrOS, check /run/perfetto/ before using /tmp/ as the socket + // base directory. + bool UseRunPerfettoBaseDir() { +-#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) ++#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD) // Note that the trailing / in |kRunPerfettoBaseDir| ensures we are checking // against a directory, not a file. int res = PERFETTO_EINTR(access(kRunPerfettoBaseDir, X_OK)); diff --git a/www/chromium/files/patch-third__party_skia_src_ports_SkFontHost__FreeType__common.cpp b/www/chromium/files/patch-third__party_skia_src_ports_SkFontHost__FreeType__common.cpp deleted file mode 100644 index 782c6d85f6c9..000000000000 --- a/www/chromium/files/patch-third__party_skia_src_ports_SkFontHost__FreeType__common.cpp +++ /dev/null @@ -1,50 +0,0 @@ ---- third_party/skia/src/ports/SkFontHost_FreeType_common.cpp.orig 2021-08-19 14:15:44 UTC -+++ third_party/skia/src/ports/SkFontHost_FreeType_common.cpp -@@ -712,7 +712,11 @@ void colrv1_draw_paint(SkCanvas* canvas, - canvas->drawPaint(colrPaint); - break; - } -+#if FREETYPE_MAJOR > 2 || (FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11) -+ case FT_COLR_PAINTFORMAT_TRANSFORM: -+#else - case FT_COLR_PAINTFORMAT_TRANSFORMED: -+#endif - case FT_COLR_PAINTFORMAT_TRANSLATE: - case FT_COLR_PAINTFORMAT_ROTATE: - case FT_COLR_PAINTFORMAT_SKEW: -@@ -759,10 +763,17 @@ void colrv1_transform(SkCanvas* canvas, FT_Face face, - SkMatrix transform; - - switch (colrv1_paint.format) { -+#if FREETYPE_MAJOR > 2 || (FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11) -+ case FT_COLR_PAINTFORMAT_TRANSFORM: { -+ transform = ToSkMatrix(colrv1_paint.u.transform.affine); -+ break; -+ } -+#else - case FT_COLR_PAINTFORMAT_TRANSFORMED: { - transform = ToSkMatrix(colrv1_paint.u.transformed.affine); - break; - } -+#endif - case FT_COLR_PAINTFORMAT_TRANSLATE: { - transform = SkMatrix::Translate( - SkFixedToScalar(colrv1_paint.u.translate.dx), -@@ -880,10 +891,17 @@ bool colrv1_traverse_paint(SkCanvas* canvas, - traverse_result = colrv1_start_glyph(canvas, palette, face, paint.u.colr_glyph.glyphID, - FT_COLOR_NO_ROOT_TRANSFORM); - break; -+#if FREETYPE_MAJOR > 2 || (FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11) -+ case FT_COLR_PAINTFORMAT_TRANSFORM: -+ colrv1_transform(canvas, face, paint); -+ traverse_result = colrv1_traverse_paint(canvas, palette, face, -+ paint.u.transform.paint, visited_set); -+#else - case FT_COLR_PAINTFORMAT_TRANSFORMED: - colrv1_transform(canvas, face, paint); - traverse_result = colrv1_traverse_paint(canvas, palette, face, - paint.u.transformed.paint, visited_set); -+#endif - break; - case FT_COLR_PAINTFORMAT_TRANSLATE: - colrv1_transform(canvas, face, paint); diff --git a/www/chromium/files/patch-third__party_skia_src_ports_SkOSFile__stdio.cpp b/www/chromium/files/patch-third__party_skia_src_ports_SkOSFile__stdio.cpp index f035b11933e8..3d792e9ad243 100644 --- a/www/chromium/files/patch-third__party_skia_src_ports_SkOSFile__stdio.cpp +++ b/www/chromium/files/patch-third__party_skia_src_ports_SkOSFile__stdio.cpp @@ -1,6 +1,6 @@ ---- third_party/skia/src/ports/SkOSFile_stdio.cpp.orig 2021-04-14 18:43:09 UTC +--- third_party/skia/src/ports/SkOSFile_stdio.cpp.orig 2021-09-14 01:58:31 UTC +++ third_party/skia/src/ports/SkOSFile_stdio.cpp -@@ -132,7 +132,7 @@ void sk_fflush(FILE* f) { +@@ -129,7 +129,7 @@ void sk_fflush(FILE* f) { void sk_fsync(FILE* f) { #if !defined(_WIN32) && !defined(SK_BUILD_FOR_ANDROID) && !defined(__UCLIBC__) \ diff --git a/www/chromium/files/patch-third__party_swiftshader_BUILD.gn b/www/chromium/files/patch-third__party_swiftshader_BUILD.gn deleted file mode 100644 index 23339fe1c4b5..000000000000 --- a/www/chromium/files/patch-third__party_swiftshader_BUILD.gn +++ /dev/null @@ -1,29 +0,0 @@ ---- third_party/swiftshader/BUILD.gn.orig 2021-04-14 18:43:08 UTC -+++ third_party/swiftshader/BUILD.gn -@@ -153,9 +153,11 @@ config("swiftshader_config") { - ldflags = [ "-Wl,--gc-sections" ] - - if (current_cpu == "mipsel") { -- ldflags += [ -- "-Wl,--hash-style=sysv", -- ] -+ if (!is_bsd) { -+ ldflags += [ -+ "-Wl,--hash-style=sysv", -+ ] -+ } - if (mips_arch_variant == "r1") { - ldflags += [ - "-mips32", -@@ -167,11 +169,8 @@ config("swiftshader_config") { - } - } else if (current_cpu == "mips64el") { - ldflags += [ -- "-Wl,--hash-style=sysv", - "-mips64r2", - ] -- } else { -- ldflags += [ "-Wl,--hash-style=both" ] - } - - # A bug in the gold linker prevents using ICF on 32-bit (crbug.com/729532) diff --git a/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-10.0_configs_linux_include_llvm_Config_config.h b/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-10.0_configs_linux_include_llvm_Config_config.h index 7a8558527a22..b1a0b512f285 100644 --- a/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-10.0_configs_linux_include_llvm_Config_config.h +++ b/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-10.0_configs_linux_include_llvm_Config_config.h @@ -1,6 +1,15 @@ ---- third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h.orig 2021-04-14 18:43:10 UTC +--- third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h.orig 2021-09-24 04:28:16 UTC +++ third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h -@@ -9,17 +9,21 @@ +@@ -5,24 +5,30 @@ + #include "llvm/Config/llvm-config.h" + + /* For detecting __GLIBC__ usage */ ++#ifndef __FreeBSD__ + #include <features.h> ++#endif + + /* Bug report URL. */ + #define BUG_REPORT_URL "https://bugs.llvm.org/" /* Define to 1 to enable backtraces, and to 0 otherwise. */ /* #undef ENABLE_BACKTRACES */ @@ -22,7 +31,7 @@ /* Define to 1 if you have the <CrashReporterClient.h> header file. */ /* #undef HAVE_CRASHREPORTERCLIENT_H */ -@@ -29,7 +33,7 @@ +@@ -32,7 +38,7 @@ /* Define to 1 if you have the declaration of `arc4random', and to 0 if you don't. */ @@ -31,7 +40,7 @@ /* Define to 1 if you have the declaration of `FE_ALL_EXCEPT', and to 0 if you don't. */ -@@ -53,7 +57,7 @@ +@@ -56,7 +62,7 @@ #define HAVE_DLOPEN 1 /* Define if dladdr() is available on this platform. */ @@ -40,7 +49,7 @@ /* Define to 1 if you have the <errno.h> header file. */ #define HAVE_ERRNO_H 1 -@@ -92,7 +96,7 @@ +@@ -95,7 +101,7 @@ #define HAVE_ISATTY 1 /* Define to 1 if you have the `edit' library (-ledit). */ @@ -49,7 +58,7 @@ /* Define to 1 if you have the `pfm' library (-lpfm). */ /* #undef HAVE_LIBPFM */ -@@ -111,21 +115,25 @@ +@@ -114,21 +120,25 @@ /* Define to 1 if you have the `z' library (-lz). */ /* #undef HAVE_LIBZ */ @@ -75,9 +84,9 @@ +/* #define HAVE_MALLINFO 1 */ +/* #undef HAVE_MALLINFO */ - /* Define to 1 if you have the <malloc/malloc.h> header file. */ - /* #undef HAVE_MALLOC_MALLOC_H */ -@@ -137,7 +145,7 @@ + /* Some projects using SwiftShader bypass cmake (eg Chromium via gn) */ + /* so we need to check glibc version for the new API to be safe */ +@@ -146,7 +156,7 @@ #define HAVE_POSIX_FALLOCATE 1 /* Define to 1 if you have the `posix_spawn' function. */ @@ -86,7 +95,7 @@ /* Define to 1 if you have the `pread' function. */ #define HAVE_PREAD 1 -@@ -155,16 +163,16 @@ +@@ -164,16 +174,16 @@ #define HAVE_PTHREAD_RWLOCK_INIT 1 /* Define to 1 if you have the `sbrk' function. */ @@ -106,7 +115,7 @@ /* Define to 1 if you have the `setrlimit' function. */ #define HAVE_SETRLIMIT 1 -@@ -212,13 +220,13 @@ +@@ -221,13 +231,13 @@ #define HAVE_SYS_TYPES_H 1 /* Define if the setupterm() function is supported this platform. */ @@ -122,7 +131,7 @@ /* Define to 1 if you have the <unistd.h> header file. */ #define HAVE_UNISTD_H 1 -@@ -227,7 +235,7 @@ +@@ -236,7 +246,7 @@ /* #undef HAVE_VALGRIND_VALGRIND_H */ /* Define to 1 if you have the <zlib.h> header file. */ @@ -131,7 +140,7 @@ /* Have host's _alloca */ /* #undef HAVE__ALLOCA */ -@@ -301,7 +309,7 @@ +@@ -310,7 +320,7 @@ #elif defined(__arm__) #define LLVM_DEFAULT_TARGET_TRIPLE "armv7-linux-gnueabihf" #elif defined(__aarch64__) @@ -140,7 +149,7 @@ #elif defined(__mips__) #define LLVM_DEFAULT_TARGET_TRIPLE "mipsel-linux-gnu" #elif defined(__mips64) -@@ -313,7 +321,7 @@ +@@ -322,7 +332,7 @@ #endif /* Define if zlib compression is available */ diff --git a/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-subzero_build_Linux_include_llvm_Config_config.h b/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-subzero_build_Linux_include_llvm_Config_config.h index fef6cac86c27..f5b1056e1fd5 100644 --- a/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-subzero_build_Linux_include_llvm_Config_config.h +++ b/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-subzero_build_Linux_include_llvm_Config_config.h @@ -1,6 +1,16 @@ ---- third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h.orig 2021-04-14 18:43:11 UTC +--- third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h.orig 2021-09-24 04:28:17 UTC +++ third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h -@@ -121,7 +121,7 @@ +@@ -5,7 +5,9 @@ + #include "llvm/Config/llvm-config.h" + + /* For detecting __GLIBC__ usage */ ++#ifndef __FreeBSD__ + #include <features.h> ++#endif + + /* Bug report URL. */ + #define BUG_REPORT_URL "http://llvm.org/bugs/" +@@ -124,7 +126,7 @@ #define HAVE_LINK_H 1 /* Define to 1 if you have the `lseek64' function. */ @@ -9,16 +19,16 @@ /* Define to 1 if you have the <mach/mach.h> header file. */ /* #undef HAVE_MACH_MACH_H */ -@@ -130,7 +130,7 @@ +@@ -133,7 +135,7 @@ /* #undef HAVE_MALLCTL */ /* Define to 1 if you have the `mallinfo' function. */ -#define HAVE_MALLINFO 1 +/* #undef HAVE_MALLINFO */ - /* Define to 1 if you have the <malloc.h> header file. */ - #define HAVE_MALLOC_H 1 -@@ -154,7 +154,7 @@ + /* Some projects using SwiftShader bypass cmake (eg Chromium via gn) */ + /* so we need to check glibc version for the new API to be safe */ +@@ -163,7 +165,7 @@ /* #undef HAVE_NDIR_H */ /* Define to 1 if you have the `posix_fallocate' function. */ diff --git a/www/chromium/files/patch-third__party_vulkan-deps_glslang_src_BUILD.gn b/www/chromium/files/patch-third__party_vulkan-deps_glslang_src_BUILD.gn index 0759f743494c..3a1a7fbfeb0c 100644 --- a/www/chromium/files/patch-third__party_vulkan-deps_glslang_src_BUILD.gn +++ b/www/chromium/files/patch-third__party_vulkan-deps_glslang_src_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/vulkan-deps/glslang/src/BUILD.gn.orig 2021-04-14 18:43:13 UTC +--- third_party/vulkan-deps/glslang/src/BUILD.gn.orig 2021-09-14 01:58:35 UTC +++ third_party/vulkan-deps/glslang/src/BUILD.gn -@@ -239,6 +239,12 @@ template("glslang_sources_common") { +@@ -241,6 +241,12 @@ template("glslang_sources_common") { "-Wno-unused-variable", ] } diff --git a/www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_loader.c b/www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_loader.c index 8a0e78a94c74..91c26649f86b 100644 --- a/www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_loader.c +++ b/www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_loader.c @@ -1,11 +1,11 @@ ---- third_party/vulkan-deps/vulkan-loader/src/loader/loader.c.orig 2021-07-19 18:47:36 UTC +--- third_party/vulkan-deps/vulkan-loader/src/loader/loader.c.orig 2021-09-24 04:28:21 UTC +++ third_party/vulkan-deps/vulkan-loader/src/loader/loader.c -@@ -253,7 +253,7 @@ void *loader_device_heap_realloc(const struct loader_d +@@ -248,7 +248,7 @@ void *loader_device_heap_realloc(const struct loader_d } // Environment variables -#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__) +#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__) || defined(__FreeBSD__) - static inline bool IsHighIntegrity() { - return geteuid() != getuid() || getegid() != getgid(); + static inline bool IsHighIntegrity() { return geteuid() != getuid() || getegid() != getgid(); } + diff --git a/www/chromium/files/patch-third__party_vulkan__memory__allocator_src_vk__mem__alloc.h b/www/chromium/files/patch-third__party_vulkan__memory__allocator_src_vk__mem__alloc.h deleted file mode 100644 index 54a471aac141..000000000000 --- a/www/chromium/files/patch-third__party_vulkan__memory__allocator_src_vk__mem__alloc.h +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/vulkan_memory_allocator/src/vk_mem_alloc.h.orig 2021-06-14 13:18:02 UTC -+++ third_party/vulkan_memory_allocator/src/vk_mem_alloc.h -@@ -3946,7 +3946,7 @@ void *vma_aligned_alloc(size_t alignment, size_t size) - - return memalign(alignment, size); - } --#elif defined(__APPLE__) || defined(__ANDROID__) || (defined(__linux__) && defined(__GLIBCXX__) && !defined(_GLIBCXX_HAVE_ALIGNED_ALLOC)) -+#elif defined(__APPLE__) || defined(__ANDROID__) || defined(__FreeBSD__) || (defined(__linux__) && defined(__GLIBCXX__) && !defined(_GLIBCXX_HAVE_ALIGNED_ALLOC)) - #include <cstdlib> - - #if defined(__APPLE__) diff --git a/www/chromium/files/patch-third__party_webrtc_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_BUILD.gn index 6c5202a31144..e77dca7fb133 100644 --- a/www/chromium/files/patch-third__party_webrtc_BUILD.gn +++ b/www/chromium/files/patch-third__party_webrtc_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/webrtc/BUILD.gn.orig 2021-07-19 18:47:32 UTC +--- third_party/webrtc/BUILD.gn.orig 2021-09-24 04:28:17 UTC +++ third_party/webrtc/BUILD.gn -@@ -185,6 +185,9 @@ config("common_inherited_config") { +@@ -188,6 +188,9 @@ config("common_inherited_config") { if (is_linux || is_chromeos) { defines += [ "WEBRTC_LINUX" ] } diff --git a/www/chromium/files/patch-third__party_webrtc_modules_video__coding_codecs_h264_h264__decoder__impl.cc b/www/chromium/files/patch-third__party_webrtc_modules_video__coding_codecs_h264_h264__decoder__impl.cc index 4d6ee5c9c3ca..a94f1c1ccb7d 100644 --- a/www/chromium/files/patch-third__party_webrtc_modules_video__coding_codecs_h264_h264__decoder__impl.cc +++ b/www/chromium/files/patch-third__party_webrtc_modules_video__coding_codecs_h264_h264__decoder__impl.cc @@ -1,22 +1,23 @@ ---- third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc.orig 2021-05-10 18:48:00 UTC +--- third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc.orig 2021-09-24 04:28:18 UTC +++ third_party/webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc -@@ -77,7 +77,8 @@ int H264DecoderImpl::AVGetBuffer2(AVCodecContext* cont +@@ -87,7 +87,10 @@ int H264DecoderImpl::AVGetBuffer2(AVCodecContext* cont int height = av_frame->height; - // See |lowres|, if used the decoder scales the image by 1/2^(lowres). This + // See `lowres`, if used the decoder scales the image by 1/2^(lowres). This // has implications on which resolutions are valid, but we don't use it. -- RTC_CHECK_EQ(context->lowres, 0); -+ // PR255687: disabled to prevent crash with Microsoft Teams -+ // RTC_CHECK_EQ(context->lowres, 0); - // Adjust the |width| and |height| to values acceptable by the decoder. - // Without this, FFmpeg may overflow the buffer. If modified, |width| and/or - // |height| are larger than the actual image and the image has to be cropped -@@ -201,6 +202,9 @@ int32_t H264DecoderImpl::InitDecode(const VideoCodec* - // |get_buffer2| is called with the context, there |opaque| can be used to get - // a pointer |this|. ++#if !defined(OS_FREEBSD) ++ // PR255687: disabled on FreeBSD to prevent crash with Microsoft Teams + RTC_CHECK_EQ(context->lowres, 0); ++#endif + // Adjust the `width` and `height` to values acceptable by the decoder. + // Without this, FFmpeg may overflow the buffer. If modified, `width` and/or + // `height` are larger than the actual image and the image has to be cropped +@@ -211,6 +214,9 @@ bool H264DecoderImpl::Configure(const Settings& settin + // `get_buffer2` is called with the context, there `opaque` can be used to get + // a pointer `this`. av_context_->opaque = this; + + // Initializing |lowres| + av_context_->lowres = 0; - AVCodec* codec = avcodec_find_decoder(av_context_->codec_id); + const AVCodec* codec = avcodec_find_decoder(av_context_->codec_id); if (!codec) { diff --git a/www/chromium/files/patch-tools_gn_build_gen.py b/www/chromium/files/patch-tools_gn_build_gen.py index d8e32cdb8ee3..c63cb79a0cb3 100644 --- a/www/chromium/files/patch-tools_gn_build_gen.py +++ b/www/chromium/files/patch-tools_gn_build_gen.py @@ -1,6 +1,6 @@ ---- tools/gn/build/gen.py.orig 2021-04-14 18:49:10 UTC +--- tools/gn/build/gen.py.orig 2021-09-24 04:34:58 UTC +++ tools/gn/build/gen.py -@@ -90,6 +90,9 @@ class Platform(object): +@@ -91,6 +91,9 @@ class Platform(object): def is_solaris(self): return self._platform == 'solaris' @@ -10,10 +10,10 @@ def is_posix(self): return self._platform in ['linux', 'freebsd', 'darwin', 'aix', 'openbsd', 'haiku', 'solaris', 'msys', 'netbsd'] -@@ -405,6 +408,11 @@ def WriteGNNinja(path, platform, host, options): - elif platform.is_haiku(): - cflags.append('-fPIC') - cflags.extend(['-D_BSD_SOURCE']) +@@ -429,6 +432,11 @@ def WriteGNNinja(path, platform, host, options): + cflags.append('-Wno-unused-function') + cflags.append('-D_OPEN_SYS_FILE_EXT') + cflags.append('-DPATH_MAX=1024') + elif platform.is_freebsd(): + cflags.extend(['-Wno-deprecated-register', '-Wno-parentheses-equality']) + ldflags.extend(['-pthread']) diff --git a/www/chromium/files/patch-tools_gn_src_base_files_file__posix.cc b/www/chromium/files/patch-tools_gn_src_base_files_file__posix.cc index ccceca868419..8004dec2996e 100644 --- a/www/chromium/files/patch-tools_gn_src_base_files_file__posix.cc +++ b/www/chromium/files/patch-tools_gn_src_base_files_file__posix.cc @@ -1,6 +1,6 @@ ---- tools/gn/src/base/files/file_posix.cc.orig 2021-04-14 18:49:10 UTC +--- tools/gn/src/base/files/file_posix.cc.orig 2021-09-24 04:34:58 UTC +++ tools/gn/src/base/files/file_posix.cc -@@ -372,7 +372,7 @@ void File::DoInitialize(const FilePath& path, uint32_t +@@ -369,7 +369,7 @@ void File::DoInitialize(const FilePath& path, uint32_t bool File::Flush() { DCHECK(IsValid()); diff --git a/www/chromium/files/patch-tools_gn_src_gn_exec__process.cc b/www/chromium/files/patch-tools_gn_src_gn_exec__process.cc index 5ca6f2508c7c..c1ca69b75fff 100644 --- a/www/chromium/files/patch-tools_gn_src_gn_exec__process.cc +++ b/www/chromium/files/patch-tools_gn_src_gn_exec__process.cc @@ -1,6 +1,6 @@ ---- tools/gn/src/gn/exec_process.cc.orig 2021-04-14 18:49:11 UTC +--- tools/gn/src/gn/exec_process.cc.orig 2021-09-24 04:34:58 UTC +++ tools/gn/src/gn/exec_process.cc -@@ -30,6 +30,10 @@ +@@ -31,6 +31,10 @@ #include "base/posix/file_descriptor_shuffle.h" #endif diff --git a/www/chromium/files/patch-tools_gn_src_gn_function__write__file__unittest.cc b/www/chromium/files/patch-tools_gn_src_gn_function__write__file__unittest.cc index 85e3342caf74..30af95ae74b8 100644 --- a/www/chromium/files/patch-tools_gn_src_gn_function__write__file__unittest.cc +++ b/www/chromium/files/patch-tools_gn_src_gn_function__write__file__unittest.cc @@ -1,4 +1,4 @@ ---- tools/gn/src/gn/function_write_file_unittest.cc.orig 2021-04-14 18:49:11 UTC +--- tools/gn/src/gn/function_write_file_unittest.cc.orig 2021-09-24 04:34:58 UTC +++ tools/gn/src/gn/function_write_file_unittest.cc @@ -13,7 +13,7 @@ #include "gn/test_with_scope.h" @@ -7,5 +7,5 @@ -#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_HAIKU) || defined(OS_MSYS) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_HAIKU) || defined(OS_MSYS) || defined(OS_BSD) #include <sys/time.h> - #endif - + #elif defined(OS_ZOS) + #include <utime.h> diff --git a/www/chromium/files/patch-tools_gn_src_gn_version.h b/www/chromium/files/patch-tools_gn_src_gn_version.h index eedf3027389a..a3c6f07d4a48 100644 --- a/www/chromium/files/patch-tools_gn_src_gn_version.h +++ b/www/chromium/files/patch-tools_gn_src_gn_version.h @@ -1,6 +1,6 @@ ---- tools/gn/src/gn/version.h.orig 2021-04-14 18:49:11 UTC +--- tools/gn/src/gn/version.h.orig 2021-09-14 02:05:25 UTC +++ tools/gn/src/gn/version.h -@@ -15,9 +15,9 @@ class Version { +@@ -22,9 +22,9 @@ class Version { static std::optional<Version> FromString(std::string s); diff --git a/www/chromium/files/patch-tools_gn_src_util_sys__info.cc b/www/chromium/files/patch-tools_gn_src_util_sys__info.cc index 69c0c8a20763..300d87efcbaa 100644 --- a/www/chromium/files/patch-tools_gn_src_util_sys__info.cc +++ b/www/chromium/files/patch-tools_gn_src_util_sys__info.cc @@ -1,4 +1,4 @@ ---- tools/gn/src/util/sys_info.cc.orig 2021-04-14 18:49:11 UTC +--- tools/gn/src/util/sys_info.cc.orig 2021-09-24 04:34:58 UTC +++ tools/gn/src/util/sys_info.cc @@ -34,6 +34,8 @@ std::string OperatingSystemArchitecture() { arch = "x86_64"; @@ -8,4 +8,4 @@ + arch = "aarch64"; } else if (os == "AIX" || os == "OS400") { arch = "ppc64"; - } + } else if (std::string(info.sysname) == "OS/390") { diff --git a/www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py b/www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py index e24411bf32a7..dc5491f03b71 100644 --- a/www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py +++ b/www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py @@ -1,10 +1,12 @@ ---- tools/json_schema_compiler/feature_compiler.py.orig 2021-07-19 18:45:43 UTC +--- tools/json_schema_compiler/feature_compiler.py.orig 2021-09-24 04:26:37 UTC +++ tools/json_schema_compiler/feature_compiler.py -@@ -259,6 +259,7 @@ FEATURE_GRAMMAR = ({ +@@ -258,7 +258,9 @@ FEATURE_GRAMMAR = ({ + 'platforms': { + list: { + 'enum_map': { ++ 'bsd': 'Feature::LINUX_PLATFORM', 'chromeos': 'Feature::CHROMEOS_PLATFORM', ++ 'freebsd': 'Feature::LINUX_PLATFORM', 'lacros': 'Feature::LACROS_PLATFORM', 'linux': 'Feature::LINUX_PLATFORM', -+ 'bsd': 'Feature::LINUX_PLATFORM', 'mac': 'Feature::MACOSX_PLATFORM', - 'win': 'Feature::WIN_PLATFORM', - } diff --git a/www/chromium/files/patch-tools_json__schema__compiler_model.py b/www/chromium/files/patch-tools_json__schema__compiler_model.py index 14aa86d81f5d..c54ae60f273e 100644 --- a/www/chromium/files/patch-tools_json__schema__compiler_model.py +++ b/www/chromium/files/patch-tools_json__schema__compiler_model.py @@ -1,11 +1,10 @@ ---- tools/json_schema_compiler/model.py.orig 2021-07-19 18:45:43 UTC +--- tools/json_schema_compiler/model.py.orig 2021-09-24 04:26:37 UTC +++ tools/json_schema_compiler/model.py -@@ -872,7 +872,7 @@ class Platforms(object): +@@ -871,6 +871,7 @@ class Platforms(object): + """Enum of the possible platforms. """ CHROMEOS = _PlatformInfo("chromeos") ++ FREEBSD = _PlatformInfo("freebsd") LACROS = _PlatformInfo("lacros") -- LINUX = _PlatformInfo("linux") -+ LINUX = _PlatformInfo("bsd") + LINUX = _PlatformInfo("linux") MAC = _PlatformInfo("mac") - WIN = _PlatformInfo("win") - diff --git a/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn b/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn index 58bdbb4a33f7..0a45cf3d3975 100644 --- a/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn +++ b/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn @@ -1,6 +1,6 @@ ---- tools/perf/chrome_telemetry_build/BUILD.gn.orig 2021-07-19 18:45:43 UTC +--- tools/perf/chrome_telemetry_build/BUILD.gn.orig 2021-09-14 01:52:22 UTC +++ tools/perf/chrome_telemetry_build/BUILD.gn -@@ -59,7 +59,7 @@ group("telemetry_chrome_test") { +@@ -62,7 +62,7 @@ group("telemetry_chrome_test") { data_deps += [ "//chrome:reorder_imports" ] } diff --git a/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.cc b/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.cc index 7f03e8b0bde4..29ece60feb59 100644 --- a/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.cc +++ b/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__non__backed.cc @@ -1,6 +1,6 @@ ---- ui/base/dragdrop/os_exchange_data_provider_non_backed.cc.orig 2021-05-12 22:06:46 UTC +--- ui/base/dragdrop/os_exchange_data_provider_non_backed.cc.orig 2021-09-14 01:52:22 UTC +++ ui/base/dragdrop/os_exchange_data_provider_non_backed.cc -@@ -102,14 +102,14 @@ void OSExchangeDataProviderNonBacked::SetPickledData( +@@ -103,14 +103,14 @@ void OSExchangeDataProviderNonBacked::SetPickledData( } bool OSExchangeDataProviderNonBacked::GetString(std::u16string* data) const { diff --git a/www/chromium/files/patch-ui_base_resource_resource__bundle.cc b/www/chromium/files/patch-ui_base_resource_resource__bundle.cc index 2d11a32224c0..2cf54bb5571f 100644 --- a/www/chromium/files/patch-ui_base_resource_resource__bundle.cc +++ b/www/chromium/files/patch-ui_base_resource_resource__bundle.cc @@ -1,15 +1,15 @@ ---- ui/base/resource/resource_bundle.cc.orig 2021-07-19 18:45:43 UTC +--- ui/base/resource/resource_bundle.cc.orig 2021-09-24 04:26:38 UTC +++ ui/base/resource/resource_bundle.cc -@@ -817,7 +817,7 @@ void ResourceBundle::ReloadFonts() { +@@ -814,7 +814,7 @@ void ResourceBundle::ReloadFonts() { } - ScaleFactor ResourceBundle::GetMaxScaleFactor() const { + ResourceScaleFactor ResourceBundle::GetMaxResourceScaleFactor() const { -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) return max_scale_factor_; #else - return GetSupportedScaleFactors().back(); -@@ -870,7 +870,7 @@ void ResourceBundle::InitSharedInstance(Delegate* dele + return GetSupportedResourceScaleFactors().back(); +@@ -867,7 +867,7 @@ void ResourceBundle::InitSharedInstance(Delegate* dele // On platforms other than iOS, 100P is always a supported scale factor. // For Windows we have a separate case in this function. supported_scale_factors.push_back(SCALE_FACTOR_100P); diff --git a/www/chromium/files/patch-ui_base_test_skia__gold__pixel__diff.cc b/www/chromium/files/patch-ui_base_test_skia__gold__pixel__diff.cc index e8c9f725bfc6..ff89cb88a7f7 100644 --- a/www/chromium/files/patch-ui_base_test_skia__gold__pixel__diff.cc +++ b/www/chromium/files/patch-ui_base_test_skia__gold__pixel__diff.cc @@ -1,6 +1,6 @@ ---- ui/base/test/skia_gold_pixel_diff.cc.orig 2021-07-19 18:45:43 UTC +--- ui/base/test/skia_gold_pixel_diff.cc.orig 2021-09-24 04:26:38 UTC +++ ui/base/test/skia_gold_pixel_diff.cc -@@ -134,7 +134,7 @@ std::string SkiaGoldPixelDiff::GetPlatform() { +@@ -142,7 +142,7 @@ std::string SkiaGoldPixelDiff::GetPlatform() { return "macOS"; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-ui_base_ui__base__features.cc b/www/chromium/files/patch-ui_base_ui__base__features.cc index 797740705274..9da9a7e07b39 100644 --- a/www/chromium/files/patch-ui_base_ui__base__features.cc +++ b/www/chromium/files/patch-ui_base_ui__base__features.cc @@ -1,6 +1,6 @@ ---- ui/base/ui_base_features.cc.orig 2021-07-19 18:45:43 UTC +--- ui/base/ui_base_features.cc.orig 2021-09-14 01:52:22 UTC +++ ui/base/ui_base_features.cc -@@ -139,7 +139,7 @@ const base::Feature kExperimentalFlingAnimation { +@@ -130,7 +130,7 @@ const base::Feature kExperimentalFlingAnimation { "ExperimentalFlingAnimation", // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,25 +9,7 @@ !BUILDFLAG(IS_CHROMEOS_LACROS)) base::FEATURE_ENABLED_BY_DEFAULT #else -@@ -194,7 +194,7 @@ bool IsDeprecateAltBasedSixPackEnabled() { - } - #endif // 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) - // Enables stylus appearing as touch when in contact with digitizer. - const base::Feature kDirectManipulationStylus = { -@@ -205,7 +205,7 @@ const base::Feature kDirectManipulationStylus = { - base::FEATURE_DISABLED_BY_DEFAULT - #endif - }; --#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) - - // Enables forced colors mode for web content. -@@ -223,7 +223,7 @@ bool IsForcedColorsEnabled() { +@@ -213,7 +213,7 @@ bool IsForcedColorsEnabled() { // milestones. const base::Feature kEyeDropper { "EyeDropper", diff --git a/www/chromium/files/patch-ui_base_ui__base__features.h b/www/chromium/files/patch-ui_base_ui__base__features.h deleted file mode 100644 index b87beffd4e2e..000000000000 --- a/www/chromium/files/patch-ui_base_ui__base__features.h +++ /dev/null @@ -1,16 +0,0 @@ ---- ui/base/ui_base_features.h.orig 2021-07-19 18:45:43 UTC -+++ ui/base/ui_base_features.h -@@ -77,11 +77,11 @@ COMPONENT_EXPORT(UI_BASE_FEATURES) - bool IsDeprecateAltBasedSixPackEnabled(); - #endif // 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) - COMPONENT_EXPORT(UI_BASE_FEATURES) - extern const base::Feature kDirectManipulationStylus; --#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) - - // Used to enable forced colors mode for web content. diff --git a/www/chromium/files/patch-ui_base_webui_web__ui__util.cc b/www/chromium/files/patch-ui_base_webui_web__ui__util.cc index 6b282c0551f8..922f7448d1fa 100644 --- a/www/chromium/files/patch-ui_base_webui_web__ui__util.cc +++ b/www/chromium/files/patch-ui_base_webui_web__ui__util.cc @@ -1,6 +1,6 @@ ---- ui/base/webui/web_ui_util.cc.orig 2021-04-14 18:41:37 UTC +--- ui/base/webui/web_ui_util.cc.orig 2021-09-24 04:26:38 UTC +++ ui/base/webui/web_ui_util.cc -@@ -224,7 +224,7 @@ std::string GetFontFamily() { +@@ -221,7 +221,7 @@ std::string GetFontFamily() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-ui_compositor_compositor.cc b/www/chromium/files/patch-ui_compositor_compositor.cc index 562f41317262..c4fe2a7ce41a 100644 --- a/www/chromium/files/patch-ui_compositor_compositor.cc +++ b/www/chromium/files/patch-ui_compositor_compositor.cc @@ -1,6 +1,6 @@ ---- ui/compositor/compositor.cc.orig 2021-07-19 18:45:44 UTC +--- ui/compositor/compositor.cc.orig 2021-09-24 04:26:39 UTC +++ ui/compositor/compositor.cc -@@ -792,7 +792,7 @@ void Compositor::CancelThroughtputTracker(TrackerId tr +@@ -794,7 +794,7 @@ void Compositor::CancelThroughtputTracker(TrackerId tr // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-ui_compositor_compositor.h b/www/chromium/files/patch-ui_compositor_compositor.h index 403887ab0b40..722170702e99 100644 --- a/www/chromium/files/patch-ui_compositor_compositor.h +++ b/www/chromium/files/patch-ui_compositor_compositor.h @@ -1,6 +1,6 @@ ---- ui/compositor/compositor.h.orig 2021-07-19 18:45:44 UTC +--- ui/compositor/compositor.h.orig 2021-09-14 01:52:22 UTC +++ ui/compositor/compositor.h -@@ -377,7 +377,7 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerT +@@ -378,7 +378,7 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerT // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-ui_gfx_BUILD.gn b/www/chromium/files/patch-ui_gfx_BUILD.gn index 9779b882db6b..6ac770292cfe 100644 --- a/www/chromium/files/patch-ui_gfx_BUILD.gn +++ b/www/chromium/files/patch-ui_gfx_BUILD.gn @@ -1,6 +1,6 @@ ---- ui/gfx/BUILD.gn.orig 2021-07-19 18:45:44 UTC +--- ui/gfx/BUILD.gn.orig 2021-09-24 04:26:39 UTC +++ ui/gfx/BUILD.gn -@@ -607,7 +607,7 @@ source_set("memory_buffer_sources") { +@@ -606,7 +606,7 @@ source_set("memory_buffer_sources") { deps += [ "//build/config/linux/libdrm" ] } diff --git a/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h b/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h index b786a07c1671..4bfd5aa3ecc4 100644 --- a/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h +++ b/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h @@ -1,7 +1,7 @@ ---- ui/gfx/mojom/native_handle_types_mojom_traits.h.orig 2021-04-14 18:41:39 UTC +--- ui/gfx/mojom/native_handle_types_mojom_traits.h.orig 2021-09-14 01:52:23 UTC +++ ui/gfx/mojom/native_handle_types_mojom_traits.h -@@ -14,13 +14,13 @@ - #include "mojo/public/cpp/system/platform_handle.h" +@@ -15,13 +15,13 @@ + #include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/gfx/mojom/native_handle_types.mojom-shared.h" -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(USE_OZONE) @@ -16,7 +16,7 @@ template <> struct COMPONENT_EXPORT(GFX_NATIVE_HANDLE_TYPES_SHARED_MOJOM_TRAITS) StructTraits<gfx::mojom::NativePixmapPlaneDataView, -@@ -48,7 +48,7 @@ struct COMPONENT_EXPORT(GFX_NATIVE_HANDLE_TYPES_SHARED +@@ -49,7 +49,7 @@ struct COMPONENT_EXPORT(GFX_NATIVE_HANDLE_TYPES_SHARED return pixmap_handle.planes; } @@ -25,7 +25,7 @@ static uint64_t modifier(const gfx::NativePixmapHandle& pixmap_handle) { return pixmap_handle.modifier; } -@@ -72,7 +72,7 @@ struct COMPONENT_EXPORT(GFX_NATIVE_HANDLE_TYPES_SHARED +@@ -73,7 +73,7 @@ struct COMPONENT_EXPORT(GFX_NATIVE_HANDLE_TYPES_SHARED static bool Read(gfx::mojom::NativePixmapHandleDataView data, gfx::NativePixmapHandle* out); }; diff --git a/www/chromium/files/patch-ui_gfx_render__text.cc b/www/chromium/files/patch-ui_gfx_render__text.cc index 32ede3f97b6b..9775556741a5 100644 --- a/www/chromium/files/patch-ui_gfx_render__text.cc +++ b/www/chromium/files/patch-ui_gfx_render__text.cc @@ -1,6 +1,6 @@ ---- ui/gfx/render_text.cc.orig 2021-07-19 18:45:44 UTC +--- ui/gfx/render_text.cc.orig 2021-09-24 04:26:39 UTC +++ ui/gfx/render_text.cc -@@ -1201,23 +1201,24 @@ void RenderText::SetDisplayOffset(Vector2d offset) { +@@ -1230,30 +1230,31 @@ void RenderText::SetDisplayOffset(Vector2d offset) { const int extra_content = GetContentWidth() - display_rect_.width(); const int cursor_width = cursor_enabled_ ? 1 : 0; @@ -31,12 +31,11 @@ break; default: break; -@@ -1225,7 +1226,7 @@ void RenderText::SetDisplayOffset(Vector2d offset) { + } } - const int horizontal_offset = -- base::ClampToRange(offset.x(), min_offset, max_offset); -+ base::ClampToRange(offset.x(), _min_offset, _max_offset); +- const int horizontal_offset = base::clamp(offset.x(), min_offset, max_offset); ++ const int horizontal_offset = base::clamp(offset.x(), _min_offset, _max_offset); // y-offset is set only when the vertical alignment is ALIGN_TOP. // TODO(jongkown.lee): Support other vertical alignments. diff --git a/www/chromium/files/patch-ui_gfx_x_gen__xproto.py b/www/chromium/files/patch-ui_gfx_x_gen__xproto.py new file mode 100644 index 000000000000..d905eca0a0ae --- /dev/null +++ b/www/chromium/files/patch-ui_gfx_x_gen__xproto.py @@ -0,0 +1,19 @@ +--- ui/gfx/x/gen_xproto.py.orig 2021-10-08 06:26:48 UTC ++++ ui/gfx/x/gen_xproto.py +@@ -1219,6 +1219,8 @@ class GenXproto(FileWriter): + self.write('#include <cstring>') + self.write('#include <vector>') + self.write() ++ self.write('#include <unistd.h>') ++ self.write() + self.write('#include "base/component_export.h"') + self.write('#include "base/memory/ref_counted_memory.h"') + self.write('#include "base/memory/scoped_refptr.h"') +@@ -1313,6 +1315,7 @@ class GenXproto(FileWriter): + self.write() + self.write('#include <xcb/xcb.h>') + self.write('#include <xcb/xcbext.h>') ++ self.write('#include <unistd.h>') + self.write() + self.write('#include "base/logging.h"') + self.write('#include "base/posix/eintr_wrapper.h"') diff --git a/www/chromium/files/patch-ui_gfx_x_generated__protos_dri3.cc b/www/chromium/files/patch-ui_gfx_x_generated__protos_dri3.cc new file mode 100644 index 000000000000..2f6fbbdc61f2 --- /dev/null +++ b/www/chromium/files/patch-ui_gfx_x_generated__protos_dri3.cc @@ -0,0 +1,11 @@ +--- ui/gfx/x/generated_protos/dri3.cc.orig 2021-10-08 06:26:48 UTC ++++ ui/gfx/x/generated_protos/dri3.cc +@@ -43,6 +43,8 @@ + #include <xcb/xcb.h> + #include <xcb/xcbext.h> + ++#include <unistd.h> ++ + #include "base/logging.h" + #include "base/posix/eintr_wrapper.h" + #include "ui/gfx/x/xproto_internal.h" diff --git a/www/chromium/files/patch-ui_gfx_x_generated__protos_shm.cc b/www/chromium/files/patch-ui_gfx_x_generated__protos_shm.cc new file mode 100644 index 000000000000..eb9e9fbab33d --- /dev/null +++ b/www/chromium/files/patch-ui_gfx_x_generated__protos_shm.cc @@ -0,0 +1,11 @@ +--- ui/gfx/x/generated_protos/shm.cc.orig 2021-10-08 06:26:48 UTC ++++ ui/gfx/x/generated_protos/shm.cc +@@ -43,6 +43,8 @@ + #include <xcb/xcb.h> + #include <xcb/xcbext.h> + ++#include <unistd.h> ++ + #include "base/logging.h" + #include "base/posix/eintr_wrapper.h" + #include "ui/gfx/x/xproto_internal.h" diff --git a/www/chromium/files/patch-ui_gl_BUILD.gn b/www/chromium/files/patch-ui_gl_BUILD.gn index 0e92bc019335..02405e07ab1f 100644 --- a/www/chromium/files/patch-ui_gl_BUILD.gn +++ b/www/chromium/files/patch-ui_gl_BUILD.gn @@ -1,6 +1,6 @@ ---- ui/gl/BUILD.gn.orig 2021-07-19 18:45:44 UTC +--- ui/gl/BUILD.gn.orig 2021-09-14 01:52:23 UTC +++ ui/gl/BUILD.gn -@@ -226,7 +226,7 @@ component("gl") { +@@ -229,7 +229,7 @@ component("gl") { ] } diff --git a/www/chromium/files/patch-ui_gl_generate__bindings.py b/www/chromium/files/patch-ui_gl_generate__bindings.py index 96932dd00afc..edfda89cf346 100644 --- a/www/chromium/files/patch-ui_gl_generate__bindings.py +++ b/www/chromium/files/patch-ui_gl_generate__bindings.py @@ -1,6 +1,6 @@ ---- ui/gl/generate_bindings.py.orig 2021-04-14 18:41:39 UTC +--- ui/gl/generate_bindings.py.orig 2021-09-14 01:52:23 UTC +++ ui/gl/generate_bindings.py -@@ -2840,6 +2840,9 @@ GLX_FUNCTIONS = [ +@@ -2842,6 +2842,9 @@ GLX_FUNCTIONS = [ 'arguments': 'Display* dpy, GLXDrawable drawable, int32_t* numerator, ' 'int32_t* denominator' }, diff --git a/www/chromium/files/patch-ui_gl_gl__features.cc b/www/chromium/files/patch-ui_gl_gl__features.cc index 51c5ccad09bb..f74219296778 100644 --- a/www/chromium/files/patch-ui_gl_gl__features.cc +++ b/www/chromium/files/patch-ui_gl_gl__features.cc @@ -1,12 +1,12 @@ ---- ui/gl/gl_features.cc.orig 2021-07-19 18:45:44 UTC +--- ui/gl/gl_features.cc.orig 2021-09-24 04:26:39 UTC +++ ui/gl/gl_features.cc @@ -71,8 +71,8 @@ bool IsDeviceBlocked(const char* field, const std::str // Launched on Windows, still experimental on other platforms. - const base::Feature kDefaultPassthroughCommandDecoder{ + const base::Feature kDefaultPassthroughCommandDecoder { "DefaultPassthroughCommandDecoder", --#if defined(OS_WIN) || \ +-#if defined(OS_WIN) || defined(OS_FUCHSIA) || \ - ((defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ -+#if defined(OS_WIN) || \ ++#if defined(OS_WIN) || defined(OS_FUCHSIA) || \ + ((defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) && \ !defined(CHROMECAST_BUILD)) base::FEATURE_ENABLED_BY_DEFAULT diff --git a/www/chromium/files/patch-ui_gl_gl__image__glx__native__pixmap.cc b/www/chromium/files/patch-ui_gl_gl__image__glx__native__pixmap.cc new file mode 100644 index 000000000000..73ae287b43af --- /dev/null +++ b/www/chromium/files/patch-ui_gl_gl__image__glx__native__pixmap.cc @@ -0,0 +1,11 @@ +--- ui/gl/gl_image_glx_native_pixmap.cc.orig 2021-10-08 13:10:57 UTC ++++ ui/gl/gl_image_glx_native_pixmap.cc +@@ -4,6 +4,8 @@ + + #include "ui/gl/gl_image_glx_native_pixmap.h" + ++#include <unistd.h> ++ + #include "base/posix/eintr_wrapper.h" + #include "ui/gfx/buffer_types.h" + #include "ui/gfx/linux/native_pixmap_dmabuf.h" diff --git a/www/chromium/files/patch-ui_gl_init_gl__factory.cc b/www/chromium/files/patch-ui_gl_init_gl__factory.cc new file mode 100644 index 000000000000..d4f6397511c9 --- /dev/null +++ b/www/chromium/files/patch-ui_gl_init_gl__factory.cc @@ -0,0 +1,11 @@ +--- ui/gl/init/gl_factory.cc.orig 2021-09-24 18:57:41 UTC ++++ ui/gl/init/gl_factory.cc +@@ -171,7 +171,7 @@ bool InitializeGLOneOffPlatformHelper(bool init_extens + } // namespace + + GLImplementationParts GetSoftwareGLForTestsImplementation() { +-#if defined(OS_WIN) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) + return GetSoftwareGLImplementation(); + #else + return GetLegacySoftwareGLImplementation(); diff --git a/www/chromium/files/patch-ui_gl_test_gl__surface__test__support.cc b/www/chromium/files/patch-ui_gl_test_gl__surface__test__support.cc new file mode 100644 index 000000000000..215cf64c9b09 --- /dev/null +++ b/www/chromium/files/patch-ui_gl_test_gl__surface__test__support.cc @@ -0,0 +1,20 @@ +--- ui/gl/test/gl_surface_test_support.cc.orig 2021-09-24 18:58:09 UTC ++++ ui/gl/test/gl_surface_test_support.cc +@@ -14,7 +14,7 @@ + #include "ui/gl/gl_switches.h" + #include "ui/gl/init/gl_factory.h" + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + #include "ui/platform_window/common/platform_window_defaults.h" // nogncheck + #endif + +@@ -43,7 +43,7 @@ void InitializeOneOffHelper(bool init_extensions) { + } + #endif + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + ui::test::EnableTestConfigForPlatformWindows(); + #endif + diff --git a/www/chromium/files/patch-ui_native__theme_native__theme__base.cc b/www/chromium/files/patch-ui_native__theme_native__theme__base.cc index 3f5c18ca2958..7fbd1054a7d4 100644 --- a/www/chromium/files/patch-ui_native__theme_native__theme__base.cc +++ b/www/chromium/files/patch-ui_native__theme_native__theme__base.cc @@ -1,6 +1,6 @@ ---- ui/native_theme/native_theme_base.cc.orig 2021-07-19 18:45:44 UTC +--- ui/native_theme/native_theme_base.cc.orig 2021-09-24 04:26:39 UTC +++ ui/native_theme/native_theme_base.cc -@@ -280,7 +280,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas, +@@ -267,7 +267,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas, break; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-ui_platform__window_platform__window__init__properties.h b/www/chromium/files/patch-ui_platform__window_platform__window__init__properties.h index 6d12f17e5f9a..f1d7ac5fb0b4 100644 --- a/www/chromium/files/patch-ui_platform__window_platform__window__init__properties.h +++ b/www/chromium/files/patch-ui_platform__window_platform__window__init__properties.h @@ -1,15 +1,15 @@ ---- ui/platform_window/platform_window_init_properties.h.orig 2021-07-19 18:45:44 UTC +--- ui/platform_window/platform_window_init_properties.h.orig 2021-09-24 04:26:39 UTC +++ ui/platform_window/platform_window_init_properties.h -@@ -47,7 +47,7 @@ enum class PlatformWindowShadowType { - - class WorkspaceExtensionDelegate; +@@ -52,7 +52,7 @@ class WorkspaceExtensionDelegate; + class ScenicWindowDelegate; + #endif -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) class X11ExtensionDelegate; #endif -@@ -93,7 +93,7 @@ struct COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindo +@@ -106,7 +106,7 @@ struct COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindo PlatformWindowShadowType shadow_type = PlatformWindowShadowType::kDefault; diff --git a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc index 28048e78623a..2033813bee60 100644 --- a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc +++ b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc @@ -1,6 +1,6 @@ ---- ui/views/controls/textfield/textfield.cc.orig 2021-07-19 18:45:44 UTC +--- ui/views/controls/textfield/textfield.cc.orig 2021-09-14 01:52:23 UTC +++ ui/views/controls/textfield/textfield.cc -@@ -74,7 +74,7 @@ +@@ -70,7 +70,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/linux/text_edit_command_auralinux.h" #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" #endif -@@ -171,7 +171,7 @@ bool IsControlKeyModifier(int flags) { +@@ -167,7 +167,7 @@ bool IsControlKeyModifier(int flags) { // Control-modified key combination, but we cannot extend it to other platforms // as Control has different meanings and behaviors. // https://crrev.com/2580483002/#msg46 @@ -18,7 +18,7 @@ return flags & ui::EF_CONTROL_DOWN; #else return false; -@@ -731,7 +731,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event +@@ -722,7 +722,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -27,7 +27,7 @@ ui::TextEditKeyBindingsDelegateAuraLinux* delegate = ui::GetTextEditKeyBindingsDelegate(); std::vector<ui::TextEditCommandAuraLinux> commands; -@@ -877,7 +877,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo +@@ -868,7 +868,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -36,7 +36,7 @@ // Skip any accelerator handling that conflicts with custom keybindings. ui::TextEditKeyBindingsDelegateAuraLinux* delegate = ui::GetTextEditKeyBindingsDelegate(); -@@ -2252,14 +2252,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( +@@ -2243,14 +2243,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( #endif return ui::TextEditCommand::DELETE_BACKWARD; } diff --git a/www/chromium/files/patch-ui_views_focus_focus__manager.cc b/www/chromium/files/patch-ui_views_focus_focus__manager.cc index df26b1f20f8c..a166a5a07e89 100644 --- a/www/chromium/files/patch-ui_views_focus_focus__manager.cc +++ b/www/chromium/files/patch-ui_views_focus_focus__manager.cc @@ -1,6 +1,6 @@ ---- ui/views/focus/focus_manager.cc.orig 2021-07-19 18:45:44 UTC +--- ui/views/focus/focus_manager.cc.orig 2021-09-14 01:52:23 UTC +++ ui/views/focus/focus_manager.cc -@@ -636,7 +636,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi +@@ -637,7 +637,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ // Processing an accelerator can delete things. Because we // need these objects afterwards on Linux, save widget_ as weak pointer and // save the close_on_deactivate property value of widget_delegate in a -@@ -653,7 +653,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi +@@ -654,7 +654,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-ui_views_style_platform__style.cc b/www/chromium/files/patch-ui_views_style_platform__style.cc index dc4a75e85a01..3c48cf6c36f0 100644 --- a/www/chromium/files/patch-ui_views_style_platform__style.cc +++ b/www/chromium/files/patch-ui_views_style_platform__style.cc @@ -1,6 +1,6 @@ ---- ui/views/style/platform_style.cc.orig 2021-07-19 18:45:44 UTC +--- ui/views/style/platform_style.cc.orig 2021-09-24 04:26:39 UTC +++ ui/views/style/platform_style.cc -@@ -57,7 +57,7 @@ const View::FocusBehavior PlatformStyle::kDefaultFocus +@@ -52,7 +52,7 @@ const View::FocusBehavior PlatformStyle::kDefaultFocus const bool PlatformStyle::kAdjustBubbleIfOffscreen = // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ false; #else true; -@@ -87,7 +87,7 @@ gfx::Range PlatformStyle::RangeToDeleteBackwards(const +@@ -82,7 +82,7 @@ gfx::Range PlatformStyle::RangeToDeleteBackwards(const #endif // OS_MAC #if !BUILDFLAG(ENABLE_DESKTOP_AURA) || \ diff --git a/www/chromium/files/patch-ui_views_test_widget__test__aura.cc b/www/chromium/files/patch-ui_views_test_widget__test__aura.cc new file mode 100644 index 000000000000..cff70e9ac5dd --- /dev/null +++ b/www/chromium/files/patch-ui_views_test_widget__test__aura.cc @@ -0,0 +1,38 @@ +--- ui/views/test/widget_test_aura.cc.orig 2021-09-24 18:58:31 UTC ++++ ui/views/test/widget_test_aura.cc +@@ -15,7 +15,7 @@ + #include "ui/views/widget/widget.h" + #include "ui/wm/core/shadow_controller.h" + +-#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && \ ++#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && \ + BUILDFLAG(ENABLE_DESKTOP_AURA) + #include "ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h" + #endif +@@ -74,7 +74,7 @@ BOOL CALLBACK FindAllWindowsCallback(HWND hwnd, LPARAM + + std::vector<aura::Window*> GetAllTopLevelWindows() { + std::vector<aura::Window*> roots; +-#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && \ ++#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && \ + BUILDFLAG(ENABLE_DESKTOP_AURA) + roots = DesktopWindowTreeHostLinux::GetAllOpenWindows(); + #elif defined(OS_WIN) +@@ -130,7 +130,7 @@ gfx::Size WidgetTest::GetNativeWidgetMinimumContentSiz + return widget->GetNativeWindow()->delegate()->GetMinimumSize(); + // 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) + #if defined(USE_OZONE) + if (features::IsUsingOzonePlatform()) + return widget->GetNativeWindow()->delegate()->GetMinimumSize(); +@@ -144,7 +144,7 @@ gfx::Size WidgetTest::GetNativeWidgetMinimumContentSiz + &hints); + return gfx::Size(hints.min_width, hints.min_height); + #endif // USE_X11 +-#endif // OS_LINUX && !OS_CHROMEOS ++#endif // (OS_LINUX || OS_BSD) && !OS_CHROMEOS + NOTREACHED(); + return gfx::Size(); + } diff --git a/www/chromium/files/patch-ui_views_views__delegate.cc b/www/chromium/files/patch-ui_views_views__delegate.cc index 21a348993016..97662df81f99 100644 --- a/www/chromium/files/patch-ui_views_views__delegate.cc +++ b/www/chromium/files/patch-ui_views_views__delegate.cc @@ -1,6 +1,6 @@ ---- ui/views/views_delegate.cc.orig 2021-04-14 18:41:39 UTC +--- ui/views/views_delegate.cc.orig 2021-09-24 04:26:39 UTC +++ ui/views/views_delegate.cc -@@ -90,7 +90,7 @@ bool ViewsDelegate::IsWindowInMetro(gfx::NativeWindow +@@ -94,7 +94,7 @@ bool ViewsDelegate::IsWindowInMetro(gfx::NativeWindow return false; } #elif BUILDFLAG(ENABLE_DESKTOP_AURA) && \ diff --git a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc index 88f3b8ea9475..4d7951a3276b 100644 --- a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc +++ b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc @@ -1,6 +1,6 @@ ---- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2021-07-19 18:45:44 UTC +--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2021-09-24 04:26:39 UTC +++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc -@@ -883,7 +883,7 @@ display::Display DesktopWindowTreeHostPlatform::GetDis +@@ -884,7 +884,7 @@ display::Display DesktopWindowTreeHostPlatform::GetDis // DesktopWindowTreeHost: // Linux subclasses this host and adds some Linux specific bits. diff --git a/www/chromium/files/patch-ui_views_widget_native__widget__aura.cc b/www/chromium/files/patch-ui_views_widget_native__widget__aura.cc index dc70e2e58e3e..9563d7584abd 100644 --- a/www/chromium/files/patch-ui_views_widget_native__widget__aura.cc +++ b/www/chromium/files/patch-ui_views_widget_native__widget__aura.cc @@ -1,4 +1,4 @@ ---- ui/views/widget/native_widget_aura.cc.orig 2021-07-19 18:45:44 UTC +--- ui/views/widget/native_widget_aura.cc.orig 2021-09-24 04:26:39 UTC +++ ui/views/widget/native_widget_aura.cc @@ -69,7 +69,7 @@ #endif @@ -9,7 +9,7 @@ #include "ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h" #endif -@@ -1133,7 +1133,7 @@ void NativeWidgetAura::SetInitialFocus(ui::WindowShowS +@@ -1143,7 +1143,7 @@ void NativeWidgetAura::SetInitialFocus(ui::WindowShowS namespace { #if BUILDFLAG(ENABLE_DESKTOP_AURA) && \ @@ -18,7 +18,7 @@ void CloseWindow(aura::Window* window) { if (window) { Widget* widget = Widget::GetWidgetForNativeView(window); -@@ -1164,7 +1164,7 @@ void Widget::CloseAllSecondaryWidgets() { +@@ -1174,7 +1174,7 @@ void Widget::CloseAllSecondaryWidgets() { #endif #if BUILDFLAG(ENABLE_DESKTOP_AURA) && \ diff --git a/www/chromium/files/patch-ui_views_widget_widget.cc b/www/chromium/files/patch-ui_views_widget_widget.cc index 9e2e5c053af3..f6cfcfa534a1 100644 --- a/www/chromium/files/patch-ui_views_widget_widget.cc +++ b/www/chromium/files/patch-ui_views_widget_widget.cc @@ -1,6 +1,6 @@ ---- ui/views/widget/widget.cc.orig 2021-07-28 08:23:02 UTC +--- ui/views/widget/widget.cc.orig 2021-09-24 04:26:39 UTC +++ ui/views/widget/widget.cc -@@ -48,7 +48,7 @@ +@@ -51,7 +51,7 @@ #include "ui/views/window/custom_frame_view.h" #include "ui/views/window/dialog_delegate.h" @@ -9,7 +9,7 @@ #include "ui/views/linux_ui/linux_ui.h" #endif -@@ -1664,7 +1664,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const +@@ -1777,7 +1777,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const parent_) return parent_->GetNativeTheme(); diff --git a/www/chromium/files/patch-ui_views_window_custom__frame__view.cc b/www/chromium/files/patch-ui_views_window_custom__frame__view.cc index 33be5e812c2f..a29d3de16f61 100644 --- a/www/chromium/files/patch-ui_views_window_custom__frame__view.cc +++ b/www/chromium/files/patch-ui_views_window_custom__frame__view.cc @@ -1,6 +1,6 @@ ---- ui/views/window/custom_frame_view.cc.orig 2021-07-19 18:45:44 UTC +--- ui/views/window/custom_frame_view.cc.orig 2021-09-14 01:52:23 UTC +++ ui/views/window/custom_frame_view.cc -@@ -259,7 +259,7 @@ int CustomFrameView::CaptionButtonY() const { +@@ -261,7 +261,7 @@ int CustomFrameView::CaptionButtonY() const { // drawn flush with the screen edge, they still obey Fitts' Law. // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-ui_views_window_dialog__delegate.cc b/www/chromium/files/patch-ui_views_window_dialog__delegate.cc index afd810a006c8..3026adde9165 100644 --- a/www/chromium/files/patch-ui_views_window_dialog__delegate.cc +++ b/www/chromium/files/patch-ui_views_window_dialog__delegate.cc @@ -1,6 +1,6 @@ ---- ui/views/window/dialog_delegate.cc.orig 2021-04-14 18:41:39 UTC +--- ui/views/window/dialog_delegate.cc.orig 2021-09-14 01:52:23 UTC +++ ui/views/window/dialog_delegate.cc -@@ -72,7 +72,7 @@ Widget* DialogDelegate::CreateDialogWidget( +@@ -78,7 +78,7 @@ Widget* DialogDelegate::CreateDialogWidget( // static bool DialogDelegate::CanSupportCustomFrame(gfx::NativeView parent) { diff --git a/www/chromium/files/patch-ui_views_window_frame__background.cc b/www/chromium/files/patch-ui_views_window_frame__background.cc index 33d1d0b5794e..51f1e9705a5e 100644 --- a/www/chromium/files/patch-ui_views_window_frame__background.cc +++ b/www/chromium/files/patch-ui_views_window_frame__background.cc @@ -1,11 +1,11 @@ ---- ui/views/window/frame_background.cc.orig 2021-04-14 18:41:39 UTC +--- ui/views/window/frame_background.cc.orig 2021-09-14 01:52:23 UTC +++ ui/views/window/frame_background.cc -@@ -99,7 +99,7 @@ void FrameBackground::PaintMaximized(gfx::Canvas* canv - const View* view) const { +@@ -109,7 +109,7 @@ void FrameBackground::PaintMaximized(gfx::Canvas* canv + int width) const { // Fill the top with the frame color first so we have a constant background // for areas not covered by the theme image. -#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && \ +#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && \ BUILDFLAG(ENABLE_DESKTOP_AURA) - auto* native_theme = view->GetNativeTheme(); ui::NativeTheme::ExtraParams params; + params.frame_top_area.use_custom_frame = use_custom_frame_; diff --git a/www/chromium/files/patch-v8_BUILD.gn b/www/chromium/files/patch-v8_BUILD.gn index 35dc5ad8b269..7463af73d96a 100644 --- a/www/chromium/files/patch-v8_BUILD.gn +++ b/www/chromium/files/patch-v8_BUILD.gn @@ -1,6 +1,6 @@ ---- v8/BUILD.gn.orig 2021-07-19 18:47:37 UTC +--- v8/BUILD.gn.orig 2021-09-24 04:28:21 UTC +++ v8/BUILD.gn -@@ -4667,9 +4667,15 @@ v8_component("v8_libbase") { +@@ -4804,9 +4804,15 @@ v8_component("v8_libbase") { } } @@ -17,7 +17,7 @@ "src/base/platform/platform-linux.cc", ] -@@ -5204,6 +5210,7 @@ if (current_toolchain == v8_generator_toolchain) { +@@ -5361,6 +5367,7 @@ if (current_toolchain == v8_generator_toolchain) { "src/interpreter/bytecodes.cc", "src/interpreter/bytecodes.h", ] diff --git a/www/chromium/files/patch-v8_include_v8config.h b/www/chromium/files/patch-v8_include_v8config.h index 5933db95eb32..8ac2f092c33b 100644 --- a/www/chromium/files/patch-v8_include_v8config.h +++ b/www/chromium/files/patch-v8_include_v8config.h @@ -1,6 +1,6 @@ ---- v8/include/v8config.h.orig 2021-04-14 18:43:14 UTC +--- v8/include/v8config.h.orig 2021-09-24 04:28:21 UTC +++ v8/include/v8config.h -@@ -293,7 +293,18 @@ path. Add it with -I<path> to the command line +@@ -338,7 +338,18 @@ path. Add it with -I<path> to the command line # define V8_HAS_CPP_ATTRIBUTE_NODISCARD (V8_HAS_CPP_ATTRIBUTE(nodiscard)) diff --git a/www/chromium/files/patch-v8_src_api_api.cc b/www/chromium/files/patch-v8_src_api_api.cc index ac8435d35c6e..3a6257f1229b 100644 --- a/www/chromium/files/patch-v8_src_api_api.cc +++ b/www/chromium/files/patch-v8_src_api_api.cc @@ -1,6 +1,6 @@ ---- v8/src/api/api.cc.orig 2021-07-19 18:47:37 UTC +--- v8/src/api/api.cc.orig 2021-09-24 04:28:21 UTC +++ v8/src/api/api.cc -@@ -5833,7 +5833,7 @@ bool v8::V8::Initialize(const int build_config) { +@@ -5886,7 +5886,7 @@ bool v8::V8::Initialize(const int build_config) { return true; } @@ -8,4 +8,4 @@ +#if V8_OS_LINUX || V8_OS_MACOSX || V8_OS_OPENBSD || V8_OS_FREEBSD bool TryHandleWebAssemblyTrapPosix(int sig_code, siginfo_t* info, void* context) { - // When the target code runs on the V8 arm simulator, the trap handler does + #if V8_ENABLE_WEBASSEMBLY && V8_TRAP_HANDLER_SUPPORTED diff --git a/www/chromium/files/patch-v8_src_base_cpu.cc b/www/chromium/files/patch-v8_src_base_cpu.cc index 06c60e4601f4..b0b4de3c4398 100644 --- a/www/chromium/files/patch-v8_src_base_cpu.cc +++ b/www/chromium/files/patch-v8_src_base_cpu.cc @@ -1,6 +1,6 @@ ---- v8/src/base/cpu.cc.orig 2021-05-12 22:13:52 UTC +--- v8/src/base/cpu.cc.orig 2021-09-14 01:58:38 UTC +++ v8/src/base/cpu.cc -@@ -572,6 +572,7 @@ CPU::CPU() +@@ -568,6 +568,7 @@ CPU::CPU() #if V8_OS_LINUX @@ -8,7 +8,7 @@ CPUInfo cpu_info; // Extract implementor from the "CPU implementer" field. -@@ -605,6 +606,7 @@ CPU::CPU() +@@ -601,6 +602,7 @@ CPU::CPU() } delete[] part; } diff --git a/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc b/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc index 3b38c297f950..8494c7aeb65a 100644 --- a/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc +++ b/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc @@ -1,6 +1,6 @@ ---- v8/src/base/platform/platform-posix.cc.orig 2021-04-14 18:43:14 UTC +--- v8/src/base/platform/platform-posix.cc.orig 2021-09-14 01:58:38 UTC +++ v8/src/base/platform/platform-posix.cc -@@ -478,7 +478,7 @@ bool OS::DiscardSystemPages(void* address, size_t size +@@ -493,7 +493,7 @@ bool OS::DiscardSystemPages(void* address, size_t size // static bool OS::HasLazyCommits() { @@ -9,7 +9,7 @@ return true; #else // TODO(bbudge) Return true for all POSIX platforms. -@@ -611,6 +611,12 @@ int OS::GetCurrentThreadId() { +@@ -626,6 +626,12 @@ int OS::GetCurrentThreadId() { return static_cast<int>(syscall(__NR_gettid)); #elif V8_OS_ANDROID return static_cast<int>(gettid()); diff --git a/www/chromium/files/patch-v8_src_d8_d8.cc b/www/chromium/files/patch-v8_src_d8_d8.cc index c8ca133c81f9..af5151445cc9 100644 --- a/www/chromium/files/patch-v8_src_d8_d8.cc +++ b/www/chromium/files/patch-v8_src_d8_d8.cc @@ -1,6 +1,6 @@ ---- v8/src/d8/d8.cc.orig 2021-07-19 18:47:38 UTC +--- v8/src/d8/d8.cc.orig 2021-09-24 04:28:22 UTC +++ v8/src/d8/d8.cc -@@ -73,7 +73,7 @@ +@@ -74,7 +74,7 @@ #include "unicode/locid.h" #endif // V8_INTL_SUPPORT @@ -9,7 +9,7 @@ #include <sys/mman.h> // For MultiMappedAllocator. #endif -@@ -235,7 +235,7 @@ class MockArrayBufferAllocatiorWithLimit : public Mock +@@ -236,7 +236,7 @@ class MockArrayBufferAllocatiorWithLimit : public Mock std::atomic<size_t> space_left_; }; @@ -18,7 +18,7 @@ // This is a mock allocator variant that provides a huge virtual allocation // backed by a small real allocation that is repeatedly mapped. If you create an -@@ -328,7 +328,7 @@ class MultiMappedAllocator : public ArrayBufferAllocat +@@ -329,7 +329,7 @@ class MultiMappedAllocator : public ArrayBufferAllocat base::Mutex regions_mutex_; }; @@ -27,7 +27,7 @@ v8::Platform* g_default_platform; std::unique_ptr<v8::Platform> g_platform; -@@ -4171,7 +4171,7 @@ bool Shell::SetOptions(int argc, char* argv[]) { +@@ -4404,7 +4404,7 @@ bool Shell::SetOptions(int argc, char* argv[]) { options.mock_arraybuffer_allocator = i::FLAG_mock_arraybuffer_allocator; options.mock_arraybuffer_allocator_limit = i::FLAG_mock_arraybuffer_allocator_limit; @@ -36,7 +36,7 @@ options.multi_mapped_mock_allocator = i::FLAG_multi_mapped_mock_allocator; #endif -@@ -4808,19 +4808,19 @@ int Shell::Main(int argc, char* argv[]) { +@@ -5053,19 +5053,19 @@ int Shell::Main(int argc, char* argv[]) { memory_limit >= options.mock_arraybuffer_allocator_limit ? memory_limit : std::numeric_limits<size_t>::max()); diff --git a/www/chromium/files/patch-weblayer_BUILD.gn b/www/chromium/files/patch-weblayer_BUILD.gn index 607bb0317575..d43753298468 100644 --- a/www/chromium/files/patch-weblayer_BUILD.gn +++ b/www/chromium/files/patch-weblayer_BUILD.gn @@ -1,6 +1,6 @@ ---- weblayer/BUILD.gn.orig 2021-07-19 18:45:45 UTC +--- weblayer/BUILD.gn.orig 2021-09-24 04:26:39 UTC +++ weblayer/BUILD.gn -@@ -752,6 +752,14 @@ source_set("weblayer_lib_base") { +@@ -775,6 +775,14 @@ source_set("weblayer_lib_base") { ] } diff --git a/www/chromium/files/patch-weblayer_app_content__main__delegate__impl.cc b/www/chromium/files/patch-weblayer_app_content__main__delegate__impl.cc index 066262c5d029..217feae57a81 100644 --- a/www/chromium/files/patch-weblayer_app_content__main__delegate__impl.cc +++ b/www/chromium/files/patch-weblayer_app_content__main__delegate__impl.cc @@ -1,6 +1,6 @@ ---- weblayer/app/content_main_delegate_impl.cc.orig 2021-07-19 18:45:45 UTC +--- weblayer/app/content_main_delegate_impl.cc.orig 2021-09-24 04:26:39 UTC +++ weblayer/app/content_main_delegate_impl.cc -@@ -242,8 +242,8 @@ bool ContentMainDelegateImpl::ShouldCreateFeatureList( +@@ -255,8 +255,8 @@ ContentMainDelegateImpl::CreateVariationsIdsProvider() void ContentMainDelegateImpl::PreSandboxStartup() { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.cc b/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.cc index 19ec3bb4ae7c..39555eb7166e 100644 --- a/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.cc +++ b/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.cc @@ -1,6 +1,6 @@ ---- weblayer/browser/content_browser_client_impl.cc.orig 2021-07-19 18:45:45 UTC +--- weblayer/browser/content_browser_client_impl.cc.orig 2021-09-24 04:26:39 UTC +++ weblayer/browser/content_browser_client_impl.cc -@@ -148,7 +148,7 @@ +@@ -149,7 +149,7 @@ // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. @@ -9,7 +9,7 @@ #include "content/public/common/content_descriptors.h" #endif -@@ -488,7 +488,7 @@ void ContentBrowserClientImpl::OnNetworkServiceCreated +@@ -497,7 +497,7 @@ void ContentBrowserClientImpl::OnNetworkServiceCreated embedder_support::GetUserAgent()); // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. @@ -18,7 +18,7 @@ network::mojom::CryptConfigPtr config = network::mojom::CryptConfig::New(); content::GetNetworkService()->SetCryptConfig(std::move(config)); #endif -@@ -974,7 +974,7 @@ SafeBrowsingService* ContentBrowserClientImpl::GetSafe +@@ -1012,7 +1012,7 @@ SafeBrowsingService* ContentBrowserClientImpl::GetSafe // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. @@ -27,7 +27,7 @@ void ContentBrowserClientImpl::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -1008,7 +1008,7 @@ void ContentBrowserClientImpl::GetAdditionalMappedFile +@@ -1046,7 +1046,7 @@ void ContentBrowserClientImpl::GetAdditionalMappedFile mappings->Share(kCrashDumpSignal, crash_signal_fd); #endif // defined(OS_ANDROID) } |