diff options
| author | Matthias Wolf <freebsd@rheinwolf.de> | 2021-08-22 08:38:57 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2021-08-22 08:51:02 +0000 |
| commit | 1a8f509f6d4073363b5a39a8da581e05dec4834c (patch) | |
| tree | 8936c740a279de0ee24b07fada5e0f2f68f49fd9 | |
| parent | f302216145c10a30b4d11951a1611cb7725b8297 (diff) | |
| download | ports-1a8f509f6d4073363b5a39a8da581e05dec4834c.tar.gz ports-1a8f509f6d4073363b5a39a8da581e05dec4834c.zip | |
www/chromium: update to 92.0.4515.159
Mark broken on i386 for now, it does not compile there because of a
ssize_t * vs off_t * mismatch.
MFH: 2021Q3
Security: https://vuxml.freebsd.org/freebsd/128deba6-ff56-11eb-8514-3065ec8fd3ec.html
Security: https://vuxml.freebsd.org/freebsd/c3c6c4a3-f47d-11eb-b632-3065ec8fd3ec.html
Security: https://vuxml.freebsd.org/freebsd/76487640-ea29-11eb-a686-3065ec8fd3ec.html
(cherry picked from commit 76daa653245e62b0f8e07ef4899c0a5bb176b3da)
430 files changed, 2590 insertions, 1894 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile index cf322744e6fc..7ea8aca712e6 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -1,8 +1,8 @@ # Created by: Florent Thoumie <flz@FreeBSD.org> PORTNAME= chromium -PORTVERSION= 91.0.4472.164 -CATEGORIES= www java +PORTVERSION= 92.0.4515.159 +CATEGORIES= www MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ LOCAL/rene/chromium/:fonts DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -14,6 +14,7 @@ LICENSE= BSD3CLAUSE LGPL21 MPL11 LICENSE_COMB= multi BROKEN_FreeBSD_11_aarch64= components/safe_browsing_db/v4_rice.cc:120:18: use of overloaded operator '&' is ambiguous +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 \ @@ -28,7 +29,8 @@ BUILD_DEPENDS= bash:shells/bash \ ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \ ${LOCALBASE}/share/usbids/usb.ids:misc/usbids \ ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR} \ - ${LOCALBASE}/include/va/va.h:multimedia/libva + ${LOCALBASE}/include/va/va.h:multimedia/libva \ + ${LOCALBASE}/bin/python2.7:lang/python27 LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-atk \ libatspi.so:accessibility/at-spi2-core \ @@ -66,7 +68,7 @@ RUN_DEPENDS= xdg-open:devel/xdg-utils \ noto-basic>0:x11-fonts/noto-basic USES= bison compiler:c++17-lang cpe desktop-file-utils dos2unix gl gnome jpeg localbase:ldflags \ - ninja perl5 pkgconfig python:2.7,build shebangfix tar:xz xorg + ninja perl5 pkgconfig python:build shebangfix tar:xz xorg CPE_VENDOR= google CPE_PRODUCT= chrome @@ -84,7 +86,8 @@ SHEBANG_FILES= chrome/tools/build/linux/chrome-wrapper buildtools/linux64/clang- MAKE_ARGS= -C out/${BUILDTYPE} ALL_TARGET= chrome -BINARY_ALIAS= python=${PYTHON_CMD} +BINARY_ALIAS= python=${LOCALBASE}/bin/python2.7 \ + python3=${PYTHON_CMD} EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang # TODO bz@ : install libwidevinecdm.so (see third_party/widevine/cdm/BUILD.gn) @@ -261,14 +264,6 @@ pre-configure: ./build/linux/unbundle/replace_gn_files.py --system-libraries \ ffmpeg flac fontconfig freetype harfbuzz-ng libdrm libpng libwebp libxml libxslt openh264 opus snappy || ${FALSE} - # We need the site package from xcbgen, which installs as python3.x (really: default version), while the chromium - # build still needs to use python2.7. It works, because xcbgen can run with both versions, but we want to avoid - # having the pre-compiled pyc files from 2.7 in the 3.x site packages - # Remove this as soon as chromium uses python3.x as well - @${MKDIR} ${WRKDIR}/site-packages/xcbgen - ${CP} ${PYTHONBASE}/lib/python${PYTHON_DEFAULT}/site-packages/xcbgen/*.py \ - ${WRKDIR}/site-packages/xcbgen - do-configure: # GN generator bootstrapping and generating ninja files cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} CC=${CC} CXX=${CXX} LD=${CXX} \ @@ -285,6 +280,7 @@ do-configure: @${MKDIR} ${WRKSRC}/buildtools/freebsd ${LN} -sf ${WRKSRC}/buildtools/linux64/clang-format ${WRKSRC}/buildtools/freebsd ${LN} -sf ${WRKSRC}/out/${BUILDTYPE}/gn ${WRKSRC}/buildtools/freebsd + ${LN} -sf /usr/bin/strip ${WRKSRC}/buildtools/freebsd/strip do-install: @${MKDIR} ${STAGEDIR}${DATADIR} diff --git a/www/chromium/distinfo b/www/chromium/distinfo index 34fb57c861b9..2138bdc60c5c 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1626468011 -SHA256 (chromium-91.0.4472.164.tar.xz) = 84e56fa2ad96d910cab429c513eeaca7bfa94096fef057bd024be826ce8426bd -SIZE (chromium-91.0.4472.164.tar.xz) = 950253100 -SHA256 (chromium-91.0.4472.164-testdata.tar.xz) = 0f9da538d6f70ea0f360e71e8dbbb940f827dc20bb7dcd5a4566ae196fdbd366 -SIZE (chromium-91.0.4472.164-testdata.tar.xz) = 256786536 +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 SHA256 (test_fonts-85.tar.xz) = f22b61b3639acb147c98ec2e2305d8b96f0b55c8c74c40e2ea696402fae8cef9 SIZE (test_fonts-85.tar.xz) = 9511984 diff --git a/www/chromium/files/extra-patch-build_config_compiler_pgo_pgo.gni b/www/chromium/files/extra-patch-build_config_compiler_pgo_pgo.gni index 6e19cd7c7da5..ede4422aa141 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-06-09 22:13:52 UTC +--- build/config/compiler/pgo/pgo.gni.orig 2021-08-17 00:15:54 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 d13e0e3e592a..b9cbe4cc1c83 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-06-09 22:16:18 UTC +--- 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 @@ -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 4a38e2e73dcf..8528f242ee69 100644 --- a/www/chromium/files/patch-BUILD.gn +++ b/www/chromium/files/patch-BUILD.gn @@ -1,6 +1,6 @@ ---- BUILD.gn.orig 2021-05-12 22:05:39 UTC +--- BUILD.gn.orig 2021-07-19 18:45:04 UTC +++ BUILD.gn -@@ -429,7 +429,7 @@ group("gn_all") { +@@ -443,7 +443,7 @@ group("gn_all") { ] } @@ -9,7 +9,7 @@ deps += [ "//third_party/breakpad:breakpad_unittests", "//third_party/breakpad:core-2-minidump", -@@ -474,8 +474,6 @@ group("gn_all") { +@@ -488,8 +488,6 @@ group("gn_all") { "//net:disk_cache_memory_test", "//net:quic_client", "//net:quic_server", @@ -18,7 +18,7 @@ "//testing:empty_main", ] -@@ -530,10 +528,6 @@ group("gn_all") { +@@ -544,10 +542,6 @@ group("gn_all") { "//chrome/test:load_library_perf_tests", "//chrome/test:sync_performance_tests", "//chrome/test/chromedriver:chromedriver", @@ -29,7 +29,7 @@ "//media/cast:generate_barcode_video", "//media/cast:generate_timecode_audio", "//net:crash_cache", -@@ -592,10 +586,6 @@ group("gn_all") { +@@ -606,10 +600,6 @@ group("gn_all") { "//mojo:mojo_perftests", "//services/service_manager/public/cpp", "//testing/gmock:gmock_main", @@ -40,7 +40,7 @@ ] if (!is_android) { -@@ -673,7 +663,7 @@ group("gn_all") { +@@ -687,7 +677,7 @@ group("gn_all") { host_os == "win") { deps += [ "//chrome/test/mini_installer:mini_installer_tests" ] } @@ -49,7 +49,7 @@ deps += [ "//third_party/breakpad:symupload($host_toolchain)" ] } -@@ -688,7 +678,7 @@ group("gn_all") { +@@ -702,7 +692,7 @@ group("gn_all") { } } @@ -58,7 +58,7 @@ deps += [ "//third_party/crashpad/crashpad:crashpad_tests", "//third_party/crashpad/crashpad/handler:crashpad_handler", -@@ -803,7 +793,6 @@ group("gn_all") { +@@ -819,7 +809,6 @@ group("gn_all") { "//chrome/browser/vr:vr_common_perftests", "//chrome/browser/vr:vr_common_unittests", "//chrome/browser/vr:vr_pixeltests", @@ -66,7 +66,7 @@ ] if (is_android) { deps += [ "//chrome/browser/android/vr:vr_android_unittests" ] -@@ -1102,7 +1091,7 @@ if (!is_ios) { +@@ -1118,7 +1107,7 @@ if (!is_ios) { data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ] } @@ -75,7 +75,7 @@ data_deps += [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } -@@ -1111,7 +1100,7 @@ if (!is_ios) { +@@ -1127,7 +1116,7 @@ if (!is_ios) { data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } @@ -84,7 +84,7 @@ data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } -@@ -1355,9 +1344,6 @@ group("chromium_builder_perf") { +@@ -1371,9 +1360,6 @@ group("chromium_builder_perf") { if (is_win) { data_deps += [ "//chrome/installer/mini_installer:mini_installer" ] diff --git a/www/chromium/files/patch-ash_display_mirror__window__controller.cc b/www/chromium/files/patch-ash_display_mirror__window__controller.cc index 86ac55d854fe..8e2ee6085452 100644 --- a/www/chromium/files/patch-ash_display_mirror__window__controller.cc +++ b/www/chromium/files/patch-ash_display_mirror__window__controller.cc @@ -1,6 +1,6 @@ ---- ash/display/mirror_window_controller.cc.orig 2021-04-14 18:40:48 UTC +--- ash/display/mirror_window_controller.cc.orig 2021-07-19 18:45:04 UTC +++ ash/display/mirror_window_controller.cc -@@ -286,7 +286,11 @@ void MirrorWindowController::UpdateWindow( +@@ -287,7 +287,11 @@ void MirrorWindowController::UpdateWindow( return info.id() == iter->first; }) == display_info_list.end()) { CloseAndDeleteHost(iter->second, true); diff --git a/www/chromium/files/patch-base_BUILD.gn b/www/chromium/files/patch-base_BUILD.gn index f18542dec520..071f2b46a17e 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-05-24 22:05:31 UTC +--- base/BUILD.gn.orig 2021-07-19 18:45:05 UTC +++ base/BUILD.gn -@@ -963,7 +963,7 @@ component("base") { +@@ -972,7 +972,7 @@ component("base") { "timer/hi_res_timer_manager_posix.cc", ] @@ -9,7 +9,7 @@ sources += [ "cpu_affinity_posix.cc", "cpu_affinity_posix.h", -@@ -974,6 +974,11 @@ component("base") { +@@ -983,6 +983,11 @@ component("base") { "profiler/thread_delegate_posix.h", ] } @@ -21,7 +21,7 @@ } if (is_win) { -@@ -1377,7 +1382,7 @@ component("base") { +@@ -1394,7 +1399,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" ] } -@@ -1430,7 +1435,7 @@ component("base") { +@@ -1447,7 +1452,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) { -@@ -2064,6 +2069,34 @@ component("base") { +@@ -2119,6 +2124,34 @@ component("base") { } } @@ -74,21 +74,21 @@ # iOS if (is_ios) { sources -= [ -@@ -3273,7 +3306,7 @@ if (build_base_unittests) { - } - } - -- if (is_linux || is_chromeos) { -+ if ((is_linux || is_chromeos) && !is_bsd) { - sources += [ "debug/proc_maps_linux_unittest.cc" ] +@@ -3339,7 +3372,7 @@ test("base_unittests") { } + } -@@ -3313,7 +3346,7 @@ if (build_base_unittests) { - "posix/unix_domain_socket_unittest.cc", - "task/thread_pool/task_tracker_posix_unittest.cc", - ] -- if (!is_nacl && !is_apple) { -+ if (!is_nacl && !is_apple && !is_bsd) { - sources += [ - "cpu_affinity_posix_unittest.cc", - "profiler/stack_copier_signal_unittest.cc", +- if (is_linux || is_chromeos) { ++ if ((is_linux || is_chromeos) && !is_bsd) { + sources += [ + "debug/proc_maps_linux_unittest.cc", + "files/scoped_file_linux_unittest.cc", +@@ -3382,7 +3415,7 @@ test("base_unittests") { + "posix/unix_domain_socket_unittest.cc", + "task/thread_pool/task_tracker_posix_unittest.cc", + ] +- if (!is_nacl && !is_apple) { ++ if (!is_nacl && !is_apple && !is_bsd) { + sources += [ + "cpu_affinity_posix_unittest.cc", + "profiler/stack_copier_signal_unittest.cc", diff --git a/www/chromium/files/patch-base_allocator_allocator.gni b/www/chromium/files/patch-base_allocator_allocator.gni index 460eda24c41a..a8a21f360289 100644 --- a/www/chromium/files/patch-base_allocator_allocator.gni +++ b/www/chromium/files/patch-base_allocator_allocator.gni @@ -1,6 +1,6 @@ ---- base/allocator/allocator.gni.orig 2021-05-24 22:05:31 UTC +--- base/allocator/allocator.gni.orig 2021-07-19 18:45:05 UTC +++ base/allocator/allocator.gni -@@ -63,7 +63,7 @@ declare_args() { +@@ -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. diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_address__pool__manager.cc b/www/chromium/files/patch-base_allocator_partition__allocator_address__pool__manager.cc index 3c2f4be3e9cb..8c16e950e5ba 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_address__pool__manager.cc +++ b/www/chromium/files/patch-base_allocator_partition__allocator_address__pool__manager.cc @@ -1,4 +1,4 @@ ---- base/allocator/partition_allocator/address_pool_manager.cc.orig 2021-04-14 18:40:48 UTC +--- base/allocator/partition_allocator/address_pool_manager.cc.orig 2021-07-19 18:45:05 UTC +++ base/allocator/partition_allocator/address_pool_manager.cc @@ -8,6 +8,13 @@ #include <sys/mman.h> @@ -27,5 +27,5 @@ + PA_PCHECK(ptr == address); + HANDLE_EINTR(close(fd)); #else + static_assert(DecommittedMemoryIsAlwaysZeroed(), ""); DecommitSystemPages(address, size, PageUpdatePermissions); - #endif diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h index 91f9b30c0ca2..5e523e2c6be3 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h +++ b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h @@ -1,24 +1,22 @@ ---- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2021-04-14 18:40:48 UTC +--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2021-07-19 18:45:05 UTC +++ base/allocator/partition_allocator/page_allocator_internals_posix.h -@@ -28,12 +28,16 @@ +@@ -28,10 +28,14 @@ #if defined(OS_ANDROID) #include <sys/prctl.h> #endif -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include <sys/resource.h> - - #include <algorithm> #endif -+#if defined(OS_FREEBSD) ++#if defined(OS_BSD) +#include <fcntl.h> +#endif + #include "base/allocator/partition_allocator/page_allocator.h" #ifndef MAP_ANONYMOUS -@@ -153,12 +157,19 @@ void* SystemAllocPagesInternal(void* hint, +@@ -151,12 +155,19 @@ void* SystemAllocPagesInternal(void* hint, PA_DCHECK(PageTag::kFirst <= page_tag); PA_DCHECK(PageTag::kLast >= page_tag); int fd = VM_MAKE_TAG(static_cast<int>(page_tag)); @@ -38,7 +36,7 @@ #if defined(OS_APPLE) // On macOS 10.14 and higher, executables that are code signed with the -@@ -185,6 +196,8 @@ void* SystemAllocPagesInternal(void* hint, +@@ -183,6 +194,8 @@ void* SystemAllocPagesInternal(void* hint, prctl(PR_SET_VMA, PR_SET_VMA_ANON_NAME, ret, length, PageTagToName(page_tag)); } @@ -47,7 +45,7 @@ #endif return ret; -@@ -317,6 +330,8 @@ void DiscardSystemPagesInternal(void* address, size_t +@@ -334,6 +347,8 @@ void DiscardSystemPagesInternal(void* address, size_t ret = madvise(address, length, MADV_DONTNEED); } PA_PCHECK(ret == 0); diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h index 20ff541d2e02..76d20b689187 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-05-18 13:58:13 UTC +--- base/allocator/partition_allocator/partition_alloc_config.h.orig 2021-07-19 18:45:05 UTC +++ base/allocator/partition_allocator/partition_alloc_config.h -@@ -34,9 +34,13 @@ static_assert(sizeof(void*) != 8, ""); +@@ -46,9 +46,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 8f6488a80bd6..f9667782d087 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-05-12 22:05:40 UTC +--- base/allocator/partition_allocator/partition_alloc_unittest.cc.orig 2021-07-19 18:45:05 UTC +++ base/allocator/partition_allocator/partition_alloc_unittest.cc -@@ -1659,7 +1659,7 @@ TEST_F(PartitionAllocTest, LostFreeSlotSpansBug) { +@@ -1651,7 +1651,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 -@@ -1710,7 +1710,7 @@ TEST_F(PartitionAllocDeathTest, DISABLED_RepeatedTryRe +@@ -1702,7 +1702,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 147faa94e4b7..f0e47dbc54d7 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.cc +++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.cc @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/partition_root.cc.orig 2021-05-12 22:05:40 UTC +--- base/allocator/partition_allocator/partition_root.cc.orig 2021-07-19 18:45:05 UTC +++ base/allocator/partition_allocator/partition_root.cc -@@ -22,7 +22,7 @@ +@@ -25,7 +25,7 @@ #include "wow64apiset.h" #endif @@ -9,7 +9,7 @@ #include <pthread.h> #endif -@@ -36,7 +36,7 @@ namespace { +@@ -39,7 +39,7 @@ namespace { #if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) @@ -18,7 +18,7 @@ // NO_THREAD_SAFETY_ANALYSIS: acquires the lock and doesn't release it, by // design. -@@ -89,7 +89,7 @@ void AfterForkInChild() { +@@ -92,7 +92,7 @@ void AfterForkInChild() { internal::ThreadCacheRegistry::Instance() .ForcePurgeAllThreadAfterForkUnsafe(); } @@ -27,7 +27,7 @@ std::atomic<bool> g_global_init_called; void PartitionAllocMallocInitOnce() { -@@ -99,7 +99,7 @@ void PartitionAllocMallocInitOnce() { +@@ -102,7 +102,7 @@ void PartitionAllocMallocInitOnce() { if (!g_global_init_called.compare_exchange_strong(expected, true)) return; @@ -36,7 +36,7 @@ // When fork() is called, only the current thread continues to execute in the // child process. If the lock is held, but *not* by this thread when fork() is // called, we have a deadlock. -@@ -124,7 +124,7 @@ void PartitionAllocMallocInitOnce() { +@@ -127,7 +127,7 @@ void PartitionAllocMallocInitOnce() { int err = pthread_atfork(BeforeForkInParent, AfterForkInParent, AfterForkInChild); PA_CHECK(err == 0); diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_starscan_pcscan.cc b/www/chromium/files/patch-base_allocator_partition__allocator_starscan_pcscan__internal.cc index fb0af07cb8d8..4e62c2a629f9 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_starscan_pcscan.cc +++ b/www/chromium/files/patch-base_allocator_partition__allocator_starscan_pcscan__internal.cc @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/starscan/pcscan.cc.orig 2021-05-25 11:07:18 UTC -+++ base/allocator/partition_allocator/starscan/pcscan.cc -@@ -67,7 +67,7 @@ namespace internal { +--- base/allocator/partition_allocator/starscan/pcscan_internal.cc.orig 2021-07-28 07:02:32 UTC ++++ base/allocator/partition_allocator/starscan/pcscan_internal.cc +@@ -72,7 +72,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 new file mode 100644 index 000000000000..44ee20228aa7 --- /dev/null +++ b/www/chromium/files/patch-base_allocator_partition__allocator_starscan_stack_stack.cc @@ -0,0 +1,39 @@ +--- base/allocator/partition_allocator/starscan/stack/stack.cc.orig 2021-07-28 10:41:10 UTC ++++ base/allocator/partition_allocator/starscan/stack/stack.cc +@@ -17,6 +17,10 @@ + #include <pthread.h> + #endif + ++#if defined(OS_FREEBSD) ++#include <pthread_np.h> ++#endif ++ + #if defined(LIBC_GLIBC) + extern "C" void* __libc_stack_end; + #endif +@@ -54,7 +58,15 @@ void* GetStackTop() { + + void* GetStackTop() { + pthread_attr_t attr; ++#if defined(OS_FREEBSD) ++ int error = pthread_attr_init(&attr); ++ if (error) { ++ return nullptr; ++ } ++ error = pthread_attr_get_np(pthread_self(), &attr); ++#else + int error = pthread_getattr_np(pthread_self(), &attr); ++#endif + if (!error) { + void* base; + size_t size; +@@ -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) ++#if defined(OS_FREEBSD) ++ pthread_attr_destroy(&attr); ++#endif + return nullptr; + } + diff --git a/www/chromium/files/patch-base_cpu.cc b/www/chromium/files/patch-base_cpu.cc index c9a46b5903d3..7f8adecb5ac5 100644 --- a/www/chromium/files/patch-base_cpu.cc +++ b/www/chromium/files/patch-base_cpu.cc @@ -1,4 +1,4 @@ ---- base/cpu.cc.orig 2021-04-14 18:40:48 UTC +--- base/cpu.cc.orig 2021-07-19 18:45:05 UTC +++ base/cpu.cc @@ -16,7 +16,7 @@ @@ -9,7 +9,7 @@ defined(OS_AIX) #include "base/containers/flat_set.h" #include "base/files/file_util.h" -@@ -214,6 +214,14 @@ const ProcCpuInfo& ParseProcCpu() { +@@ -215,6 +215,14 @@ const ProcCpuInfo& ParseProcCpu() { return *info; } @@ -24,7 +24,7 @@ #endif // defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || // defined(OS_LINUX) || defined(OS_CHROMEOS)) -@@ -352,6 +360,8 @@ void CPU::Initialize(bool require_branding) { +@@ -357,6 +365,8 @@ void CPU::Initialize(bool require_branding) { has_bti_ = hwcap2 & HWCAP2_BTI; #endif diff --git a/www/chromium/files/patch-base_cpu.h b/www/chromium/files/patch-base_cpu.h index 648d68bdb1c0..f8c188751c1f 100644 --- a/www/chromium/files/patch-base_cpu.h +++ b/www/chromium/files/patch-base_cpu.h @@ -1,6 +1,6 @@ ---- base/cpu.h.orig 2021-04-14 18:40:48 UTC +--- base/cpu.h.orig 2021-07-19 18:45:05 UTC +++ base/cpu.h -@@ -92,7 +92,7 @@ class BASE_EXPORT CPU final { +@@ -96,7 +96,7 @@ class BASE_EXPORT CPU final { IntelMicroArchitecture GetIntelMicroArchitecture() const; const std::string& cpu_brand() const { return cpu_brand_; } @@ -9,7 +9,7 @@ defined(OS_AIX) enum class CoreType { kUnknown = 0, -@@ -143,7 +143,7 @@ class BASE_EXPORT CPU final { +@@ -147,7 +147,7 @@ class BASE_EXPORT CPU final { // cpuidle driver. using CoreIdleTimes = std::vector<TimeDelta>; static bool GetCumulativeCoreIdleTimes(CoreIdleTimes&); diff --git a/www/chromium/files/patch-base_debug_debugger__posix.cc b/www/chromium/files/patch-base_debug_debugger__posix.cc index ea7f110b6fb4..0d6e7bbd22d2 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-04-14 18:40:48 UTC +--- base/debug/debugger_posix.cc.orig 2021-07-19 18:45:05 UTC +++ base/debug/debugger_posix.cc -@@ -98,7 +98,7 @@ bool BeingDebugged() { +@@ -93,7 +93,7 @@ bool BeingDebugged() { KERN_PROC, KERN_PROC_PID, getpid() @@ -9,7 +9,7 @@ , sizeof(struct kinfo_proc), 0 #endif -@@ -106,33 +106,35 @@ bool BeingDebugged() { +@@ -101,33 +101,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_elf__reader.cc b/www/chromium/files/patch-base_debug_elf__reader.cc index 46585628ac17..50e4509445ed 100644 --- a/www/chromium/files/patch-base_debug_elf__reader.cc +++ b/www/chromium/files/patch-base_debug_elf__reader.cc @@ -1,6 +1,6 @@ ---- base/debug/elf_reader.cc.orig 2021-04-14 18:40:48 UTC +--- base/debug/elf_reader.cc.orig 2021-07-19 18:45:05 UTC +++ base/debug/elf_reader.cc -@@ -38,7 +38,9 @@ using Nhdr = Elf64_Nhdr; +@@ -39,7 +39,9 @@ using Nhdr = Elf64_Nhdr; using Word = Elf64_Word; #endif @@ -10,7 +10,7 @@ // Returns a pointer to the header of the ELF binary mapped into memory, or a // null pointer if the header is invalid. Here and below |elf_mapped_base| is a -@@ -75,6 +77,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base, +@@ -76,6 +78,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base, bool found = false; while (current_section < section_end) { current_note = reinterpret_cast<const Nhdr*>(current_section); @@ -18,7 +18,7 @@ if (current_note->n_type == NT_GNU_BUILD_ID) { StringPiece note_name(current_section + sizeof(Nhdr), current_note->n_namesz); -@@ -84,6 +87,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base, +@@ -85,6 +88,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base, break; } } 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 bc18b34a20ab..66045b0c285c 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-04-14 18:40:48 UTC +--- base/debug/stack_trace_posix.cc.orig 2021-07-19 18:45:05 UTC +++ base/debug/stack_trace_posix.cc @@ -35,7 +35,7 @@ #include <AvailabilityMacros.h> @@ -9,7 +9,7 @@ #include "base/debug/proc_maps_linux.h" #endif -@@ -659,13 +659,21 @@ class SandboxSymbolizeHelper { +@@ -667,13 +667,21 @@ class SandboxSymbolizeHelper { // Reads /proc/self/maps. std::string contents; if (!ReadProcMaps(&contents)) { @@ -31,7 +31,7 @@ return false; } -@@ -696,7 +704,11 @@ class SandboxSymbolizeHelper { +@@ -704,7 +712,11 @@ class SandboxSymbolizeHelper { // Skip regions with empty file names. continue; } diff --git a/www/chromium/files/patch-base_debug_stack__trace__unittest.cc b/www/chromium/files/patch-base_debug_stack__trace__unittest.cc index 6eb9d505526c..a679dcb06d73 100644 --- a/www/chromium/files/patch-base_debug_stack__trace__unittest.cc +++ b/www/chromium/files/patch-base_debug_stack__trace__unittest.cc @@ -1,6 +1,6 @@ ---- base/debug/stack_trace_unittest.cc.orig 2021-04-14 18:40:48 UTC +--- base/debug/stack_trace_unittest.cc.orig 2021-07-19 18:45:05 UTC +++ base/debug/stack_trace_unittest.cc -@@ -88,6 +88,7 @@ TEST_F(StackTraceTest, OutputToStream) { +@@ -71,6 +71,7 @@ TEST_F(StackTraceTest, OutputToStream) { std::string::npos) << "Unable to resolve symbols."; @@ -8,7 +8,7 @@ // Expect a demangled symbol. // Note that Windows Release builds omit the function parameters from the // demangled stack output, otherwise this could be "testing::UnitTest::Run()". -@@ -106,9 +107,10 @@ TEST_F(StackTraceTest, OutputToStream) { +@@ -89,9 +90,10 @@ TEST_F(StackTraceTest, OutputToStream) { EXPECT_TRUE(backtrace_message.find(__func__) != std::string::npos) << "Expected to find " << __func__ << " in backtrace:\n" << backtrace_message; @@ -20,7 +20,7 @@ // Disabled in Official builds, where Link-Time Optimization can result in two // or fewer stack frames being available, causing the test to fail. TEST_F(StackTraceTest, TruncatedTrace) { -@@ -122,7 +124,7 @@ TEST_F(StackTraceTest, TruncatedTrace) { +@@ -105,7 +107,7 @@ TEST_F(StackTraceTest, TruncatedTrace) { truncated.Addresses(&count); EXPECT_EQ(2u, count); } @@ -29,7 +29,7 @@ // The test is used for manual testing, e.g., to see the raw output. TEST_F(StackTraceTest, DebugOutputToStream) { -@@ -361,7 +363,7 @@ TEST_F(StackTraceTest, MAYBE_TraceStackFramePointers) +@@ -344,7 +346,7 @@ TEST_F(StackTraceTest, MAYBE_TraceStackFramePointers) // sometimes we read fp / pc from the place that previously held // uninitialized value. // TODO(crbug.com/1132511): Enable this test on Fuchsia. diff --git a/www/chromium/files/patch-base_files_file__util.cc b/www/chromium/files/patch-base_files_file__util.cc new file mode 100644 index 000000000000..44ec0709b9b8 --- /dev/null +++ b/www/chromium/files/patch-base_files_file__util.cc @@ -0,0 +1,11 @@ +--- base/files/file_util.cc.orig 2021-07-28 07:18:23 UTC ++++ base/files/file_util.cc +@@ -52,7 +52,7 @@ bool Move(const FilePath& from_path, const FilePath& t + } + + bool CopyFileContents(File& infile, File& outfile) { +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) + bool retry_slow = false; + bool res = + internal::CopyFileContentsWithSendfile(infile, outfile, retry_slow); diff --git a/www/chromium/files/patch-base_files_file__util.h b/www/chromium/files/patch-base_files_file__util.h index 40aae8f579de..2fe14cf11e09 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-05-12 22:05:40 UTC +--- base/files/file_util.h.orig 2021-07-19 18:45:05 UTC +++ base/files/file_util.h -@@ -283,14 +283,14 @@ BASE_EXPORT bool SetPosixFilePermissions(const FilePat +@@ -284,14 +284,14 @@ BASE_EXPORT bool SetPosixFilePermissions(const FilePat BASE_EXPORT bool ExecutableExistsInPath(Environment* env, const FilePath::StringType& executable); @@ -17,7 +17,7 @@ #endif // OS_POSIX -@@ -602,7 +602,7 @@ BASE_EXPORT bool VerifyPathControlledByAdmin(const bas +@@ -614,7 +614,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,3 +26,21 @@ // 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 + const FilePath& to_path); + #endif // defined(OS_WIN) + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) + // 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 + BASE_EXPORT bool CopyFileContentsWithSendfile(File& infile, + File& outfile, + bool& retry_slow); +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) + + // Used by PreReadFile() when no kernel support for prefetching is available. + bool PreReadFileSlow(const FilePath& file_path, int64_t max_bytes); 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 ca0e4d4a8e28..c92ce21bda62 100644 --- a/www/chromium/files/patch-base_files_file__util__posix.cc +++ b/www/chromium/files/patch-base_files_file__util__posix.cc @@ -1,6 +1,17 @@ ---- base/files/file_util_posix.cc.orig 2021-05-12 22:05:40 UTC +--- base/files/file_util_posix.cc.orig 2021-07-19 18:45:05 UTC +++ base/files/file_util_posix.cc -@@ -384,7 +384,7 @@ bool CreatePipe(ScopedFD* read_fd, ScopedFD* write_fd, +@@ -23,6 +23,10 @@ + #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) + #include <sys/sendfile.h> + #endif ++#if defined(OS_BSD) ++#include <sys/socket.h> ++#include <sys/uio.h> ++#endif + + #include "base/base_switches.h" + #include "base/bits.h" +@@ -383,7 +387,7 @@ bool CreatePipe(ScopedFD* read_fd, ScopedFD* write_fd, } bool CreateLocalNonBlockingPipe(int fds[2]) { @@ -9,7 +20,7 @@ return pipe2(fds, O_CLOEXEC | O_NONBLOCK) == 0; #else int raw_fds[2]; -@@ -932,8 +932,12 @@ bool AllocateFileRegion(File* file, int64_t offset, si +@@ -936,8 +940,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. @@ -23,7 +34,7 @@ return true; DPLOG(ERROR) << "fallocate"; #elif defined(OS_APPLE) -@@ -1103,7 +1107,7 @@ int GetMaximumPathComponentLength(const FilePath& path +@@ -1111,7 +1119,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) { @@ -32,7 +43,7 @@ bool disable_dev_shm = false; #if !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_CHROMEOS_LACROS) disable_dev_shm = CommandLine::ForCurrentProcess()->HasSwitch( -@@ -1119,7 +1123,7 @@ bool GetShmemTempDir(bool executable, FilePath* path) +@@ -1127,7 +1135,7 @@ bool GetShmemTempDir(bool executable, FilePath* path) *path = FilePath("/dev/shm"); return true; } @@ -41,7 +52,7 @@ return GetTempDir(path); } #endif // !defined(OS_ANDROID) -@@ -1157,7 +1161,7 @@ PrefetchResult PreReadFile(const FilePath& file_path, +@@ -1165,7 +1173,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. @@ -50,7 +61,7 @@ (defined(OS_ANDROID) && __ANDROID_API__ >= 21) File file(file_path, File::FLAG_OPEN | File::FLAG_READ); if (!file.IsValid()) -@@ -1193,7 +1197,7 @@ PrefetchResult PreReadFile(const FilePath& file_path, +@@ -1201,7 +1209,7 @@ PrefetchResult PreReadFile(const FilePath& file_path, return internal::PreReadFileSlow(file_path, max_bytes) ? PrefetchResult{PrefetchResultCode::kSlowSuccess} : PrefetchResult{PrefetchResultCode::kSlowFailed}; @@ -59,7 +70,50 @@ // __ANDROID_API__ >= 21) } -@@ -1263,7 +1267,7 @@ bool CopyFileContentsWithSendfile(File& infile, +@@ -1232,7 +1240,7 @@ bool MoveUnsafe(const FilePath& from_path, const FileP + return true; + } + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) + bool CopyFileContentsWithSendfile(File& infile, + File& outfile, + bool& retry_slow) { +@@ -1246,12 +1254,26 @@ bool CopyFileContentsWithSendfile(File& infile, + while (file_size - copied > 0) { + // Don't specify an offset and the kernel will begin reading/writing to the + // current file offsets. ++#if defined(OS_BSD) ++ int retv = HANDLE_EINTR(sendfile(infile.GetPlatformFile(), ++ outfile.GetPlatformFile(), ++ copied, ++ file_size - copied, ++ /*hdtr=*/nullptr, ++ &res, ++ 0)); ++ if (retv != 0) { ++ res = -1; ++ break; ++ } ++#else + res = HANDLE_EINTR(sendfile(outfile.GetPlatformFile(), + infile.GetPlatformFile(), /*offset=*/nullptr, + /*length=*/file_size - copied)); + if (res <= 0) { + break; + } ++#endif + + copied += res; + } +@@ -1265,13 +1287,13 @@ bool CopyFileContentsWithSendfile(File& infile, + + return res >= 0; + } +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) + + } // namespace internal #endif // !defined(OS_NACL_NONSFI) @@ -68,7 +122,7 @@ BASE_EXPORT bool IsPathExecutable(const FilePath& path) { bool result = false; FilePath tmp_file_path; -@@ -1284,6 +1288,6 @@ BASE_EXPORT bool IsPathExecutable(const FilePath& path +@@ -1292,6 +1314,6 @@ BASE_EXPORT bool IsPathExecutable(const FilePath& path } return result; } diff --git a/www/chromium/files/patch-base_files_scoped__file.h b/www/chromium/files/patch-base_files_scoped__file.h new file mode 100644 index 000000000000..0973e46682f4 --- /dev/null +++ b/www/chromium/files/patch-base_files_scoped__file.h @@ -0,0 +1,43 @@ +--- base/files/scoped_file.h.orig 2021-07-28 07:19:23 UTC ++++ base/files/scoped_file.h +@@ -26,7 +26,7 @@ struct BASE_EXPORT ScopedFDCloseTraits : public Scoped + static void Release(const ScopedGeneric<int, ScopedFDCloseTraits>&, int); + }; + #elif defined(OS_POSIX) || defined(OS_FUCHSIA) +-#if defined(OS_CHROMEOS) || defined(OS_LINUX) ++#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) + // On ChromeOS and Linux we guard FD lifetime with a global table and hook into + // libc close() to perform checks. + struct BASE_EXPORT ScopedFDCloseTraits : public ScopedGenericOwnershipTracking { +@@ -37,7 +37,7 @@ struct BASE_EXPORT ScopedFDCloseTraits { + return -1; + } + static void Free(int fd); +-#if defined(OS_CHROMEOS) || defined(OS_LINUX) ++#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) + static void Acquire(const ScopedGeneric<int, ScopedFDCloseTraits>&, int); + static void Release(const ScopedGeneric<int, ScopedFDCloseTraits>&, int); + #endif +@@ -54,7 +54,7 @@ struct ScopedFILECloser { + + } // namespace internal + +-#if defined(OS_CHROMEOS) || defined(OS_LINUX) ++#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) + namespace subtle { + + // Enables or disables enforcement of FD ownership as tracked by ScopedFD +@@ -104,11 +104,11 @@ typedef ScopedGeneric<int, internal::ScopedFDCloseTrai + // Automatically closes |FILE*|s. + typedef std::unique_ptr<FILE, internal::ScopedFILECloser> ScopedFILE; + +-#if defined(OS_CHROMEOS) || defined(OS_LINUX) ++#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) + // Queries the ownership status of an FD, i.e. whether it is currently owned by + // a ScopedFD in the calling process. + bool BASE_EXPORT IsFDOwned(int fd); +-#endif // defined(OS_CHROMEOS) || defined(OS_LINUX) ++#endif // defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) + + } // namespace base + diff --git a/www/chromium/files/patch-base_files_scoped__file__linux.cc b/www/chromium/files/patch-base_files_scoped__file__linux.cc new file mode 100644 index 000000000000..05667175c342 --- /dev/null +++ b/www/chromium/files/patch-base_files_scoped__file__linux.cc @@ -0,0 +1,23 @@ +--- base/files/scoped_file_linux.cc.orig 2021-07-28 11:34:50 UTC ++++ base/files/scoped_file_linux.cc +@@ -80,12 +80,20 @@ bool IsFDOwned(int fd) { + + extern "C" { + ++#if defined(OS_FREEBSD) ++int __sys_close(int); ++#else + int __close(int); ++#endif + + __attribute__((visibility("default"), noinline)) int close(int fd) { + if (base::IsFDOwned(fd) && g_is_ownership_enforced) + CrashOnFdOwnershipViolation(); ++#if defined(OS_FREEBSD) ++ return __sys_close(fd); ++#else + return __close(fd); ++#endif + } + + } // extern "C" diff --git a/www/chromium/files/patch-base_logging__unittest.cc b/www/chromium/files/patch-base_logging__unittest.cc index dfe9a09bd0bb..4facaf43d7b5 100644 --- a/www/chromium/files/patch-base_logging__unittest.cc +++ b/www/chromium/files/patch-base_logging__unittest.cc @@ -1,6 +1,6 @@ ---- base/logging_unittest.cc.orig 2021-04-14 18:40:48 UTC +--- base/logging_unittest.cc.orig 2021-07-19 18:45:05 UTC +++ base/logging_unittest.cc -@@ -32,7 +32,7 @@ +@@ -33,7 +33,7 @@ #include "base/posix/eintr_wrapper.h" #endif // OS_POSIX @@ -9,7 +9,7 @@ #include <ucontext.h> #endif -@@ -557,7 +557,7 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo +@@ -559,7 +559,7 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo // need the arch-specific boilerplate below, which is inspired by breakpad. // At the same time, on OSX, ucontext.h is deprecated but si_addr works fine. uintptr_t crash_addr = 0; diff --git a/www/chromium/files/patch-base_memory_platform__shared__memory__region.h b/www/chromium/files/patch-base_memory_platform__shared__memory__region.h index d5679bdece87..f0959968cdd1 100644 --- a/www/chromium/files/patch-base_memory_platform__shared__memory__region.h +++ b/www/chromium/files/patch-base_memory_platform__shared__memory__region.h @@ -1,6 +1,6 @@ ---- base/memory/platform_shared_memory_region.h.orig 2021-04-14 18:40:48 UTC +--- base/memory/platform_shared_memory_region.h.orig 2021-07-19 18:45:05 UTC +++ base/memory/platform_shared_memory_region.h -@@ -27,7 +27,7 @@ +@@ -25,7 +25,7 @@ #include "base/files/scoped_file.h" #endif @@ -9,7 +9,7 @@ namespace content { class SandboxIPCHandler; } -@@ -120,7 +120,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { +@@ -118,7 +118,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { kMaxValue = GET_SHMEM_TEMP_DIR_FAILURE }; @@ -18,7 +18,7 @@ // Structure to limit access to executable region creation. struct ExecutableRegion { private: -@@ -264,7 +264,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { +@@ -262,7 +262,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { CheckPlatformHandlePermissionsCorrespondToMode); static PlatformSharedMemoryRegion Create(Mode mode, size_t size diff --git a/www/chromium/files/patch-base_process_launch.h b/www/chromium/files/patch-base_process_launch.h index 6c44c2cac20b..a7a7825cf9a4 100644 --- a/www/chromium/files/patch-base_process_launch.h +++ b/www/chromium/files/patch-base_process_launch.h @@ -1,6 +1,6 @@ ---- base/process/launch.h.orig 2021-05-12 22:05:40 UTC +--- base/process/launch.h.orig 2021-07-19 18:45:05 UTC +++ base/process/launch.h -@@ -190,7 +190,7 @@ struct BASE_EXPORT LaunchOptions { +@@ -191,7 +191,7 @@ struct BASE_EXPORT LaunchOptions { bool clear_environment = false; #endif // OS_WIN || OS_POSIX || OS_FUCHSIA @@ -9,7 +9,7 @@ // If non-zero, start the process using clone(), using flags as provided. // Unlike in clone, clone_flags may not contain a custom termination signal // that is sent to the parent when the child dies. The termination signal will -@@ -203,7 +203,7 @@ struct BASE_EXPORT LaunchOptions { +@@ -204,7 +204,7 @@ struct BASE_EXPORT LaunchOptions { // Sets parent process death signal to SIGKILL. bool kill_on_parent_death = false; @@ -18,7 +18,7 @@ #if defined(OS_MAC) // Mach ports that will be accessible to the child process. These are not -@@ -415,7 +415,7 @@ BASE_EXPORT void RaiseProcessToHighPriority(); +@@ -416,7 +416,7 @@ BASE_EXPORT void RaiseProcessToHighPriority(); // binary. This should not be called in production/released code. BASE_EXPORT LaunchOptions LaunchOptionsForTest(); diff --git a/www/chromium/files/patch-base_process_launch__posix.cc b/www/chromium/files/patch-base_process_launch__posix.cc index f312ca87e251..48f4348273c3 100644 --- a/www/chromium/files/patch-base_process_launch__posix.cc +++ b/www/chromium/files/patch-base_process_launch__posix.cc @@ -1,6 +1,6 @@ ---- base/process/launch_posix.cc.orig 2021-04-14 18:40:48 UTC +--- base/process/launch_posix.cc.orig 2021-07-19 18:45:05 UTC +++ base/process/launch_posix.cc -@@ -59,12 +59,14 @@ +@@ -58,12 +58,14 @@ #if defined(OS_FREEBSD) #include <sys/event.h> #include <sys/ucontext.h> @@ -15,7 +15,7 @@ extern char** environ; namespace base { -@@ -221,6 +223,28 @@ void CloseSuperfluousFds(const base::InjectiveMultimap +@@ -220,6 +222,28 @@ void CloseSuperfluousFds(const base::InjectiveMultimap DirReaderPosix fd_dir(kFDDir); if (!fd_dir.IsValid()) { // Fallback case: Try every possible fd. @@ -44,7 +44,16 @@ for (size_t i = 0; i < max_fds; ++i) { const int fd = static_cast<int>(i); if (fd == STDIN_FILENO || fd == STDOUT_FILENO || fd == STDERR_FILENO) -@@ -444,22 +468,32 @@ Process LaunchProcess(const std::vector<std::string>& +@@ -358,7 +382,7 @@ Process LaunchProcess(const std::vector<std::string>& + // might do things like block waiting for threads that don't even exist + // in the child. + +-#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(); +@@ -451,22 +475,32 @@ Process LaunchProcess(const std::vector<std::string>& // Set NO_NEW_PRIVS by default. Since NO_NEW_PRIVS only exists in kernel // 3.5+, do not check the return value of prctl here. diff --git a/www/chromium/files/patch-base_process_memory.h b/www/chromium/files/patch-base_process_memory.h index 03eff8b25b5a..ecbfa05d7fa1 100644 --- a/www/chromium/files/patch-base_process_memory.h +++ b/www/chromium/files/patch-base_process_memory.h @@ -1,6 +1,6 @@ ---- base/process/memory.h.orig 2021-04-14 18:40:48 UTC +--- base/process/memory.h.orig 2021-07-19 18:45:05 UTC +++ base/process/memory.h -@@ -31,7 +31,7 @@ BASE_EXPORT void TerminateBecauseOutOfMemory(size_t si +@@ -32,7 +32,7 @@ BASE_EXPORT void TerminateBecauseOutOfMemory(size_t si // TODO: this can be removed when Breakpad is no longer supported. BASE_EXPORT extern size_t g_oom_size; diff --git a/www/chromium/files/patch-base_process_memory__unittest.cc b/www/chromium/files/patch-base_process_memory__unittest.cc index ec0df47ff011..09dba6c1e236 100644 --- a/www/chromium/files/patch-base_process_memory__unittest.cc +++ b/www/chromium/files/patch-base_process_memory__unittest.cc @@ -1,15 +1,15 @@ ---- base/process/memory_unittest.cc.orig 2021-04-14 18:40:48 UTC +--- base/process/memory_unittest.cc.orig 2021-07-19 18:45:05 UTC +++ base/process/memory_unittest.cc -@@ -38,6 +38,8 @@ +@@ -37,6 +37,8 @@ #if defined(OS_LINUX) || defined(OS_CHROMEOS) #include <malloc.h> #include "base/test/malloc_wrapper.h" +#elif defined(OS_BSD) +#include "base/test/malloc_wrapper.h" #endif - - #if defined(OS_WIN) -@@ -110,9 +112,9 @@ TEST(MemoryTest, AllocatorShimWorking) { + #if defined(OS_ANDROID) + #include "base/android/build_info.h" +@@ -112,9 +114,9 @@ TEST(MemoryTest, AllocatorShimWorking) { #endif } @@ -21,7 +21,7 @@ !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) namespace { -@@ -307,7 +309,7 @@ TEST_F(OutOfMemoryDeathTest, SecurityAlignedRealloc) { +@@ -336,7 +338,7 @@ TEST_F(OutOfMemoryDeathTest, SecurityAlignedRealloc) { #endif // defined(OS_WIN) #endif // !defined(OS_MAC) && !defined(OS_ANDROID) @@ -30,7 +30,7 @@ TEST_F(OutOfMemoryDeathTest, Valloc) { ASSERT_OOM_DEATH({ -@@ -353,7 +355,7 @@ TEST_F(OutOfMemoryDeathTest, ViaSharedLibraries) { +@@ -382,7 +384,7 @@ TEST_F(OutOfMemoryDeathTest, ViaSharedLibraries) { value_ = MallocWrapper(test_size_); }); } @@ -39,7 +39,7 @@ // Android doesn't implement posix_memalign(). #if defined(OS_POSIX) && !defined(OS_ANDROID) -@@ -504,7 +506,7 @@ TEST_F(OutOfMemoryTest, TerminateBecauseOutOfMemoryRep +@@ -533,7 +535,7 @@ TEST_F(OutOfMemoryTest, TerminateBecauseOutOfMemoryRep #endif // OS_WIN #if defined(ARCH_CPU_32_BITS) && \ @@ -48,7 +48,7 @@ void TestAllocationsReleaseReservation(void* (*alloc_fn)(size_t), void (*free_fn)(void*)) { -@@ -562,7 +564,7 @@ TEST_F(OutOfMemoryHandledTest, NewReleasesReservation) +@@ -591,7 +593,7 @@ TEST_F(OutOfMemoryHandledTest, NewReleasesReservation) [](size_t size) { return static_cast<void*>(new char[size]); }, [](void* ptr) { delete[] static_cast<char*>(ptr); }); } @@ -57,7 +57,7 @@ // defined(OS_CHROMEOS)) // See the comment in |UncheckedMalloc()|, it behaves as malloc() in these -@@ -624,5 +626,5 @@ TEST_F(OutOfMemoryHandledTest, UncheckedCalloc) { +@@ -653,5 +655,5 @@ TEST_F(OutOfMemoryHandledTest, UncheckedCalloc) { #endif // BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) || defined(OS_ANDROID) diff --git a/www/chromium/files/patch-base_process_process__handle.h b/www/chromium/files/patch-base_process_process__handle.h index 962a580a10a9..1708776734a2 100644 --- a/www/chromium/files/patch-base_process_process__handle.h +++ b/www/chromium/files/patch-base_process_process__handle.h @@ -1,6 +1,6 @@ ---- base/process/process_handle.h.orig 2021-04-14 18:40:48 UTC +--- base/process/process_handle.h.orig 2021-07-19 18:45:05 UTC +++ base/process/process_handle.h -@@ -103,7 +103,7 @@ BASE_EXPORT ProcessId GetCurrentProcId(); +@@ -106,7 +106,7 @@ BASE_EXPORT ProcessId GetCurrentProcId(); // processes may be reused. BASE_EXPORT UniqueProcId GetUniqueIdForProcess(); 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 20a4c07237c3..e938b55bfa05 100644 --- a/www/chromium/files/patch-base_process_process__handle__freebsd.cc +++ b/www/chromium/files/patch-base_process_process__handle__freebsd.cc @@ -1,6 +1,21 @@ ---- base/process/process_handle_freebsd.cc.orig 2021-04-14 18:40:48 UTC +--- base/process/process_handle_freebsd.cc.orig 2021-07-19 18:45:05 UTC +++ base/process/process_handle_freebsd.cc -@@ -16,10 +16,13 @@ namespace base { +@@ -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> + #include <unistd.h> + ++#include "base/files/file_path.h" ++#include "base/stl_util.h" ++ + namespace base { ProcessId GetParentProcessId(ProcessHandle process) { struct kinfo_proc info; diff --git a/www/chromium/files/patch-base_process_process__metrics.h b/www/chromium/files/patch-base_process_process__metrics.h index 9ca0b2333067..1280ac12748e 100644 --- a/www/chromium/files/patch-base_process_process__metrics.h +++ b/www/chromium/files/patch-base_process_process__metrics.h @@ -1,6 +1,15 @@ ---- base/process/process_metrics.h.orig 2021-05-12 22:05:40 UTC +--- base/process/process_metrics.h.orig 2021-07-19 18:45:05 UTC +++ base/process/process_metrics.h -@@ -47,7 +47,7 @@ namespace base { +@@ -37,7 +37,7 @@ + #include "base/win/windows_types.h" + #endif + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) || \ + defined(OS_AIX) + #include <string> + #include <utility> +@@ -55,7 +55,7 @@ class Value; // Full declaration is in process_metrics_iocounters.h. struct IoCounters; @@ -9,7 +18,7 @@ // Minor and major page fault counts since the process creation. // Both counts are process-wide, and exclude child processes. // -@@ -57,7 +57,7 @@ struct PageFaultCounts { +@@ -65,7 +65,7 @@ struct PageFaultCounts { int64_t minor; int64_t major; }; @@ -18,7 +27,7 @@ // Convert a POSIX timeval to microseconds. BASE_EXPORT int64_t TimeValToMicroseconds(const struct timeval& tv); -@@ -98,7 +98,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -106,7 +106,7 @@ class BASE_EXPORT ProcessMetrics { // convenience wrapper for CreateProcessMetrics(). static std::unique_ptr<ProcessMetrics> CreateCurrentProcessMetrics(); @@ -27,16 +36,16 @@ // 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; -@@ -124,7 +124,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -132,7 +132,7 @@ class BASE_EXPORT ProcessMetrics { // will result in a time delta of 2 seconds/per 1 wall-clock second. - TimeDelta GetCumulativeCPUUsage(); + TimeDelta GetCumulativeCPUUsage() WARN_UNUSED_RESULT; -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) || \ 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). -@@ -159,7 +159,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -167,7 +167,7 @@ class BASE_EXPORT ProcessMetrics { bool ParseProcTimeInState(const std::string& content, PlatformThreadId tid, TimeInStatePerThread& time_in_state_per_thread); @@ -45,7 +54,7 @@ // defined(OS_AIX) // Returns the number of average idle cpu wakeups per second since the last -@@ -208,14 +208,14 @@ class BASE_EXPORT ProcessMetrics { +@@ -216,14 +216,14 @@ class BASE_EXPORT ProcessMetrics { int GetOpenFdSoftLimit() const; #endif // defined(OS_POSIX) @@ -62,7 +71,7 @@ // Returns total memory usage of malloc. size_t GetMallocUsage(); -@@ -227,7 +227,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -235,7 +235,7 @@ class BASE_EXPORT ProcessMetrics { ProcessMetrics(ProcessHandle process, PortProvider* port_provider); #endif // !defined(OS_MAC) @@ -71,7 +80,7 @@ defined(OS_AIX) int CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups); #endif -@@ -238,10 +238,10 @@ class BASE_EXPORT ProcessMetrics { +@@ -246,10 +246,10 @@ class BASE_EXPORT ProcessMetrics { uint64_t absolute_package_idle_wakeups); #endif @@ -84,7 +93,7 @@ // defined(OS_AIX) #if defined(OS_WIN) -@@ -263,7 +263,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -271,7 +271,7 @@ class BASE_EXPORT ProcessMetrics { // Number of bytes transferred to/from disk in bytes. uint64_t last_cumulative_disk_usage_ = 0; 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 b3cfd3d4c3c2..c750a9881deb 100644 --- a/www/chromium/files/patch-base_process_process__metrics__freebsd.cc +++ b/www/chromium/files/patch-base_process_process__metrics__freebsd.cc @@ -1,4 +1,4 @@ ---- base/process/process_metrics_freebsd.cc.orig 2021-04-14 18:40:48 UTC +--- base/process/process_metrics_freebsd.cc.orig 2021-07-19 18:45:05 UTC +++ base/process/process_metrics_freebsd.cc @@ -3,8 +3,10 @@ // found in the LICENSE file. @@ -11,9 +11,11 @@ #include <sys/sysctl.h> #include <sys/user.h> #include <unistd.h> -@@ -14,11 +16,29 @@ +@@ -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 */ @@ -43,7 +45,7 @@ // static std::unique_ptr<ProcessMetrics> ProcessMetrics::CreateProcessMetrics( -@@ -69,4 +89,216 @@ size_t GetSystemCommitCharge() { +@@ -69,4 +90,216 @@ size_t GetSystemCommitCharge() { return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize); } diff --git a/www/chromium/files/patch-base_process_process__metrics__posix.cc b/www/chromium/files/patch-base_process_process__metrics__posix.cc index b476b607f81e..3fe1216db9df 100644 --- a/www/chromium/files/patch-base_process_process__metrics__posix.cc +++ b/www/chromium/files/patch-base_process_process__metrics__posix.cc @@ -1,4 +1,4 @@ ---- base/process/process_metrics_posix.cc.orig 2021-04-14 18:40:48 UTC +--- base/process/process_metrics_posix.cc.orig 2021-07-19 18:45:05 UTC +++ base/process/process_metrics_posix.cc @@ -20,6 +20,8 @@ @@ -9,10 +9,10 @@ #else #include <malloc.h> #endif -@@ -126,7 +128,7 @@ size_t ProcessMetrics::GetMallocUsage() { - #else - return minfo.hblkhd + minfo.arena; - #endif +@@ -136,7 +138,7 @@ size_t ProcessMetrics::GetMallocUsage() { + return stats.size_in_use; + #elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) + return GetMallocUsageMallinfo(); -#elif defined(OS_FUCHSIA) +#elif defined(OS_FUCHSIA) || defined(OS_BSD) // TODO(fuchsia): Not currently exposed. https://crbug.com/735087. diff --git a/www/chromium/files/patch-base_process_process__unittest.cc b/www/chromium/files/patch-base_process_process__unittest.cc index 684f1fe44457..302b9073639f 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-04-20 18:58:23 UTC +--- base/process/process_unittest.cc.orig 2021-07-19 18:45:05 UTC +++ base/process/process_unittest.cc -@@ -139,7 +139,7 @@ TEST_F(ProcessTest, CreationTimeOtherProcess) { +@@ -138,7 +138,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. -@@ -287,6 +287,7 @@ TEST_F(ProcessTest, WaitForExitOrEventWithEventSet) { +@@ -285,6 +285,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 -@@ -344,6 +345,7 @@ TEST_F(ProcessTest, SetProcessBackgroundedSelf) { +@@ -342,6 +343,7 @@ TEST_F(ProcessTest, SetProcessBackgroundedSelf) { int new_priority = process.GetPriority(); EXPECT_EQ(old_priority, new_priority); } diff --git a/www/chromium/files/patch-base_profiler_stack__copier__signal.cc b/www/chromium/files/patch-base_profiler_stack__copier__signal.cc index 909703eed7db..4d309daebe17 100644 --- a/www/chromium/files/patch-base_profiler_stack__copier__signal.cc +++ b/www/chromium/files/patch-base_profiler_stack__copier__signal.cc @@ -1,4 +1,4 @@ ---- base/profiler/stack_copier_signal.cc.orig 2021-05-12 22:05:40 UTC +--- base/profiler/stack_copier_signal.cc.orig 2021-07-19 18:45:05 UTC +++ base/profiler/stack_copier_signal.cc @@ -4,7 +4,14 @@ @@ -15,7 +15,7 @@ #include <signal.h> #include <sys/ucontext.h> #include <syscall.h> -@@ -36,8 +43,13 @@ class AsyncSafeWaitableEvent { +@@ -37,8 +44,13 @@ class AsyncSafeWaitableEvent { // for a pthread mutex. So, also check the condition. while (true) { int res = @@ -29,7 +29,7 @@ if (futex_.load(std::memory_order_acquire) != 0) return true; if (res != 0) -@@ -47,8 +59,12 @@ class AsyncSafeWaitableEvent { +@@ -48,8 +60,12 @@ class AsyncSafeWaitableEvent { void Signal() { futex_.store(1, std::memory_order_release); @@ -42,7 +42,7 @@ } private: -@@ -222,11 +238,18 @@ bool StackCopierSignal::CopyStack(StackBuffer* stack_b +@@ -223,11 +239,18 @@ bool StackCopierSignal::CopyStack(StackBuffer* stack_b if (!scoped_sigaction.succeeded()) return false; 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 ad992a5c09a0..35b42ee88f59 100644 --- a/www/chromium/files/patch-base_profiler_thread__delegate__posix.cc +++ b/www/chromium/files/patch-base_profiler_thread__delegate__posix.cc @@ -1,16 +1,17 @@ ---- base/profiler/thread_delegate_posix.cc.orig 2021-04-14 18:40:48 UTC +--- base/profiler/thread_delegate_posix.cc.orig 2021-07-19 18:45:05 UTC +++ base/profiler/thread_delegate_posix.cc -@@ -12,6 +12,9 @@ - #include "base/profiler/thread_delegate_posix.h" - #include "base/stl_util.h" +@@ -13,6 +13,10 @@ #include "build/build_config.h" -+#if defined(OS_FREEBSD) + #include "third_party/abseil-cpp/absl/types/optional.h" + ++#if defined(OS_BSD) +#include <pthread_np.h> +#endif - ++ #if defined(OS_ANDROID) #include "base/files/file_util.h" -@@ -43,7 +46,12 @@ base::Optional<uintptr_t> GetAndroidMainThreadStackBas + #include "base/files/scoped_file.h" +@@ -43,7 +47,12 @@ absl::optional<uintptr_t> GetAndroidMainThreadStackBas uintptr_t GetThreadStackBaseAddressImpl( SamplingProfilerThreadToken thread_token) { pthread_attr_t attr; @@ -23,7 +24,7 @@ // See crbug.com/617730 for limitations of this approach on Linux. void* address; size_t size; -@@ -130,16 +138,33 @@ std::vector<uintptr_t*> ThreadDelegatePosix::GetRegist +@@ -130,16 +139,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. @@ -57,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 +172,7 @@ std::vector<uintptr_t*> ThreadDelegatePosix::GetRegist +@@ -147,6 +173,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_test_BUILD.gn b/www/chromium/files/patch-base_test_BUILD.gn index 46256e1091d1..2719ad877a29 100644 --- a/www/chromium/files/patch-base_test_BUILD.gn +++ b/www/chromium/files/patch-base_test_BUILD.gn @@ -1,6 +1,6 @@ ---- base/test/BUILD.gn.orig 2021-05-12 22:05:40 UTC +--- base/test/BUILD.gn.orig 2021-07-19 18:45:05 UTC +++ base/test/BUILD.gn -@@ -423,7 +423,11 @@ if (is_linux || is_chromeos) { +@@ -425,7 +425,11 @@ if (is_linux || is_chromeos) { copy("fonts_conf") { sources = [ "fonts.conf" ] 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 d5ecd16fb2f8..efdfb4483653 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-04-14 18:40:48 UTC +--- base/test/launcher/test_launcher.cc.orig 2021-07-19 18:45:05 UTC +++ base/test/launcher/test_launcher.cc -@@ -58,6 +58,7 @@ +@@ -60,6 +60,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" -@@ -599,7 +600,7 @@ ChildProcessResults DoLaunchChildTestProcess( +@@ -601,7 +602,7 @@ ChildProcessResults DoLaunchChildTestProcess( #if !defined(OS_FUCHSIA) options.new_process_group = true; #endif @@ -17,7 +17,7 @@ options.kill_on_parent_death = true; #endif -@@ -1515,7 +1516,7 @@ bool TestLauncher::Init(CommandLine* command_line) { +@@ -1523,7 +1524,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 ee31c754a5a0..1f2d086d17c7 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-05-12 22:05:40 UTC +--- base/test/test_suite.cc.orig 2021-07-19 18:45:05 UTC +++ base/test/test_suite.cc @@ -68,7 +68,7 @@ #include "base/test/test_support_android.h" @@ -18,7 +18,7 @@ class CheckProcessPriority : public testing::EmptyTestEventListener { public: CheckProcessPriority() { CHECK(!IsProcessBackgrounded()); } -@@ -399,14 +399,14 @@ void TestSuite::PreInitialize() { +@@ -351,14 +351,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. -@@ -680,7 +680,7 @@ void TestSuite::Initialize() { +@@ -632,7 +632,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 -@@ -693,7 +693,7 @@ void TestSuite::Initialize() { +@@ -645,7 +645,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__internal__posix.h b/www/chromium/files/patch-base_threading_platform__thread__internal__posix.h index aa814ce4c670..6839b0e56713 100644 --- a/www/chromium/files/patch-base_threading_platform__thread__internal__posix.h +++ b/www/chromium/files/patch-base_threading_platform__thread__internal__posix.h @@ -1,8 +1,8 @@ ---- base/threading/platform_thread_internal_posix.h.orig 2021-04-14 18:40:48 UTC +--- base/threading/platform_thread_internal_posix.h.orig 2021-07-19 18:45:05 UTC +++ base/threading/platform_thread_internal_posix.h @@ -47,13 +47,13 @@ bool SetCurrentThreadPriorityForPlatform(ThreadPriorit // of CanIncreaseThreadPriority(). - Optional<ThreadPriority> GetCurrentThreadPriorityForPlatform(); + absl::optional<ThreadPriority> GetCurrentThreadPriorityForPlatform(); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) 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 8a5b4291b007..f257725cea33 100644 --- a/www/chromium/files/patch-base_threading_platform__thread__linux.cc +++ b/www/chromium/files/patch-base_threading_platform__thread__linux.cc @@ -1,6 +1,6 @@ ---- base/threading/platform_thread_linux.cc.orig 2021-04-14 18:40:48 UTC +--- base/threading/platform_thread_linux.cc.orig 2021-07-19 18:45:05 UTC +++ base/threading/platform_thread_linux.cc -@@ -27,7 +27,9 @@ +@@ -29,7 +29,9 @@ #if !defined(OS_NACL) && !defined(OS_AIX) #include <pthread.h> @@ -10,16 +10,16 @@ #include <sys/resource.h> #include <sys/time.h> #include <sys/types.h> -@@ -298,7 +300,7 @@ const ThreadPriorityToNiceValuePair kThreadPriorityToN +@@ -300,7 +302,7 @@ const ThreadPriorityToNiceValuePair kThreadPriorityToN - Optional<bool> CanIncreaseCurrentThreadPriorityForPlatform( + absl::optional<bool> CanIncreaseCurrentThreadPriorityForPlatform( ThreadPriority priority) { -#if !defined(OS_NACL) +#if !defined(OS_NACL) && !defined(OS_BSD) // A non-zero soft-limit on RLIMIT_RTPRIO is required to be allowed to invoke // pthread_setschedparam in SetCurrentThreadPriorityForPlatform(). struct rlimit rlim; -@@ -348,7 +350,7 @@ Optional<ThreadPriority> GetCurrentThreadPriorityForPl +@@ -350,7 +352,7 @@ absl::optional<ThreadPriority> GetCurrentThreadPriorit void PlatformThread::SetName(const std::string& name) { ThreadIdNameManager::GetInstance()->SetName(name); 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 bb8888d61b1e..d469007593db 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-06-09 22:13:52 UTC +--- base/threading/platform_thread_posix.cc.orig 2021-07-19 18:45:05 UTC +++ base/threading/platform_thread_posix.cc -@@ -32,6 +32,10 @@ +@@ -33,6 +33,10 @@ #include <sys/syscall.h> #endif @@ -11,7 +11,7 @@ #if defined(OS_FUCHSIA) #include <zircon/process.h> #else -@@ -181,6 +185,8 @@ PlatformThreadId PlatformThread::CurrentId() { +@@ -194,6 +198,8 @@ PlatformThreadId PlatformThread::CurrentId() { // into the kernel. #if defined(OS_APPLE) return pthread_mach_thread_np(pthread_self()); diff --git a/www/chromium/files/patch-base_time_time.cc b/www/chromium/files/patch-base_time_time.cc new file mode 100644 index 000000000000..071c04757fff --- /dev/null +++ b/www/chromium/files/patch-base_time_time.cc @@ -0,0 +1,17 @@ +--- base/time/time.cc.orig 2021-07-28 07:27:11 UTC ++++ base/time/time.cc +@@ -4,12 +4,12 @@ + + #include "base/time/time.h" + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // time.h is a widely included header and its size impacts build time. + // Try not to raise this limit unless necessary. See + // https://chromium.googlesource.com/chromium/src/+/HEAD/docs/wmax_tokens.md + #pragma clang max_tokens_here 390000 +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + #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 index 4014b577f727..02772da581c3 100644 --- a/www/chromium/files/patch-base_time_time__unittest.cc +++ b/www/chromium/files/patch-base_time_time__unittest.cc @@ -1,14 +1,14 @@ ---- base/time/time_unittest.cc.orig 2021-05-12 22:05:40 UTC +--- base/time/time_unittest.cc.orig 2021-07-19 18:45:05 UTC +++ base/time/time_unittest.cc -@@ -2074,6 +2074,7 @@ TEST(TimeDelta, Overflows) { - EXPECT_TRUE((kLargeDelta / 0.5).is_max()); - EXPECT_TRUE((kLargeDelta / -0.5).is_min()); +@@ -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(), ""); -@@ -2102,6 +2103,7 @@ TEST(TimeDelta, Overflows) { +@@ -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(), ""); diff --git a/www/chromium/files/patch-base_trace__event_heap__profiler__allocation__context__tracker.cc b/www/chromium/files/patch-base_trace__event_heap__profiler__allocation__context__tracker.cc index db289fa7ecc6..0d931d1190e3 100644 --- a/www/chromium/files/patch-base_trace__event_heap__profiler__allocation__context__tracker.cc +++ b/www/chromium/files/patch-base_trace__event_heap__profiler__allocation__context__tracker.cc @@ -1,4 +1,4 @@ ---- base/trace_event/heap_profiler_allocation_context_tracker.cc.orig 2021-04-14 18:40:48 UTC +--- base/trace_event/heap_profiler_allocation_context_tracker.cc.orig 2021-07-19 18:45:05 UTC +++ base/trace_event/heap_profiler_allocation_context_tracker.cc @@ -30,6 +30,10 @@ #include <sys/prctl.h> @@ -11,7 +11,7 @@ namespace base { namespace trace_event { -@@ -61,13 +65,23 @@ ThreadLocalStorage::Slot& AllocationContextTrackerTLS( +@@ -62,13 +66,23 @@ ThreadLocalStorage::Slot& AllocationContextTrackerTLS( // with id. This function intentionally leaks the allocated strings since they // are used to tag allocations even after the thread dies. const char* GetAndLeakThreadName() { 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 cf882af43d79..f4491ec684a2 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-05-12 22:05:40 UTC +--- base/trace_event/malloc_dump_provider.cc.orig 2021-07-19 18:45:05 UTC +++ base/trace_event/malloc_dump_provider.cc -@@ -20,6 +20,8 @@ +@@ -21,6 +21,8 @@ #if defined(OS_APPLE) #include <malloc/malloc.h> @@ -9,8 +9,8 @@ #else #include <malloc.h> #endif -@@ -199,6 +201,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump - } +@@ -203,6 +205,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump + &allocated_objects_count); #elif defined(OS_FUCHSIA) // TODO(fuchsia): Port, see https://crbug.com/706592. +#elif defined(OS_BSD) 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 a33f302f5f91..346392d8ec65 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-05-12 22:05:40 UTC +--- base/trace_event/process_memory_dump.cc.orig 2021-07-19 18:45:05 UTC +++ base/trace_event/process_memory_dump.cc -@@ -102,7 +102,7 @@ base::Optional<size_t> ProcessMemoryDump::CountResiden +@@ -104,7 +104,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-base_tracing_trace__time.cc b/www/chromium/files/patch-base_tracing_trace__time.cc new file mode 100644 index 000000000000..917480bf011b --- /dev/null +++ b/www/chromium/files/patch-base_tracing_trace__time.cc @@ -0,0 +1,14 @@ +--- base/tracing/trace_time.cc.orig 2021-07-21 11:24:56 UTC ++++ base/tracing/trace_time.cc +@@ -16,7 +16,11 @@ int64_t TraceBootTicksNow() { + #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ + defined(OS_FUCHSIA) + struct timespec ts; ++#if defined(OS_BSD) + int res = clock_gettime(CLOCK_BOOTTIME, &ts); ++#else ++ int res = clock_gettime(CLOCK_BOOTTIME, &ts); ++#endif + if (res != -1) + return static_cast<int64_t>(perfetto::base::FromPosixTimespec(ts).count()); + #endif diff --git a/www/chromium/files/patch-services_tracing_public_cpp_perfetto_trace__time.h b/www/chromium/files/patch-base_tracing_trace__time.h index 7e4adcc80d27..684427507459 100644 --- a/www/chromium/files/patch-services_tracing_public_cpp_perfetto_trace__time.h +++ b/www/chromium/files/patch-base_tracing_trace__time.h @@ -1,11 +1,11 @@ ---- services/tracing/public/cpp/perfetto/trace_time.h.orig 2021-06-11 09:59:43 UTC -+++ services/tracing/public/cpp/perfetto/trace_time.h -@@ -10,7 +10,7 @@ - +--- base/tracing/trace_time.h.orig 2021-07-21 13:25:51 UTC ++++ base/tracing/trace_time.h +@@ -11,7 +11,7 @@ + namespace base { namespace tracing { -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ -+#if defined(OS_BSD) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) || \ defined(OS_FUCHSIA) // Linux, Android, and Fuchsia all use CLOCK_MONOTONIC. See crbug.com/166153 // about efforts to unify base::TimeTicks across all platforms. diff --git a/www/chromium/files/patch-build_config_compiler_BUILD.gn b/www/chromium/files/patch-build_config_compiler_BUILD.gn index ef52986708aa..9bc74ac51a27 100644 --- a/www/chromium/files/patch-build_config_compiler_BUILD.gn +++ b/www/chromium/files/patch-build_config_compiler_BUILD.gn @@ -1,6 +1,6 @@ ---- build/config/compiler/BUILD.gn.orig 2021-06-09 22:13:52 UTC +--- build/config/compiler/BUILD.gn.orig 2021-07-19 18:45:05 UTC +++ build/config/compiler/BUILD.gn -@@ -133,7 +133,7 @@ declare_args() { +@@ -144,7 +144,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. @@ -9,7 +9,7 @@ # This argument is to control whether enabling text section splitting in the # final binary. When enabled, the separated text sections with prefix -@@ -333,7 +333,7 @@ config("compiler") { +@@ -347,7 +347,7 @@ config("compiler") { } # Linker warnings. @@ -18,7 +18,7 @@ ldflags += [ "-Wl,--fatal-warnings" ] } if (fatal_linker_warnings && is_apple) { -@@ -428,7 +428,7 @@ config("compiler") { +@@ -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. @@ -27,7 +27,7 @@ ldflags += [ "-Wl,-z,defs", "-Wl,--as-needed", -@@ -518,7 +518,7 @@ config("compiler") { +@@ -532,7 +532,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 -@@ -661,7 +661,12 @@ config("compiler") { +@@ -675,7 +675,12 @@ config("compiler") { # and let it use all cores. # TODO(thakis): Check if '=0' (that is, number of cores, instead # of "all" which means number of hardware threads) is faster. @@ -50,7 +50,7 @@ ldflags += [ "-Wl,--thinlto-cache-dir=" + -@@ -851,7 +856,7 @@ config("compiler_cpu_abi") { +@@ -861,7 +866,7 @@ config("compiler_cpu_abi") { cflags += [ "-mtune=$arm_tune" ] } } else if (current_cpu == "arm64") { @@ -59,7 +59,7 @@ cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] } -@@ -1201,7 +1206,7 @@ config("compiler_deterministic") { +@@ -1211,7 +1216,7 @@ config("compiler_deterministic") { "-Xclang", ".", ] @@ -68,7 +68,7 @@ # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167) asmflags = [ "-Wa,-fdebug-compilation-dir,." ] } -@@ -1584,7 +1589,7 @@ config("default_warnings") { +@@ -1594,7 +1599,7 @@ config("default_warnings") { cflags += [ "-Wno-nonportable-include-path" ] } @@ -77,7 +77,7 @@ # Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not # recognize. cflags += [ -@@ -1625,6 +1630,18 @@ config("default_warnings") { +@@ -1635,6 +1640,18 @@ config("default_warnings") { cflags += [ "-Wno-max-tokens" ] } } @@ -96,16 +96,16 @@ } } } -@@ -1754,7 +1771,7 @@ config("no_chromium_code") { +@@ -1769,7 +1786,7 @@ config("no_chromium_code") { # suppressing them individually, we just blanket suppress them here. "-Wno-unused-variable", ] - 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/1031169): Clean up and enable. + # TODO(https://crbug.com/1202159): Clean up and enable. "-Wno-misleading-indentation", -@@ -1832,7 +1849,7 @@ config("export_dynamic") { +@@ -1847,7 +1864,7 @@ config("export_dynamic") { config("thin_archive") { # The macOS and iOS default linker ld64 does not support reading thin # archives. @@ -114,7 +114,7 @@ arflags = [ "-T" ] } else if (is_win && use_lld) { arflags = [ "/llvmlibthin" ] -@@ -2373,7 +2390,7 @@ config("symbols") { +@@ -2381,7 +2398,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) { @@ -123,7 +123,7 @@ } # TODO(https://crbug.com/1050118): Investigate missing debug info on mac. -@@ -2406,7 +2423,7 @@ config("symbols") { +@@ -2414,7 +2431,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_linux_strip__binary.gni b/www/chromium/files/patch-build_linux_strip__binary.gni new file mode 100644 index 000000000000..7a6a20f0bfa8 --- /dev/null +++ b/www/chromium/files/patch-build_linux_strip__binary.gni @@ -0,0 +1,15 @@ +--- build/linux/strip_binary.gni.orig 2021-08-17 16:31:26 UTC ++++ build/linux/strip_binary.gni +@@ -20,7 +20,11 @@ template("strip_binary") { + "testonly", + ]) + action("${target_name}") { +- eu_strip_binary = "//buildtools/third_party/eu-strip/bin/eu-strip" ++ if (is_bsd) { ++ eu_strip_binary = "//buildtools/freebsd/strip" ++ } else { ++ eu_strip_binary = "//buildtools/third_party/eu-strip/bin/eu-strip" ++ } + script = "//build/linux/strip_binary.py" + inputs = [ + invoker.binary_input, diff --git a/www/chromium/files/patch-build_linux_strip__binary.py b/www/chromium/files/patch-build_linux_strip__binary.py new file mode 100644 index 000000000000..cf3ba059ea85 --- /dev/null +++ b/www/chromium/files/patch-build_linux_strip__binary.py @@ -0,0 +1,12 @@ +--- build/linux/strip_binary.py.orig 2021-08-17 16:45:54 UTC ++++ build/linux/strip_binary.py +@@ -19,8 +19,7 @@ def main(): + args = argparser.parse_args() + + cmd_line = [ +- args.eu_strip_binary_path, '-o', args.stripped_binary_output, '-f', +- args.symbol_output, args.binary_input ++ args.eu_strip_binary_path, '-o', args.stripped_binary_output, args.binary_input + ] + + process = subprocess.Popen(cmd_line) diff --git a/www/chromium/files/patch-build_toolchain_get__concurrent__links.py b/www/chromium/files/patch-build_toolchain_get__concurrent__links.py index 991cf22f96c3..5cf16130a4db 100644 --- a/www/chromium/files/patch-build_toolchain_get__concurrent__links.py +++ b/www/chromium/files/patch-build_toolchain_get__concurrent__links.py @@ -1,15 +1,12 @@ ---- build/toolchain/get_concurrent_links.py.orig 2021-04-14 18:40:48 UTC +--- build/toolchain/get_concurrent_links.py.orig 2021-08-17 00:15:54 UTC +++ build/toolchain/get_concurrent_links.py -@@ -53,6 +53,14 @@ def _GetTotalMemoryInBytes(): +@@ -53,6 +53,11 @@ def _GetTotalMemoryInBytes(): return int(subprocess.check_output(['sysctl', '-n', 'hw.memsize'])) except Exception: return 0 + elif sys.platform.startswith('freebsd'): + try: -+ avail_bytes = int(subprocess.check_output(['sysctl', '-n', 'hw.physmem'])) -+ # With -fuse-lld it doesn't take a lot of ram, feel free to change that -+ # 1 * ... to needed amount -+ return max(1, avail_bytes / (1 * (2 ** 30))) # total / 4GB ++ return int(subprocess.check_output(['sysctl', '-n', 'hw.physmem'])) + except Exception: + return 1 # TODO(scottmg): Implement this for other platforms. diff --git a/www/chromium/files/patch-cc_BUILD.gn b/www/chromium/files/patch-cc_BUILD.gn index d3301d156f48..67f4df2ae89e 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-05-12 22:05:40 UTC +--- cc/BUILD.gn.orig 2021-07-19 18:45:05 UTC +++ cc/BUILD.gn -@@ -640,7 +640,7 @@ cc_test_static_library("test_support") { +@@ -642,7 +642,7 @@ cc_test_static_library("test_support") { if (enable_vulkan) { deps += [ "//gpu/vulkan/init" ] } @@ -9,7 +9,7 @@ data_deps = [ "//third_party/mesa_headers" ] } } -@@ -857,7 +857,6 @@ cc_test("cc_unittests") { +@@ -860,7 +860,6 @@ cc_test("cc_unittests") { ] data_deps = [ "//testing/buildbot/filters:cc_unittests_filters", 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 840d38108045..457e67f323fb 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-04-14 18:40:48 UTC +--- cc/test/layer_tree_test.cc.orig 2021-07-19 18:45:05 UTC +++ cc/test/layer_tree_test.cc -@@ -674,7 +674,7 @@ LayerTreeTest::LayerTreeTest(viz::RendererType rendere +@@ -673,7 +673,7 @@ LayerTreeTest::LayerTreeTest(viz::RendererType rendere init_vulkan = true; } else if (renderer_type_ == viz::RendererType::kSkiaDawn) { scoped_feature_list_.InitAndEnableFeature(features::kSkiaDawn); @@ -8,4 +8,4 @@ +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) init_vulkan = true; #elif defined(OS_WIN) - // TODO(sgilhuly): Initialize D3D12 for Windows. + // TODO(rivr): Initialize D3D12 for Windows. diff --git a/www/chromium/files/patch-cc_test_pixel__test.cc b/www/chromium/files/patch-cc_test_pixel__test.cc index f1ce98713c03..bfcb67dd94d9 100644 --- a/www/chromium/files/patch-cc_test_pixel__test.cc +++ b/www/chromium/files/patch-cc_test_pixel__test.cc @@ -1,4 +1,4 @@ ---- cc/test/pixel_test.cc.orig 2021-04-14 18:40:48 UTC +--- cc/test/pixel_test.cc.orig 2021-07-19 18:45:05 UTC +++ cc/test/pixel_test.cc @@ -71,7 +71,7 @@ PixelTest::PixelTest(GraphicsBackend backend) init_vulkan = true; @@ -8,4 +8,4 @@ +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) init_vulkan = true; #elif defined(OS_WIN) - // TODO(sgilhuly): Initialize D3D12 for Windows. + // TODO(rivr): Initialize D3D12 for Windows. diff --git a/www/chromium/files/patch-chrome_BUILD.gn b/www/chromium/files/patch-chrome_BUILD.gn index 91e75d0d389f..22afdb41b250 100644 --- a/www/chromium/files/patch-chrome_BUILD.gn +++ b/www/chromium/files/patch-chrome_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/BUILD.gn.orig 2021-05-12 22:05:41 UTC +--- chrome/BUILD.gn.orig 2021-07-19 18:45:05 UTC +++ chrome/BUILD.gn -@@ -1335,6 +1335,10 @@ group("browser_dependencies") { +@@ -1368,6 +1368,10 @@ group("browser_dependencies") { public_deps += [ "//chromeos/lacros" ] } diff --git a/www/chromium/files/patch-chrome_app_BUILD.gn b/www/chromium/files/patch-chrome_app_BUILD.gn index 2c74fdad393e..3b4817c30b95 100644 --- a/www/chromium/files/patch-chrome_app_BUILD.gn +++ b/www/chromium/files/patch-chrome_app_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/app/BUILD.gn.orig 2021-05-12 22:05:41 UTC +--- chrome/app/BUILD.gn.orig 2021-07-19 18:45:06 UTC +++ chrome/app/BUILD.gn -@@ -141,7 +141,7 @@ static_library("test_support") { +@@ -144,7 +144,7 @@ static_library("test_support") { "//v8:v8_headers", ] diff --git a/www/chromium/files/patch-chrome_app_chrome__command__ids.h b/www/chromium/files/patch-chrome_app_chrome__command__ids.h index 9fec5c2c859d..87bae79ebd41 100644 --- a/www/chromium/files/patch-chrome_app_chrome__command__ids.h +++ b/www/chromium/files/patch-chrome_app_chrome__command__ids.h @@ -1,6 +1,6 @@ ---- chrome/app/chrome_command_ids.h.orig 2021-04-14 18:40:49 UTC +--- chrome/app/chrome_command_ids.h.orig 2021-07-19 18:45:06 UTC +++ chrome/app/chrome_command_ids.h -@@ -65,7 +65,7 @@ +@@ -66,7 +66,7 @@ #define IDC_NAME_WINDOW 34049 // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_app_chrome__main.cc b/www/chromium/files/patch-chrome_app_chrome__main.cc index 1febcb3b46a0..4889852b2be1 100644 --- a/www/chromium/files/patch-chrome_app_chrome__main.cc +++ b/www/chromium/files/patch-chrome_app_chrome__main.cc @@ -1,6 +1,15 @@ ---- chrome/app/chrome_main.cc.orig 2021-04-14 18:40:49 UTC +--- chrome/app/chrome_main.cc.orig 2021-07-19 18:45:06 UTC +++ chrome/app/chrome_main.cc -@@ -130,12 +130,12 @@ int ChromeMain(int argc, const char** argv) { +@@ -22,7 +22,7 @@ + #include "chrome/app/chrome_main_mac.h" + #endif + +-#if defined(OS_WIN) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) + #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. @@ -14,4 +23,4 @@ +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) || // defined(OS_WIN) - int rv = content::ContentMain(params); + #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 4ada1cf4bc66..fb37b2702fef 100644 --- a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc +++ b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc @@ -1,4 +1,4 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2021-05-12 22:05:41 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2021-07-19 18:45:06 UTC +++ chrome/app/chrome_main_delegate.cc @@ -150,12 +150,12 @@ #include "v8/include/v8.h" @@ -78,7 +78,7 @@ defined(OS_CHROMEOS) // Record the startup process creation time on supported platforms. On Android // this is recorded in ChromeMainDelegateAndroid. -@@ -735,7 +735,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -739,7 +739,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi v8_crashpad_support::SetUp(); #endif @@ -87,7 +87,7 @@ if (!crash_reporter::IsCrashpadEnabled()) { breakpad::SetFirstChanceExceptionHandler(v8::TryHandleWebAssemblyTrapPosix); } -@@ -748,7 +748,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -752,7 +752,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 +96,7 @@ // This will directly exit if the user asked for help. HandleHelpSwitches(command_line); #endif -@@ -957,7 +957,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -961,7 +961,7 @@ void ChromeMainDelegate::PreSandboxStartup() { crash_reporter::InitializeCrashKeys(); @@ -105,7 +105,7 @@ ChromeCrashReporterClient::Create(); #endif -@@ -970,7 +970,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -974,7 +974,7 @@ void ChromeMainDelegate::PreSandboxStartup() { child_process_logging::Init(); #endif #if defined(ARCH_CPU_ARM_FAMILY) && \ @@ -114,7 +114,7 @@ // Create an instance of the CPU class to parse /proc/cpuinfo and cache // cpu_brand info. base::CPU cpu_info; -@@ -1088,7 +1088,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1092,7 +1092,7 @@ void ChromeMainDelegate::PreSandboxStartup() { locale; } @@ -123,7 +123,7 @@ // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess) { #if defined(OS_ANDROID) -@@ -1109,7 +1109,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1113,7 +1113,7 @@ void ChromeMainDelegate::PreSandboxStartup() { } #endif // defined(OS_ANDROID) } @@ -132,7 +132,7 @@ #if defined(OS_ANDROID) CHECK_EQ(base::android::GetLibraryProcessType(), -@@ -1129,7 +1129,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1133,7 +1133,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 +141,7 @@ AdjustLinuxOOMScore(process_type); #endif #if defined(OS_WIN) -@@ -1171,7 +1171,7 @@ int ChromeMainDelegate::RunProcess( +@@ -1175,7 +1175,7 @@ int ChromeMainDelegate::RunProcess( // This entry is not needed on Linux, where the NaCl loader // process is launched via nacl_helper instead. @@ -150,7 +150,7 @@ {switches::kNaClLoaderProcess, NaClMain}, #else {"<invalid>", nullptr}, // To avoid constant array of size 0 -@@ -1199,7 +1199,7 @@ void ChromeMainDelegate::ProcessExiting(const std::str +@@ -1203,7 +1203,7 @@ void ChromeMainDelegate::ProcessExiting(const std::str #endif // !defined(OS_ANDROID) } @@ -159,7 +159,7 @@ void ChromeMainDelegate::ZygoteStarting( std::vector<std::unique_ptr<content::ZygoteForkDelegate>>* delegates) { #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -1236,7 +1236,7 @@ void ChromeMainDelegate::ZygoteForked() { +@@ -1240,7 +1240,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 a9584c2b8f57..31731424cfaa 100644 --- a/www/chromium/files/patch-chrome_app_chromium__strings.grd +++ b/www/chromium/files/patch-chrome_app_chromium__strings.grd @@ -1,6 +1,6 @@ ---- chrome/app/chromium_strings.grd.orig 2021-05-12 22:05:41 UTC +--- chrome/app/chromium_strings.grd.orig 2021-07-19 18:45:06 UTC +++ chrome/app/chromium_strings.grd -@@ -703,7 +703,7 @@ Chromium is unable to recover your settings. +@@ -722,7 +722,7 @@ Chromium is unable to recover your settings. </if> <!-- about:browser-switch strings --> @@ -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> -@@ -833,7 +833,7 @@ Chromium is unable to recover your settings. +@@ -852,7 +852,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 7b58b87c724f..1f8f577b74a5 100644 --- a/www/chromium/files/patch-chrome_app_generated__resources.grd +++ b/www/chromium/files/patch-chrome_app_generated__resources.grd @@ -1,6 +1,15 @@ ---- chrome/app/generated_resources.grd.orig 2021-05-12 22:05:41 UTC +--- chrome/app/generated_resources.grd.orig 2021-07-19 18:45:06 UTC +++ chrome/app/generated_resources.grd -@@ -5271,7 +5271,7 @@ Keep your key file in a safe place. You will need it t +@@ -293,7 +293,7 @@ are declared in tools/grit/grit_rule.gni. + <part file="profiles_strings.grdp" /> + + <!-- Web app intent picker strings --> +- <if expr="is_win or is_macosx or is_linux"> ++ <if expr="is_win or is_macosx or is_linux or is_posix"> + <part file="protocol_handler_intent_picker_strings.grdp" /> + </if> + +@@ -5298,7 +5298,7 @@ Keep your key file in a safe place. You will need it t </if> <!-- chrome://browser-switch strings --> @@ -9,7 +18,7 @@ <message name="IDS_ABOUT_BROWSER_SWITCH_TITLE" desc="about:browser-switch page title"> Legacy Browser Support </message> -@@ -7432,7 +7432,7 @@ Keep your key file in a safe place. You will need it t +@@ -7480,7 +7480,7 @@ Keep your key file in a safe place. You will need it t Google Pay </message> @@ -18,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> -@@ -8443,7 +8443,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -8502,7 +8502,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 442cb826ae67..2e3f2994043e 100644 --- a/www/chromium/files/patch-chrome_app_google__chrome__strings.grd +++ b/www/chromium/files/patch-chrome_app_google__chrome__strings.grd @@ -1,6 +1,6 @@ ---- chrome/app/google_chrome_strings.grd.orig 2021-05-12 22:05:41 UTC +--- chrome/app/google_chrome_strings.grd.orig 2021-07-19 18:45:06 UTC +++ chrome/app/google_chrome_strings.grd -@@ -711,7 +711,7 @@ Google Chrome is unable to recover your settings. +@@ -730,7 +730,7 @@ Google Chrome is unable to recover your settings. </if> <!-- about:browser-switch strings --> @@ -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> -@@ -841,7 +841,7 @@ Google Chrome is unable to recover your settings. +@@ -860,7 +860,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 895264e079dd..a184ddf245a6 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-04-14 18:40:49 UTC +--- chrome/app/profiles_strings.grdp.orig 2021-07-19 18:45:06 UTC +++ chrome/app/profiles_strings.grdp -@@ -81,7 +81,7 @@ +@@ -78,7 +78,7 @@ Add Profile... </message> </if> diff --git a/www/chromium/files/patch-chrome_browser_BUILD.gn b/www/chromium/files/patch-chrome_browser_BUILD.gn index 14b4d3fa05c5..281afe26f2d2 100644 --- a/www/chromium/files/patch-chrome_browser_BUILD.gn +++ b/www/chromium/files/patch-chrome_browser_BUILD.gn @@ -1,7 +1,7 @@ ---- chrome/browser/BUILD.gn.orig 2021-05-12 22:05:42 UTC +--- chrome/browser/BUILD.gn.orig 2021-07-19 18:45:07 UTC +++ chrome/browser/BUILD.gn -@@ -2427,9 +2427,18 @@ static_library("browser") { - ] +@@ -2456,9 +2456,18 @@ static_library("browser") { + deps += [ "//chromeos/services/libassistant/public/mojom" ] } } - if (is_linux || is_chromeos) { @@ -20,7 +20,7 @@ if (use_ozone) { deps += [ "//ui/events/ozone", -@@ -5134,6 +5143,17 @@ static_library("browser") { +@@ -5310,6 +5319,18 @@ static_library("browser") { } } @@ -35,10 +35,11 @@ + ] + } + - if (is_chromeos_ash) { - if (use_allocator == "tcmalloc") { - deps += [ "//chrome/common/performance_manager/mojom" ] -@@ -5361,7 +5381,7 @@ static_library("browser") { ++ + if (is_posix || is_fuchsia) { + deps += [ "//chrome/app:shutdown_signal_handlers" ] + } +@@ -5468,7 +5489,7 @@ static_library("browser") { ] } diff --git a/www/chromium/files/patch-chrome_browser_about__flags.cc b/www/chromium/files/patch-chrome_browser_about__flags.cc index 90d337fb7e23..0486e7a5451e 100644 --- a/www/chromium/files/patch-chrome_browser_about__flags.cc +++ b/www/chromium/files/patch-chrome_browser_about__flags.cc @@ -1,24 +1,33 @@ ---- chrome/browser/about_flags.cc.orig 2021-06-09 22:13:54 UTC +--- chrome/browser/about_flags.cc.orig 2021-07-21 14:11:02 UTC +++ chrome/browser/about_flags.cc -@@ -937,7 +937,7 @@ const FeatureEntry::Choice kMemlogSamplingRateChoices[ - heap_profiling::kMemlogSamplingRate5MB}, - }; +@@ -192,7 +192,7 @@ + #include "ui/gl/gl_switches.h" + #include "ui/native_theme/native_theme_features.h" + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + #include "base/allocator/buildflags.h" + #endif + +@@ -992,7 +992,7 @@ const FeatureEntry::FeatureVariation kMemoriesVariatio + 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"}, -@@ -1225,7 +1225,7 @@ const FeatureEntry::FeatureVariation - nullptr, - }}; - +@@ -1263,7 +1263,7 @@ const FeatureEntry::FeatureVariation kOmniboxBookmarkP + 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 -@@ -3076,7 +3076,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3151,7 +3151,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(media::kDeprecateLowUsageCodecs)}, #endif // defined(OS_CHROMEOS) @@ -27,7 +36,7 @@ { "enable-accelerated-video-decode", flag_descriptions::kAcceleratedVideoDecodeName, -@@ -3094,7 +3094,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3169,7 +3169,7 @@ const FeatureEntry kFeatureEntries[] = { kOsMac | kOsWin | kOsCrOS | kOsAndroid | kOsLinux, SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode), }, @@ -36,7 +45,7 @@ { "disable-accelerated-video-encode", flag_descriptions::kAcceleratedVideoEncodeName, -@@ -3439,7 +3439,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3510,7 +3510,7 @@ const FeatureEntry kFeatureEntries[] = { {"enable-login-detection", flag_descriptions::kEnableLoginDetectionName, flag_descriptions::kEnableLoginDetectionDescription, kOsAll, FEATURE_VALUE_TYPE(login_detection::kLoginDetection)}, @@ -45,7 +54,7 @@ {"enable-save-data", flag_descriptions::kEnableSaveDataName, flag_descriptions::kEnableSaveDataDescription, kOsCrOS | kOsLinux, SINGLE_VALUE_TYPE( -@@ -3449,7 +3449,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3520,7 +3520,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kEnableNavigationPredictorDescription, kOsCrOS | kOsLinux, FEATURE_VALUE_TYPE(blink::features::kNavigationPredictor)}, @@ -54,7 +63,7 @@ {"enable-preconnect-to-search", flag_descriptions::kEnablePreconnectToSearchName, flag_descriptions::kEnablePreconnectToSearchDescription, kOsAll, -@@ -4307,7 +4307,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4346,7 +4346,7 @@ const FeatureEntry kFeatureEntries[] = { kOsAll, FEATURE_VALUE_TYPE(omnibox::kOmniboxTrendingZeroPrefixSuggestionsOnNTP)}, @@ -63,16 +72,16 @@ defined(OS_WIN) {"omnibox-experimental-keyword-mode", flag_descriptions::kOmniboxExperimentalKeywordModeName, -@@ -4410,7 +4410,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_WITH_PARAMS_VALUE_TYPE(omnibox::kKeywordSpaceTriggering, - kOmniboxKeywordSpaceTriggeringVariations, - "OmniboxBundledExperimentV1")}, +@@ -4443,7 +4443,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kOmniboxKeywordSpaceTriggeringSettingName, + flag_descriptions::kOmniboxKeywordSpaceTriggeringSettingDescription, + kOsDesktop, FEATURE_VALUE_TYPE(omnibox::kKeywordSpaceTriggeringSetting)}, -#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) - {"enable-speculative-service-worker-start-on-query-input", -@@ -4706,14 +4706,14 @@ const FeatureEntry kFeatureEntries[] = { + #if BUILDFLAG(IS_CHROMEOS_ASH) +@@ -4721,7 +4721,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(chrome::android::kReaderModeInCCT)}, #endif // !defined(OS_ANDROID) @@ -81,33 +90,16 @@ defined(OS_CHROMEOS) {"direct-manipulation-stylus", flag_descriptions::kDirectManipulationStylusName, - flag_descriptions::kDirectManipulationStylusDescription, - kOsWin | kOsMac | kOsLinux, - FEATURE_VALUE_TYPE(features::kDirectManipulationStylus)}, +@@ -4732,7 +4732,7 @@ const FeatureEntry kFeatureEntries[] = { + {"webui-feedback", flag_descriptions::kWebuiFeedbackName, + flag_descriptions::kWebuiFeedbackDescription, kOsDesktop, + FEATURE_VALUE_TYPE(features::kWebUIFeedback)}, -#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) #if !defined(OS_ANDROID) -@@ -5350,7 +5350,7 @@ const FeatureEntry kFeatureEntries[] = { - chromeos::assistant::features::kAssistantBetterOnboarding)}, - #endif // BUILDFLAG(IS_CHROMEOS_ASH) - --#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) - {"remote-copy-receiver", flag_descriptions::kRemoteCopyReceiverName, - flag_descriptions::kRemoteCopyReceiverDescription, kOsDesktop, -@@ -5367,7 +5367,7 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kRemoteCopyProgressNotificationName, - flag_descriptions::kRemoteCopyProgressNotificationDescription, kOsDesktop, - FEATURE_VALUE_TYPE(kRemoteCopyProgressNotification)}, --#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) - - {"restrict-gamepad-access", flag_descriptions::kRestrictGamepadAccessName, -@@ -5398,7 +5398,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5373,7 +5373,7 @@ const FeatureEntry kFeatureEntries[] = { kSharingDeviceExpirationVariations, "SharingDeviceExpiration")}, @@ -116,7 +108,7 @@ {"sharing-hub-desktop-app-menu", flag_descriptions::kSharingHubDesktopAppMenuName, flag_descriptions::kSharingHubDesktopAppMenuDescription, kOsDesktop, -@@ -5407,7 +5407,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5382,7 +5382,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kSharingHubDesktopOmniboxName, flag_descriptions::kSharingHubDesktopOmniboxDescription, kOsDesktop, FEATURE_VALUE_TYPE(sharing_hub::kSharingHubDesktopOmnibox)}, @@ -125,7 +117,7 @@ #if BUILDFLAG(IS_CHROMEOS_ASH) {"ash-enable-pip-rounded-corners", -@@ -5889,7 +5889,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5856,7 +5856,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kMouseSubframeNoImplicitCaptureDescription, kOsAll, FEATURE_VALUE_TYPE(features::kMouseSubframeNoImplicitCapture)}, @@ -134,7 +126,7 @@ defined(OS_CHROMEOS) {"global-media-controls", flag_descriptions::kGlobalMediaControlsName, flag_descriptions::kGlobalMediaControlsDescription, -@@ -5930,7 +5930,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5897,7 +5897,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kGlobalMediaControlsOverlayControlsDescription, kOsWin | kOsMac | kOsLinux, FEATURE_VALUE_TYPE(media::kGlobalMediaControlsOverlayControls)}, @@ -143,7 +135,7 @@ // defined(OS_CHROMEOS) #if BUILDFLAG(ENABLE_SPELLCHECK) && defined(OS_WIN) -@@ -6122,7 +6122,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6089,7 +6089,7 @@ const FeatureEntry kFeatureEntries[] = { kPasswordsAccountStorageVariations, "ButterForPasswords")}, @@ -152,7 +144,7 @@ defined(OS_CHROMEOS) {"passwords-account-storage-iph", flag_descriptions::kEnablePasswordsAccountStorageIPHName, -@@ -6130,7 +6130,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6097,7 +6097,7 @@ const FeatureEntry kFeatureEntries[] = { kOsWin | kOsMac | kOsLinux, FEATURE_VALUE_TYPE( feature_engagement::kIPHPasswordsAccountStorageFeature)}, @@ -161,16 +153,16 @@ // defined(OS_CHROMEOS) {"autofill-always-return-cloud-tokenized-card", -@@ -6731,7 +6731,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(features::kEnableIncognitoShortcutOnDesktop)}, - #endif // defined(OS_WIN) +@@ -6701,7 +6701,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(features::kIncognitoBrandConsistencyForAndroid)}, + #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) {"incognito-brand-consistency-for-desktop", flag_descriptions::kIncognitoBrandConsistencyForDesktopName, -@@ -6823,7 +6823,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6806,7 +6806,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(language::kDetailedLanguageSettings)}, #endif @@ -179,16 +171,18 @@ {"commander", flag_descriptions::kCommanderName, flag_descriptions::kCommanderDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kCommander)}, -@@ -6860,7 +6860,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(ash::features::kEnhancedDeskAnimations)}, - #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) +@@ -6835,8 +6835,8 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kSyncAutofillWalletOfferDataDescription, kOsAll, + FEATURE_VALUE_TYPE(switches::kSyncAutofillWalletOfferData)}, + +-#if (defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ +- defined(OS_CHROMEOS)) && \ ++#if (defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ ++ defined(OS_CHROMEOS)) && \ + BUILDFLAG(ENABLE_PRINTING) {"enable-oop-print-drivers", flag_descriptions::kEnableOopPrintDriversName, flag_descriptions::kEnableOopPrintDriversDescription, kOsDesktop, -@@ -6879,14 +6879,14 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6855,14 +6855,14 @@ const FeatureEntry kFeatureEntries[] = { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -205,16 +199,16 @@ // BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_MAC) #if defined(OS_ANDROID) -@@ -7162,7 +7162,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7148,7 +7148,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(media::kVaapiAV1Decoder)}, #endif // defined(OS_CHROMEOS) -#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ -+#if defined(OS_WIN) || (defined(OS_LINUX) || defined(OS_BSD) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) || \ ++#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) || \ defined(OS_MAC) { "ui-debug-tools", -@@ -7243,7 +7243,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7225,7 +7225,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(metrics::structured::kBluetoothSessionizedMetrics)}, #endif diff --git a/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc b/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc index 21d70b5fc31e..698a0924e098 100644 --- a/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc +++ b/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc @@ -1,6 +1,6 @@ ---- chrome/browser/after_startup_task_utils.cc.orig 2021-05-12 22:05:42 UTC +--- chrome/browser/after_startup_task_utils.cc.orig 2021-07-19 18:45:07 UTC +++ chrome/browser/after_startup_task_utils.cc -@@ -35,7 +35,7 @@ +@@ -22,7 +22,7 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,16 +9,16 @@ #include "ui/views/linux_ui/linux_ui.h" #endif -@@ -113,7 +113,7 @@ void QueueTask(std::unique_ptr<AfterStartupTask> queue +@@ -103,7 +103,7 @@ void SetBrowserStartupIsComplete() { + return; - void SetBrowserStartupIsComplete() { - DCHECK_CURRENTLY_ON(BrowserThread::UI); + g_startup_complete_flag.Get().Set(); -#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) // Process::Current().CreationTime() is not available on all platforms. const base::Time process_creation_time = -@@ -122,7 +122,7 @@ void SetBrowserStartupIsComplete() { +@@ -112,7 +112,7 @@ void SetBrowserStartupIsComplete() { UMA_HISTOGRAM_LONG_TIMES("Startup.AfterStartupTaskDelayedUntilTime", base::Time::Now() - process_creation_time); } @@ -27,7 +27,7 @@ // defined(OS_CHROMEOS) UMA_HISTOGRAM_COUNTS_10000("Startup.AfterStartupTaskCount", g_after_startup_tasks.Get().size()); -@@ -134,7 +134,7 @@ void SetBrowserStartupIsComplete() { +@@ -123,7 +123,7 @@ void SetBrowserStartupIsComplete() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-chrome_browser_browsing__data_chrome__browsing__data__remover__delegate.cc b/www/chromium/files/patch-chrome_browser_browsing__data_chrome__browsing__data__remover__delegate.cc index f597a4167eba..df9ef0a2d6dd 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-05-12 22:05:43 UTC +--- 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 -@@ -635,7 +635,9 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedder +@@ -637,7 +637,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 67fb12045ff0..e435dd6da16e 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,6 +1,6 @@ ---- chrome/browser/chrome_browser_interface_binders.cc.orig 2021-06-09 22:13:55 UTC +--- chrome/browser/chrome_browser_interface_binders.cc.orig 2021-07-19 18:45:08 UTC +++ chrome/browser/chrome_browser_interface_binders.cc -@@ -148,7 +148,7 @@ +@@ -146,7 +146,7 @@ #include "mojo/public/cpp/bindings/self_owned_receiver.h" #endif // defined(OS_ANDROID) @@ -10,7 +10,7 @@ #include "chrome/browser/ui/webui/discards/discards.mojom.h" #include "chrome/browser/ui/webui/discards/discards_ui.h" @@ -612,7 +612,7 @@ void PopulateChromeFrameBinders( - base::BindRepeating(&BindCaptionContextHandler)); + base::BindRepeating(&BindSpeechRecognitionRecognizerClientHandler)); #endif -#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) @@ -18,7 +18,7 @@ if (base::FeatureList::IsEnabled(features::kWebAppWindowControlsOverlay) && !render_frame_host->GetParent()) { map->Add<chrome::mojom::DraggableRegions>( -@@ -846,7 +846,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -854,7 +854,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 1adca260583c..bfcee4e9c114 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-05-24 22:05:33 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2021-07-19 18:45:08 UTC +++ chrome/browser/chrome_browser_main.cc -@@ -251,7 +251,7 @@ +@@ -257,7 +257,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" -@@ -946,7 +946,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -956,7 +956,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 . -@@ -955,7 +955,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -965,7 +965,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) -@@ -980,7 +980,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -990,7 +990,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( -@@ -1142,6 +1142,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { +@@ -1156,6 +1156,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}) -@@ -1149,6 +1150,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { +@@ -1163,6 +1164,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { base::BindOnce(&WebUsbDetector::Initialize, base::Unretained(web_usb_detector_.get()))); } diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc index 7daf039ec9dd..53817dc3e649 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc @@ -1,4 +1,4 @@ ---- chrome/browser/chrome_browser_main_linux.cc.orig 2021-04-14 18:40:52 UTC +--- chrome/browser/chrome_browser_main_linux.cc.orig 2021-07-19 18:45:08 UTC +++ chrome/browser/chrome_browser_main_linux.cc @@ -47,7 +47,7 @@ ChromeBrowserMainPartsLinux::~ChromeBrowserMainPartsLi } @@ -9,16 +9,16 @@ // Needs to be called after we have chrome::DIR_USER_DATA and // g_browser_process. This happens in PreCreateThreads. // base::GetLinuxDistro() will initialize its value if needed. -@@ -79,7 +79,7 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() { - +@@ -78,7 +78,7 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() { + } - void ChromeBrowserMainPartsLinux::PostMainMessageLoopStart() { + void ChromeBrowserMainPartsLinux::PostCreateMainMessageLoop() { -#if !BUILDFLAG(IS_CHROMEOS_ASH) +#if !BUILDFLAG(IS_CHROMEOS_ASH) && !defined(OS_BSD) bluez::BluezDBusManager::Initialize(nullptr /* system_bus */); #endif -@@ -87,7 +87,7 @@ void ChromeBrowserMainPartsLinux::PostMainMessageLoopS +@@ -86,7 +86,7 @@ void ChromeBrowserMainPartsLinux::PostCreateMainMessag } void ChromeBrowserMainPartsLinux::PostDestroyThreads() { 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 5276a2ff105d..32b0e4269229 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2021-06-09 22:13:55 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2021-07-19 18:45:08 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -446,7 +446,7 @@ +@@ -450,7 +450,7 @@ #include "components/user_manager/user.h" #include "components/user_manager/user_manager.h" #include "services/service_manager/public/mojom/interface_provider_spec.mojom.h" @@ -9,7 +9,7 @@ #include "chrome/browser/chrome_browser_main_linux.h" #elif defined(OS_ANDROID) #include "base/android/application_status_listener.h" -@@ -507,7 +507,7 @@ +@@ -511,7 +511,7 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if defined(OS_WIN) || defined(OS_MAC) || \ @@ -18,7 +18,7 @@ #include "chrome/browser/browser_switcher/browser_switcher_navigation_throttle.h" #endif -@@ -526,9 +526,9 @@ +@@ -530,9 +530,9 @@ // TODO(crbug/1169547) Remove `BUILDFLAG(IS_CHROMEOS_LACROS)` once the // migration is complete. @@ -30,7 +30,7 @@ // TODO(crbug.com/939205): Once the upcoming App Service is available, use a // single navigation throttle to display the intent picker on all platforms. -@@ -546,7 +546,7 @@ +@@ -550,7 +550,7 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -39,7 +39,7 @@ #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h" #endif -@@ -957,11 +957,13 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHos +@@ -951,11 +951,13 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHos } int GetCrashSignalFD(const base::CommandLine& command_line) { @@ -53,7 +53,7 @@ // Extensions have the same process type as renderers. if (command_line.HasSwitch(extensions::switches::kExtensionProcess)) { -@@ -1381,7 +1383,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( +@@ -1377,7 +1379,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( #elif BUILDFLAG(IS_CHROMEOS_LACROS) main_parts = std::make_unique<ChromeBrowserMainPartsLacros>(parameters, &startup_data_); @@ -62,7 +62,7 @@ main_parts = std::make_unique<ChromeBrowserMainPartsLinux>(parameters, &startup_data_); #elif defined(OS_ANDROID) -@@ -1412,7 +1414,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( +@@ -1408,7 +1410,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 +71,7 @@ main_parts->AddParts( std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>()); #else -@@ -2190,7 +2192,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2192,7 +2194,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin command_line->AppendSwitchASCII(switches::kMetricsClientID, client_info->client_id); } @@ -80,16 +80,7 @@ #if defined(OS_ANDROID) bool enable_crash_reporter = true; #else -@@ -2493,7 +2495,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin - ThreadProfilerConfiguration::Get()->AppendCommandLineSwitchForChildProcess( - command_line); - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - // Processes may only query perf_event_open with the BPF sandbox disabled. - if (browser_command_line.HasSwitch(switches::kEnableThreadInstructionCount) && - command_line->HasSwitch(sandbox::policy::switches::kNoSandbox)) { -@@ -3821,7 +3823,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst +@@ -3753,7 +3755,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst } } @@ -98,7 +89,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -3856,7 +3858,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFi +@@ -3788,7 +3790,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFi mappings->Share(kCrashDumpSignal, crash_signal_fd); } } @@ -107,7 +98,7 @@ #if defined(OS_WIN) std::wstring ChromeContentBrowserClient::GetAppContainerSidForSandboxType( -@@ -4210,11 +4212,11 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -4146,11 +4148,11 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati &throttles); } @@ -121,7 +112,7 @@ #if !defined(OS_ANDROID) MaybeAddThrottle(DevToolsWindow::MaybeCreateNavigationThrottle(handle), -@@ -4236,7 +4238,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -4172,7 +4174,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 6a512952dacb..bfcfc6b9c69b 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-05-12 22:05:43 UTC +--- chrome/browser/chrome_content_browser_client.h.orig 2021-07-19 18:45:08 UTC +++ chrome/browser/chrome_content_browser_client.h -@@ -395,12 +395,12 @@ class ChromeContentBrowserClient : public content::Con +@@ -405,12 +405,12 @@ class ChromeContentBrowserClient : public content::Con void OverridePageVisibilityState( content::RenderFrameHost* render_frame_host, content::PageVisibilityState* visibility_state) override; diff --git a/www/chromium/files/patch-chrome_browser_custom__handlers_protocol__handler__registry.cc b/www/chromium/files/patch-chrome_browser_custom__handlers_protocol__handler__registry.cc index 11a187a00238..c3057e9a82c1 100644 --- a/www/chromium/files/patch-chrome_browser_custom__handlers_protocol__handler__registry.cc +++ b/www/chromium/files/patch-chrome_browser_custom__handlers_protocol__handler__registry.cc @@ -1,6 +1,6 @@ ---- chrome/browser/custom_handlers/protocol_handler_registry.cc.orig 2021-05-12 22:05:43 UTC +--- chrome/browser/custom_handlers/protocol_handler_registry.cc.orig 2021-07-19 18:45:08 UTC +++ chrome/browser/custom_handlers/protocol_handler_registry.cc -@@ -46,7 +46,7 @@ const ProtocolHandler& LookupHandler( +@@ -45,7 +45,7 @@ const ProtocolHandler& LookupHandler( // If true default protocol handlers will be removed if the OS level // registration for a protocol is no longer Chrome. bool ShouldRemoveHandlersNotInOS() { 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 e29a9b3a51fb..300cf93bc885 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-05-12 22:05:43 UTC +--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2021-07-19 18:45:08 UTC +++ chrome/browser/download/chrome_download_manager_delegate.cc -@@ -1436,7 +1436,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1439,7 +1439,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 -@@ -1489,7 +1489,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1494,7 +1494,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(); -@@ -1586,7 +1586,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow +@@ -1598,7 +1598,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. -@@ -1628,7 +1628,7 @@ ChromeDownloadManagerDelegate::GetQuarantineConnection +@@ -1640,7 +1640,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.h b/www/chromium/files/patch-chrome_browser_download_download__commands.h index c84859608113..8bfaedfefb0d 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__commands.h +++ b/www/chromium/files/patch-chrome_browser_download_download__commands.h @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_commands.h.orig 2021-05-12 22:05:43 UTC +--- chrome/browser/download/download_commands.h.orig 2021-07-19 18:45:08 UTC +++ chrome/browser/download/download_commands.h -@@ -49,7 +49,7 @@ class DownloadCommands { +@@ -47,7 +47,7 @@ class DownloadCommands { bool IsCommandVisible(Command command) const; void ExecuteCommand(Command command); diff --git a/www/chromium/files/patch-chrome_browser_download_download__item__model.cc b/www/chromium/files/patch-chrome_browser_download_download__item__model.cc index e6274a4c4041..85bffdf06da9 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-04-14 18:40:53 UTC +--- chrome/browser/download/download_item_model.cc.orig 2021-07-19 18:45:08 UTC +++ chrome/browser/download/download_item_model.cc -@@ -571,7 +571,7 @@ bool DownloadItemModel::IsCommandChecked( +@@ -579,7 +579,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()); -@@ -612,7 +612,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand +@@ -620,7 +620,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 a9678b6e36a7..d6f5abf57b31 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__prefs.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__prefs.cc @@ -1,4 +1,4 @@ ---- chrome/browser/download/download_prefs.cc.orig 2021-04-14 18:40:53 UTC +--- chrome/browser/download/download_prefs.cc.orig 2021-07-19 18:45:08 UTC +++ chrome/browser/download/download_prefs.cc @@ -68,7 +68,7 @@ namespace { // Consider downloads 'dangerous' if they go to the home directory on Linux and @@ -27,7 +27,7 @@ defined(OS_MAC) registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false); #endif -@@ -431,7 +431,7 @@ bool DownloadPrefs::IsDownloadPathManaged() const { +@@ -438,7 +438,7 @@ bool DownloadPrefs::IsDownloadPathManaged() const { } bool DownloadPrefs::IsAutoOpenByUserUsed() const { @@ -36,7 +36,7 @@ defined(OS_MAC) if (ShouldOpenPdfInSystemReader()) return true; -@@ -446,7 +446,7 @@ bool DownloadPrefs::IsAutoOpenEnabled(const GURL& url, +@@ -453,7 +453,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")) && -@@ -497,7 +497,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens +@@ -504,7 +504,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) -@@ -519,7 +519,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons +@@ -526,7 +526,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons #endif void DownloadPrefs::ResetAutoOpenByUser() { 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 new file mode 100644 index 000000000000..94294223caaf --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_attestation__service.cc @@ -0,0 +1,70 @@ +--- 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 new file mode 100644 index 000000000000..9eb8b1b6a487 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_attestation__service.h @@ -0,0 +1,14 @@ +--- 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 index 7b2bb199cc08..2207540b6ba1 100644 --- 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 @@ -1,38 +1,31 @@ ---- chrome/browser/enterprise/connectors/device_trust/device_trust_service.cc.orig 2021-06-10 11:07:22 UTC +--- 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 -@@ -21,9 +21,9 @@ DeviceTrustService::DeviceTrustService(Profile* profil - signal_report_callback_( - base::BindOnce(&DeviceTrustService::OnSignalReported, - base::Unretained(this))) { --#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<DeviceTrustKeyPair>(); --#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) -+#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) +@@ -82,12 +82,12 @@ void DeviceTrustService::OnReporterInitialized(bool su - pref_observer_.Init(prefs_); - pref_observer_.Add(kContextAwareAccessSignalsAllowlistPref, -@@ -53,9 +53,9 @@ void DeviceTrustService::OnPolicyUpdated() { + DeviceTrustReportEvent report; - if (!first_report_sent_ && - IsEnabled()) { // Policy enabled for the first time. -#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_->Init(); + 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_->Init( - base::BindRepeating( - [](DeviceTrustService* self) { return self->IsEnabled(); }, -@@ -76,9 +76,9 @@ void DeviceTrustService::OnReporterInitialized(bool su - base::Value val(base::Value::Type::DICTIONARY); + 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) - val.SetStringKey("machine_attestion_key", key_pair_->ExportPEMPublicKey()); + 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) - reporter_->SendReport(std::move(val), std::move(signal_report_callback_)); - } + 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 index 9b16792e67b6..98c8cc888e3a 100644 --- 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 @@ -1,26 +1,14 @@ ---- chrome/browser/enterprise/connectors/device_trust/device_trust_service.h.orig 2021-06-10 11:08:08 UTC +--- 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 -@@ -16,9 +16,9 @@ - - #include <memory> - --#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/device_trust_key_pair.h" --#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) -+#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) - - class KeyedService; - class Profile; -@@ -59,9 +59,9 @@ class DeviceTrustService : public KeyedService { - - PrefService* prefs_; - +@@ -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::unique_ptr<DeviceTrustKeyPair> key_pair_; + 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) - PrefChangeRegistrar pref_observer_; - bool first_report_sent_; + // 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_signals_device__info__fetcher.cc b/www/chromium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher.cc index 98202b98e279..3aae5efa9501 100644 --- a/www/chromium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher.cc +++ b/www/chromium/files/patch-chrome_browser_enterprise_signals_device__info__fetcher.cc @@ -1,4 +1,4 @@ ---- chrome/browser/enterprise/signals/device_info_fetcher.cc.orig 2021-04-22 07:41:36 UTC +--- chrome/browser/enterprise/signals/device_info_fetcher.cc.orig 2021-07-19 18:45:08 UTC +++ chrome/browser/enterprise/signals/device_info_fetcher.cc @@ -12,6 +12,8 @@ #include "chrome/browser/enterprise/signals/device_info_fetcher_win.h" @@ -9,7 +9,7 @@ #endif namespace enterprise_signals { -@@ -60,6 +62,8 @@ std::unique_ptr<DeviceInfoFetcher> DeviceInfoFetcher:: +@@ -61,6 +63,8 @@ std::unique_ptr<DeviceInfoFetcher> DeviceInfoFetcher:: return std::make_unique<DeviceInfoFetcherWin>(); #elif defined(OS_LINUX) || defined(OS_CHROMEOS) return std::make_unique<DeviceInfoFetcherLinux>(); diff --git a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn index d89cd2e9eb0b..3af65d639695 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn +++ b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/BUILD.gn.orig 2021-05-12 22:05:43 UTC +--- chrome/browser/extensions/BUILD.gn.orig 2021-07-19 18:45:08 UTC +++ chrome/browser/extensions/BUILD.gn -@@ -1269,6 +1269,12 @@ static_library("extensions") { +@@ -1259,6 +1259,12 @@ static_library("extensions") { ] } 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 bac5f1c1f447..353cec01ec98 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,6 +1,6 @@ ---- chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc.orig 2021-06-09 22:13:55 UTC +--- 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 -@@ -22,7 +22,7 @@ +@@ -23,7 +23,7 @@ #include "base/win/registry.h" #endif @@ -9,19 +9,19 @@ #include "base/environment.h" #include "base/nix/xdg_util.h" #endif -@@ -238,7 +238,7 @@ base::FilePath GetEndpointVerificationDir() { - return *GetEndpointVerificationDirOverride(); +@@ -241,7 +241,7 @@ base::FilePath GetEndpointVerificationDir() { + bool got_path = false; #if defined(OS_WIN) - if (!base::PathService::Get(base::DIR_LOCAL_APP_DATA, &path)) + got_path = base::PathService::Get(base::DIR_LOCAL_APP_DATA, &path); -#elif defined(OS_LINUX) || defined(OS_CHROMEOS) +#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) std::unique_ptr<base::Environment> env(base::Environment::Create()); path = base::nix::GetXDGDirectory(env.get(), base::nix::kXdgConfigHomeEnvVar, base::nix::kDotConfigDir); -@@ -249,7 +249,7 @@ base::FilePath GetEndpointVerificationDir() { - if (true) - #endif +@@ -252,7 +252,7 @@ base::FilePath GetEndpointVerificationDir() { + if (!got_path) return path; + -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) path = path.AppendASCII("google"); 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 1bb1f9c1f806..9f6eb2ee06cd 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-05-12 22:05:43 UTC +--- 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 -@@ -282,7 +282,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionInteractiveTest, T +@@ -285,7 +285,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_settings__private_prefs__util.cc b/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc index 7e13554a197d..e74d885790a6 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-05-12 22:05:44 UTC +--- 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 -@@ -178,7 +178,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -181,7 +181,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ (*s_allowlist)[::prefs::kUseCustomChromeFrame] = settings_api::PrefType::PREF_TYPE_BOOLEAN; #endif -@@ -192,7 +192,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -195,7 +195,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist settings_api::PrefType::PREF_TYPE_NUMBER; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. 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 9e0811f6ef6a..10dd794f341c 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-05-12 22:05:44 UTC +--- chrome/browser/extensions/external_provider_impl.cc.orig 2021-07-19 18:45:08 UTC +++ chrome/browser/extensions/external_provider_impl.cc -@@ -796,7 +796,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -797,7 +797,7 @@ void ExternalProviderImpl::CreateExternalProviders( if (!profile->GetPrefs()->GetBoolean(pref_names::kBlockExternalExtensions)) { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ provider_list->push_back(std::make_unique<ExternalProviderImpl>( service, base::MakeRefCounted<ExternalPrefLoader>( -@@ -824,7 +824,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -825,7 +825,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 4f6a7f31bd46..6dd62acdaec6 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,8 +1,8 @@ ---- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2021-04-14 18:40:53 UTC +--- 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 -@@ -190,7 +190,7 @@ const struct { - {base::DIR_APP_DATA, nullptr, kBlockAllChildren}, - {base::DIR_HOME, FILE_PATH_LITERAL("Library"), kBlockAllChildren}, +@@ -222,7 +222,7 @@ const struct { + {base::DIR_HOME, FILE_PATH_LITERAL("Library/Mobile Documents"), + kDontBlockChildren}, #endif -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) 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 cfcab5adb88e..37e18602f6c5 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,4 +1,4 @@ ---- chrome/browser/first_run/first_run_internal_posix.cc.orig 2021-04-14 18:40:53 UTC +--- 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 @@ -46,7 +46,7 @@ enum class ForcedShowDialogState { ForcedShowDialogState g_forced_show_dialog_state = @@ -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 -@@ -97,7 +97,7 @@ void ForceFirstRunDialogShownForTesting(bool shown) { +@@ -96,7 +96,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 41242761d61c..1f192e114dff 100644 --- a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc @@ -1,6 +1,6 @@ ---- chrome/browser/flag_descriptions.cc.orig 2021-06-09 22:13:55 UTC +--- chrome/browser/flag_descriptions.cc.orig 2021-07-19 18:45:08 UTC +++ chrome/browser/flag_descriptions.cc -@@ -5007,7 +5007,7 @@ const char kEnableNewBadgeOnMenuItemsDescription[] = +@@ -5015,7 +5015,7 @@ const char kInstallableInkDropDescription[] = // Random platform combinations ----------------------------------------------- @@ -9,32 +9,20 @@ defined(OS_CHROMEOS) const char kEnableOopPrintDriversName[] = -@@ -5040,20 +5040,20 @@ const char kRemoteCopyProgressNotificationDescription[ - "Enables progress notifications to be shown for the remote copy feature " - "when receiving a message."; +@@ -5039,10 +5039,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) --#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ - defined(OS_CHROMEOS) - - const char kDirectManipulationStylusName[] = "Direct Manipulation Stylus"; - const char kDirectManipulationStylusDescription[] = - "If enabled, Chrome will scroll web pages on stylus drag."; - --#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) - -#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[] = -@@ -5069,7 +5069,7 @@ const char kDesktopDetailedLanguageSettingsName[] = +@@ -5058,7 +5058,7 @@ const char kDesktopDetailedLanguageSettingsName[] = const char kDesktopDetailedLanguageSettingsDescription[] = "Enable the new detailed language settings page"; @@ -43,7 +31,7 @@ #if defined(OS_CHROMEOS) || defined(OS_LINUX) #if BUILDFLAG(USE_TCMALLOC) -@@ -5096,20 +5096,20 @@ const char kWebShareDescription[] = +@@ -5085,20 +5085,20 @@ const char kWebShareDescription[] = // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -68,7 +56,7 @@ // Feature flags -------------------------------------------------------------- -@@ -5190,7 +5190,7 @@ const char kAutofillCreditCardUploadDescription[] = +@@ -5184,7 +5184,7 @@ const char kAutofillCreditCardUploadDescription[] = #endif // defined(TOOLKIT_VIEWS) || defined(OS_ANDROID) @@ -77,7 +65,7 @@ const char kSendWebUIJavaScriptErrorReportsName[] = "Send WebUI JavaScript Error Reports"; const char kSendWebUIJavaScriptErrorReportsDescription[] = -@@ -5199,7 +5199,7 @@ const char kSendWebUIJavaScriptErrorReportsDescription +@@ -5193,7 +5193,7 @@ const char kSendWebUIJavaScriptErrorReportsDescription "will be sent to Google."; #endif diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.h b/www/chromium/files/patch-chrome_browser_flag__descriptions.h index 59b088eed300..728321dc3006 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-06-09 22:13:55 UTC +--- chrome/browser/flag_descriptions.h.orig 2021-07-19 18:45:08 UTC +++ chrome/browser/flag_descriptions.h @@ -22,9 +22,9 @@ #include "printing/buildflags/buildflags.h" @@ -12,7 +12,7 @@ // This file declares strings used in chrome://flags. These messages are not // translated, because instead of end-users they target Chromium developers and -@@ -2919,7 +2919,7 @@ extern const char kEnableNewBadgeOnMenuItemsDescriptio +@@ -2928,7 +2928,7 @@ extern const char kInstallableInkDropDescription[]; // Random platform combinations ----------------------------------------------- @@ -21,9 +21,9 @@ defined(OS_CHROMEOS) extern const char kEnableOopPrintDriversName[]; -@@ -2940,10 +2940,10 @@ extern const char kRemoteCopyProgressNotificationDescr - extern const char kDirectManipulationStylusName[]; - extern const char kDirectManipulationStylusDescription[]; +@@ -2943,10 +2943,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) || @@ -34,7 +34,7 @@ extern const char kCommanderName[]; extern const char kCommanderDescription[]; -@@ -2954,7 +2954,7 @@ extern const char kDesktopRestructuredLanguageSettings +@@ -2957,7 +2957,7 @@ extern const char kDesktopRestructuredLanguageSettings extern const char kDesktopDetailedLanguageSettingsName[]; extern const char kDesktopDetailedLanguageSettingsDescription[]; @@ -43,7 +43,7 @@ #if defined(OS_CHROMEOS) || defined(OS_LINUX) #if BUILDFLAG(USE_TCMALLOC) -@@ -2975,17 +2975,17 @@ extern const char kWebShareDescription[]; +@@ -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. @@ -65,7 +65,7 @@ // Feature flags -------------------------------------------------------------- -@@ -3041,12 +3041,12 @@ extern const char kAutofillCreditCardUploadDescription +@@ -3046,12 +3046,12 @@ extern const char kAutofillCreditCardUploadDescription #endif // defined(TOOLKIT_VIEWS) || defined(OS_ANDROID) diff --git a/www/chromium/files/patch-chrome_browser_media_audio__service__util.cc b/www/chromium/files/patch-chrome_browser_media_audio__service__util.cc index 9353e243748b..91e6d17ca98d 100644 --- a/www/chromium/files/patch-chrome_browser_media_audio__service__util.cc +++ b/www/chromium/files/patch-chrome_browser_media_audio__service__util.cc @@ -1,4 +1,4 @@ ---- chrome/browser/media/audio_service_util.cc.orig 2021-04-14 18:40:53 UTC +--- chrome/browser/media/audio_service_util.cc.orig 2021-07-19 18:45:08 UTC +++ chrome/browser/media/audio_service_util.cc @@ -21,7 +21,7 @@ namespace { @@ -9,7 +9,7 @@ bool GetPolicyOrFeature(const char* policy_name, const base::Feature& feature) { const policy::PolicyMap& policies = g_browser_process->browser_policy_connector() -@@ -43,7 +43,7 @@ bool IsAudioServiceSandboxEnabled() { +@@ -41,7 +41,7 @@ bool IsAudioServiceSandboxEnabled() { // TODO(crbug.com/1052397): Remove !IS_CHROMEOS_LACROS once lacros starts being // built with OS_CHROMEOS instead of OS_LINUX. #if defined(OS_WIN) || defined(OS_MAC) || \ diff --git a/www/chromium/files/patch-chrome_browser_media_router_providers_wired__display_wired__display__media__route__provider.cc b/www/chromium/files/patch-chrome_browser_media_router_providers_wired__display_wired__display__media__route__provider.cc deleted file mode 100644 index 4c9207a126d2..000000000000 --- a/www/chromium/files/patch-chrome_browser_media_router_providers_wired__display_wired__display__media__route__provider.cc +++ /dev/null @@ -1,23 +0,0 @@ ---- chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.cc.orig 2021-04-14 18:40:53 UTC -+++ chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.cc -@@ -105,6 +105,12 @@ void WiredDisplayMediaRouteProvider::CreateRoute( - bool off_the_record, - CreateRouteCallback callback) { - DCHECK(!base::Contains(presentations_, presentation_id)); -+#if defined(OS_BSD) -+ std::move(callback).Run(base::nullopt, nullptr, -+ std::string("Not implemented"), -+ RouteRequestResult::UNKNOWN_ERROR); -+ return; -+#else - base::Optional<Display> display = GetDisplayBySinkId(sink_id); - if (!display) { - std::move(callback).Run(base::nullopt, nullptr, -@@ -131,6 +137,7 @@ void WiredDisplayMediaRouteProvider::CreateRoute( - std::move(callback).Run(route, nullptr, base::nullopt, - RouteRequestResult::OK); - NotifyRouteObservers(); -+#endif - } - - void WiredDisplayMediaRouteProvider::JoinRoute( 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 ac30a2c7a052..ef628a8fe399 100644 --- a/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc +++ b/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2021-05-12 22:05:44 UTC +--- 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 -@@ -63,7 +63,9 @@ +@@ -62,7 +62,9 @@ // of lacros-chrome is complete. #if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) #include <gnu/libc-version.h> @@ -10,7 +10,7 @@ #include "base/linux_util.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" -@@ -72,7 +74,7 @@ +@@ -71,7 +73,7 @@ #include "ui/base/ui_base_features.h" #include "ui/base/x/x11_util.h" #endif 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 3baffb487384..3202428e6739 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-05-12 22:05:44 UTC +--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2021-07-19 18:45:08 UTC +++ chrome/browser/metrics/chrome_metrics_service_client.cc -@@ -711,10 +711,10 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -722,10 +722,10 @@ void ChromeMetricsServiceClient::RegisterMetricsServic // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if defined(OS_WIN) || defined(OS_MAC) || \ @@ -13,7 +13,7 @@ // BUILDFLAG(IS_CHROMEOS_LACROS)) #if BUILDFLAG(ENABLE_PLUGINS) -@@ -1002,7 +1002,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve +@@ -1013,7 +1013,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_perf_cpu__identity.cc b/www/chromium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc new file mode 100644 index 000000000000..1458181621b2 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_metrics_perf_cpu__identity.cc @@ -0,0 +1,11 @@ +--- chrome/browser/metrics/perf/cpu_identity.cc.orig 2021-07-28 07:40:29 UTC ++++ chrome/browser/metrics/perf/cpu_identity.cc +@@ -106,7 +106,7 @@ CPUIdentity GetCPUIdentity() { + result.release = + #if BUILDFLAG(IS_CHROMEOS_ASH) + base::SysInfo::KernelVersion(); +-#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) + base::SysInfo::OperatingSystemVersion(); + #else + #error "Unsupported configuration" 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 2103bcac5a1d..ce24977fae8c 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-04-14 18:40:53 UTC +--- chrome/browser/metrics/process_memory_metrics_emitter.cc.orig 2021-07-19 18:45:08 UTC +++ chrome/browser/metrics/process_memory_metrics_emitter.cc -@@ -514,7 +514,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc +@@ -516,7 +516,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 -@@ -537,7 +537,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc +@@ -539,7 +539,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_password__manager_password__store__factory.cc b/www/chromium/files/patch-chrome_browser_password__manager_password__store__factory.cc index d68836ddba11..942b05e1771b 100644 --- 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 @@ -1,6 +1,6 @@ ---- chrome/browser/password_manager/password_store_factory.cc.orig 2021-05-12 22:05:44 UTC +--- chrome/browser/password_manager/password_store_factory.cc.orig 2021-07-19 18:45:09 UTC +++ chrome/browser/password_manager/password_store_factory.cc -@@ -167,7 +167,7 @@ PasswordStoreFactory::BuildServiceInstanceFor( +@@ -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) || \ 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 a62ccc3702d6..4c9a3801df75 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,25 @@ ---- chrome/browser/pdf/pdf_extension_test.cc.orig 2021-05-12 22:05:44 UTC +--- chrome/browser/pdf/pdf_extension_test.cc.orig 2021-07-19 18:45:09 UTC +++ chrome/browser/pdf/pdf_extension_test.cc -@@ -2180,7 +2180,7 @@ class PDFExtensionClipboardTest : public PDFExtensionT - const std::string& expected) { - // 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) - DoActionAndCheckClipboard(std::move(action), - ui::ClipboardBuffer::kSelection, expected); +@@ -791,11 +791,11 @@ IN_PROC_BROWSER_TEST_F(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) + #define MAYBE_EmbedPdfPlaceholderWithCSP DISABLED_EmbedPdfPlaceholderWithCSP #else -@@ -2312,7 +2312,7 @@ IN_PROC_BROWSER_TEST_F(PDFExtensionClipboardTest, - // Flaky on ChromeOS (https://crbug.com/1121446) - // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is - // complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) + #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, + 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, + } + + // Flaky on Linux (https://crbug.com/1121446) +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) #define MAYBE_CombinedShiftArrowPresses DISABLED_CombinedShiftArrowPresses #else #define MAYBE_CombinedShiftArrowPresses CombinedShiftArrowPresses diff --git a/www/chromium/files/patch-chrome_browser_performance__manager_policies_policy__features.cc b/www/chromium/files/patch-chrome_browser_performance__manager_policies_policy__features.cc deleted file mode 100644 index b401971734e8..000000000000 --- a/www/chromium/files/patch-chrome_browser_performance__manager_policies_policy__features.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/performance_manager/policies/policy_features.cc.orig 2021-05-12 22:05:44 UTC -+++ chrome/browser/performance_manager/policies/policy_features.cc -@@ -125,7 +125,7 @@ const base::Feature kPageFreezingFromPerformanceManage - - const base::Feature kUrgentDiscardingFromPerformanceManager{ - "UrgentDiscardingFromPerformanceManager", --#if BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_LINUX) || defined(OS_BSD) - base::FEATURE_DISABLED_BY_DEFAULT - #else - base::FEATURE_ENABLED_BY_DEFAULT diff --git a/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__recorder.cc b/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__recorder.cc deleted file mode 100644 index b03918f8cc5a..000000000000 --- a/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__recorder.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/performance_monitor/process_metrics_recorder.cc.orig 2021-05-12 22:05:44 UTC -+++ chrome/browser/performance_monitor/process_metrics_recorder.cc -@@ -32,7 +32,7 @@ void RecordProcessHistograms(const char* histogram_suf - ""), - metrics.cpu_usage * kCPUUsageFactor, kCPUUsageHistogramMin, - kCPUUsageHistogramMax, kCPUUsageHistogramBucketCount); --#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_AIX) - base::UmaHistogramCounts10000( - base::JoinString({"PerformanceMonitor.IdleWakeUps.", histogram_suffix}, 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 163f35d9d676..2c2f9eb096cc 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,8 +1,8 @@ ---- chrome/browser/policy/browser_signin_policy_handler.cc.orig 2021-04-14 18:40:54 UTC +--- chrome/browser/policy/browser_signin_policy_handler.cc.orig 2021-07-19 18:45:09 UTC +++ chrome/browser/policy/browser_signin_policy_handler.cc @@ -52,7 +52,7 @@ void BrowserSigninPolicyHandler::ApplyPolicySettings(c } - switch (static_cast<BrowserSigninMode>(int_value)) { + 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) 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 a4bfbcde9c17..7565ed62ee3e 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-05-12 22:05:44 UTC +--- 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 -@@ -1293,11 +1293,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1308,11 +1308,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // !defined(OS_MAC) && !defined(OS_CHROMEOS) @@ -14,24 +14,25 @@ #if !defined(OS_MAC) { key::kFullscreenAllowed, -@@ -1650,14 +1650,14 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -1663,7 +1663,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) +-#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) handlers->AddHandler( std::make_unique< - enterprise_connectors::EnterpriseConnectorsPolicyHandler>( +@@ -1671,7 +1671,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) +-#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) #if defined(OS_CHROMEOS) - handlers->AddHandler(std::make_unique<extensions::ExtensionListPolicyHandler>( -@@ -2012,13 +2012,13 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2028,13 +2028,13 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH SimpleSchemaValidatingPolicyHandler::RECOMMENDED_PROHIBITED, SimpleSchemaValidatingPolicyHandler::MANDATORY_ALLOWED)); @@ -47,7 +48,7 @@ #endif // BUILDFLAG(ENABLE_EXTENSIONS) -@@ -2031,7 +2031,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -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. @@ -56,7 +57,7 @@ handlers->AddHandler(std::make_unique<SimpleDeprecatingPolicyHandler>( std::make_unique<SimplePolicyHandler>(key::kAllowNativeNotifications, prefs::kAllowNativeNotifications, -@@ -2039,7 +2039,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2064,7 +2064,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH std::make_unique<SimplePolicyHandler>(key::kAllowSystemNotifications, prefs::kAllowSystemNotifications, base::Value::Type::BOOLEAN))); diff --git a/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc b/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc index 1dec6f86d1c6..b26510726f6b 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-05-12 22:05:44 UTC +--- chrome/browser/prefs/browser_prefs.cc.orig 2021-07-19 18:45:09 UTC +++ chrome/browser/prefs/browser_prefs.cc -@@ -386,14 +386,14 @@ +@@ -395,14 +395,14 @@ #endif #if defined(OS_WIN) || defined(OS_MAC) || \ @@ -17,7 +17,7 @@ #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" #endif -@@ -840,10 +840,10 @@ void RegisterLocalState(PrefRegistrySimple* registry) +@@ -883,10 +883,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); -@@ -871,7 +871,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) +@@ -914,7 +914,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 -@@ -1153,7 +1153,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync +@@ -1205,7 +1205,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_printing_print__job__worker.cc b/www/chromium/files/patch-chrome_browser_printing_print__job__worker.cc index a6255af471a6..7274f38c5818 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,20 +1,29 @@ ---- chrome/browser/printing/print_job_worker.cc.orig 2021-04-14 18:40:54 UTC +--- chrome/browser/printing/print_job_worker.cc.orig 2021-07-19 18:45:09 UTC +++ chrome/browser/printing/print_job_worker.cc -@@ -224,7 +224,7 @@ void PrintJobWorker::UpdatePrintSettings(base::Value n - crash_key = std::make_unique<crash_keys::ScopedPrinterInfo>( - print_backend->GetPrinterDriverInfo(printer_name)); +@@ -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 + crash_key = std::make_unique<crash_keys::ScopedPrinterInfo>( + print_backend->GetPrinterDriverInfo(printer_name)); + +-#if defined(OS_LINUX) && defined(USE_CUPS) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_CUPS) PrinterBasicInfo basic_info; - if (print_backend->GetPrinterBasicInfo(printer_name, &basic_info)) { - base::Value advanced_settings(base::Value::Type::DICTIONARY); -@@ -234,7 +234,7 @@ void PrintJobWorker::UpdatePrintSettings(base::Value n + if (print_backend->GetPrinterBasicInfo(printer_name, &basic_info) == + mojom::ResultCode::kSuccess) { +@@ -239,7 +239,7 @@ void PrintJobWorker::UpdatePrintSettings(base::Value n new_settings.SetKey(kSettingAdvancedSettings, std::move(advanced_settings)); } --#endif // (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && -+#endif // (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) && - // defined(USE_CUPS) +-#endif // defined(OS_LINUX) && defined(USE_CUPS) ++#endif // (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_CUPS) } + PrintingContext::Result result; 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 39db6078c3c7..59e5c6ede8bf 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-05-12 22:05:44 UTC +--- 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 -@@ -349,7 +349,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -361,7 +361,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 index 33250bb38305..c17915b8cc92 100644 --- a/www/chromium/files/patch-chrome_browser_profiles_profile.cc +++ b/www/chromium/files/patch-chrome_browser_profiles_profile.cc @@ -1,6 +1,6 @@ ---- chrome/browser/profiles/profile.cc.orig 2021-05-12 22:05:44 UTC +--- chrome/browser/profiles/profile.cc.orig 2021-07-19 18:45:09 UTC +++ chrome/browser/profiles/profile.cc -@@ -376,7 +376,7 @@ bool Profile::IsIncognitoProfile() const { +@@ -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. 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 index 304842f01f61..6fd0273fc570 100644 --- a/www/chromium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc +++ b/www/chromium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc @@ -1,9 +1,9 @@ ---- chrome/browser/profiles/profile_attributes_entry.cc.orig 2021-05-12 22:05:44 UTC +--- chrome/browser/profiles/profile_attributes_entry.cc.orig 2021-07-19 18:45:09 UTC +++ chrome/browser/profiles/profile_attributes_entry.cc -@@ -159,7 +159,7 @@ void ProfileAttributesEntry::Initialize(ProfileInfoCac - if (is_force_signin_enabled_) { - if (!IsAuthenticated()) +@@ -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) 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 58fabfe570e8..fe98bcd27603 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-05-12 22:05:44 UTC +--- chrome/browser/profiles/profiles_state.cc.orig 2021-07-19 18:45:09 UTC +++ chrome/browser/profiles/profiles_state.cc -@@ -227,7 +227,7 @@ bool IsRegularOrGuestSession(Browser* browser) { +@@ -185,7 +185,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 0fb329c8fca4..19a8a5eed6b6 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,6 @@ ---- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig 2021-05-12 22:05:44 UTC +--- 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 -@@ -2148,7 +2148,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) +@@ -2176,7 +2176,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) case IDC_CHECK_SPELLING_WHILE_TYPING: return prefs->GetBoolean(spellcheck::prefs::kSpellCheckEnable); diff --git a/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc b/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc index e702f0d14fd8..dc1a762d4609 100644 --- a/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc +++ b/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc @@ -1,4 +1,4 @@ ---- chrome/browser/renderer_preferences_util.cc.orig 2021-05-12 22:05:44 UTC +--- chrome/browser/renderer_preferences_util.cc.orig 2021-07-19 18:45:09 UTC +++ chrome/browser/renderer_preferences_util.cc @@ -42,7 +42,7 @@ #include "ui/base/cocoa/defaults_utils.h" @@ -9,7 +9,7 @@ #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" #include "ui/views/linux_ui/linux_ui.h" -@@ -171,7 +171,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc +@@ -170,7 +170,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc prefs->caret_blink_interval = interval; #endif @@ -18,7 +18,7 @@ views::LinuxUI* linux_ui = views::LinuxUI::instance(); if (linux_ui) { if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) { -@@ -190,7 +190,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc +@@ -189,7 +189,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc } #endif diff --git a/www/chromium/files/patch-chrome_browser_resources_media__router_extension_src_utils_platform__utils.js b/www/chromium/files/patch-chrome_browser_resources_media__router_extension_src_utils_platform__utils.js deleted file mode 100644 index ee9ff1a103bf..000000000000 --- a/www/chromium/files/patch-chrome_browser_resources_media__router_extension_src_utils_platform__utils.js +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/resources/media_router/extension/src/utils/platform_utils.js.orig 2021-06-11 09:26:56 UTC -+++ chrome/browser/resources/media_router/extension/src/utils/platform_utils.js -@@ -58,5 +58,8 @@ mr.PlatformUtils.getCurrentOS = function() { - if (userAgent.includes('Linux')) { - return mr.PlatformUtils.OS.LINUX; - } -+ if (userAgent.includes('FreeBSD')) { -+ return mr.PlatformUtils.OS.LINUX; -+ } - return mr.PlatformUtils.OS.OTHER; - }; 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 e813d2950790..bbd253a01b81 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-06-11 09:29:55 UTC +--- chrome/browser/resources/settings/route.js.orig 2021-07-19 18:45:09 UTC +++ chrome/browser/resources/settings/route.js -@@ -183,7 +183,7 @@ function createBrowserSettingsRoutes() { +@@ -184,7 +184,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 index 9a7c1b397c42..e650cbd3c101 100644 --- a/www/chromium/files/patch-chrome_browser_search_drive_drive__service.cc +++ b/www/chromium/files/patch-chrome_browser_search_drive_drive__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/search/drive/drive_service.cc.orig 2021-06-10 11:15:16 UTC +--- chrome/browser/search/drive/drive_service.cc.orig 2021-07-19 18:45:09 UTC +++ chrome/browser/search/drive/drive_service.cc -@@ -19,6 +19,8 @@ namespace { +@@ -27,6 +27,8 @@ namespace { constexpr char kDriveScope[] = "https://www.googleapis.com/auth/drive.readonly"; #if OS_LINUX constexpr char kPlatform[] = "LINUX"; 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 4ea9f3758e34..b766698ee952 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,20 +1,29 @@ ---- chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc.orig 2021-04-14 18:40:55 UTC +--- 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 -@@ -11,7 +11,7 @@ - #include "chrome/browser/profiles/profile.h" - #include "chrome/browser/send_tab_to_self/receiving_ui_handler.h" +@@ -13,7 +13,7 @@ + #include "chrome/browser/ui/send_tab_to_self/send_tab_to_self_toolbar_button_controller.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 -@@ -33,7 +33,7 @@ ReceivingUiHandlerRegistry* ReceivingUiHandlerRegistry +@@ -35,7 +35,7 @@ ReceivingUiHandlerRegistry* ReceivingUiHandlerRegistry // Instantiates all the handlers relevant to this platform. void ReceivingUiHandlerRegistry::InstantiatePlatformSpecificHandlers( Profile* profile) { -#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) - applicable_handlers_.push_back( - std::make_unique<send_tab_to_self::DesktopNotificationHandler>(profile)); + + // If STTS 2.0 is enabled the handler will be created when the toolbar +@@ -54,7 +54,7 @@ void ReceivingUiHandlerRegistry::InstantiatePlatformSp + SendTabToSelfToolbarButtonController* + ReceivingUiHandlerRegistry::GetToolbarButtonControllerForProfile( + Profile* profile) { +-#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) + for (const std::unique_ptr<ReceivingUiHandler>& handler : + applicable_handlers_) { 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 b58d997f47f6..ea033448ba83 100644 --- a/www/chromium/files/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc +++ b/www/chromium/files/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc.orig 2021-04-14 18:40:55 UTC +--- 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 -@@ -40,7 +40,7 @@ void SendTabToSelfClientService::SendTabToSelfModelLoa +@@ -42,7 +42,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 new file mode 100644 index 000000000000..691d359471fb --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_service__sandbox__type.h @@ -0,0 +1,33 @@ +--- chrome/browser/service_sandbox_type.h.orig 2021-07-28 07:42:53 UTC ++++ chrome/browser/service_sandbox_type.h +@@ -12,8 +12,8 @@ + #include "printing/buildflags/buildflags.h" + #include "sandbox/policy/sandbox_type.h" + +-#if (defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ +- defined(OS_CHROMEOS)) && \ ++#if (defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ ++ defined(OS_CHROMEOS)) && \ + BUILDFLAG(ENABLE_PRINTING) + #include "chrome/browser/printing/print_backend_service_manager.h" + #endif +@@ -127,8 +127,8 @@ content::GetServiceSandboxType<printing::mojom::Printi + #endif // defined(OS_WIN) && BUILDFLAG(ENABLE_PRINT_PREVIEW) + + // printing::mojom::PrintBackendService +-#if (defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ +- defined(OS_CHROMEOS)) && \ ++#if (defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ ++ defined(OS_CHROMEOS)) && \ + BUILDFLAG(ENABLE_PRINTING) + namespace printing { + namespace mojom { +@@ -144,7 +144,7 @@ content::GetServiceSandboxType<printing::mojom::PrintB + ? sandbox::policy::SandboxType::kPrintBackend + : sandbox::policy::SandboxType::kNoSandbox; + } +-#endif // (defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || ++#endif // (defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || + // defined(OS_CHROMEOS)) && + // BUILDFLAG(ENABLE_PRINTING) + diff --git a/www/chromium/files/patch-chrome_browser_sessions_session__restore.cc b/www/chromium/files/patch-chrome_browser_sessions_session__restore.cc index c26096a11622..37cfc3b21589 100644 --- a/www/chromium/files/patch-chrome_browser_sessions_session__restore.cc +++ b/www/chromium/files/patch-chrome_browser_sessions_session__restore.cc @@ -1,6 +1,6 @@ ---- chrome/browser/sessions/session_restore.cc.orig 2021-06-10 11:16:08 UTC +--- chrome/browser/sessions/session_restore.cc.orig 2021-07-19 18:45:09 UTC +++ chrome/browser/sessions/session_restore.cc -@@ -931,7 +931,7 @@ void SessionRestore::RestoreSessionAfterCrash(Browser* +@@ -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) diff --git a/www/chromium/files/patch-chrome_browser_sharing_shared__clipboard_feature__flags.cc b/www/chromium/files/patch-chrome_browser_sharing_shared__clipboard_feature__flags.cc deleted file mode 100644 index 85ed859e50e2..000000000000 --- a/www/chromium/files/patch-chrome_browser_sharing_shared__clipboard_feature__flags.cc +++ /dev/null @@ -1,18 +0,0 @@ ---- chrome/browser/sharing/shared_clipboard/feature_flags.cc.orig 2021-04-14 18:40:55 UTC -+++ chrome/browser/sharing/shared_clipboard/feature_flags.cc -@@ -7,7 +7,7 @@ - const base::Feature kSharedClipboardUI{"SharedClipboardUI", - base::FEATURE_DISABLED_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) || \ - defined(OS_CHROMEOS) - const base::Feature kRemoteCopyReceiver{"RemoteCopyReceiver", - base::FEATURE_ENABLED_BY_DEFAULT}; -@@ -24,5 +24,5 @@ const base::Feature kRemoteCopyPersistentNotification{ - - const base::Feature kRemoteCopyProgressNotification{ - "RemoteCopyProgressNotification", base::FEATURE_DISABLED_BY_DEFAULT}; --#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || -+#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || - // defined(OS_CHROMEOS) diff --git a/www/chromium/files/patch-chrome_browser_sharing_shared__clipboard_feature__flags.h b/www/chromium/files/patch-chrome_browser_sharing_shared__clipboard_feature__flags.h deleted file mode 100644 index d836a03d5328..000000000000 --- a/www/chromium/files/patch-chrome_browser_sharing_shared__clipboard_feature__flags.h +++ /dev/null @@ -1,20 +0,0 @@ ---- chrome/browser/sharing/shared_clipboard/feature_flags.h.orig 2021-04-14 18:40:55 UTC -+++ chrome/browser/sharing/shared_clipboard/feature_flags.h -@@ -14,7 +14,7 @@ - // Feature to allow shared clipboard gets processed. - extern const base::Feature kSharedClipboardUI; - --#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) - // Feature to enable handling remote copy messages. - extern const base::Feature kRemoteCopyReceiver; -@@ -30,7 +30,7 @@ extern const base::Feature kRemoteCopyPersistentNotifi - - // Feature to enable progress notifications for remote copy messages. - extern const base::Feature kRemoteCopyProgressNotification; --#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) - - #endif // CHROME_BROWSER_SHARING_SHARED_CLIPBOARD_FEATURE_FLAGS_H_ diff --git a/www/chromium/files/patch-chrome_browser_sharing_sharing__device__registration.cc b/www/chromium/files/patch-chrome_browser_sharing_sharing__device__registration.cc index d179dddc441f..72e863f69fda 100644 --- a/www/chromium/files/patch-chrome_browser_sharing_sharing__device__registration.cc +++ b/www/chromium/files/patch-chrome_browser_sharing_sharing__device__registration.cc @@ -1,4 +1,4 @@ ---- chrome/browser/sharing/sharing_device_registration.cc.orig 2021-05-12 22:05:45 UTC +--- chrome/browser/sharing/sharing_device_registration.cc.orig 2021-07-19 18:45:09 UTC +++ chrome/browser/sharing/sharing_device_registration.cc @@ -321,7 +321,7 @@ bool SharingDeviceRegistration::IsSmsFetcherSupported( } @@ -7,5 +7,5 @@ -#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) - return base::FeatureList::IsEnabled(kRemoteCopyReceiver); + return true; #else 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 885a1436073e..17baa2ade67f 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-04-14 18:40:55 UTC +--- chrome/browser/sync/chrome_sync_client.cc.orig 2021-07-19 18:45:09 UTC +++ chrome/browser/sync/chrome_sync_client.cc -@@ -466,7 +466,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy +@@ -471,7 +471,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)) { -@@ -475,7 +475,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy +@@ -480,7 +480,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_profile__sync__service__factory.cc index 8dc23b6fff54..9f3d3f9dac08 100644 --- a/www/chromium/files/patch-chrome_browser_sync_profile__sync__service__factory.cc +++ b/www/chromium/files/patch-chrome_browser_sync_profile__sync__service__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/sync/profile_sync_service_factory.cc.orig 2021-04-14 18:40:55 UTC +--- chrome/browser/sync/profile_sync_service_factory.cc.orig 2021-07-19 18:45:09 UTC +++ chrome/browser/sync/profile_sync_service_factory.cc -@@ -213,7 +213,7 @@ KeyedService* ProfileSyncServiceFactory::BuildServiceI +@@ -217,7 +217,7 @@ KeyedService* ProfileSyncServiceFactory::BuildServiceI // in lacros-chrome once build flag switch of lacros-chrome is // complete. #if defined(OS_WIN) || defined(OS_MAC) || \ @@ -9,7 +9,7 @@ syncer::SyncPrefs prefs(profile->GetPrefs()); local_sync_backend_enabled = prefs.IsLocalSyncEnabled(); UMA_HISTOGRAM_BOOLEAN("Sync.Local.Enabled", local_sync_backend_enabled); -@@ -231,7 +231,7 @@ KeyedService* ProfileSyncServiceFactory::BuildServiceI +@@ -235,7 +235,7 @@ KeyedService* ProfileSyncServiceFactory::BuildServiceI init_params.start_behavior = syncer::ProfileSyncService::AUTO_START; } diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc index f0cd5ce5aa31..4427d816e1ee 100644 --- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc +++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc @@ -1,6 +1,6 @@ ---- chrome/browser/task_manager/sampling/task_group.cc.orig 2021-05-12 22:05:45 UTC +--- chrome/browser/task_manager/sampling/task_group.cc.orig 2021-07-19 18:45:09 UTC +++ chrome/browser/task_manager/sampling/task_group.cc -@@ -33,9 +33,9 @@ const int kBackgroundRefreshTypesMask = +@@ -38,9 +38,9 @@ const int kBackgroundRefreshTypesMask = #if defined(OS_WIN) REFRESH_TYPE_START_TIME | REFRESH_TYPE_CPU_TIME | #endif // defined(OS_WIN) @@ -12,7 +12,7 @@ #if BUILDFLAG(ENABLE_NACL) REFRESH_TYPE_NACL | #endif // BUILDFLAG(ENABLE_NACL) -@@ -114,9 +114,9 @@ TaskGroup::TaskGroup( +@@ -123,9 +123,9 @@ TaskGroup::TaskGroup( #if BUILDFLAG(ENABLE_NACL) nacl_debug_stub_port_(nacl::kGdbDebugStubPortUnknown), #endif // BUILDFLAG(ENABLE_NACL) @@ -24,7 +24,7 @@ idle_wakeups_per_second_(-1), gpu_memory_has_duplicates_(false), is_backgrounded_(false) { -@@ -129,10 +129,10 @@ TaskGroup::TaskGroup( +@@ -142,10 +142,10 @@ TaskGroup::TaskGroup( weak_ptr_factory_.GetWeakPtr()), base::BindRepeating(&TaskGroup::OnIdleWakeupsRefreshDone, weak_ptr_factory_.GetWeakPtr()), @@ -37,7 +37,7 @@ base::BindRepeating(&TaskGroup::OnProcessPriorityDone, weak_ptr_factory_.GetWeakPtr())); -@@ -301,14 +301,14 @@ void TaskGroup::OnRefreshNaClDebugStubPortDone(int nac +@@ -329,14 +329,14 @@ void TaskGroup::OnRefreshNaClDebugStubPortDone(int nac } #endif // BUILDFLAG(ENABLE_NACL) 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 bf9eeea29fc0..442b6e7d1208 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-04-14 18:40:55 UTC +--- chrome/browser/task_manager/sampling/task_group.h.orig 2021-07-19 18:45:09 UTC +++ chrome/browser/task_manager/sampling/task_group.h -@@ -40,7 +40,7 @@ constexpr int kUnsupportedVMRefreshFlags = +@@ -41,7 +41,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,19 +9,20 @@ REFRESH_TYPE_FD_COUNT | #endif REFRESH_TYPE_HARD_FAULTS; -@@ -123,9 +123,9 @@ class TaskGroup { - int nacl_debug_stub_port() const { return nacl_debug_stub_port_; } +@@ -147,10 +147,10 @@ class TaskGroup { + } #endif // BUILDFLAG(ENABLE_NACL) -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) int open_fd_count() const { return open_fd_count_; } + void set_open_fd_count(int open_fd_count) { open_fd_count_ = open_fd_count; } -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) int idle_wakeups_per_second() const { return idle_wakeups_per_second_; } - -@@ -139,9 +139,9 @@ class TaskGroup { + void set_idle_wakeups_per_second(int idle_wakeups) { +@@ -167,9 +167,9 @@ class TaskGroup { void RefreshNaClDebugStubPort(int child_process_unique_id); void OnRefreshNaClDebugStubPortDone(int port); #endif @@ -33,7 +34,7 @@ void OnCpuRefreshDone(double cpu_usage); void OnSwappedMemRefreshDone(int64_t swapped_mem_bytes); -@@ -210,10 +210,10 @@ class TaskGroup { +@@ -239,10 +239,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_task__manager_sampling_task__group__sampler.h b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h index 9dd8365bf649..69ed2530f60f 100644 --- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h +++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h @@ -1,6 +1,6 @@ ---- chrome/browser/task_manager/sampling/task_group_sampler.h.orig 2021-04-14 18:40:55 UTC +--- chrome/browser/task_manager/sampling/task_group_sampler.h.orig 2021-07-19 18:45:09 UTC +++ chrome/browser/task_manager/sampling/task_group_sampler.h -@@ -32,9 +32,9 @@ class TaskGroupSampler : public base::RefCountedThread +@@ -31,9 +31,9 @@ class TaskGroupSampler : public base::RefCountedThread using OnCpuRefreshCallback = base::RepeatingCallback<void(double)>; using OnSwappedMemRefreshCallback = base::RepeatingCallback<void(int64_t)>; using OnIdleWakeupsCallback = base::RepeatingCallback<void(int)>; @@ -12,7 +12,7 @@ using OnProcessPriorityCallback = base::RepeatingCallback<void(bool)>; TaskGroupSampler( -@@ -43,9 +43,9 @@ class TaskGroupSampler : public base::RefCountedThread +@@ -42,9 +42,9 @@ class TaskGroupSampler : public base::RefCountedThread const OnCpuRefreshCallback& on_cpu_refresh, const OnSwappedMemRefreshCallback& on_memory_refresh, const OnIdleWakeupsCallback& on_idle_wakeups, @@ -23,8 +23,8 @@ +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) const OnProcessPriorityCallback& on_process_priority); - // Refreshes the expensive process' stats (CPU usage, memory usage, and idle -@@ -60,9 +60,9 @@ class TaskGroupSampler : public base::RefCountedThread + TaskGroupSampler(const TaskGroupSampler&) = delete; +@@ -62,9 +62,9 @@ class TaskGroupSampler : public base::RefCountedThread double RefreshCpuUsage(); int64_t RefreshSwappedMem(); int RefreshIdleWakeupsPerSecond(); @@ -36,7 +36,7 @@ bool RefreshProcessPriority(); // The process that holds the handle that we own so that we can use it for -@@ -84,9 +84,9 @@ class TaskGroupSampler : public base::RefCountedThread +@@ -86,9 +86,9 @@ class TaskGroupSampler : public base::RefCountedThread const OnCpuRefreshCallback on_cpu_refresh_callback_; const OnSwappedMemRefreshCallback on_swapped_mem_refresh_callback_; const OnIdleWakeupsCallback on_idle_wakeups_callback_; diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc index 2c0a5994a470..3eca0ac2d0ad 100644 --- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc +++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2021-05-12 22:05:45 UTC +--- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2021-07-19 18:45:09 UTC +++ chrome/browser/task_manager/sampling/task_manager_impl.cc -@@ -213,11 +213,11 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id, +@@ -217,11 +217,11 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id, } int TaskManagerImpl::GetOpenFdCount(TaskId task_id) const { diff --git a/www/chromium/files/patch-chrome_browser_task__manager_task__manager__observer.h b/www/chromium/files/patch-chrome_browser_task__manager_task__manager__observer.h index 77111779aba6..3489fa191a1c 100644 --- a/www/chromium/files/patch-chrome_browser_task__manager_task__manager__observer.h +++ b/www/chromium/files/patch-chrome_browser_task__manager_task__manager__observer.h @@ -1,6 +1,6 @@ ---- chrome/browser/task_manager/task_manager_observer.h.orig 2021-05-12 22:05:45 UTC +--- chrome/browser/task_manager/task_manager_observer.h.orig 2021-07-19 18:45:09 UTC +++ chrome/browser/task_manager/task_manager_observer.h -@@ -47,11 +47,11 @@ enum RefreshType { +@@ -46,11 +46,11 @@ enum RefreshType { // or backgrounded. REFRESH_TYPE_PRIORITY = 1 << 13, diff --git a/www/chromium/files/patch-chrome_browser_ui_BUILD.gn b/www/chromium/files/patch-chrome_browser_ui_BUILD.gn index 5a6da10d2346..53f39b1c2008 100644 --- a/www/chromium/files/patch-chrome_browser_ui_BUILD.gn +++ b/www/chromium/files/patch-chrome_browser_ui_BUILD.gn @@ -1,7 +1,7 @@ ---- chrome/browser/ui/BUILD.gn.orig 2021-05-12 22:05:45 UTC +--- chrome/browser/ui/BUILD.gn.orig 2021-07-19 18:45:09 UTC +++ chrome/browser/ui/BUILD.gn -@@ -648,11 +648,18 @@ static_library("ui") { - deps += [ "//components/autofill/content/browser/webauthn" ] +@@ -615,7 +615,7 @@ static_library("ui") { + deps += [ "//chrome/browser/vr:vr_base" ] } - if (!is_fuchsia) { @@ -9,14 +9,26 @@ # TODO(crbug.com/753619): Enable crash reporting on Fuchsia. deps += [ "//components/crash/core/app", - "//components/crash/core/browser", -+ ] -+ } -+ +@@ -623,6 +623,13 @@ static_library("ui") { + ] + } + + if (is_bsd) { + sources -= [ + "webui/crashes_ui.cc", + "webui/crashes_ui.h", - ] ++ ] ++ } ++ + if (is_win || is_android || is_linux || is_chromeos) { + sources += [ + "webui/sandbox/sandbox_internals_ui.cc", +@@ -3425,7 +3432,7 @@ static_library("ui") { + } } +- if (is_linux || is_chromeos_lacros || is_mac) { ++ if ((is_linux || is_chromeos_lacros || is_mac) && !is_bsd) { + # The first run dialog shows only on Linux and macOS. + sources += [ + "views/first_run_dialog.cc", 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 699789496981..5f13fc7c621b 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,6 +1,6 @@ ---- chrome/browser/ui/browser_command_controller.cc.orig 2021-04-14 18:40:55 UTC +--- chrome/browser/ui/browser_command_controller.cc.orig 2021-07-19 18:45:10 UTC +++ chrome/browser/ui/browser_command_controller.cc -@@ -88,7 +88,7 @@ +@@ -89,7 +89,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_key_bindings_delegate_auralinux.h" #endif -@@ -256,7 +256,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( +@@ -257,7 +257,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -18,7 +18,7 @@ // If this key was registered by the user as a content editing hotkey, then // it is not reserved. ui::TextEditKeyBindingsDelegateAuraLinux* delegate = -@@ -496,7 +496,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -493,7 +493,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -27,7 +27,7 @@ case IDC_MINIMIZE_WINDOW: browser_->window()->Minimize(); break; -@@ -1013,7 +1013,7 @@ void BrowserCommandController::InitCommandState() { +@@ -989,7 +989,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 new file mode 100644 index 000000000000..0d13cced8a27 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_browser__dialogs.h @@ -0,0 +1,11 @@ +--- chrome/browser/ui/browser_dialogs.h.orig 2021-07-28 07:44:03 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 = 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 697b2f071ad3..4b2a8716fc5c 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,6 +1,12 @@ ---- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2021-06-10 11:17:17 UTC +--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2021-07-19 18:45:10 UTC +++ chrome/browser/ui/startup/startup_browser_creator.cc -@@ -125,7 +125,7 @@ +@@ -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) + #include "chrome/browser/ui/startup/web_app_protocol_handling_startup_utils.h" #endif #if defined(OS_WIN) || defined(OS_MAC) || \ @@ -8,8 +14,8 @@ + (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 "third_party/blink/public/common/features.h" -@@ -510,7 +510,7 @@ bool MaybeLaunchApplication( + #endif +@@ -471,7 +471,7 @@ bool MaybeLaunchApplication( } #if defined(OS_WIN) || defined(OS_MAC) || \ @@ -18,7 +24,16 @@ // 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. -@@ -1061,7 +1061,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -999,7 +999,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( + } + } + +-#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 // Web app URL handling. #if defined(OS_WIN) || defined(OS_MAC) || \ 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 4847977ad5ef..4c6a9158ec1f 100644 --- a/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc +++ b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc @@ -1,7 +1,7 @@ ---- chrome/browser/ui/tab_helpers.cc.orig 2021-05-12 22:05:45 UTC +--- chrome/browser/ui/tab_helpers.cc.orig 2021-07-19 18:45:10 UTC +++ chrome/browser/ui/tab_helpers.cc -@@ -150,7 +150,7 @@ - #include "chrome/browser/ui/app_list/search/cros_action_history/cros_action_recorder_tab_tracker.h" +@@ -155,7 +155,7 @@ + #include "chrome/browser/lacros/web_contents_can_go_back_observer.h" #endif -#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ @@ -9,7 +9,7 @@ defined(OS_CHROMEOS) #include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h" #include "chrome/browser/ui/hats/hats_helper.h" -@@ -414,11 +414,11 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con +@@ -423,11 +423,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) || \ 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 169bdfe15f85..93122f906e77 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-05-12 22:05:45 UTC +--- 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 -@@ -449,13 +449,13 @@ std::u16string TaskManagerTableModel::GetText(int row, +@@ -450,13 +450,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( -@@ -615,7 +615,7 @@ int TaskManagerTableModel::CompareValues(int row1, +@@ -616,7 +616,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]); -@@ -623,7 +623,7 @@ int TaskManagerTableModel::CompareValues(int row1, +@@ -624,7 +624,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(); -@@ -789,11 +789,11 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col +@@ -790,11 +790,11 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col type = REFRESH_TYPE_KEEPALIVE_COUNT; break; diff --git a/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc b/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc index ddaa3ef2dcc6..dcec6207d8fc 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/accelerator_table.cc.orig 2021-04-14 18:40:55 UTC +--- chrome/browser/ui/views/accelerator_table.cc.orig 2021-07-19 18:45:10 UTC +++ chrome/browser/ui/views/accelerator_table.cc @@ -62,7 +62,7 @@ const AcceleratorMapping kAcceleratorMap[] = { {ui::VKEY_NUMPAD9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB}, @@ -42,5 +42,5 @@ -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - #if BUILDFLAG(IS_CHROMEOS_ASH) - // On Chrome OS, VKEY_BROWSER_SEARCH is handled in Ash. + #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) + // Chrome OS keyboard does not have delete key, so assign it to backspace. 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 5035f8cb1bea..89ac2c80c9c0 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-04-14 18:40:55 UTC +--- 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 -@@ -38,7 +38,7 @@ +@@ -40,7 +40,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> -@@ -48,7 +48,7 @@ +@@ -50,7 +50,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 { -@@ -131,7 +131,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( +@@ -135,7 +135,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. -@@ -162,7 +162,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( +@@ -166,7 +166,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 427d9f99c7c3..1b49df8903bc 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-04-14 18:40:55 UTC +--- 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 -@@ -188,7 +188,7 @@ bool UseNewWarnings() { +@@ -185,7 +185,7 @@ bool UseNewWarnings() { } int GetFilenameStyle(const views::Label& label) { @@ -9,7 +9,7 @@ if (UseNewWarnings()) return STYLE_EMPHASIZED; #endif -@@ -196,7 +196,7 @@ int GetFilenameStyle(const views::Label& label) { +@@ -193,7 +193,7 @@ int GetFilenameStyle(const views::Label& label) { } int GetFilenameStyle(const views::StyledLabel& label) { 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 0dc665cd252d..9314d065ffb8 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/browser_frame.cc.orig 2021-05-12 22:05:46 UTC +--- chrome/browser/ui/views/frame/browser_frame.cc.orig 2021-07-19 18:45:10 UTC +++ chrome/browser/ui/views/frame/browser_frame.cc -@@ -44,7 +44,7 @@ +@@ -44,11 +44,11 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,12 @@ #include "ui/display/screen.h" #endif -@@ -53,7 +53,7 @@ namespace { +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "ui/views/linux_ui/linux_ui.h" + #endif + +@@ -57,7 +57,7 @@ namespace { bool IsUsingGtkTheme(Profile* profile) { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -18,7 +23,7 @@ return ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme(); #else return false; -@@ -221,7 +221,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() { +@@ -237,7 +237,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() { IsVisibleOnAllWorkspaces()); // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -27,3 +32,21 @@ // 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() { + } + } + +-#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( + bool need_regenerate = false; + // TODO(crbug.com/1052397): Revisit the macro expression once build flag + // switch of lacros-chrome is complete. +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) + // GTK and user theme changes can both change frame buttons, so the frame + // always needs to be regenerated on Linux. + need_regenerate = true; diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc index f3bbeb57a328..96c3636335d1 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-05-12 22:05:46 UTC +--- chrome/browser/ui/views/frame/browser_view.cc.orig 2021-07-19 18:45:10 UTC +++ chrome/browser/ui/views/frame/browser_view.cc -@@ -1563,7 +1563,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra +@@ -1586,7 +1586,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. @@ -9,12 +9,3 @@ contents_web_view_->SetFastResize(is_dragging); if (!is_dragging) { // When tab dragging is ended, we need to make sure the web contents get -@@ -1951,7 +1951,7 @@ void BrowserView::UserChangedTheme(BrowserThemeChangeT - bool must_regenerate_frame; - // 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) - // GTK and user theme changes can both change frame buttons, so the frame - // always needs to be regenerated on Linux. - must_regenerate_frame = true; 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 f88d437a755a..01fd780ef2de 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-04-14 18:40:55 UTC +--- 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 -@@ -51,7 +51,7 @@ +@@ -52,7 +52,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 -@@ -462,7 +462,7 @@ OpaqueBrowserFrameView::FrameButtonStyle +@@ -463,7 +463,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; -@@ -656,7 +656,7 @@ gfx::Rect OpaqueBrowserFrameView::GetIconBounds() cons +@@ -657,7 +657,7 @@ gfx::Rect OpaqueBrowserFrameView::GetIconBounds() cons } void OpaqueBrowserFrameView::WindowIconPressed() { diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc index 236289b8191a..051c085e216a 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-04-14 18:40:55 UTC +--- 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 -@@ -70,7 +70,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser +@@ -68,7 +68,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser ui::SimpleMenuModel* model) { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ model->AddItemWithStringId(IDC_MINIMIZE_WINDOW, IDS_MINIMIZE_WINDOW_MENU); model->AddItemWithStringId(IDC_MAXIMIZE_WINDOW, IDS_MAXIMIZE_WINDOW_MENU); model->AddItemWithStringId(IDC_RESTORE_WINDOW, IDS_RESTORE_WINDOW_MENU); -@@ -87,7 +87,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser +@@ -85,7 +85,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser } // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -18,7 +18,7 @@ model->AddSeparator(ui::NORMAL_SEPARATOR); model->AddCheckItemWithStringId(IDC_USE_SYSTEM_TITLE_BAR, IDS_SHOW_WINDOW_DECORATIONS_MENU); -@@ -130,7 +130,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo +@@ -128,7 +128,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 5cb23e290028..458e7ae62a45 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-04-14 18:40:55 UTC +--- 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 -@@ -19,7 +19,7 @@ +@@ -23,7 +23,7 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ #include "chrome/common/pref_names.h" #include "components/prefs/pref_service.h" #endif -@@ -36,7 +36,7 @@ SystemMenuModelDelegate::~SystemMenuModelDelegate() {} +@@ -40,7 +40,7 @@ SystemMenuModelDelegate::~SystemMenuModelDelegate() {} bool SystemMenuModelDelegate::IsCommandIdChecked(int command_id) const { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -18,7 +18,7 @@ if (command_id == IDC_USE_SYSTEM_TITLE_BAR) { PrefService* prefs = browser_->profile()->GetPrefs(); return !prefs->GetBoolean(prefs::kUseCustomChromeFrame); -@@ -52,7 +52,7 @@ bool SystemMenuModelDelegate::IsCommandIdEnabled(int c +@@ -60,7 +60,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 be6611aa92eb..caa8e1fd6443 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-04-14 18:40:55 UTC +--- 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 -@@ -586,7 +586,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo( +@@ -604,7 +604,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_tabs_tab.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc index fe26cd435c31..3d2ec505ef78 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/tab.cc.orig 2021-05-12 22:05:46 UTC +--- chrome/browser/ui/views/tabs/tab.cc.orig 2021-07-19 18:45:10 UTC +++ chrome/browser/ui/views/tabs/tab.cc -@@ -582,7 +582,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& +@@ -580,7 +580,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& if (mouse_hovered_ || !GetWidget()->IsMouseEventsEnabled()) return; diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc index c39053d48c6e..201c3e610835 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-05-12 22:05:46 UTC +--- 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 -@@ -456,7 +456,7 @@ void TabDragController::Init(TabDragContext* source_co +@@ -457,7 +457,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. @@ -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. -@@ -2145,7 +2145,7 @@ TabDragController::Liveness TabDragController::GetLoca +@@ -2193,7 +2193,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_webui_about__ui.cc b/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc index d7cb824e0b47..f1cf64c1f419 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-04-14 18:40:56 UTC +--- chrome/browser/ui/webui/about_ui.cc.orig 2021-07-19 18:45:10 UTC +++ chrome/browser/ui/webui/about_ui.cc -@@ -580,7 +580,7 @@ std::string ChromeURLs() { +@@ -582,7 +582,7 @@ std::string ChromeURLs() { return html; } @@ -9,7 +9,7 @@ std::string AboutLinuxProxyConfig() { std::string data; AppendHeader(&data, 0, -@@ -636,7 +636,7 @@ void AboutUIHTMLSource::StartDataRequest( +@@ -638,7 +638,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 37296e596a29..95bb4e8f30d5 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-05-12 22:05:46 UTC +--- 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 -@@ -30,7 +30,9 @@ +@@ -31,7 +31,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" -@@ -272,12 +274,12 @@ +@@ -280,12 +282,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 -@@ -496,7 +498,7 @@ bool IsAboutUI(const GURL& url) { +@@ -523,7 +525,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) -@@ -545,8 +547,10 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -572,8 +574,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) -@@ -927,7 +931,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -969,7 +973,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>; -@@ -971,13 +975,13 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -1019,13 +1023,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>; -@@ -985,7 +989,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -1033,7 +1037,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 -@@ -1181,8 +1185,10 @@ base::RefCountedMemory* ChromeWebUIControllerFactory:: +@@ -1221,8 +1225,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 3e444821332d..b61da1dfe144 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-05-12 22:05:46 UTC +--- 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 -@@ -1396,7 +1396,7 @@ void AppLauncherHandler::InstallOsHooks(const web_app: +@@ -1373,7 +1373,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 5c31faca434c..fbc3d6227265 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,6 @@ ---- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2021-05-12 22:05:46 UTC +--- 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 -@@ -338,7 +338,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -337,7 +337,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 +9,7 @@ {"systemTheme", IDS_SETTINGS_SYSTEM_THEME}, {"useSystemTheme", IDS_SETTINGS_USE_SYSTEM_THEME}, {"classicTheme", IDS_SETTINGS_CLASSIC_THEME}, -@@ -346,7 +346,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -345,7 +345,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht #else {"resetToDefaultTheme", IDS_SETTINGS_RESET_TO_DEFAULT_THEME}, #endif diff --git a/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__file__handler__registration.h b/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__file__handler__registration.h index 5097be46172b..b78451aa5d1c 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,8 +1,8 @@ ---- chrome/browser/web_applications/components/web_app_file_handler_registration.h.orig 2021-05-12 22:05:46 UTC +--- 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 @@ -42,7 +42,7 @@ void UnregisterFileHandlersWithOs(const AppId& app_id, std::unique_ptr<ShortcutInfo> info, - base::OnceCallback<void()> callback); + base::OnceCallback<void(bool)> callback); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) diff --git a/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__protocol__handler__registration.cc b/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__protocol__handler__registration.cc deleted file mode 100644 index edb22367ca2c..000000000000 --- a/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__protocol__handler__registration.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/web_applications/components/web_app_protocol_handler_registration.cc.orig 2021-06-10 11:20:20 UTC -+++ chrome/browser/web_applications/components/web_app_protocol_handler_registration.cc -@@ -10,7 +10,7 @@ - - namespace web_app { - --#if !(defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX)) -+#if !(defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD)) - // Registers a protocol handler for the web app with the OS. - void RegisterProtocolHandlersWithOs( - const AppId& app_id, 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_components_web__app__utils.cc new file mode 100644 index 000000000000..7e2f7da3a998 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__utils.cc @@ -0,0 +1,27 @@ +--- 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 + const apps::FileHandlers file_handlers = + GetFileHandlersForAllWebAppsWithOrigin(profile, url); + std::vector<std::string> associations; +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + std::set<std::string> mime_types_set = + apps::GetMimeTypesFromFileHandlers(file_handlers); + associations.reserve(mime_types_set.size()); + associations.insert(associations.end(), mime_types_set.begin(), + mime_types_set.end()); +-#else // !defined(OS_LINUX) ++#else // !defined(OS_LINUX) || defined(OS_BSD) + std::set<std::string> extensions_set = + apps::GetFileExtensionsFromFileHandlers(file_handlers); + associations.reserve(extensions_set.size()); +@@ -215,7 +215,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( diff --git a/www/chromium/files/patch-chrome_browser_web__applications_pending__app__install__task.cc b/www/chromium/files/patch-chrome_browser_web__applications_externally__managed__app__install__task.cc index 0d5abcf7e73b..586f42d173fc 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_pending__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/pending_app_install_task.cc.orig 2021-05-12 22:05:46 UTC -+++ chrome/browser/web_applications/pending_app_install_task.cc -@@ -311,7 +311,7 @@ void PendingAppInstallTask::OnWebAppInstalled(bool is_ +--- 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 +@@ -318,7 +318,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 cd86b668259c..848f6b353548 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-05-12 22:05:46 UTC +--- 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 -@@ -861,7 +861,7 @@ void WebAppInstallTask::OnInstallFinalizedCreateShortc +@@ -862,7 +862,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 ff3a3f95bf8c..2f5383c2bcca 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,8 +1,8 @@ ---- chrome/browser/web_applications/web_app_provider.cc.orig 2021-05-12 22:05:46 UTC +--- chrome/browser/web_applications/web_app_provider.cc.orig 2021-07-19 18:45:10 UTC +++ chrome/browser/web_applications/web_app_provider.cc -@@ -237,7 +237,7 @@ void WebAppProvider::CreateWebAppsSubsystems(Profile* +@@ -229,7 +229,7 @@ void WebAppProvider::CreateWebAppsSubsystems(Profile* - std::unique_ptr<UrlHandlerManager> url_handler_manager = nullptr; + std::unique_ptr<UrlHandlerManager> url_handler_manager; #if defined(OS_WIN) || defined(OS_MAC) || \ - (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) + (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) diff --git a/www/chromium/files/patch-chrome_common_BUILD.gn b/www/chromium/files/patch-chrome_common_BUILD.gn index f946906ed434..3416a0ba2728 100644 --- a/www/chromium/files/patch-chrome_common_BUILD.gn +++ b/www/chromium/files/patch-chrome_common_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/common/BUILD.gn.orig 2021-05-12 22:05:46 UTC +--- chrome/common/BUILD.gn.orig 2021-07-19 18:45:10 UTC +++ chrome/common/BUILD.gn -@@ -253,6 +253,10 @@ static_library("common") { +@@ -257,6 +257,10 @@ static_library("common") { public_deps += [ "//ppapi/shared_impl" ] } @@ -11,7 +11,7 @@ if (enable_extensions) { sources += [ "extensions/api/commands/commands_handler.cc", -@@ -480,13 +484,21 @@ static_library("common") { +@@ -484,13 +488,21 @@ static_library("common") { public_deps += [ "//chrome/common/safe_browsing" ] } diff --git a/www/chromium/files/patch-chrome_common_channel__info__posix.cc b/www/chromium/files/patch-chrome_common_channel__info__posix.cc index c3d10dbcde87..f96130441ac9 100644 --- a/www/chromium/files/patch-chrome_common_channel__info__posix.cc +++ b/www/chromium/files/patch-chrome_common_channel__info__posix.cc @@ -1,6 +1,6 @@ ---- chrome/common/channel_info_posix.cc.orig 2021-05-12 22:05:46 UTC +--- chrome/common/channel_info_posix.cc.orig 2021-07-19 18:45:10 UTC +++ chrome/common/channel_info_posix.cc -@@ -90,7 +90,7 @@ std::string GetChannelSuffixForDataDir() { +@@ -93,7 +93,7 @@ std::string GetChannelSuffixForDataDir() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ std::string GetDesktopName(base::Environment* env) { #if BUILDFLAG(GOOGLE_CHROME_BRANDING) // Google Chrome packaged as a snap is a special case: the application name -@@ -120,7 +120,7 @@ std::string GetDesktopName(base::Environment* env) { +@@ -123,7 +123,7 @@ std::string GetDesktopName(base::Environment* env) { return "chromium-browser.desktop"; #endif } diff --git a/www/chromium/files/patch-chrome_common_chrome__features.cc b/www/chromium/files/patch-chrome_common_chrome__features.cc index 9e7679b1e5ba..590df2168c31 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-06-09 22:13:57 UTC +--- chrome/common/chrome_features.cc.orig 2021-07-19 18:45:10 UTC +++ chrome/common/chrome_features.cc -@@ -81,13 +81,13 @@ const base::Feature kAsyncDns { +@@ -83,13 +83,13 @@ const base::Feature kAsyncDns { #endif }; @@ -16,7 +16,7 @@ #if BUILDFLAG(IS_CHROMEOS_ASH) // Enable Borealis on Chrome OS. -@@ -265,7 +265,7 @@ const base::Feature kDesktopPWAsFlashAppNameInsteadOfO +@@ -282,7 +282,7 @@ const base::Feature kDesktopPWAsNotificationIconAndTit // Enables or disables Desktop PWAs to be auto-started on OS login. const base::Feature kDesktopPWAsRunOnOsLogin { "DesktopPWAsRunOnOsLogin", @@ -25,7 +25,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -356,13 +356,13 @@ const base::Feature kEnableAllSystemWebApps{"EnableAll +@@ -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. @@ -41,8 +41,8 @@ // BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_MAC) #if defined(OS_WIN) -@@ -544,7 +544,7 @@ const base::Feature kIncompatibleApplicationsWarning{ - "IncompatibleApplicationsWarning", base::FEATURE_DISABLED_BY_DEFAULT}; +@@ -566,7 +566,7 @@ const base::Feature kIncognitoBrandConsistencyForAndro + "IncognitoBrandConsistencyForAndroid", base::FEATURE_DISABLED_BY_DEFAULT}; #endif -#if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || \ diff --git a/www/chromium/files/patch-chrome_common_chrome__features.h b/www/chromium/files/patch-chrome_common_chrome__features.h index a10edda0168a..dc1c03e1f02d 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-06-09 22:13:57 UTC +--- chrome/common/chrome_features.h.orig 2021-07-19 18:45:10 UTC +++ chrome/common/chrome_features.h -@@ -70,10 +70,10 @@ extern const base::Feature kAppShimNewCloseBehavior; +@@ -69,10 +69,10 @@ extern const base::Feature kAppShimNewCloseBehavior; COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kAsyncDns; @@ -13,7 +13,7 @@ #if BUILDFLAG(IS_CHROMEOS_ASH) COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kBorealis; -@@ -234,11 +234,11 @@ extern const base::Feature kEnableAmbientAuthenticatio +@@ -250,11 +250,11 @@ extern const base::Feature kEnableAmbientAuthenticatio // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -27,9 +27,9 @@ // BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_MAC) #if defined(OS_WIN) -@@ -358,7 +358,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) - extern const base::Feature kIncompatibleApplicationsWarning; - #endif // defined(OS_ANDROID) +@@ -374,7 +374,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) + extern const base::Feature kIncognitoBrandConsistencyForAndroid; + #endif -#if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || \ +#if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ diff --git a/www/chromium/files/patch-chrome_common_chrome__paths.cc b/www/chromium/files/patch-chrome_common_chrome__paths.cc index 29f21126b859..e5809d62f4ce 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-04-14 18:40:56 UTC +--- chrome/common/chrome_paths.cc.orig 2021-07-19 18:45:10 UTC +++ chrome/common/chrome_paths.cc -@@ -44,15 +44,23 @@ +@@ -43,15 +43,23 @@ namespace { @@ -25,7 +25,7 @@ #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) -@@ -175,7 +183,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -172,7 +180,7 @@ bool PathProvider(int key, base::FilePath* result) { return false; break; case chrome::DIR_DEFAULT_DOWNLOADS_SAFE: @@ -34,7 +34,7 @@ if (!GetUserDownloadsDirectorySafe(&cur)) return false; break; -@@ -425,6 +433,9 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -416,6 +424,9 @@ bool PathProvider(int key, base::FilePath* result) { case chrome::DIR_POLICY_FILES: { #if BUILDFLAG(GOOGLE_CHROME_BRANDING) cur = base::FilePath(FILE_PATH_LITERAL("/etc/opt/chrome/policies")); @@ -44,7 +44,7 @@ #else cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies")); #endif -@@ -436,7 +447,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -427,7 +438,7 @@ bool PathProvider(int key, base::FilePath* result) { #if BUILDFLAG(IS_CHROMEOS_ASH) || \ ((defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ BUILDFLAG(CHROMIUM_BRANDING)) || \ @@ -53,7 +53,7 @@ case chrome::DIR_USER_EXTERNAL_EXTENSIONS: { if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) return false; -@@ -444,7 +455,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -435,7 +446,7 @@ bool PathProvider(int key, base::FilePath* result) { break; } #endif @@ -62,7 +62,7 @@ case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: { cur = base::FilePath(kFilepathSinglePrefExtensions); break; -@@ -479,7 +490,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -470,7 +481,7 @@ bool PathProvider(int key, base::FilePath* result) { #endif break; @@ -71,7 +71,7 @@ case chrome::DIR_NATIVE_MESSAGING: #if defined(OS_MAC) #if BUILDFLAG(GOOGLE_CHROME_BRANDING) -@@ -493,6 +504,9 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -484,6 +495,9 @@ bool PathProvider(int key, base::FilePath* result) { #if BUILDFLAG(GOOGLE_CHROME_BRANDING) cur = base::FilePath(FILE_PATH_LITERAL( "/etc/opt/chrome/native-messaging-hosts")); @@ -81,7 +81,7 @@ #else cur = base::FilePath(FILE_PATH_LITERAL( "/etc/chromium/native-messaging-hosts")); -@@ -505,7 +519,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -496,7 +510,7 @@ bool PathProvider(int key, base::FilePath* result) { return false; cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts")); break; diff --git a/www/chromium/files/patch-chrome_common_chrome__paths.h b/www/chromium/files/patch-chrome_common_chrome__paths.h index cb0abf26c283..927894223b5e 100644 --- a/www/chromium/files/patch-chrome_common_chrome__paths.h +++ b/www/chromium/files/patch-chrome_common_chrome__paths.h @@ -1,6 +1,6 @@ ---- chrome/common/chrome_paths.h.orig 2021-04-14 18:40:56 UTC +--- chrome/common/chrome_paths.h.orig 2021-07-19 18:45:10 UTC +++ chrome/common/chrome_paths.h -@@ -56,7 +56,7 @@ enum { +@@ -57,7 +57,7 @@ enum { #if BUILDFLAG(IS_CHROMEOS_ASH) || \ ((defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ BUILDFLAG(CHROMIUM_BRANDING)) || \ @@ -9,7 +9,7 @@ DIR_USER_EXTERNAL_EXTENSIONS, // Directory for per-user external extensions // on Chrome Mac and Chromium Linux. // On Chrome OS, this path is used for OEM -@@ -64,7 +64,7 @@ enum { +@@ -65,7 +65,7 @@ enum { // create it. #endif @@ -18,7 +18,7 @@ DIR_STANDALONE_EXTERNAL_EXTENSIONS, // Directory for 'per-extension' // definition manifest files that // describe extensions which are to be -@@ -111,7 +111,7 @@ enum { +@@ -109,7 +109,7 @@ enum { DIR_CHROMEOS_CUSTOM_WALLPAPERS, // Directory where custom wallpapers // reside. #endif diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.cc b/www/chromium/files/patch-chrome_common_chrome__switches.cc index 2a4679643445..1a6a28086ffe 100644 --- a/www/chromium/files/patch-chrome_common_chrome__switches.cc +++ b/www/chromium/files/patch-chrome_common_chrome__switches.cc @@ -1,6 +1,6 @@ ---- chrome/common/chrome_switches.cc.orig 2021-05-12 22:05:46 UTC +--- chrome/common/chrome_switches.cc.orig 2021-07-19 18:45:10 UTC +++ chrome/common/chrome_switches.cc -@@ -803,7 +803,7 @@ const char kAllowNaClFileHandleAPI[] = "allow-n +@@ -810,7 +810,7 @@ const char kAllowNaClFileHandleAPI[] = "allow-n const char kAllowNaClSocketAPI[] = "allow-nacl-socket-api"; #endif diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.h b/www/chromium/files/patch-chrome_common_chrome__switches.h index 971ef7da360d..cb1e3c7a1732 100644 --- a/www/chromium/files/patch-chrome_common_chrome__switches.h +++ b/www/chromium/files/patch-chrome_common_chrome__switches.h @@ -1,6 +1,6 @@ ---- chrome/common/chrome_switches.h.orig 2021-05-12 22:05:46 UTC +--- chrome/common/chrome_switches.h.orig 2021-07-19 18:45:10 UTC +++ chrome/common/chrome_switches.h -@@ -253,7 +253,7 @@ extern const char kAllowNaClFileHandleAPI[]; +@@ -254,7 +254,7 @@ extern const char kAllowNaClFileHandleAPI[]; extern const char kAllowNaClSocketAPI[]; #endif diff --git a/www/chromium/files/patch-chrome_common_pref__names.cc b/www/chromium/files/patch-chrome_common_pref__names.cc index b787e20781bc..d798a2d3c94c 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-05-12 22:05:46 UTC +--- chrome/common/pref_names.cc.orig 2021-07-19 18:45:10 UTC +++ chrome/common/pref_names.cc -@@ -1123,7 +1123,7 @@ const char kAllowedDomainsForApps[] = "settings.allowe +@@ -1125,7 +1125,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 -@@ -1264,7 +1264,7 @@ const char kShowUpdatePromotionInfoBar[] = +@@ -1228,7 +1228,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"; -@@ -1722,7 +1722,7 @@ const char kDownloadDefaultDirectory[] = "download.def +@@ -1686,7 +1686,7 @@ const char kDownloadDefaultDirectory[] = "download.def // upgrade a unsafe location to a safe location. const char kDownloadDirUpgraded[] = "download.directory_upgrade"; @@ -27,7 +27,7 @@ defined(OS_MAC) const char kOpenPdfDownloadInSystemReader[] = "download.open_pdf_in_system_reader"; -@@ -1993,7 +1993,7 @@ const char kWebAppsUninstalledDefaultChromeApps[] = +@@ -1958,7 +1958,7 @@ const char kWebAppsUninstalledDefaultChromeApps[] = const char kWebAppsPreferences[] = "web_apps.web_app_ids"; #if defined(OS_WIN) || defined(OS_MAC) || \ @@ -36,7 +36,7 @@ // Dictionary that maps origins to web apps that can act as URL handlers. const char kWebAppsUrlHandlerInfo[] = "web_apps.url_handler_info"; #endif -@@ -2109,12 +2109,12 @@ const char kAmbientAuthenticationInPrivateModesEnabled +@@ -2074,12 +2074,12 @@ const char kAmbientAuthenticationInPrivateModesEnabled // requests. const char kBasicAuthOverHttpEnabled[] = "auth.basic_over_http_enabled"; @@ -51,7 +51,7 @@ #if defined(OS_POSIX) // Boolean that specifies whether NTLMv2 is enabled. -@@ -3015,7 +3015,7 @@ const char kBlockAutoplayEnabled[] = "media.block_auto +@@ -2993,7 +2993,7 @@ const char kBlockAutoplayEnabled[] = "media.block_auto // 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_pref__names.h b/www/chromium/files/patch-chrome_common_pref__names.h index 1bf5efd122d4..b8e9f85dd341 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-05-12 22:05:46 UTC +--- chrome/common/pref_names.h.orig 2021-07-19 18:45:10 UTC +++ chrome/common/pref_names.h -@@ -366,7 +366,7 @@ extern const char kForceYouTubeRestrict[]; +@@ -360,7 +360,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[]; -@@ -395,7 +395,7 @@ extern const char kShowUpdatePromotionInfoBar[]; +@@ -389,7 +389,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) -@@ -567,7 +567,7 @@ extern const char kDownloadExtensionsToOpen[]; +@@ -561,7 +561,7 @@ extern const char kDownloadExtensionsToOpen[]; extern const char kDownloadExtensionsToOpenByPolicy[]; extern const char kDownloadAllowedURLsForOpenByPolicy[]; extern const char kDownloadDirUpgraded[]; @@ -27,7 +27,7 @@ defined(OS_MAC) extern const char kOpenPdfDownloadInSystemReader[]; #endif -@@ -671,7 +671,7 @@ extern const char kWebAppsUninstalledDefaultChromeApps +@@ -665,7 +665,7 @@ extern const char kWebAppsUninstalledDefaultChromeApps extern const char kWebAppsPreferences[]; #if defined(OS_WIN) || defined(OS_MAC) || \ @@ -36,7 +36,7 @@ extern const char kWebAppsUrlHandlerInfo[]; #endif -@@ -807,9 +807,9 @@ extern const char kGloballyScopeHTTPAuthCacheEnabled[] +@@ -801,9 +801,9 @@ extern const char kGloballyScopeHTTPAuthCacheEnabled[] extern const char kAmbientAuthenticationInPrivateModesEnabled[]; extern const char kBasicAuthOverHttpEnabled[]; @@ -48,7 +48,7 @@ #if defined(OS_POSIX) extern const char kNtlmV2Enabled[]; -@@ -1042,7 +1042,7 @@ extern const char kBlockAutoplayEnabled[]; +@@ -1039,7 +1039,7 @@ extern const char kBlockAutoplayEnabled[]; // 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_webui__url__constants.cc b/www/chromium/files/patch-chrome_common_webui__url__constants.cc index 9554246a4f3e..99058328f9a9 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-05-12 22:05:46 UTC +--- chrome/common/webui_url_constants.cc.orig 2021-07-19 18:45:10 UTC +++ chrome/common/webui_url_constants.cc -@@ -358,12 +358,12 @@ const char kChromeUIOSSettingsHost[] = "os-settings"; +@@ -359,12 +359,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/"; -@@ -378,7 +378,7 @@ const char kChromeUINearbyShareURL[] = "chrome://nearb +@@ -379,7 +379,7 @@ const char kChromeUINearbyShareURL[] = "chrome://nearb const char kChromeUILinuxProxyConfigHost[] = "linux-proxy-config"; #endif @@ -24,7 +24,7 @@ defined(OS_ANDROID) const char kChromeUISandboxHost[] = "sandbox"; #endif -@@ -386,7 +386,7 @@ const char kChromeUISandboxHost[] = "sandbox"; +@@ -387,7 +387,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) || \ @@ -33,7 +33,7 @@ const char kChromeUIBrowserSwitchHost[] = "browser-switch"; const char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/"; const char kChromeUIEnterpriseProfileWelcomeHost[] = -@@ -401,7 +401,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro +@@ -402,7 +402,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 -@@ -583,14 +583,14 @@ const char* const kChromeHostURLs[] = { +@@ -584,14 +584,14 @@ const char* const kChromeHostURLs[] = { kChromeUIInternetDetailDialogHost, kChromeUIAssistantOptInHost, #endif @@ -59,8 +59,8 @@ defined(OS_ANDROID) kChromeUISandboxHost, #endif -@@ -649,7 +649,7 @@ const char* const kChromeDebugURLs[] = { - content::kChromeUIGpuJavaCrashURL, +@@ -653,7 +653,7 @@ const char* const kChromeDebugURLs[] = { + blink::kChromeUIGpuJavaCrashURL, kChromeUIJavaCrashURL, #endif -#if defined(OS_LINUX) || defined(OS_CHROMEOS) 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 c1ed02dde8ec..7f2d7d09500e 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-05-12 22:05:46 UTC +--- chrome/common/webui_url_constants.h.orig 2021-07-19 18:45:10 UTC +++ chrome/common/webui_url_constants.h -@@ -308,12 +308,12 @@ extern const char kChromeUIOSSettingsHost[]; +@@ -309,12 +309,12 @@ extern const char kChromeUIOSSettingsHost[]; extern const char kChromeUIOSSettingsURL[]; #endif @@ -15,7 +15,7 @@ defined(OS_CHROMEOS) extern const char kChromeUIDiscardsHost[]; extern const char kChromeUIDiscardsURL[]; -@@ -328,7 +328,7 @@ extern const char kChromeUINearbyShareURL[]; +@@ -329,7 +329,7 @@ extern const char kChromeUINearbyShareURL[]; extern const char kChromeUILinuxProxyConfigHost[]; #endif @@ -24,7 +24,7 @@ defined(OS_ANDROID) extern const char kChromeUISandboxHost[]; #endif -@@ -336,7 +336,7 @@ extern const char kChromeUISandboxHost[]; +@@ -337,7 +337,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) || \ @@ -33,7 +33,7 @@ extern const char kChromeUIBrowserSwitchHost[]; extern const char kChromeUIBrowserSwitchURL[]; extern const char kChromeUIEnterpriseProfileWelcomeHost[]; -@@ -348,7 +348,7 @@ extern const char kChromeUIProfilePickerUrl[]; +@@ -349,7 +349,7 @@ extern const char kChromeUIProfilePickerUrl[]; extern const char kChromeUIProfilePickerStartupQuery[]; #endif 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 new file mode 100644 index 000000000000..01fe02d3da8e --- /dev/null +++ b/www/chromium/files/patch-chrome_services_speech_soda_soda__test__paths.h @@ -0,0 +1,11 @@ +--- chrome/services/speech/soda/soda_test_paths.h.orig 2021-07-28 07:49:56 UTC ++++ chrome/services/speech/soda/soda_test_paths.h +@@ -34,7 +34,7 @@ constexpr base::FilePath::CharType kSodaResourcePath[] + constexpr base::FilePath::CharType kSodaTestBinaryRelativePath = + FILE_PATH_LITERAL("SODA_for_testing.dll"); + +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + + constexpr base::FilePath::CharType kSodaResourcePath[] = + FILE_PATH_LITERAL("third_party/soda/resources"); diff --git a/www/chromium/files/patch-chrome_test_BUILD.gn b/www/chromium/files/patch-chrome_test_BUILD.gn index 62f876089f6a..3f895d679117 100644 --- a/www/chromium/files/patch-chrome_test_BUILD.gn +++ b/www/chromium/files/patch-chrome_test_BUILD.gn @@ -1,6 +1,17 @@ ---- chrome/test/BUILD.gn.orig 2021-06-09 22:13:57 UTC +--- chrome/test/BUILD.gn.orig 2021-07-19 18:45:11 UTC +++ chrome/test/BUILD.gn -@@ -1666,7 +1666,7 @@ if (!is_android) { +@@ -476,6 +476,10 @@ 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) { ] } @@ -9,7 +20,7 @@ sources += [ "../browser/error_reporting/webui_js_error_reporting_browsertest.cc", ] -@@ -5193,7 +5193,7 @@ test("unit_tests") { +@@ -5425,7 +5429,7 @@ test("unit_tests") { ] } @@ -18,7 +29,7 @@ deps += [ "//chrome/browser/error_reporting:unit_test" ] } -@@ -7031,7 +7031,7 @@ test("chrome_app_unittests") { +@@ -7354,7 +7358,7 @@ test("chrome_app_unittests") { "//components/safe_browsing:buildflags", "//pdf:pdf_ppapi", ] diff --git a/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc b/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc index 5e0ce19ad492..f1ac5eeef45b 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,7 +1,7 @@ ---- chrome/test/base/in_process_browser_test.cc.orig 2021-05-12 22:05:46 UTC +--- chrome/test/base/in_process_browser_test.cc.orig 2021-07-19 18:45:11 UTC +++ chrome/test/base/in_process_browser_test.cc @@ -83,6 +83,10 @@ - #include "services/device/public/cpp/test/fake_geolocation_system_permission.h" + #include "services/device/public/cpp/test/fake_geolocation_manager.h" #endif +#if defined(OS_FREEBSD) @@ -20,7 +20,7 @@ OSCryptMocker::SetUp(); #endif -@@ -400,7 +404,7 @@ void InProcessBrowserTest::TearDown() { +@@ -403,7 +407,7 @@ void InProcessBrowserTest::TearDown() { com_initializer_.reset(); #endif BrowserTestBase::TearDown(); diff --git a/www/chromium/files/patch-chrome_test_base_interactive__ui__tests__main.cc b/www/chromium/files/patch-chrome_test_base_interactive__ui__tests__main.cc index 3f2c50aabc0e..e4dcf52752f9 100644 --- a/www/chromium/files/patch-chrome_test_base_interactive__ui__tests__main.cc +++ b/www/chromium/files/patch-chrome_test_base_interactive__ui__tests__main.cc @@ -1,6 +1,6 @@ ---- chrome/test/base/interactive_ui_tests_main.cc.orig 2021-05-12 22:05:46 UTC +--- chrome/test/base/interactive_ui_tests_main.cc.orig 2021-07-19 18:45:11 UTC +++ chrome/test/base/interactive_ui_tests_main.cc -@@ -17,7 +17,7 @@ +@@ -19,7 +19,7 @@ #if defined(USE_AURA) #include "ui/aura/test/ui_controls_factory_aura.h" #include "ui/base/test/ui_controls_aura.h" @@ -9,8 +9,8 @@ #include "ui/base/ui_base_features.h" #include "ui/ozone/public/ozone_platform.h" #include "ui/platform_window/common/platform_window_defaults.h" -@@ -53,7 +53,7 @@ class InteractiveUITestSuite : public ChromeTestSuite - com_initializer_.reset(new base::win::ScopedCOMInitializer()); +@@ -57,7 +57,7 @@ class InteractiveUITestSuite : public ChromeTestSuite + com_initializer_ = std::make_unique<base::win::ScopedCOMInitializer>(); ui_controls::InstallUIControlsAura( aura::test::CreateUIControlsAura(nullptr)); -#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) 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 abc7dc942803..9ddaefead968 100644 --- a/www/chromium/files/patch-chrome_test_base_test__browser__window.h +++ b/www/chromium/files/patch-chrome_test_base_test__browser__window.h @@ -1,6 +1,6 @@ ---- chrome/test/base/test_browser_window.h.orig 2021-05-24 22:05:36 UTC +--- chrome/test/base/test_browser_window.h.orig 2021-07-19 18:45:11 UTC +++ chrome/test/base/test_browser_window.h -@@ -179,7 +179,7 @@ class TestBrowserWindow : public BrowserWindow { +@@ -188,7 +188,7 @@ class TestBrowserWindow : public BrowserWindow { void MaybeShowProfileSwitchIPH() override {} #if defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_WIN) || \ diff --git a/www/chromium/files/patch-chrome_utility_services.cc b/www/chromium/files/patch-chrome_utility_services.cc index 20078fb5d89a..2eebfd5bbd5f 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-05-12 22:05:48 UTC +--- chrome/utility/services.cc.orig 2021-07-19 18:45:12 UTC +++ chrome/utility/services.cc -@@ -81,7 +81,7 @@ +@@ -80,7 +80,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" -@@ -241,7 +241,7 @@ auto RunPaintPreviewCompositor( +@@ -244,7 +244,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) { -@@ -355,7 +355,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -365,7 +365,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 b9ada070acfd..0f48b637db80 100644 --- a/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc +++ b/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc @@ -1,4 +1,4 @@ ---- chromecast/browser/cast_browser_main_parts.cc.orig 2021-05-12 22:05:48 UTC +--- chromecast/browser/cast_browser_main_parts.cc.orig 2021-07-19 18:45:12 UTC +++ chromecast/browser/cast_browser_main_parts.cc @@ -77,7 +77,7 @@ #include "ui/base/ui_base_switches.h" @@ -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)) { -@@ -668,7 +668,7 @@ int CastBrowserMainParts::PreMainMessageLoopRun() { +@@ -671,7 +671,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 -@@ -749,7 +749,7 @@ void CastBrowserMainParts::PostMainMessageLoopRun() { +@@ -752,7 +752,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 0bbed18f5686..792e4ce0ee94 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-05-12 22:05:48 UTC +--- chromecast/browser/cast_browser_main_parts.h.orig 2021-07-19 18:45:12 UTC +++ chromecast/browser/cast_browser_main_parts.h -@@ -134,7 +134,7 @@ class CastBrowserMainParts : public content::BrowserMa +@@ -136,7 +136,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 fe4e0d43330b..2ae9a8335894 100644 --- a/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc +++ b/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc @@ -1,6 +1,6 @@ ---- chromecast/browser/cast_content_browser_client.cc.orig 2021-05-12 22:05:48 UTC +--- chromecast/browser/cast_content_browser_client.cc.orig 2021-07-19 18:45:12 UTC +++ chromecast/browser/cast_content_browser_client.cc -@@ -130,9 +130,9 @@ +@@ -131,9 +131,9 @@ #include "chromecast/external_mojo/broker_service/broker_service.h" // nogncheck #endif @@ -12,7 +12,7 @@ #if BUILDFLAG(ENABLE_CAST_RENDERER) #include "base/sequenced_task_runner.h" -@@ -479,7 +479,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS +@@ -475,7 +475,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. -@@ -876,12 +876,12 @@ CastContentBrowserClient::CreateThrottlesForNavigation +@@ -867,12 +867,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 5c96348b6a04..dc24d792bf34 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-04-14 18:40:58 UTC +--- 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 @@ -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 -@@ -205,7 +205,7 @@ void CastContentBrowserClient::RunServiceInstance( +@@ -217,7 +217,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 08f1d6a0d28f..821c3998eca1 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-05-12 22:05:48 UTC +--- chromecast/renderer/cast_content_renderer_client.cc.orig 2021-07-19 18:45:12 UTC +++ chromecast/renderer/cast_content_renderer_client.cc -@@ -199,7 +199,7 @@ void CastContentRendererClient::RenderFrameCreated( +@@ -201,7 +201,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 c01d87f4527e..f9a9626784e5 100644 --- a/www/chromium/files/patch-components_BUILD.gn +++ b/www/chromium/files/patch-components_BUILD.gn @@ -1,6 +1,6 @@ ---- components/BUILD.gn.orig 2021-05-12 22:05:49 UTC +--- components/BUILD.gn.orig 2021-07-19 18:45:12 UTC +++ components/BUILD.gn -@@ -342,9 +342,13 @@ test("components_unittests") { +@@ -351,9 +351,13 @@ test("components_unittests") { } if (!is_fuchsia) { # !iOS and !Fuchsia diff --git a/www/chromium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc b/www/chromium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc index 5e2c49b5526d..f0f4c87cd9ec 100644 --- a/www/chromium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc +++ b/www/chromium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc @@ -1,6 +1,6 @@ ---- components/autofill/content/renderer/password_form_conversion_utils.cc.orig 2021-04-14 18:40:58 UTC +--- components/autofill/content/renderer/password_form_conversion_utils.cc.orig 2021-07-19 18:45:12 UTC +++ components/autofill/content/renderer/password_form_conversion_utils.cc -@@ -18,7 +18,11 @@ +@@ -19,7 +19,11 @@ #include "third_party/blink/public/web/web_form_control_element.h" #include "third_party/blink/public/web/web_input_element.h" #include "third_party/blink/public/web/web_local_frame.h" diff --git a/www/chromium/files/patch-components_autofill_core_browser_autofill__external__delegate.cc b/www/chromium/files/patch-components_autofill_core_browser_autofill__external__delegate.cc index 11a02ec27b47..9249850f1464 100644 --- a/www/chromium/files/patch-components_autofill_core_browser_autofill__external__delegate.cc +++ b/www/chromium/files/patch-components_autofill_core_browser_autofill__external__delegate.cc @@ -1,6 +1,6 @@ ---- components/autofill/core/browser/autofill_external_delegate.cc.orig 2021-04-14 18:40:58 UTC +--- components/autofill/core/browser/autofill_external_delegate.cc.orig 2021-07-19 18:45:12 UTC +++ components/autofill/core/browser/autofill_external_delegate.cc -@@ -128,7 +128,7 @@ void AutofillExternalDelegate::OnSuggestionsReturned( +@@ -129,7 +129,7 @@ void AutofillExternalDelegate::OnSuggestionsReturned( // Append the "Hide Suggestions" menu item for only Autofill Address and // Autocomplete popups. 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 c2ba1998044f..4b7d30437279 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-04-14 18:40:58 UTC +--- components/autofill/core/browser/personal_data_manager.cc.orig 2021-07-19 18:45:12 UTC +++ components/autofill/core/browser/personal_data_manager.cc -@@ -1931,7 +1931,7 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp +@@ -2034,7 +2034,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. -@@ -1955,7 +1955,7 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp +@@ -2058,7 +2058,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 b36acf996c2e..72ac12b0d73e 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-05-12 22:05:49 UTC +--- components/autofill/core/common/autofill_payments_features.cc.orig 2021-07-19 18:45:12 UTC +++ components/autofill/core/common/autofill_payments_features.cc -@@ -144,7 +144,7 @@ bool ShouldShowImprovedUserConsentForCreditCardSave() +@@ -176,7 +176,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 e6679c548588..30e21d8c3748 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-05-12 22:05:49 UTC +--- components/autofill/core/common/autofill_util.cc.orig 2021-07-19 18:45:12 UTC +++ components/autofill/core/common/autofill_util.cc -@@ -171,7 +171,7 @@ bool SanitizedFieldIsEmpty(const std::u16string& value +@@ -161,7 +161,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 b27003024abd..bf1889c74d42 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-06-11 09:34:59 UTC +--- components/cast_channel/cast_message_util.cc.orig 2021-07-19 18:45:12 UTC +++ components/cast_channel/cast_message_util.cc -@@ -168,7 +168,7 @@ int GetVirtualConnectPlatformValue() { +@@ -169,7 +169,7 @@ int GetVirtualConnectPlatformValue() { return 4; #elif BUILDFLAG(IS_CHROMEOS_ASH) return 5; 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 cdc51637ac7f..9c9aa78af044 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_event__constants.cc +++ b/www/chromium/files/patch-components_feature__engagement_public_event__constants.cc @@ -1,4 +1,4 @@ ---- components/feature_engagement/public/event_constants.cc.orig 2021-05-12 22:05:49 UTC +--- components/feature_engagement/public/event_constants.cc.orig 2021-07-19 18:45:13 UTC +++ components/feature_engagement/public/event_constants.cc @@ -10,13 +10,13 @@ namespace feature_engagement { @@ -17,10 +17,10 @@ defined(OS_CHROMEOS) const char kSixthTabOpened[] = "sixth_tab_opened"; const char kTabGroupCreated[] = "tab_group_created"; -@@ -39,7 +39,7 @@ const char kWebUITabStripClosed[] = "webui_tab_strip_c - const char kWebUITabStripOpened[] = "webui_tab_strip_opened"; +@@ -43,7 +43,7 @@ const char kDesktopPwaInstalled[] = "desktop_pwa_insta + const char kUpdatedConnectionSecurityIndicatorDisplayed[] = + "updated_connection_security_indicator_displayed"; - const char kDesktopPwaInstalled[] = "desktop_pwa_installed"; -#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) 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 f3cc7e19c434..ddc196ab72d2 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_event__constants.h +++ b/www/chromium/files/patch-components_feature__engagement_public_event__constants.h @@ -1,4 +1,4 @@ ---- components/feature_engagement/public/event_constants.h.orig 2021-05-12 22:05:49 UTC +--- components/feature_engagement/public/event_constants.h.orig 2021-07-19 18:45:13 UTC +++ components/feature_engagement/public/event_constants.h @@ -12,16 +12,16 @@ namespace feature_engagement { namespace events { @@ -20,9 +20,9 @@ defined(OS_CHROMEOS) // A new tab was opened when 5 (or more) tabs were already open. extern const char kSixthTabOpened[]; -@@ -66,7 +66,7 @@ extern const char kWebUITabStripOpened[]; - // The PWA was installed by the user. - extern const char kDesktopPwaInstalled[]; +@@ -69,7 +69,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) || diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc b/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc index 39483e8eeea2..b49649b481ad 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc @@ -1,15 +1,15 @@ ---- components/feature_engagement/public/feature_configurations.cc.orig 2021-05-12 22:05:49 UTC +--- components/feature_engagement/public/feature_configurations.cc.orig 2021-07-19 18:45:13 UTC +++ components/feature_engagement/public/feature_configurations.cc @@ -12,7 +12,7 @@ namespace feature_engagement { - base::Optional<FeatureConfig> GetClientSideFeatureConfig( + absl::optional<FeatureConfig> GetClientSideFeatureConfig( const base::Feature* feature) { -#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) if (kIPHPasswordsAccountStorageFeature.name == feature->name) { - base::Optional<FeatureConfig> config = FeatureConfig(); -@@ -41,7 +41,7 @@ base::Optional<FeatureConfig> GetClientSideFeatureConf + absl::optional<FeatureConfig> config = FeatureConfig(); +@@ -41,7 +41,7 @@ absl::optional<FeatureConfig> GetClientSideFeatureConf EventConfig("profile_menu_shown", Comparator(EQUAL, 0), 360, 360); return config; } 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 41656d31555b..5a73260c5d3b 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,4 +1,4 @@ ---- components/feature_engagement/public/feature_constants.cc.orig 2021-05-12 22:05:49 UTC +--- components/feature_engagement/public/feature_constants.cc.orig 2021-07-19 18:45:13 UTC +++ components/feature_engagement/public/feature_constants.cc @@ -12,7 +12,7 @@ const base::Feature kIPHDemoMode{"IPH_DemoMode", const base::Feature kIPHDummyFeature{"IPH_Dummy", @@ -9,10 +9,10 @@ defined(OS_CHROMEOS) const base::Feature kIPHDesktopTabGroupsNewGroupFeature{ "IPH_DesktopTabGroupsNewGroup", base::FEATURE_DISABLED_BY_DEFAULT}; -@@ -38,7 +38,7 @@ const base::Feature kIPHDesktopPwaInstallFeature{ - "IPH_DesktopPwaInstall", base::FEATURE_DISABLED_BY_DEFAULT}; - const base::Feature kIPHProfileSwitchFeature{"IPH_ProfileSwitch", - base::FEATURE_DISABLED_BY_DEFAULT}; +@@ -42,7 +42,7 @@ const base::Feature kIPHUpdatedConnectionSecurityIndic + "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) 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 44d3a8d7ba2d..4e337050f26c 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,4 +1,4 @@ ---- components/feature_engagement/public/feature_constants.h.orig 2021-05-12 22:05:49 UTC +--- components/feature_engagement/public/feature_constants.h.orig 2021-07-19 18:45:13 UTC +++ components/feature_engagement/public/feature_constants.h @@ -16,7 +16,7 @@ extern const base::Feature kIPHDemoMode; // A feature to ensure all arrays can contain at least one feature. @@ -9,10 +9,10 @@ defined(OS_CHROMEOS) extern const base::Feature kIPHDesktopTabGroupsNewGroupFeature; extern const base::Feature kIPHFocusModeFeature; -@@ -30,7 +30,7 @@ extern const base::Feature kIPHWebUITabStripFeature; - extern const base::Feature kIPHDesktopSnoozeFeature; +@@ -31,7 +31,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) 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 9de0a150036c..8e2a954081a3 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-05-12 22:05:49 UTC +--- components/feature_engagement/public/feature_list.cc.orig 2021-07-19 18:45:13 UTC +++ components/feature_engagement/public/feature_list.cc -@@ -83,7 +83,7 @@ const base::Feature* const kAllFeatures[] = { +@@ -89,7 +89,7 @@ const base::Feature* const kAllFeatures[] = { &kIPHBadgedTranslateManualTriggerFeature, &kIPHDiscoverFeedHeaderFeature, #endif // defined(OS_IOS) @@ -9,10 +9,10 @@ defined(OS_CHROMEOS) &kIPHDesktopTabGroupsNewGroupFeature, &kIPHFocusModeFeature, -@@ -96,7 +96,7 @@ const base::Feature* const kAllFeatures[] = { - &kIPHWebUITabStripFeature, +@@ -103,7 +103,7 @@ const base::Feature* const kAllFeatures[] = { &kIPHDesktopPwaInstallFeature, &kIPHProfileSwitchFeature, + &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) 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 e6c4785bc965..92c16c5056eb 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__list.h +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__list.h @@ -1,6 +1,6 @@ ---- components/feature_engagement/public/feature_list.h.orig 2021-05-24 22:05:38 UTC +--- components/feature_engagement/public/feature_list.h.orig 2021-07-19 18:45:13 UTC +++ components/feature_engagement/public/feature_list.h -@@ -155,7 +155,7 @@ DEFINE_VARIATION_PARAM(kIPHDiscoverFeedHeaderFeature, +@@ -167,7 +167,7 @@ DEFINE_VARIATION_PARAM(kIPHDiscoverFeedHeaderFeature, "IPH_DiscoverFeedHeaderMenu"); #endif // defined(OS_IOS) @@ -9,30 +9,30 @@ defined(OS_CHROMEOS) DEFINE_VARIATION_PARAM(kIPHDesktopTabGroupsNewGroupFeature, "IPH_DesktopTabGroupsNewGroup"); -@@ -172,7 +172,7 @@ DEFINE_VARIATION_PARAM(kIPHReopenTabFeature, "IPH_Reop - DEFINE_VARIATION_PARAM(kIPHWebUITabStripFeature, "IPH_WebUITabStrip"); - DEFINE_VARIATION_PARAM(kIPHDesktopPwaInstallFeature, "IPH_DesktopPwaInstall"); +@@ -186,7 +186,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) } // namespace -@@ -248,7 +248,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation +@@ -271,7 +271,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation VARIATION_ENTRY(kIPHBadgedReadingListFeature), VARIATION_ENTRY(kIPHBadgedTranslateManualTriggerFeature), VARIATION_ENTRY(kIPHDiscoverFeedHeaderFeature), --#elif defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || \ -+#elif defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || \ +-#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) VARIATION_ENTRY(kIPHDesktopTabGroupsNewGroupFeature), VARIATION_ENTRY(kIPHFocusModeFeature), -@@ -261,7 +261,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation - VARIATION_ENTRY(kIPHWebUITabStripFeature), +@@ -285,7 +285,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation VARIATION_ENTRY(kIPHDesktopPwaInstallFeature), VARIATION_ENTRY(kIPHProfileSwitchFeature), --#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || -+#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || + 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) }; 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 cc61053a0670..adbda9ec11a1 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-04-14 18:40:59 UTC +--- components/feed/core/v2/proto_util.cc.orig 2021-07-19 18:45:13 UTC +++ components/feed/core/v2/proto_util.cc -@@ -81,8 +81,8 @@ feedwire::Version GetPlatformVersionMessage() { +@@ -83,8 +83,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()); -@@ -97,8 +97,8 @@ feedwire::Version GetAppVersionMessage(const ChromeInf +@@ -99,8 +99,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 13ceab52451f..39c90be47bc4 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-05-12 22:05:49 UTC +--- components/flags_ui/flags_state.cc.orig 2021-07-19 18:45:13 UTC +++ components/flags_ui/flags_state.cc -@@ -633,7 +633,7 @@ int FlagsState::GetCurrentPlatform() { +@@ -631,7 +631,7 @@ int 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 0428c8f95930..658fb2372bfd 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-04-14 18:40:59 UTC +--- components/gcm_driver/gcm_client_impl.cc.orig 2021-07-19 18:45:13 UTC +++ components/gcm_driver/gcm_client_impl.cc -@@ -135,6 +135,9 @@ void ToCheckinProtoVersion( +@@ -134,6 +134,9 @@ void ToCheckinProtoVersion( case GCMClient::PLATFORM_CROS: platform = checkin_proto::ChromeBuildProto_Platform_PLATFORM_CROS; break; diff --git a/www/chromium/files/patch-components_invalidation_impl_invalidation__switches.cc b/www/chromium/files/patch-components_invalidation_impl_invalidation__switches.cc index 59c20de740eb..3e15ce7b318f 100644 --- a/www/chromium/files/patch-components_invalidation_impl_invalidation__switches.cc +++ b/www/chromium/files/patch-components_invalidation_impl_invalidation__switches.cc @@ -1,6 +1,6 @@ ---- components/invalidation/impl/invalidation_switches.cc.orig 2021-04-14 18:40:59 UTC +--- components/invalidation/impl/invalidation_switches.cc.orig 2021-07-19 18:45:13 UTC +++ components/invalidation/impl/invalidation_switches.cc -@@ -28,7 +28,7 @@ const base::Feature kFCMInvalidationsForSyncDontCheckV +@@ -20,7 +20,7 @@ const int kDefaultInstanceIDTokenTTLSeconds = 14 * 24 const base::Feature kSyncInstanceIDTokenTTL { "SyncInstanceIDTokenTTL", diff --git a/www/chromium/files/patch-components_metrics_metrics__log.cc b/www/chromium/files/patch-components_metrics_metrics__log.cc index 5b271ad6e474..a6486356fe46 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-05-12 22:05:49 UTC +--- components/metrics/metrics_log.cc.orig 2021-07-19 18:45:13 UTC +++ components/metrics/metrics_log.cc -@@ -240,7 +240,7 @@ void MetricsLog::RecordCoreSystemProfile( +@@ -249,7 +249,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_paint__preview_browser_paint__preview__client.cc b/www/chromium/files/patch-components_paint__preview_browser_paint__preview__client.cc index 54290adcc3e4..d0d9a63236c8 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-05-12 22:05:50 UTC +--- components/paint_preview/browser/paint_preview_client.cc.orig 2021-07-19 18:45:13 UTC +++ components/paint_preview/browser/paint_preview_client.cc -@@ -303,8 +303,8 @@ void PaintPreviewClient::CapturePaintPreview( +@@ -308,8 +308,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 new file mode 100644 index 000000000000..fba7d5ed85c9 --- /dev/null +++ b/www/chromium/files/patch-components_performance__manager_features.cc @@ -0,0 +1,11 @@ +--- components/performance_manager/features.cc.orig 2021-07-28 07:52:32 UTC ++++ components/performance_manager/features.cc +@@ -54,7 +54,7 @@ const base::Feature kRunOnMainThread{"RunOnMainThread" + #if !defined(OS_ANDROID) + const base::Feature kUrgentDiscardingFromPerformanceManager { + "UrgentDiscardingFromPerformanceManager", +-#if BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_LINUX) || defined(OS_BSD) + base::FEATURE_DISABLED_BY_DEFAULT + #else + base::FEATURE_ENABLED_BY_DEFAULT diff --git a/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc b/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc index 64e9cc3f9145..b39d1232a3ce 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-04-14 18:41:00 UTC +--- 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 @@ -18,7 +18,7 @@ #include <wincred.h> @@ -38,7 +38,7 @@ #elif defined(OS_IOS) // Use the Vendor ID as the machine name. return ios::device_util::GetVendorId(); -@@ -156,7 +160,7 @@ std::string GetMachineName() { +@@ -158,7 +162,7 @@ std::string GetMachineName() { } std::string GetOSVersion() { @@ -47,7 +47,7 @@ return base::SysInfo::OperatingSystemVersion(); #elif defined(OS_WIN) base::win::OSInfo::VersionNumber version_number = -@@ -179,7 +183,7 @@ std::string GetOSArchitecture() { +@@ -183,7 +187,7 @@ std::string GetOSArchitecture() { } std::string GetOSUsername() { diff --git a/www/chromium/files/patch-components_policy_resources_policy__templates.json b/www/chromium/files/patch-components_policy_resources_policy__templates.json index 13e80d1cc49c..9e729a66c201 100644 --- a/www/chromium/files/patch-components_policy_resources_policy__templates.json +++ b/www/chromium/files/patch-components_policy_resources_policy__templates.json @@ -1,4 +1,4 @@ ---- components/policy/resources/policy_templates.json.orig 2021-05-12 22:05:50 UTC +--- components/policy/resources/policy_templates.json.orig 2021-07-19 18:45:14 UTC +++ components/policy/resources/policy_templates.json @@ -1246,7 +1246,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], @@ -45,7 +45,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -9103,7 +9103,7 @@ +@@ -9137,7 +9137,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, -@@ -10808,7 +10808,7 @@ +@@ -10851,7 +10851,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, -@@ -11618,7 +11618,7 @@ +@@ -11698,7 +11698,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, diff --git a/www/chromium/files/patch-components_safe__browsing_core_realtime_url__lookup__service__base.cc b/www/chromium/files/patch-components_safe__browsing_core_realtime_url__lookup__service__base.cc index 46b5f4d571df..8d740bc014ec 100644 --- 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 @@ -1,6 +1,6 @@ ---- components/safe_browsing/core/realtime/url_lookup_service_base.cc.orig 2021-04-14 18:41:00 UTC +--- 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 -@@ -108,7 +108,7 @@ RTLookupRequest::OSType GetRTLookupRequestOSType() { +@@ -107,7 +107,7 @@ RTLookupRequest::OSType GetRTLookupRequestOSType() { return RTLookupRequest::OS_TYPE_FUCHSIA; #elif defined(OS_IOS) return RTLookupRequest::OS_TYPE_IOS; 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 index dc1fe64442f9..ce1f514c3990 100644 --- 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 @@ -1,6 +1,6 @@ ---- components/safe_browsing/core/resources/gen_file_type_proto.py.orig 2021-04-14 18:41:00 UTC +--- 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 -@@ -31,6 +31,7 @@ def PlatformTypes(): +@@ -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, @@ -8,7 +8,7 @@ "mac": download_file_types_pb2.DownloadFileType.PLATFORM_MAC, "win": download_file_types_pb2.DownloadFileType.PLATFORM_WINDOWS, } -@@ -169,7 +170,7 @@ class DownloadFileTypeProtoGenerator(BinaryProtoGenera +@@ -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, ' + diff --git a/www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc b/www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc index 0f898beeaec6..e9dfc4eb8cae 100644 --- a/www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc +++ b/www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc @@ -1,6 +1,6 @@ ---- components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.cc.orig 2021-04-14 18:41:00 UTC +--- components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.cc.orig 2021-07-19 18:45:14 UTC +++ components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.cc -@@ -15,7 +15,7 @@ +@@ -17,7 +17,7 @@ #if defined(OS_WIN) #include "content/public/child/dwrite_font_proxy_init_win.h" @@ -9,7 +9,7 @@ #include "components/services/font/public/cpp/font_loader.h" #endif -@@ -36,7 +36,7 @@ PaintPreviewCompositorCollectionImpl::PaintPreviewComp +@@ -56,7 +56,7 @@ PaintPreviewCompositorCollectionImpl::PaintPreviewComp // Initialize font access for Skia. #if defined(OS_WIN) content::InitializeDWriteFontProxy(); @@ -18,7 +18,7 @@ mojo::PendingRemote<font_service::mojom::FontService> font_service; content::UtilityThread::Get()->BindHostReceiver( font_service.InitWithNewPipeAndPassReceiver()); -@@ -55,7 +55,7 @@ PaintPreviewCompositorCollectionImpl::PaintPreviewComp +@@ -75,7 +75,7 @@ PaintPreviewCompositorCollectionImpl::PaintPreviewComp // encoding to PNG or we could provide our own codec implementations. // Sanity check that fonts are working. diff --git a/www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.h b/www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.h index f9baf0198a50..56e74d23d3ba 100644 --- a/www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.h +++ b/www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.h @@ -1,6 +1,6 @@ ---- components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.h.orig 2021-04-14 18:41:00 UTC +--- components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.h.orig 2021-07-19 18:45:14 UTC +++ components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.h -@@ -20,7 +20,7 @@ +@@ -21,7 +21,7 @@ #include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/receiver.h" @@ -9,7 +9,7 @@ #include "components/services/font/public/cpp/font_loader.h" #include "third_party/skia/include/core/SkRefCnt.h" #endif -@@ -70,7 +70,7 @@ class PaintPreviewCompositorCollectionImpl +@@ -73,7 +73,7 @@ class PaintPreviewCompositorCollectionImpl std::unique_ptr<PaintPreviewCompositorImpl>> compositors_; diff --git a/www/chromium/files/patch-components_storage__monitor_removable__device__constants.h b/www/chromium/files/patch-components_storage__monitor_removable__device__constants.h index b724ec0aea63..57a05ea7efbd 100644 --- a/www/chromium/files/patch-components_storage__monitor_removable__device__constants.h +++ b/www/chromium/files/patch-components_storage__monitor_removable__device__constants.h @@ -1,6 +1,6 @@ ---- components/storage_monitor/removable_device_constants.h.orig 2021-05-12 22:05:51 UTC +--- components/storage_monitor/removable_device_constants.h.orig 2021-07-19 18:45:14 UTC +++ components/storage_monitor/removable_device_constants.h -@@ -16,7 +16,7 @@ namespace storage_monitor { +@@ -14,7 +14,7 @@ namespace storage_monitor { extern const char kFSUniqueIdPrefix[]; extern const char kVendorModelSerialPrefix[]; diff --git a/www/chromium/files/patch-components_viz_common_features.cc b/www/chromium/files/patch-components_viz_common_features.cc index 05b7904dd702..f6c743023c65 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-05-12 22:05:51 UTC +--- components/viz/common/features.cc.orig 2021-07-19 18:45:15 UTC +++ components/viz/common/features.cc -@@ -38,7 +38,7 @@ const base::Feature kEnableOverlayPrioritization { +@@ -42,7 +42,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 - #else - base::FEATURE_DISABLED_BY_DEFAULT + #elif defined(OS_MAC) + base::FEATURE_ENABLED_BY_DEFAULT diff --git a/www/chromium/files/patch-components_viz_host_renderer__settings__creation.cc b/www/chromium/files/patch-components_viz_host_renderer__settings__creation.cc new file mode 100644 index 000000000000..621479f36b72 --- /dev/null +++ b/www/chromium/files/patch-components_viz_host_renderer__settings__creation.cc @@ -0,0 +1,11 @@ +--- components/viz/host/renderer_settings_creation.cc.orig 2021-07-28 07:54:43 UTC ++++ components/viz/host/renderer_settings_creation.cc +@@ -57,7 +57,7 @@ RendererSettings CreateRendererSettings() { + renderer_settings.partial_swap_enabled = + !command_line->HasSwitch(switches::kUIDisablePartialSwap); + +-#if defined(OS_APPLE) || defined(OS_LINUX) ++#if defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) + // Simple frame rate throttling only works on macOS and Linux + renderer_settings.apply_simple_frame_rate_throttling = + features::IsSimpleFrameRateThrottlingEnabled(); diff --git a/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc b/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc index 0dc96a5c900e..91a306e9752f 100644 --- a/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc +++ b/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc @@ -1,6 +1,6 @@ ---- components/viz/service/display_embedder/software_output_surface.cc.orig 2021-05-12 22:05:52 UTC +--- components/viz/service/display_embedder/software_output_surface.cc.orig 2021-07-19 18:45:15 UTC +++ components/viz/service/display_embedder/software_output_surface.cc -@@ -114,7 +114,7 @@ void SoftwareOutputSurface::SwapBuffersCallback(base:: +@@ -115,7 +115,7 @@ void SoftwareOutputSurface::SwapBuffersCallback(base:: now.SnappedToNextTick(refresh_timebase_, refresh_interval_) - now; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ if (needs_swap_size_notifications_) client_->DidSwapWithSize(pixel_size); #endif -@@ -145,7 +145,7 @@ gfx::OverlayTransform SoftwareOutputSurface::GetDispla +@@ -146,7 +146,7 @@ gfx::OverlayTransform SoftwareOutputSurface::GetDispla // 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 0a5beadbd1fe..ff79929650a8 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-05-12 22:05:52 UTC +--- 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 @@ -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); -@@ -479,7 +479,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw +@@ -493,7 +493,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw display_client_->DidCompleteSwapWithSize(pixel_size); // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h index 80181cf13beb..b9f41ebb1c2f 100644 --- a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h +++ b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h @@ -1,6 +1,6 @@ ---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2021-05-12 22:05:52 UTC +--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2021-07-19 18:45:15 UTC +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h -@@ -172,7 +172,7 @@ class RootCompositorFrameSinkImpl : public mojom::Comp +@@ -177,7 +177,7 @@ class RootCompositorFrameSinkImpl : public mojom::Comp // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-components_viz_test_fake__output__surface.cc b/www/chromium/files/patch-components_viz_test_fake__output__surface.cc index 3f6cbedad15d..f61fee3e3a98 100644 --- a/www/chromium/files/patch-components_viz_test_fake__output__surface.cc +++ b/www/chromium/files/patch-components_viz_test_fake__output__surface.cc @@ -1,6 +1,6 @@ ---- components/viz/test/fake_output_surface.cc.orig 2021-04-14 18:41:02 UTC +--- components/viz/test/fake_output_surface.cc.orig 2021-07-19 18:45:15 UTC +++ components/viz/test/fake_output_surface.cc -@@ -118,7 +118,7 @@ gfx::OverlayTransform FakeOutputSurface::GetDisplayTra +@@ -119,7 +119,7 @@ gfx::OverlayTransform FakeOutputSurface::GetDisplayTra // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-components_viz_test_fake__output__surface.h b/www/chromium/files/patch-components_viz_test_fake__output__surface.h index d0ce29297551..ce8cc503bbcc 100644 --- a/www/chromium/files/patch-components_viz_test_fake__output__surface.h +++ b/www/chromium/files/patch-components_viz_test_fake__output__surface.h @@ -1,6 +1,6 @@ ---- components/viz/test/fake_output_surface.h.orig 2021-04-14 18:41:02 UTC +--- components/viz/test/fake_output_surface.h.orig 2021-07-19 18:45:15 UTC +++ components/viz/test/fake_output_surface.h -@@ -89,7 +89,7 @@ class FakeOutputSurface : public OutputSurface { +@@ -88,7 +88,7 @@ class FakeOutputSurface : public OutputSurface { gfx::OverlayTransform GetDisplayTransform() override; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-components_viz_test_mock__display__client.h b/www/chromium/files/patch-components_viz_test_mock__display__client.h index 55e119ea2652..ff51e42ff434 100644 --- a/www/chromium/files/patch-components_viz_test_mock__display__client.h +++ b/www/chromium/files/patch-components_viz_test_mock__display__client.h @@ -1,6 +1,6 @@ ---- components/viz/test/mock_display_client.h.orig 2021-04-14 18:41:02 UTC +--- components/viz/test/mock_display_client.h.orig 2021-07-19 18:45:15 UTC +++ components/viz/test/mock_display_client.h -@@ -39,7 +39,7 @@ class MockDisplayClient : public mojom::DisplayClient +@@ -40,7 +40,7 @@ class MockDisplayClient : public mojom::DisplayClient #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/chromium/files/patch-components_zucchini_main__utils.cc b/www/chromium/files/patch-components_zucchini_main__utils.cc new file mode 100644 index 000000000000..0fcf64400867 --- /dev/null +++ b/www/chromium/files/patch-components_zucchini_main__utils.cc @@ -0,0 +1,63 @@ +--- components/zucchini/main_utils.cc.orig 2021-07-28 07:55:17 UTC ++++ components/zucchini/main_utils.cc +@@ -78,7 +78,7 @@ constexpr Command kCommands[] = { + + /******** GetPeakMemoryMetrics ********/ + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + // Linux does not have an exact mapping to the values used on Windows so use a + // close approximation: + // peak_virtual_memory ~= peak_page_file_usage +@@ -120,7 +120,7 @@ void GetPeakMemoryMetrics(size_t* peak_virtual_memory, + } + } + } +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + #if defined(OS_WIN) + // On failure the input values will be set to 0. +@@ -145,17 +145,17 @@ class ScopedResourceUsageTracker { + ScopedResourceUsageTracker() { + start_time_ = base::TimeTicks::Now(); + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_BSD) + GetPeakMemoryMetrics(&start_peak_page_file_usage_, + &start_peak_working_set_size_); +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_BSD) + } + + // Computes and prints usage. + ~ScopedResourceUsageTracker() { + base::TimeTicks end_time = base::TimeTicks::Now(); + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_BSD) + size_t cur_peak_page_file_usage = 0; + size_t cur_peak_working_set_size = 0; + GetPeakMemoryMetrics(&cur_peak_page_file_usage, &cur_peak_working_set_size); +@@ -171,7 +171,7 @@ class ScopedResourceUsageTracker { + << (cur_peak_working_set_size - start_peak_working_set_size_) / + 1024 + << " KiB"; +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_BSD) + + LOG(INFO) << "Zucchini.TotalTime " << (end_time - start_time_).InSecondsF() + << " s"; +@@ -179,10 +179,10 @@ class ScopedResourceUsageTracker { + + private: + base::TimeTicks start_time_; +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_BSD) + size_t start_peak_page_file_usage_ = 0; + size_t start_peak_working_set_size_ = 0; +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_BSD) + }; + + /******** Helper functions ********/ diff --git a/www/chromium/files/patch-content_app_content__main.cc b/www/chromium/files/patch-content_app_content__main.cc index 2e1a6f105a3e..11811afdc3fc 100644 --- a/www/chromium/files/patch-content_app_content__main.cc +++ b/www/chromium/files/patch-content_app_content__main.cc @@ -1,6 +1,15 @@ ---- content/app/content_main.cc.orig 2021-04-14 18:41:02 UTC +--- content/app/content_main.cc.orig 2021-07-19 18:45:15 UTC +++ content/app/content_main.cc -@@ -229,7 +229,7 @@ int RunContentProcess(const ContentMainParams& params, +@@ -62,7 +62,7 @@ + #include "base/posix/global_descriptors.h" + #endif + +-#if defined(OS_CHROMEOS) || defined(OS_LINUX) ++#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) + #include "base/files/scoped_file.h" + #endif + +@@ -233,7 +233,7 @@ int RunContentProcess(const ContentMainParams& params, #endif base::EnableTerminationOnOutOfMemory(); @@ -9,3 +18,12 @@ // 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, + InitializeMac(); + #endif + +-#if defined(OS_CHROMEOS) || defined(OS_LINUX) ++#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) + base::subtle::EnableFDOwnershipEnforcement(true); + #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 79d200357ac4..fc29048b83c7 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-05-12 22:05:52 UTC +--- content/app/content_main_runner_impl.cc.orig 2021-07-19 18:45:15 UTC +++ content/app/content_main_runner_impl.cc -@@ -138,7 +138,7 @@ +@@ -137,7 +137,7 @@ #endif // OS_POSIX || OS_FUCHSIA @@ -9,7 +9,7 @@ #include "base/native_library.h" #include "base/rand_util.h" #include "content/public/common/zygote/sandbox_support_linux.h" -@@ -158,7 +158,7 @@ +@@ -157,7 +157,7 @@ #include "content/public/common/content_client.h" #endif @@ -18,7 +18,7 @@ #if BUILDFLAG(USE_ZYGOTE_HANDLE) #include "content/browser/sandbox_host_linux.h" -@@ -311,7 +311,7 @@ void InitializeZygoteSandboxForBrowserProcess( +@@ -310,7 +310,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 -@@ -402,7 +402,7 @@ void PreSandboxInit() { +@@ -401,7 +401,7 @@ void PreSandboxInit() { } #endif // BUILDFLAG(USE_ZYGOTE_HANDLE) @@ -36,7 +36,7 @@ mojo::ScopedMessagePipeHandle MaybeAcceptMojoInvitation() { const auto& command_line = *base::CommandLine::ForCurrentProcess(); -@@ -533,7 +533,7 @@ int RunZygote(ContentMainDelegate* delegate) { +@@ -532,7 +532,7 @@ int RunZygote(ContentMainDelegate* delegate) { delegate->ZygoteStarting(&zygote_fork_delegates); media::InitializeMediaLibrary(); @@ -45,7 +45,7 @@ PreSandboxInit(); #endif -@@ -928,7 +928,7 @@ int ContentMainRunnerImpl::Run(bool start_minimal_brow +@@ -927,7 +927,7 @@ int ContentMainRunnerImpl::Run(bool start_minimal_brow 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 -@@ -938,7 +938,7 @@ int ContentMainRunnerImpl::Run(bool start_minimal_brow +@@ -937,7 +937,7 @@ int ContentMainRunnerImpl::Run(bool start_minimal_brow 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 94516bd6ef97..b98b7e56b8db 100644 --- a/www/chromium/files/patch-content_browser_BUILD.gn +++ b/www/chromium/files/patch-content_browser_BUILD.gn @@ -1,11 +1,13 @@ ---- content/browser/BUILD.gn.orig 2021-05-12 22:05:52 UTC +--- content/browser/BUILD.gn.orig 2021-07-19 18:45:15 UTC +++ content/browser/BUILD.gn -@@ -2222,6 +2222,15 @@ source_set("browser") { +@@ -2255,6 +2255,17 @@ source_set("browser") { deps += [ "//third_party/speech-dispatcher" ] } + if (is_bsd) { + sources -= [ ++ "compute_pressure/cpu_probe_linux.cc", ++ "compute_pressure/cpu_probe_linux.h", + "sandbox_host_linux.cc", + "sandbox_host_linux.h", + "sandbox_ipc_linux.cc", 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 81386e0bfb77..b187c973fd19 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-05-12 22:05:52 UTC +--- content/browser/browser_main_loop.cc.orig 2021-07-19 18:45:15 UTC +++ content/browser/browser_main_loop.cc -@@ -562,7 +562,7 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -559,7 +559,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() < -@@ -572,7 +572,7 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -569,7 +569,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. -@@ -582,7 +582,7 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -579,7 +579,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 f05bfe856d34..3db4b0966c12 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,6 +1,6 @@ ---- content/browser/devtools/protocol/system_info_handler.cc.orig 2021-05-12 22:05:52 UTC +--- content/browser/devtools/protocol/system_info_handler.cc.orig 2021-07-19 18:45:15 UTC +++ content/browser/devtools/protocol/system_info_handler.cc -@@ -51,8 +51,8 @@ std::unique_ptr<SystemInfo::Size> GfxSizeToSystemInfoS +@@ -52,8 +52,8 @@ std::unique_ptr<SystemInfo::Size> GfxSizeToSystemInfoS // 1153667. // Windows builds need more time -- see Issue 873112 and 1004472. // ASAN builds need more time -- see Issue 1167875. diff --git a/www/chromium/files/patch-content_browser_download_download__manager__impl.cc b/www/chromium/files/patch-content_browser_download_download__manager__impl.cc index 2cd41c079f51..cd44c7c40a10 100644 --- a/www/chromium/files/patch-content_browser_download_download__manager__impl.cc +++ b/www/chromium/files/patch-content_browser_download_download__manager__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/download/download_manager_impl.cc.orig 2021-05-12 22:05:52 UTC +--- content/browser/download/download_manager_impl.cc.orig 2021-07-19 18:45:15 UTC +++ content/browser/download/download_manager_impl.cc -@@ -83,7 +83,7 @@ +@@ -82,7 +82,7 @@ #include "third_party/blink/public/common/loader/referrer_utils.h" #include "third_party/blink/public/common/loader/throttling_url_loader.h" @@ -9,7 +9,7 @@ #include "base/nix/xdg_util.h" #endif -@@ -229,7 +229,7 @@ class DownloadItemFactoryImpl : public download::Downl +@@ -228,7 +228,7 @@ class DownloadItemFactoryImpl : public download::Downl } }; @@ -18,7 +18,7 @@ base::FilePath GetTemporaryDownloadDirectory() { std::unique_ptr<base::Environment> env(base::Environment::Create()); return base::nix::GetXDGDirectory(env.get(), "XDG_DATA_HOME", ".local/share"); -@@ -570,7 +570,7 @@ bool DownloadManagerImpl::InterceptDownload( +@@ -568,7 +568,7 @@ bool DownloadManagerImpl::InterceptDownload( base::FilePath DownloadManagerImpl::GetDefaultDownloadDirectory() { base::FilePath default_download_directory; diff --git a/www/chromium/files/patch-content_browser_font__access_font__enumeration__cache.h b/www/chromium/files/patch-content_browser_font__access_font__enumeration__cache.h index e26de4c44329..7659d34c6309 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-04-14 18:41:02 UTC +--- content/browser/font_access/font_enumeration_cache.h.orig 2021-07-19 18:45:15 UTC +++ content/browser/font_access/font_enumeration_cache.h -@@ -16,7 +16,7 @@ +@@ -15,7 +15,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 c1b41fea3c81..5154d254aac5 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-05-12 22:05:52 UTC +--- content/browser/gpu/compositor_util.cc.orig 2021-07-19 18:45:15 UTC +++ content/browser/gpu/compositor_util.cc -@@ -127,11 +127,11 @@ const GpuFeatureData GetGpuFeatureData( +@@ -128,11 +128,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__process__host.cc b/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc index aff9c080f205..4f8775f85c7c 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-05-12 22:05:52 UTC +--- content/browser/gpu/gpu_process_host.cc.orig 2021-07-19 18:45:15 UTC +++ content/browser/gpu/gpu_process_host.cc -@@ -231,8 +231,8 @@ static const char* const kSwitchNames[] = { +@@ -232,8 +232,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) -@@ -1177,7 +1177,7 @@ bool GpuProcessHost::LaunchGpuProcess() { +@@ -1169,7 +1169,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_pepper_pepper__file__io__host.cc b/www/chromium/files/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc index 4aeed406d409..10a885767b44 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/pepper/pepper_file_io_host.cc.orig 2021-05-12 22:05:52 UTC +--- content/browser/renderer_host/pepper/pepper_file_io_host.cc.orig 2021-07-19 18:45:15 UTC +++ content/browser/renderer_host/pepper/pepper_file_io_host.cc -@@ -438,7 +438,7 @@ void PepperFileIOHost::OnLocalFileOpened( +@@ -480,7 +480,7 @@ void PepperFileIOHost::OnLocalFileOpened( ppapi::host::ReplyMessageContext reply_context, const base::FilePath& path, base::File::Error error_code) { @@ -9,7 +9,7 @@ // Quarantining a file before its contents are available is only supported on // Windows and Linux. if (!FileOpenForWrite(open_flags_) || error_code != base::File::FILE_OK) { -@@ -472,7 +472,7 @@ void PepperFileIOHost::OnLocalFileOpened( +@@ -514,7 +514,7 @@ void PepperFileIOHost::OnLocalFileOpened( #endif } 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 83450a0db7a4..305d1fa32d6d 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,4 +1,4 @@ ---- content/browser/renderer_host/render_message_filter.cc.orig 2021-05-12 22:05:52 UTC +--- content/browser/renderer_host/render_message_filter.cc.orig 2021-07-19 18:45:15 UTC +++ content/browser/renderer_host/render_message_filter.cc @@ -68,7 +68,7 @@ #if defined(OS_MAC) @@ -9,7 +9,7 @@ #include "base/linux_util.h" #include "base/threading/platform_thread.h" #endif -@@ -116,7 +116,7 @@ void RenderMessageFilter::GenerateFrameRoutingID( +@@ -130,7 +130,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) { -@@ -137,7 +137,7 @@ void RenderMessageFilter::SetThreadPriorityOnFileThrea +@@ -151,7 +151,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 458f27226819..f9d6038b2c0e 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-05-12 22:05:52 UTC +--- content/browser/renderer_host/render_message_filter.h.orig 2021-07-19 18:45:15 UTC +++ content/browser/renderer_host/render_message_filter.h -@@ -77,14 +77,14 @@ class CONTENT_EXPORT RenderMessageFilter +@@ -76,14 +76,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 01fe8c07a94f..130c84131877 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-05-12 22:05:52 UTC +--- 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 -@@ -223,7 +223,7 @@ +@@ -224,7 +224,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> -@@ -1243,7 +1243,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = +@@ -1371,7 +1371,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; -@@ -1254,7 +1254,7 @@ size_t GetPlatformProcessLimit() { +@@ -1382,7 +1382,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) -@@ -1328,7 +1328,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public +@@ -1456,7 +1456,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; -@@ -1748,7 +1748,7 @@ bool RenderProcessHostImpl::Init() { +@@ -1884,7 +1884,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) -@@ -3176,8 +3176,8 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin +@@ -3294,8 +3294,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) -@@ -4806,6 +4806,8 @@ void RenderProcessHostImpl::OnProcessLaunched() { +@@ -4968,6 +4968,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 0f8ede625093..3a068d1274ed 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-05-12 22:05:52 UTC +--- 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 -@@ -259,7 +259,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs( +@@ -257,7 +257,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 9fbd89d7250e..e02b7154ab82 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-04-14 18:41:02 UTC +--- 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 -@@ -110,7 +110,7 @@ +@@ -112,7 +112,7 @@ #include "ui/gfx/gdi_util.h" #endif @@ -9,7 +9,7 @@ #include "content/browser/accessibility/browser_accessibility_auralinux.h" #include "ui/base/ime/linux/text_edit_command_auralinux.h" #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" -@@ -466,7 +466,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge +@@ -464,7 +464,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge if (manager) return ToBrowserAccessibilityWin(manager->GetRoot())->GetCOM(); @@ -18,7 +18,7 @@ BrowserAccessibilityManager* manager = host()->GetOrCreateRootBrowserAccessibilityManager(); if (manager && manager->GetRoot()) -@@ -2199,7 +2199,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { +@@ -2255,7 +2255,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { } bool RenderWidgetHostViewAura::NeedsMouseCapture() { @@ -27,7 +27,7 @@ return NeedsInputGrab(); #else return false; -@@ -2365,7 +2365,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit +@@ -2421,7 +2421,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 88c5c15955f7..1de5e8dfee82 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-05-12 22:05:52 UTC +--- 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 -@@ -714,7 +714,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand +@@ -715,7 +715,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_web__contents_web__contents__view__aura.cc b/www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc index 1a6d9325a198..8db1688aa96b 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-05-12 22:05:52 UTC +--- 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 -@@ -152,7 +152,7 @@ class WebDragSourceAura : public content::WebContentsO +@@ -156,7 +156,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, -@@ -235,7 +235,7 @@ void PrepareDragData(const DropData& drop_data, +@@ -239,7 +239,7 @@ void PrepareDragData(const DropData& drop_data, if (!drop_data.download_metadata.empty()) PrepareDragForDownload(drop_data, provider, web_contents); #endif @@ -18,7 +18,7 @@ // We set the file contents before the URL because the URL also sets file // contents (to a .URL shortcut). We want to prefer file content data over // a shortcut so we add it first. -@@ -1210,7 +1210,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent* +@@ -1205,7 +1205,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent* // Linux window managers like to handle raise-on-click themselves. If we // raise-on-click manually, this may override user settings that prevent // focus-stealing. diff --git a/www/chromium/files/patch-content_common_mojo__core__library__support.cc b/www/chromium/files/patch-content_common_mojo__core__library__support.cc index d0088f91541d..1663d3aeb5b1 100644 --- a/www/chromium/files/patch-content_common_mojo__core__library__support.cc +++ b/www/chromium/files/patch-content_common_mojo__core__library__support.cc @@ -1,9 +1,9 @@ ---- content/common/mojo_core_library_support.cc.orig 2021-04-14 18:41:03 UTC +--- content/common/mojo_core_library_support.cc.orig 2021-07-19 18:45:15 UTC +++ content/common/mojo_core_library_support.cc @@ -15,7 +15,7 @@ bool IsMojoCoreSharedLibraryEnabled() { } - base::Optional<base::FilePath> GetMojoCoreSharedLibraryPath() { + absl::optional<base::FilePath> GetMojoCoreSharedLibraryPath() { -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) const base::CommandLine& command_line = diff --git a/www/chromium/files/patch-content_gpu_gpu__main.cc b/www/chromium/files/patch-content_gpu_gpu__main.cc index 8ad3aceeabd6..56356738d1ee 100644 --- a/www/chromium/files/patch-content_gpu_gpu__main.cc +++ b/www/chromium/files/patch-content_gpu_gpu__main.cc @@ -1,6 +1,6 @@ ---- content/gpu/gpu_main.cc.orig 2021-05-12 22:05:53 UTC +--- content/gpu/gpu_main.cc.orig 2021-07-19 18:45:15 UTC +++ content/gpu/gpu_main.cc -@@ -87,7 +87,7 @@ +@@ -86,7 +86,7 @@ #include "ui/gfx/x/x11_switches.h" // nogncheck #endif @@ -9,7 +9,7 @@ #include "content/gpu/gpu_sandbox_hook_linux.h" #include "content/public/common/sandbox_init.h" #include "sandbox/policy/linux/sandbox_linux.h" -@@ -310,7 +310,7 @@ int GpuMain(const MainFunctionParams& parameters) { +@@ -282,7 +282,7 @@ int GpuMain(const MainFunctionParams& parameters) { gpu_preferences.message_pump_type); } #endif diff --git a/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc b/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc index bacf58aeb806..cf13df3412ea 100644 --- a/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc +++ b/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc @@ -1,6 +1,6 @@ ---- content/ppapi_plugin/ppapi_blink_platform_impl.cc.orig 2021-04-14 18:41:03 UTC +--- content/ppapi_plugin/ppapi_blink_platform_impl.cc.orig 2021-07-19 18:45:15 UTC +++ content/ppapi_plugin/ppapi_blink_platform_impl.cc -@@ -19,7 +19,7 @@ +@@ -20,7 +20,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" #include "mojo/public/cpp/bindings/pending_remote.h" #endif -@@ -34,7 +34,7 @@ typedef struct CGFont* CGFontRef; +@@ -35,7 +35,7 @@ typedef struct CGFont* CGFontRef; namespace content { PpapiBlinkPlatformImpl::PpapiBlinkPlatformImpl() { @@ -18,7 +18,7 @@ mojo::PendingRemote<font_service::mojom::FontService> font_service; ChildThread::Get()->BindHostReceiver( font_service.InitWithNewPipeAndPassReceiver()); -@@ -52,7 +52,7 @@ PpapiBlinkPlatformImpl::~PpapiBlinkPlatformImpl() { +@@ -53,7 +53,7 @@ PpapiBlinkPlatformImpl::~PpapiBlinkPlatformImpl() { void PpapiBlinkPlatformImpl::Shutdown() {} blink::WebSandboxSupport* PpapiBlinkPlatformImpl::GetSandboxSupport() { diff --git a/www/chromium/files/patch-content_ppapi__plugin_ppapi__plugin__main.cc b/www/chromium/files/patch-content_ppapi__plugin_ppapi__plugin__main.cc new file mode 100644 index 000000000000..be9b238c7fd5 --- /dev/null +++ b/www/chromium/files/patch-content_ppapi__plugin_ppapi__plugin__main.cc @@ -0,0 +1,23 @@ +--- content/ppapi_plugin/ppapi_plugin_main.cc.orig 2021-07-19 18:45:15 UTC ++++ content/ppapi_plugin/ppapi_plugin_main.cc +@@ -49,6 +49,10 @@ + #include "content/public/common/sandbox_init.h" + #include "sandbox/policy/linux/sandbox_linux.h" + #endif ++#if defined(OS_FREEBSD) ++#include "content/public/common/sandbox_init.h" ++#include "sandbox/policy/freebsd/sandbox_freebsd.h" ++#endif + + #ifdef V8_USE_EXTERNAL_STARTUP_DATA + #include "gin/v8_initializer.h" +@@ -140,6 +144,9 @@ int PpapiPluginMain(const MainFunctionParams& paramete + sandbox::policy::SandboxTypeFromCommandLine(command_line), + sandbox::policy::SandboxLinux::PreSandboxHook(), + sandbox::policy::SandboxLinux::Options()); ++#elif defined(OS_FREEBSD) ++ sandbox::policy::SandboxFreeBSD::GetInstance()->InitializeSandbox( ++ sandbox::policy::SandboxTypeFromCommandLine(command_line)); + #endif + + ChildProcess ppapi_process; 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 4516a60d7ece..8e911845dda6 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-05-12 22:05:53 UTC +--- content/public/common/content_features.cc.orig 2021-07-19 18:45:16 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,8 +9,24 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -821,8 +821,8 @@ const base::Feature kWebAssemblyThreads { - }; +@@ -851,13 +851,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) + // 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) + + // Enable WebAssembly lazy compilation (JIT on first call). + const base::Feature kWebAssemblyLazyCompilation{ +@@ -873,8 +873,8 @@ const base::Feature kWebAssemblyTiering{"WebAssemblyTi + base::FEATURE_ENABLED_BY_DEFAULT}; // Enable WebAssembly trap handler. -#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || \ @@ -20,7 +36,7 @@ defined(ARCH_CPU_X86_64) const base::Feature kWebAssemblyTrapHandler{"WebAssemblyTrapHandler", base::FEATURE_ENABLED_BY_DEFAULT}; -@@ -844,7 +844,7 @@ const base::Feature kWebAuthCable { +@@ -896,7 +896,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 new file mode 100644 index 000000000000..6774c4dd01ec --- /dev/null +++ b/www/chromium/files/patch-content_public_common_content__features.h @@ -0,0 +1,14 @@ +--- content/public/common/content_features.h.orig 2021-07-29 12:15:43 UTC ++++ content/public/common/content_features.h +@@ -219,9 +219,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) + 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) + 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 573b62c2e6be..9cd0a6561e80 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-05-12 22:05:53 UTC +--- content/public/common/content_switches.cc.orig 2021-07-19 18:45:16 UTC +++ content/public/common/content_switches.cc -@@ -977,7 +977,7 @@ const char kEnableAutomation[] = "enable-automation"; +@@ -985,7 +985,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 7e04dd770eca..e30459b60233 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-05-12 22:05:53 UTC +--- content/public/common/content_switches.h.orig 2021-07-19 18:45:16 UTC +++ content/public/common/content_switches.h -@@ -268,7 +268,7 @@ CONTENT_EXPORT extern const char kRendererWaitForJavaD +@@ -270,7 +270,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 afc7c9b63882..9173cc5a0f53 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-05-12 22:05:53 UTC +--- content/public/test/browser_test_base.cc.orig 2021-07-19 18:45:16 UTC +++ content/public/test/browser_test_base.cc -@@ -110,6 +110,10 @@ +@@ -112,6 +112,10 @@ #include "ui/views/test/event_generator_delegate_mac.h" #endif diff --git a/www/chromium/files/patch-content_renderer_render__process__impl.cc b/www/chromium/files/patch-content_renderer_render__process__impl.cc index 655e69021770..c37b958aafe1 100644 --- a/www/chromium/files/patch-content_renderer_render__process__impl.cc +++ b/www/chromium/files/patch-content_renderer_render__process__impl.cc @@ -1,6 +1,6 @@ ---- content/renderer/render_process_impl.cc.orig 2021-05-12 22:05:53 UTC +--- content/renderer/render_process_impl.cc.orig 2021-07-19 18:45:16 UTC +++ content/renderer/render_process_impl.cc -@@ -47,7 +47,7 @@ +@@ -48,7 +48,7 @@ #if defined(OS_WIN) #include "base/win/win_util.h" #endif @@ -9,7 +9,22 @@ #include "v8/include/v8-wasm-trap-handler-posix.h" #endif namespace { -@@ -197,7 +197,7 @@ RenderProcessImpl::RenderProcessImpl() +@@ -142,12 +142,12 @@ RenderProcessImpl::RenderProcessImpl() + 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) + 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) + + SetV8FlagIfFeature(features::kWebAssemblyLazyCompilation, + "--wasm-lazy-compilation"); +@@ -207,7 +207,7 @@ RenderProcessImpl::RenderProcessImpl() SetV8FlagIfNotFeature(features::kWebAssemblyTrapHandler, "--no-wasm-trap-handler"); 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 4a6ee05f3dd8..ebab58016b00 100644 --- a/www/chromium/files/patch-content_renderer_render__thread__impl.cc +++ b/www/chromium/files/patch-content_renderer_render__thread__impl.cc @@ -1,4 +1,4 @@ ---- content/renderer/render_thread_impl.cc.orig 2021-05-12 22:05:53 UTC +--- content/renderer/render_thread_impl.cc.orig 2021-07-19 18:45:16 UTC +++ content/renderer/render_thread_impl.cc @@ -180,7 +180,7 @@ @@ -9,7 +9,7 @@ #include <malloc.h> #endif -@@ -714,7 +714,7 @@ void RenderThreadImpl::Init() { +@@ -695,7 +695,7 @@ void RenderThreadImpl::Init() { compositor_thread_pipeline_.get())); } @@ -18,7 +18,7 @@ categorized_worker_pool_->SetBackgroundingCallback( main_thread_scheduler_->DefaultTaskRunner(), base::BindOnce( -@@ -737,7 +737,7 @@ void RenderThreadImpl::Init() { +@@ -718,7 +718,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( -@@ -1058,11 +1058,11 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1040,11 +1040,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); -@@ -1072,7 +1072,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1054,7 +1054,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 46c661ec0b16..498f7cad0759 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-05-12 22:05:53 UTC +--- content/renderer/renderer_blink_platform_impl.cc.orig 2021-07-19 18:45:16 UTC +++ content/renderer/renderer_blink_platform_impl.cc -@@ -102,7 +102,7 @@ +@@ -106,7 +106,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 -@@ -171,7 +171,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -175,7 +175,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()); -@@ -181,7 +181,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -185,7 +185,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( #endif } @@ -27,7 +27,7 @@ if (sandboxEnabled()) { #if defined(OS_MAC) sandbox_support_ = std::make_unique<WebSandboxSupportMac>(); -@@ -249,7 +249,7 @@ RendererBlinkPlatformImpl::WrapSharedURLLoaderFactory( +@@ -253,7 +253,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()) { -@@ -264,7 +264,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop +@@ -268,7 +268,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 eb4e05bb9589..86a40be7d41c 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-05-12 22:05:53 UTC +--- content/renderer/renderer_blink_platform_impl.h.orig 2021-07-19 18:45:16 UTC +++ content/renderer/renderer_blink_platform_impl.h @@ -29,7 +29,7 @@ #include "third_party/blink/public/mojom/cache_storage/cache_storage.mojom.h" @@ -9,7 +9,7 @@ #include "components/services/font/public/cpp/font_loader.h" // nogncheck #include "third_party/skia/include/core/SkRefCnt.h" // nogncheck #endif -@@ -183,7 +183,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -194,7 +194,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi const blink::WebURL& top_document_web_url) override; gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() override; blink::WebString ConvertIDNToUnicode(const blink::WebString& host) override; @@ -18,16 +18,16 @@ void SetDisplayThreadPriority(base::PlatformThreadId thread_id) override; #endif blink::BlameContext* GetTopLevelBlameContext() override; -@@ -230,7 +230,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi - // Return the mojo interface for making CodeCache calls. - blink::mojom::CodeCacheHost& GetCodeCacheHost(); +@@ -268,7 +268,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi + void Collect3DContextInformation(blink::Platform::GraphicsInfo* gl_info, + const gpu::GPUInfo& gpu_info) const; -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) std::unique_ptr<blink::WebSandboxSupport> sandbox_support_; #endif -@@ -251,7 +251,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -289,7 +289,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_renderer_renderer__main__platform__delegate__linux.cc b/www/chromium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc index 43c2b524d5ce..b2287ddbbe2e 100644 --- a/www/chromium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc +++ b/www/chromium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc @@ -1,4 +1,4 @@ ---- content/renderer/renderer_main_platform_delegate_linux.cc.orig 2021-06-09 22:14:02 UTC +--- content/renderer/renderer_main_platform_delegate_linux.cc.orig 2021-07-19 18:45:16 UTC +++ content/renderer/renderer_main_platform_delegate_linux.cc @@ -30,6 +30,11 @@ void RendererMainPlatformDelegate::PlatformUninitializ } @@ -10,7 +10,7 @@ + *base::CommandLine::ForCurrentProcess())); +#else // The setuid sandbox is started in the zygote process: zygote_main_linux.cc - // https://chromium.googlesource.com/chromium/src/+/master/docs/linux/suid_sandbox.md + // https://chromium.googlesource.com/chromium/src/+/main/docs/linux/suid_sandbox.md // @@ -65,7 +70,7 @@ bool RendererMainPlatformDelegate::EnableSandbox() { CHECK_EQ(errno, EPERM); diff --git a/www/chromium/files/patch-content_shell_BUILD.gn b/www/chromium/files/patch-content_shell_BUILD.gn index 99b5375d1c04..bd858193b96e 100644 --- a/www/chromium/files/patch-content_shell_BUILD.gn +++ b/www/chromium/files/patch-content_shell_BUILD.gn @@ -1,4 +1,4 @@ ---- content/shell/BUILD.gn.orig 2021-04-14 18:41:03 UTC +--- content/shell/BUILD.gn.orig 2021-07-19 18:45:16 UTC +++ content/shell/BUILD.gn @@ -87,7 +87,7 @@ static_library("content_shell_app") { "//content/web_test:web_test_renderer", @@ -18,7 +18,7 @@ deps += [ "//components/crash/content/browser", "//components/crash/core/app", -@@ -522,7 +522,7 @@ if (is_android) { +@@ -523,7 +523,7 @@ if (is_android) { } } @@ -27,7 +27,7 @@ data_deps += [ "//third_party/crashpad/crashpad/handler:crashpad_handler" ] } -@@ -808,7 +808,7 @@ group("content_shell_crash_test") { +@@ -837,7 +837,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", -@@ -817,7 +817,7 @@ group("content_shell_crash_test") { +@@ -846,7 +846,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_browser_shell__browser__main__parts.cc b/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc index 2c3a0e40c0b3..fe1b5be5b752 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,6 +1,6 @@ ---- content/shell/browser/shell_browser_main_parts.cc.orig 2021-04-14 18:41:03 UTC +--- content/shell/browser/shell_browser_main_parts.cc.orig 2021-07-19 18:45:16 UTC +++ content/shell/browser/shell_browser_main_parts.cc -@@ -56,7 +56,7 @@ +@@ -57,7 +57,7 @@ #if defined(USE_AURA) && defined(USE_X11) #include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck #endif @@ -9,7 +9,7 @@ #include "ui/base/ime/init/input_method_initializer.h" #endif #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -142,7 +142,7 @@ void ShellBrowserMainParts::PostMainMessageLoopStart() +@@ -137,7 +137,7 @@ void ShellBrowserMainParts::PostCreateMainMessageLoop( } int ShellBrowserMainParts::PreEarlyInitialization() { diff --git a/www/chromium/files/patch-content_shell_utility_shell__content__utility__client.cc b/www/chromium/files/patch-content_shell_utility_shell__content__utility__client.cc new file mode 100644 index 000000000000..4d2e1c1b3ac1 --- /dev/null +++ b/www/chromium/files/patch-content_shell_utility_shell__content__utility__client.cc @@ -0,0 +1,20 @@ +--- content/shell/utility/shell_content_utility_client.cc.orig 2021-07-28 08:08:13 UTC ++++ content/shell/utility/shell_content_utility_client.cc +@@ -33,7 +33,7 @@ + #include "sandbox/policy/sandbox.h" + #include "services/test/echo/echo_service.h" + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + #include "content/test/sandbox_status_service.h" + #endif + +@@ -142,7 +142,7 @@ void ShellContentUtilityClient::ExposeInterfacesToBrow + binders->Add<mojom::PowerMonitorTest>( + base::BindRepeating(&PowerMonitorTestImpl::MakeSelfOwnedReceiver), + base::ThreadTaskRunnerHandle::Get()); +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + if (register_sandbox_status_helper_) { + binders->Add<content::mojom::SandboxStatusService>( + base::BindRepeating( diff --git a/www/chromium/files/patch-content_test_BUILD.gn b/www/chromium/files/patch-content_test_BUILD.gn index a42b25208fa2..89c0d21fa25f 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-05-12 22:05:53 UTC +--- content/test/BUILD.gn.orig 2021-07-19 18:45:16 UTC +++ content/test/BUILD.gn -@@ -1502,10 +1502,12 @@ test("content_browsertests") { +@@ -1528,10 +1528,12 @@ test("content_browsertests") { } if (is_linux || is_chromeos) { @@ -14,10 +14,10 @@ + "../browser/zygote_host/zygote_browsertest.cc", + ] + } - deps += [ "//ui/gfx:test_support" ] - - if (use_atk) { -@@ -1754,7 +1756,7 @@ static_library("run_all_unittests") { + deps += [ + "//printing/buildflags", + "//ui/gfx:test_support", +@@ -1786,7 +1788,7 @@ static_library("run_all_unittests") { ":test_support", "//base/test:test_support", ] @@ -26,7 +26,7 @@ deps += [ "//content/common:set_process_title_linux" ] } } -@@ -2613,7 +2615,7 @@ test("content_unittests") { +@@ -2674,7 +2676,7 @@ test("content_unittests") { deps += [ "//ui/gfx/x" ] } diff --git a/www/chromium/files/patch-content_utility_BUILD.gn b/www/chromium/files/patch-content_utility_BUILD.gn index c65b8bd9cb49..c0ddeaa5242d 100644 --- a/www/chromium/files/patch-content_utility_BUILD.gn +++ b/www/chromium/files/patch-content_utility_BUILD.gn @@ -1,6 +1,6 @@ ---- content/utility/BUILD.gn.orig 2021-05-12 22:05:53 UTC +--- content/utility/BUILD.gn.orig 2021-07-19 18:45:16 UTC +++ content/utility/BUILD.gn -@@ -94,7 +94,7 @@ source_set("utility") { +@@ -102,7 +102,7 @@ source_set("utility") { deps += [ "//services/proxy_resolver:lib" ] } @@ -8,4 +8,4 @@ + if ((is_linux || is_chromeos) && !is_bsd) { deps += [ "//content/utility/speech:speech_recognition_sandbox_hook", - "//printing:printing_sandbox_hook", + "//services/network:network_sandbox_hook", diff --git a/www/chromium/files/patch-content_utility_utility__main.cc b/www/chromium/files/patch-content_utility_utility__main.cc index f85f6e097fff..501ac6883c9e 100644 --- a/www/chromium/files/patch-content_utility_utility__main.cc +++ b/www/chromium/files/patch-content_utility_utility__main.cc @@ -1,8 +1,8 @@ ---- content/utility/utility_main.cc.orig 2021-06-11 14:43:47 UTC +--- content/utility/utility_main.cc.orig 2021-07-19 18:45:16 UTC +++ content/utility/utility_main.cc -@@ -89,6 +89,11 @@ int UtilityMain(const MainFunctionParams& parameters) - if (parameters.command_line.HasSwitch(switches::kUtilityStartupDialog)) - WaitForDebugger("Utility"); +@@ -113,6 +113,11 @@ int UtilityMain(const MainFunctionParams& parameters) + } + } +#if defined(OS_FREEBSD) + sandbox::policy::Sandbox::Initialize( diff --git a/www/chromium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc b/www/chromium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc index f920ab8e8c1b..af8c790160d4 100644 --- a/www/chromium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc +++ b/www/chromium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc @@ -1,6 +1,6 @@ ---- extensions/browser/api/declarative_webrequest/webrequest_action.cc.orig 2021-04-14 18:41:03 UTC +--- extensions/browser/api/declarative_webrequest/webrequest_action.cc.orig 2021-07-19 18:45:16 UTC +++ extensions/browser/api/declarative_webrequest/webrequest_action.cc -@@ -28,7 +28,11 @@ +@@ -27,7 +27,11 @@ #include "extensions/common/extension.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "net/http/http_util.h" diff --git a/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc b/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc index 7761cf05d50d..aa311d889677 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-05-12 22:05:54 UTC +--- extensions/browser/api/messaging/message_service.cc.orig 2021-07-19 18:45:16 UTC +++ extensions/browser/api/messaging/message_service.cc -@@ -63,7 +63,7 @@ namespace { +@@ -65,7 +65,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."; -@@ -394,7 +394,7 @@ void MessageService::OpenChannelToNativeApp( +@@ -404,7 +404,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); -@@ -445,12 +445,12 @@ void MessageService::OpenChannelToNativeApp( +@@ -459,12 +459,12 @@ void MessageService::OpenChannelToNativeApp( channel->opener->IncrementLazyKeepaliveCount(); AddChannel(std::move(channel), receiver_port_id); diff --git a/www/chromium/files/patch-extensions_browser_api_web__request_form__data__parser.cc b/www/chromium/files/patch-extensions_browser_api_web__request_form__data__parser.cc index 160783b76492..96b605cf72ae 100644 --- a/www/chromium/files/patch-extensions_browser_api_web__request_form__data__parser.cc +++ b/www/chromium/files/patch-extensions_browser_api_web__request_form__data__parser.cc @@ -1,6 +1,6 @@ ---- extensions/browser/api/web_request/form_data_parser.cc.orig 2021-04-14 18:41:04 UTC +--- extensions/browser/api/web_request/form_data_parser.cc.orig 2021-07-19 18:45:16 UTC +++ extensions/browser/api/web_request/form_data_parser.cc -@@ -16,7 +16,11 @@ +@@ -17,7 +17,11 @@ #include "base/values.h" #include "net/base/escape.h" #include "net/http/http_request_headers.h" diff --git a/www/chromium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc b/www/chromium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc index 7118ec4f2cee..c34950bfeb2c 100644 --- a/www/chromium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc +++ b/www/chromium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc @@ -1,6 +1,6 @@ ---- extensions/browser/browser_context_keyed_service_factories.cc.orig 2021-05-12 22:05:54 UTC +--- extensions/browser/browser_context_keyed_service_factories.cc.orig 2021-07-19 18:45:16 UTC +++ extensions/browser/browser_context_keyed_service_factories.cc -@@ -86,7 +86,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() +@@ -88,7 +88,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() HidDeviceManager::GetFactoryInstance(); IdleManagerFactory::GetInstance(); ManagementAPI::GetFactoryInstance(); diff --git a/www/chromium/files/patch-extensions_common_api___permission__features.json b/www/chromium/files/patch-extensions_common_api___permission__features.json index 91738100a88b..1a402042403d 100644 --- a/www/chromium/files/patch-extensions_common_api___permission__features.json +++ b/www/chromium/files/patch-extensions_common_api___permission__features.json @@ -1,6 +1,6 @@ ---- extensions/common/api/_permission_features.json.orig 2021-04-14 18:41:04 UTC +--- extensions/common/api/_permission_features.json.orig 2021-07-19 18:45:16 UTC +++ extensions/common/api/_permission_features.json -@@ -451,7 +451,7 @@ +@@ -442,7 +442,7 @@ }, { "channel": "stable", "extension_types": ["extension", "legacy_packaged_app", "platform_app"], @@ -9,7 +9,7 @@ "allowlist": [ "0DE0F05680A4A056BCEC864ED8DDA84296F82B40", // http://crbug.com/434651 "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80", // http://crbug.com/293683 -@@ -486,7 +486,7 @@ +@@ -477,7 +477,7 @@ "networkingPrivate": { "channel": "stable", "extension_types": ["extension", "legacy_packaged_app", "platform_app"], diff --git a/www/chromium/files/patch-extensions_shell_BUILD.gn b/www/chromium/files/patch-extensions_shell_BUILD.gn index 938c773a1866..45b666f18078 100644 --- a/www/chromium/files/patch-extensions_shell_BUILD.gn +++ b/www/chromium/files/patch-extensions_shell_BUILD.gn @@ -1,6 +1,6 @@ ---- extensions/shell/BUILD.gn.orig 2021-05-12 22:05:54 UTC +--- extensions/shell/BUILD.gn.orig 2021-07-19 18:45:17 UTC +++ extensions/shell/BUILD.gn -@@ -209,16 +209,24 @@ source_set("app_shell_lib") { +@@ -210,16 +210,24 @@ source_set("app_shell_lib") { } if (is_linux || is_chromeos_lacros) { 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 17a9f28e18d2..e3d589c30c53 100644 --- a/www/chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc +++ b/www/chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc @@ -1,20 +1,20 @@ ---- gpu/command_buffer/common/gpu_memory_buffer_support.cc.orig 2021-04-14 18:41:04 UTC +--- 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 -@@ -55,7 +55,7 @@ bool IsImageSizeValidForGpuMemoryBufferFormat(const gf +@@ -119,7 +119,7 @@ gfx::BufferFormat GetPlaneBufferFormat(gfx::BufferPlan uint32_t GetPlatformSpecificTextureTarget() { #if defined(OS_MAC) return macos_specific_texture_target; --#elif defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#elif defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#elif defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ ++#elif defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ + defined(OS_WIN) return GL_TEXTURE_EXTERNAL_OES; - #elif defined(OS_WIN) || defined(OS_FUCHSIA) - return GL_TEXTURE_2D; -@@ -85,7 +85,7 @@ GPU_EXPORT uint32_t GetBufferTextureTarget(gfx::Buffer + #elif defined(OS_FUCHSIA) +@@ -150,7 +150,7 @@ GPU_EXPORT uint32_t GetBufferTextureTarget(gfx::Buffer GPU_EXPORT bool NativeBufferNeedsPlatformSpecificTextureTarget( gfx::BufferFormat format) { --#if defined(USE_OZONE) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(USE_OZONE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if defined(USE_OZONE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ ++#if defined(USE_OZONE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ + defined(OS_WIN) // Always use GL_TEXTURE_2D as the target for RGB textures. // https://crbug.com/916728 - if (format == gfx::BufferFormat::R_8 || format == gfx::BufferFormat::RG_88 || diff --git a/www/chromium/files/patch-gpu_command__buffer_service_external__semaphore.cc b/www/chromium/files/patch-gpu_command__buffer_service_external__semaphore.cc index 881dcd59d65e..5069ebc251de 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_external__semaphore.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_external__semaphore.cc @@ -1,8 +1,8 @@ ---- gpu/command_buffer/service/external_semaphore.cc.orig 2021-04-14 18:41:04 UTC +--- gpu/command_buffer/service/external_semaphore.cc.orig 2021-07-19 18:45:17 UTC +++ gpu/command_buffer/service/external_semaphore.cc -@@ -39,7 +39,7 @@ GLuint ImportSemaphoreHandleToGLSemaphore(SemaphoreHan - }, - base::Time::Now())); +@@ -27,7 +27,7 @@ GLuint ImportSemaphoreHandleToGLSemaphore(SemaphoreHan + if (!handle.is_valid()) + return 0; -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) 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 d1fb6c6e50aa..f0e13f27d8d5 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,4 +1,4 @@ ---- gpu/command_buffer/service/external_vk_image_backing.cc.orig 2021-04-14 18:41:04 UTC +--- 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 @@ -30,7 +30,7 @@ #include "ui/gl/gl_version_info.h" @@ -9,7 +9,7 @@ #include "gpu/command_buffer/service/external_vk_image_dawn_representation.h" #endif -@@ -616,7 +616,7 @@ std::unique_ptr<SharedImageRepresentationDawn> +@@ -601,7 +601,7 @@ std::unique_ptr<SharedImageRepresentationDawn> ExternalVkImageBacking::ProduceDawn(SharedImageManager* manager, MemoryTypeTracker* tracker, WGPUDevice wgpuDevice) { @@ -18,7 +18,7 @@ auto wgpu_format = viz::ToWGPUFormat(format()); if (wgpu_format == WGPUTextureFormat_Undefined) { -@@ -635,7 +635,7 @@ ExternalVkImageBacking::ProduceDawn(SharedImageManager +@@ -620,7 +620,7 @@ ExternalVkImageBacking::ProduceDawn(SharedImageManager return std::make_unique<ExternalVkImageDawnRepresentation>( manager, this, tracker, wgpuDevice, wgpu_format, std::move(memory_fd)); @@ -27,9 +27,9 @@ NOTIMPLEMENTED_LOG_ONCE(); return nullptr; #endif -@@ -648,7 +648,7 @@ GLuint ExternalVkImageBacking::ProduceGLTextureInterna +@@ -633,7 +633,7 @@ GLuint ExternalVkImageBacking::ProduceGLTextureInterna gl::GLApi* api = gl::g_current_gl_context; - base::Optional<ScopedDedicatedMemoryObject> memory_object; + absl::optional<ScopedDedicatedMemoryObject> memory_object; if (!use_separate_gl_texture()) { -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) diff --git a/www/chromium/files/patch-gpu_command__buffer_service_program__manager.cc b/www/chromium/files/patch-gpu_command__buffer_service_program__manager.cc index b5bd47c3d467..a2c2525f0c25 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_program__manager.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_program__manager.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/program_manager.cc.orig 2021-04-14 18:41:04 UTC +--- gpu/command_buffer/service/program_manager.cc.orig 2021-07-19 18:45:17 UTC +++ gpu/command_buffer/service/program_manager.cc -@@ -30,7 +30,11 @@ +@@ -29,7 +29,11 @@ #include "gpu/command_buffer/service/program_cache.h" #include "gpu/command_buffer/service/shader_manager.h" #include "gpu/config/gpu_preferences.h" 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 0c230ea56fbb..f94010069ac4 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-04-22 08:17:28 UTC +--- gpu/command_buffer/service/shared_image_factory.cc.orig 2021-07-19 18:45:17 UTC +++ gpu/command_buffer/service/shared_image_factory.cc -@@ -29,12 +29,12 @@ +@@ -28,12 +28,12 @@ #include "ui/gl/gl_implementation.h" #include "ui/gl/trace_util.h" 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 b2ce122eaa29..2f0dcf323ce1 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,6 +1,6 @@ ---- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2021-05-12 22:05:54 UTC +--- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2021-07-19 18:45:17 UTC +++ gpu/command_buffer/service/webgpu_decoder_impl.cc -@@ -813,12 +813,12 @@ error::Error WebGPUDecoderImpl::HandleRequestAdapter( +@@ -823,12 +823,12 @@ error::Error WebGPUDecoderImpl::HandleRequestAdapter( static_cast<DawnRequestAdapterSerial>(c.request_adapter_serial); if (gr_context_type_ != GrContextType::kVulkan) { 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 d694eef02447..da801708bd99 100644 --- a/www/chromium/files/patch-gpu_config_gpu__control__list.cc +++ b/www/chromium/files/patch-gpu_config_gpu__control__list.cc @@ -1,6 +1,6 @@ ---- gpu/config/gpu_control_list.cc.orig 2021-04-14 18:41:04 UTC +--- gpu/config/gpu_control_list.cc.orig 2021-07-19 18:45:17 UTC +++ gpu/config/gpu_control_list.cc -@@ -18,7 +18,11 @@ +@@ -19,7 +19,11 @@ #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "gpu/config/gpu_util.h" @@ -12,7 +12,7 @@ namespace gpu { namespace { -@@ -276,7 +280,7 @@ bool GpuControlList::More::GLVersionInfoMismatch( +@@ -277,7 +281,7 @@ bool GpuControlList::More::GLVersionInfoMismatch( GpuControlList::GLType GpuControlList::More::GetDefaultGLType() { #if BUILDFLAG(IS_CHROMEOS_ASH) return kGLTypeGL; diff --git a/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc b/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc index 52e2fa773534..4665fea9616d 100644 --- a/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc +++ b/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc @@ -1,4 +1,4 @@ ---- gpu/ipc/common/gpu_memory_buffer_support.cc.orig 2021-05-12 22:05:54 UTC +--- gpu/ipc/common/gpu_memory_buffer_support.cc.orig 2021-07-19 18:45:17 UTC +++ gpu/ipc/common/gpu_memory_buffer_support.cc @@ -17,7 +17,7 @@ #include "gpu/ipc/common/gpu_memory_buffer_impl_io_surface.h" @@ -36,7 +36,7 @@ return gfx::NATIVE_PIXMAP; #elif defined(OS_WIN) return gfx::DXGI_SHARED_HANDLE; -@@ -207,7 +207,7 @@ GpuMemoryBufferSupport::CreateGpuMemoryBufferImplFromH +@@ -209,7 +209,7 @@ GpuMemoryBufferSupport::CreateGpuMemoryBufferImplFromH return GpuMemoryBufferImplIOSurface::CreateFromHandle( std::move(handle), size, format, usage, std::move(callback)); #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 d33ef4bee500..85a36bfb0f06 100644 --- a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc +++ b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc @@ -1,6 +1,6 @@ ---- gpu/ipc/service/gpu_init.cc.orig 2021-05-12 22:05:54 UTC +--- gpu/ipc/service/gpu_init.cc.orig 2021-07-19 18:45:17 UTC +++ gpu/ipc/service/gpu_init.cc -@@ -118,7 +118,7 @@ void InitializePlatformOverlaySettings(GPUInfo* gpu_in +@@ -119,7 +119,7 @@ void InitializePlatformOverlaySettings(GPUInfo* gpu_in } #if BUILDFLAG(IS_CHROMEOS_LACROS) || \ @@ -9,7 +9,7 @@ bool CanAccessNvidiaDeviceFile() { bool res = true; base::ScopedBlockingCall scoped_blocking_call(FROM_HERE, -@@ -129,7 +129,7 @@ bool CanAccessNvidiaDeviceFile() { +@@ -130,7 +130,7 @@ bool CanAccessNvidiaDeviceFile() { } return res; } @@ -18,7 +18,7 @@ // !BUILDFLAG(IS_CHROMECAST)) class GpuWatchdogInit { -@@ -216,7 +216,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -217,7 +217,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL device_perf_info_ = device_perf_info; } @@ -27,7 +27,7 @@ if (gpu_info_.gpu.vendor_id == 0x10de && // NVIDIA gpu_info_.gpu.driver_vendor == "NVIDIA" && !CanAccessNvidiaDeviceFile()) return false; -@@ -268,7 +268,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -269,7 +269,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. -@@ -308,7 +308,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -309,7 +309,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. -@@ -317,7 +317,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -318,7 +318,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL watchdog_thread_.get(), &gpu_info_, gpu_preferences_); attempted_startsandbox = true; } @@ -54,7 +54,7 @@ base::TimeTicks before_initialize_one_off = base::TimeTicks::Now(); -@@ -359,7 +359,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -360,7 +360,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } if (gl_initialized && gl_use_swiftshader_ && gl::GetGLImplementation() != gl::kGLImplementationSwiftShaderGL) { @@ -63,7 +63,7 @@ VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " << "on Linux"; return false; -@@ -367,7 +367,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -368,7 +368,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL SaveHardwareGpuInfoAndGpuFeatureInfo(); gl::init::ShutdownGL(true); gl_initialized = false; @@ -72,7 +72,7 @@ } if (!gl_initialized) { -@@ -393,7 +393,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -394,7 +394,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 -@@ -458,7 +458,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -459,7 +459,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; -@@ -473,7 +473,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -474,7 +474,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL << "failed"; return false; } @@ -99,7 +99,7 @@ } } else { // gl_use_swiftshader_ == true switch (gpu_preferences_.use_vulkan) { -@@ -549,7 +549,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -550,7 +550,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. -@@ -568,7 +568,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -569,7 +569,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL return false; } } @@ -117,7 +117,7 @@ if (gl_use_swiftshader_) { AdjustInfoToSwiftShader(); -@@ -755,7 +755,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -761,7 +761,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. -@@ -776,7 +776,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -782,7 +782,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 18dfaad660c4..928d1511ba43 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-04-14 18:41:04 UTC +--- gpu/ipc/service/gpu_watchdog_thread.cc.orig 2021-07-19 18:45:17 UTC +++ gpu/ipc/service/gpu_watchdog_thread.cc -@@ -73,7 +73,7 @@ GpuWatchdogThread::GpuWatchdogThread(base::TimeDelta t +@@ -88,7 +88,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(); -@@ -101,7 +101,7 @@ GpuWatchdogThread::~GpuWatchdogThread() { +@@ -116,7 +116,7 @@ GpuWatchdogThread::~GpuWatchdogThread() { CloseHandle(watched_thread_handle_); #endif @@ -18,7 +18,7 @@ if (tty_file_) fclose(tty_file_); #endif -@@ -440,7 +440,7 @@ void GpuWatchdogThread::OnWatchdogTimeout() { +@@ -449,7 +449,7 @@ void GpuWatchdogThread::OnWatchdogTimeout() { if (foregrounded_event_) num_of_timeout_after_foregrounded_++; @@ -27,7 +27,7 @@ UpdateActiveTTY(); #endif -@@ -773,7 +773,7 @@ bool GpuWatchdogThread::WithinOneMinFromForegrounded() +@@ -782,7 +782,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_; -@@ -790,7 +790,7 @@ void GpuWatchdogThread::UpdateActiveTTY() { +@@ -799,7 +799,7 @@ void GpuWatchdogThread::UpdateActiveTTY() { #endif bool GpuWatchdogThread::ContinueOnNonHostX11ServerTty() { diff --git a/www/chromium/files/patch-headless_BUILD.gn b/www/chromium/files/patch-headless_BUILD.gn index 99d736cf614e..05d8956f1945 100644 --- a/www/chromium/files/patch-headless_BUILD.gn +++ b/www/chromium/files/patch-headless_BUILD.gn @@ -1,6 +1,6 @@ ---- headless/BUILD.gn.orig 2021-05-12 22:05:54 UTC +--- headless/BUILD.gn.orig 2021-07-19 18:45:17 UTC +++ headless/BUILD.gn -@@ -290,7 +290,7 @@ source_set("headless_shared_sources") { +@@ -289,7 +289,7 @@ source_set("headless_shared_sources") { sources += generated_devtools_api sources += get_target_outputs(":protocol_sources") @@ -9,7 +9,7 @@ sources += [ "lib/headless_crash_reporter_client.cc", "lib/headless_crash_reporter_client.h", -@@ -309,7 +309,7 @@ source_set("headless_shared_sources") { +@@ -308,7 +308,7 @@ source_set("headless_shared_sources") { "//url", ] @@ -18,7 +18,7 @@ deps += [ "//components/crash/content/browser" ] } if (is_component_build && is_win) { -@@ -487,7 +487,7 @@ component("headless_non_renderer") { +@@ -488,7 +488,7 @@ component("headless_non_renderer") { "//v8", ] @@ -27,7 +27,7 @@ deps += [ "//components/crash/content/browser" ] } if (is_win) { -@@ -808,7 +808,7 @@ static_library("headless_shell_lib") { +@@ -817,7 +817,7 @@ static_library("headless_shell_lib") { public_deps += [ ":headless_non_renderer" ] } diff --git a/www/chromium/files/patch-headless_lib_browser_headless__browser__main__parts.h b/www/chromium/files/patch-headless_lib_browser_headless__browser__main__parts.h index 9cdfcbad4d43..d31b071a6996 100644 --- a/www/chromium/files/patch-headless_lib_browser_headless__browser__main__parts.h +++ b/www/chromium/files/patch-headless_lib_browser_headless__browser__main__parts.h @@ -1,11 +1,11 @@ ---- headless/lib/browser/headless_browser_main_parts.h.orig 2021-05-12 22:05:54 UTC +--- headless/lib/browser/headless_browser_main_parts.h.orig 2021-07-19 18:45:17 UTC +++ headless/lib/browser/headless_browser_main_parts.h -@@ -46,7 +46,7 @@ class HeadlessBrowserMainParts : public content::Brows - void PreMainMessageLoopStart() override; - device::GeolocationSystemPermissionManager* GetLocationPermissionManager(); +@@ -44,7 +44,7 @@ class HeadlessBrowserMainParts : public content::Brows + #if defined(OS_MAC) + void PreCreateMainMessageLoop() override; #endif -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - void PostMainMessageLoopStart() override; + void PostCreateMainMessageLoop() override; #endif void QuitMainMessageLoop(); diff --git a/www/chromium/files/patch-headless_lib_browser_headless__browser__main__parts__linux.cc b/www/chromium/files/patch-headless_lib_browser_headless__browser__main__parts__linux.cc index 3ec3a7f0124b..62e89bae0f7d 100644 --- a/www/chromium/files/patch-headless_lib_browser_headless__browser__main__parts__linux.cc +++ b/www/chromium/files/patch-headless_lib_browser_headless__browser__main__parts__linux.cc @@ -1,9 +1,9 @@ ---- headless/lib/browser/headless_browser_main_parts_linux.cc.orig 2021-04-14 18:41:04 UTC +--- headless/lib/browser/headless_browser_main_parts_linux.cc.orig 2021-07-19 18:45:17 UTC +++ headless/lib/browser/headless_browser_main_parts_linux.cc @@ -11,7 +11,7 @@ namespace headless { - void HeadlessBrowserMainParts::PostMainMessageLoopStart() { + void HeadlessBrowserMainParts::PostCreateMainMessageLoop() { -#if defined(USE_DBUS) && !BUILDFLAG(IS_CHROMEOS_ASH) +#if defined(USE_DBUS) && !BUILDFLAG(IS_CHROMEOS_ASH) && !defined(OS_BSD) bluez::BluezDBusManager::Initialize(/*system_bus=*/nullptr); 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 5c878606ed24..539d8f34c5bd 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-05-12 22:05:54 UTC +--- headless/lib/browser/headless_content_browser_client.cc.orig 2021-07-19 18:45:17 UTC +++ headless/lib/browser/headless_content_browser_client.cc -@@ -280,7 +280,7 @@ void HeadlessContentBrowserClient::AppendExtraCommandL +@@ -288,7 +288,7 @@ void HeadlessContentBrowserClient::AppendExtraCommandL process_type, child_process_id); } diff --git a/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc b/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc index 59f6b0c99851..38f82d819b3d 100644 --- a/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc +++ b/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc @@ -1,6 +1,6 @@ ---- headless/lib/browser/headless_request_context_manager.cc.orig 2021-04-14 18:41:04 UTC +--- headless/lib/browser/headless_request_context_manager.cc.orig 2021-07-19 18:45:17 UTC +++ headless/lib/browser/headless_request_context_manager.cc -@@ -35,7 +35,7 @@ namespace { +@@ -36,7 +36,7 @@ namespace { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ constexpr char kProductName[] = "HeadlessChrome"; #endif -@@ -73,7 +73,7 @@ void SetCryptConfigOnce(const base::FilePath& user_dat +@@ -74,7 +74,7 @@ void SetCryptConfigOnce(const base::FilePath& user_dat // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. 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 a32036194727..891f0409a690 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,6 +1,6 @@ ---- headless/lib/headless_content_main_delegate.cc.orig 2021-05-12 22:05:54 UTC +--- headless/lib/headless_content_main_delegate.cc.orig 2021-07-19 18:45:17 UTC +++ headless/lib/headless_content_main_delegate.cc -@@ -323,7 +323,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( +@@ -327,7 +327,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( const base::CommandLine& command_line) { if (command_line.HasSwitch(::switches::kDisableBreakpad)) return; diff --git a/www/chromium/files/patch-ipc_ipc__channel__mojo.cc b/www/chromium/files/patch-ipc_ipc__channel__mojo.cc index 259ef231364a..06974ddfbe06 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-04-14 18:41:05 UTC +--- ipc/ipc_channel_mojo.cc.orig 2021-07-19 18:45:18 UTC +++ ipc/ipc_channel_mojo.cc -@@ -76,10 +76,10 @@ class MojoChannelFactory : public ChannelFactory { +@@ -111,10 +111,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 6c36c7ed5a1c..4320772145da 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-05-12 22:05:55 UTC +--- ipc/ipc_message_utils.cc.orig 2021-07-19 18:45:18 UTC +++ ipc/ipc_message_utils.cc -@@ -361,7 +361,7 @@ void ParamTraits<unsigned int>::Log(const param_type& +@@ -353,7 +353,7 @@ void ParamTraits<unsigned int>::Log(const param_type& l->append(base::NumberToString(p)); } diff --git a/www/chromium/files/patch-ipc_ipc__message__utils.h b/www/chromium/files/patch-ipc_ipc__message__utils.h index 2b9e9b6c5654..49fbbcd29396 100644 --- a/www/chromium/files/patch-ipc_ipc__message__utils.h +++ b/www/chromium/files/patch-ipc_ipc__message__utils.h @@ -1,6 +1,6 @@ ---- ipc/ipc_message_utils.h.orig 2021-05-12 22:05:55 UTC +--- ipc/ipc_message_utils.h.orig 2021-07-19 18:45:18 UTC +++ ipc/ipc_message_utils.h -@@ -207,7 +207,7 @@ struct ParamTraits<unsigned int> { +@@ -206,7 +206,7 @@ struct ParamTraits<unsigned int> { // 3) Android 64 bit and Fuchsia also have int64_t typedef'd to long. // Since we want to support Android 32<>64 bit IPC, as long as we don't have // these traits for 32 bit ARM then that'll catch any errors. diff --git a/www/chromium/files/patch-media_audio_BUILD.gn b/www/chromium/files/patch-media_audio_BUILD.gn index 5082825d2617..d96b475bbd25 100644 --- a/www/chromium/files/patch-media_audio_BUILD.gn +++ b/www/chromium/files/patch-media_audio_BUILD.gn @@ -1,6 +1,6 @@ ---- media/audio/BUILD.gn.orig 2021-04-14 18:41:05 UTC +--- media/audio/BUILD.gn.orig 2021-07-19 18:45:18 UTC +++ media/audio/BUILD.gn -@@ -236,7 +236,7 @@ source_set("audio") { +@@ -238,7 +238,7 @@ source_set("audio") { ] } @@ -9,7 +9,7 @@ sources += [ "linux/audio_manager_linux.cc" ] } -@@ -301,6 +301,17 @@ source_set("audio") { +@@ -303,6 +303,17 @@ source_set("audio") { } else { deps += [ ":libpulse_stubs" ] } diff --git a/www/chromium/files/patch-media_audio_audio__input__device.cc b/www/chromium/files/patch-media_audio_audio__input__device.cc index 7f12cbe4c484..ed884fcfed42 100644 --- a/www/chromium/files/patch-media_audio_audio__input__device.cc +++ b/www/chromium/files/patch-media_audio_audio__input__device.cc @@ -1,6 +1,6 @@ ---- media/audio/audio_input_device.cc.orig 2021-05-12 22:05:55 UTC +--- media/audio/audio_input_device.cc.orig 2021-07-19 18:45:18 UTC +++ media/audio/audio_input_device.cc -@@ -254,7 +254,7 @@ void AudioInputDevice::OnStreamCreated( +@@ -253,7 +253,7 @@ void AudioInputDevice::OnStreamCreated( // here. See comments in AliveChecker and PowerObserverHelper for details and // todos. if (detect_dead_stream_ == DeadStreamDetection::kEnabled) { diff --git a/www/chromium/files/patch-media_base_media__switches.cc b/www/chromium/files/patch-media_base_media__switches.cc index 08d6e8514ebf..f05a9c5e74f7 100644 --- a/www/chromium/files/patch-media_base_media__switches.cc +++ b/www/chromium/files/patch-media_base_media__switches.cc @@ -1,6 +1,15 @@ ---- media/base/media_switches.cc.orig 2021-05-12 22:05:55 UTC +--- media/base/media_switches.cc.orig 2021-07-19 18:45:18 UTC +++ media/base/media_switches.cc -@@ -379,7 +379,7 @@ const base::Feature kGav1VideoDecoder{"Gav1VideoDecode +@@ -9,7 +9,7 @@ + #include "build/chromeos_buildflags.h" + #include "components/system_media_controls/linux/buildflags/buildflags.h" + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "base/cpu.h" + #endif + +@@ -388,7 +388,7 @@ const base::Feature kGav1VideoDecoder{"Gav1VideoDecode // Show toolbar button that opens dialog for controlling media sessions. const base::Feature kGlobalMediaControls { "GlobalMediaControls", @@ -9,7 +18,7 @@ BUILDFLAG(IS_CHROMEOS_LACROS) base::FEATURE_ENABLED_BY_DEFAULT #else -@@ -421,7 +421,7 @@ const base::Feature kGlobalMediaControlsOverlayControl +@@ -430,7 +430,7 @@ const base::Feature kGlobalMediaControlsOverlayControl // Show picture-in-picture button in Global Media Controls. const base::Feature kGlobalMediaControlsPictureInPicture { "GlobalMediaControlsPictureInPicture", @@ -18,7 +27,7 @@ BUILDFLAG(IS_CHROMEOS_LACROS) base::FEATURE_ENABLED_BY_DEFAULT #else -@@ -463,7 +463,7 @@ const base::Feature kUseR16Texture{"use-r16-texture", +@@ -472,7 +472,7 @@ const base::Feature kUseR16Texture{"use-r16-texture", const base::Feature kUnifiedAutoplay{"UnifiedAutoplay", base::FEATURE_ENABLED_BY_DEFAULT}; @@ -27,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", -@@ -471,7 +471,7 @@ const base::Feature kVaapiVideoDecodeLinux{"VaapiVideo +@@ -480,7 +480,7 @@ const base::Feature kVaapiVideoDecodeLinux{"VaapiVideo const base::Feature kVaapiVideoEncodeLinux{"VaapiVideoEncoder", base::FEATURE_DISABLED_BY_DEFAULT}; @@ -36,3 +45,12 @@ // Enable VA-API hardware decode acceleration for AV1. const base::Feature kVaapiAV1Decoder{"VaapiAV1Decoder", +@@ -884,7 +884,7 @@ bool IsLiveCaptionFeatureEnabled() { + return false; + #endif + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + if (base::FeatureList::IsEnabled(media::kUseSodaForLiveCaption)) { + // Check if the CPU has the required instruction set to run the Speech + // On-Device API (SODA) library. diff --git a/www/chromium/files/patch-media_base_media__switches.h b/www/chromium/files/patch-media_base_media__switches.h index da7306901b73..a752d349f688 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-05-12 22:05:55 UTC +--- media/base/media_switches.h.orig 2021-07-19 18:45:18 UTC +++ media/base/media_switches.h -@@ -179,10 +179,10 @@ MEDIA_EXPORT extern const base::Feature kUseFakeDevice +@@ -181,10 +181,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 c3857eb28113..70aa9955ae86 100644 --- a/www/chromium/files/patch-media_base_video__frame.cc +++ b/www/chromium/files/patch-media_base_video__frame.cc @@ -1,4 +1,4 @@ ---- media/base/video_frame.cc.orig 2021-05-12 22:05:55 UTC +--- media/base/video_frame.cc.orig 2021-07-19 18:45:18 UTC +++ media/base/video_frame.cc @@ -60,7 +60,7 @@ std::string VideoFrame::StorageTypeToString( return "OWNED_MEMORY"; @@ -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 base::Optional<VideoFrameLayout> GetDefaultLayo +@@ -265,7 +265,7 @@ static absl::optional<VideoFrameLayout> GetDefaultLayo return VideoFrameLayout::CreateWithPlanes(format, coded_size, planes); } @@ -36,7 +36,7 @@ // static bool VideoFrame::IsValidConfig(VideoPixelFormat format, -@@ -623,7 +623,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM +@@ -598,7 +598,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() || -@@ -668,7 +668,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM +@@ -643,7 +643,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM return frame; } @@ -54,7 +54,7 @@ // static scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs( const VideoFrameLayout& layout, -@@ -891,7 +891,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame( +@@ -866,7 +866,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_; -@@ -1242,7 +1242,7 @@ const gpu::MailboxHolder& VideoFrame::mailbox_holder( +@@ -1218,7 +1218,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); -@@ -1327,7 +1327,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout, +@@ -1304,7 +1304,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 68b0710d80ba..5b8e1ce39807 100644 --- a/www/chromium/files/patch-media_base_video__frame.h +++ b/www/chromium/files/patch-media_base_video__frame.h @@ -1,6 +1,6 @@ ---- media/base/video_frame.h.orig 2021-05-12 22:05:55 UTC +--- media/base/video_frame.h.orig 2021-07-19 18:45:18 UTC +++ media/base/video_frame.h -@@ -40,9 +40,9 @@ +@@ -39,9 +39,9 @@ #include "base/mac/scoped_cftyperef.h" #endif // defined(OS_MAC) @@ -12,7 +12,7 @@ namespace gfx { class GpuMemoryBuffer; -@@ -82,7 +82,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -81,7 +81,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte STORAGE_UNOWNED_MEMORY = 2, // External, non owned data pointers. STORAGE_OWNED_MEMORY = 3, // VideoFrame has allocated its own data buffer. STORAGE_SHMEM = 4, // Backed by unsafe (writable) shared memory. @@ -21,7 +21,7 @@ // 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 -@@ -259,7 +259,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -263,7 +263,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte ReleaseMailboxCB mailbox_holder_release_cb, base::TimeDelta timestamp); @@ -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 -@@ -515,7 +515,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -519,7 +519,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 -@@ -697,7 +697,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -718,7 +718,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 5d462771fef8..5b9d79680945 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-04-14 18:41:05 UTC +--- 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 @@ -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" -@@ -80,7 +80,7 @@ CreateChromeOSVideoCaptureDeviceFactory( +@@ -58,7 +58,7 @@ CreateFakeVideoCaptureDeviceFactory() { std::unique_ptr<VideoCaptureDeviceFactory> CreatePlatformSpecificVideoCaptureDeviceFactory( scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) { @@ -17,4 +17,4 @@ +#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) return std::make_unique<VideoCaptureDeviceFactoryLinux>(ui_task_runner); #elif BUILDFLAG(IS_CHROMEOS_ASH) - return CreateChromeOSVideoCaptureDeviceFactory(ui_task_runner); + return std::make_unique<VideoCaptureDeviceFactoryChromeOS>(ui_task_runner); diff --git a/www/chromium/files/patch-media_capture_video_file__video__capture__device__factory.cc b/www/chromium/files/patch-media_capture_video_file__video__capture__device__factory.cc index 3eae180bb49d..73c6a118c486 100644 --- a/www/chromium/files/patch-media_capture_video_file__video__capture__device__factory.cc +++ b/www/chromium/files/patch-media_capture_video_file__video__capture__device__factory.cc @@ -1,6 +1,6 @@ ---- media/capture/video/file_video_capture_device_factory.cc.orig 2021-04-14 18:41:05 UTC +--- media/capture/video/file_video_capture_device_factory.cc.orig 2021-07-19 18:45:18 UTC +++ media/capture/video/file_video_capture_device_factory.cc -@@ -53,7 +53,7 @@ void FileVideoCaptureDeviceFactory::GetDevicesInfo( +@@ -52,7 +52,7 @@ void FileVideoCaptureDeviceFactory::GetDevicesInfo( VideoCaptureApi::WIN_DIRECT_SHOW; #elif defined(OS_MAC) VideoCaptureApi::MACOSX_AVFOUNDATION; diff --git a/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc b/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc index e3426b41f3ab..99ff745c5747 100644 --- a/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc +++ b/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc @@ -1,6 +1,6 @@ ---- media/capture/video/video_capture_device_client.cc.orig 2021-04-14 18:41:05 UTC +--- media/capture/video/video_capture_device_client.cc.orig 2021-07-19 18:45:18 UTC +++ media/capture/video/video_capture_device_client.cc -@@ -319,7 +319,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData( +@@ -320,7 +320,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData( // see http://linuxtv.org/downloads/v4l-dvb-apis/packed-rgb.html. // Windows RGB24 defines blue at lowest byte, // see https://msdn.microsoft.com/en-us/library/windows/desktop/dd407253 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 f24be27eca29..e76a07f84f8b 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-05-12 22:05:56 UTC +--- 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 -@@ -643,7 +643,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa +@@ -648,7 +648,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 766aa7f3e841..e43603f4e54d 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-05-12 22:05:56 UTC +--- media/video/video_encode_accelerator_adapter.cc.orig 2021-07-19 18:45:18 UTC +++ media/video/video_encode_accelerator_adapter.cc -@@ -67,7 +67,7 @@ VideoEncodeAccelerator::Config SetUpVeaConfig( +@@ -69,7 +69,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) -@@ -209,7 +209,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal +@@ -211,7 +211,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 9ec416f93d34..55a1edd588de 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-05-12 22:05:56 UTC +--- media/video/video_encode_accelerator_adapter_test.cc.orig 2021-07-19 18:45:18 UTC +++ media/video/video_encode_accelerator_adapter_test.cc -@@ -329,7 +329,7 @@ TEST_P(VideoEncodeAcceleratorAdapterTest, TwoFramesRes +@@ -328,7 +328,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_c_system_thunks.cc b/www/chromium/files/patch-mojo_public_c_system_thunks.cc index 354cd1873335..95fd459e0170 100644 --- a/www/chromium/files/patch-mojo_public_c_system_thunks.cc +++ b/www/chromium/files/patch-mojo_public_c_system_thunks.cc @@ -1,4 +1,4 @@ ---- mojo/public/c/system/thunks.cc.orig 2021-04-14 18:41:06 UTC +--- mojo/public/c/system/thunks.cc.orig 2021-07-19 18:45:18 UTC +++ mojo/public/c/system/thunks.cc @@ -20,7 +20,7 @@ #include "mojo/public/c/system/core.h" @@ -8,7 +8,7 @@ +#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) #include "base/environment.h" #include "base/files/file_path.h" - #include "base/optional.h" + #include "base/scoped_native_library.h" @@ -68,7 +68,7 @@ class CoreLibraryInitializer { ~CoreLibraryInitializer() = default; @@ -41,6 +41,6 @@ private: -#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) +#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) - base::Optional<base::ScopedNativeLibrary> library_; + absl::optional<base::ScopedNativeLibrary> library_; #endif }; diff --git a/www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd b/www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd index dd62f0f480c3..efe70eda6459 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-05-12 22:05:56 UTC +--- mojo/public/js/mojo_bindings_resources.grd.orig 2021-07-19 18:45:18 UTC +++ mojo/public/js/mojo_bindings_resources.grd -@@ -90,7 +90,7 @@ +@@ -95,7 +95,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 769e55fee99c..1fdcf32f98fa 100644 --- a/www/chromium/files/patch-net_BUILD.gn +++ b/www/chromium/files/patch-net_BUILD.gn @@ -1,4 +1,4 @@ ---- net/BUILD.gn.orig 2021-05-12 22:05:57 UTC +--- net/BUILD.gn.orig 2021-07-19 18:45:19 UTC +++ net/BUILD.gn @@ -100,7 +100,7 @@ net_configs = [ "//build/config/compiler:wexit_time_destructors", @@ -9,42 +9,47 @@ net_configs += [ "//build/config/linux:libresolv" ] } -@@ -1242,6 +1242,16 @@ component("net") { - ] - } +@@ -1208,7 +1208,7 @@ component("net") { + ] + } + +- if (is_linux || is_chromeos || is_android) { ++ if ((is_linux || is_chromeos || is_android) && !is_bsd) { + sources += [ + "base/address_tracker_linux.cc", + "base/address_tracker_linux.h", +@@ -1218,6 +1218,12 @@ component("net") { + ] + } -+ if (is_bsd) { -+ sources -= [ -+ "base/address_tracker_linux.cc", -+ "base/address_tracker_linux.h", -+ "base/network_change_notifier_linux.cc", -+ "base/network_change_notifier_linux.h", -+ "base/network_interfaces_linux.cc" -+ ] -+ } ++ if (is_bsd) { ++ sources += [ ++ "base/platform_mime_util_linux.cc", ++ ] ++ } + - if (is_mac) { - sources += [ - "base/network_notification_thread_mac.cc", -@@ -1378,7 +1388,7 @@ component("net") { - } + if (is_mac) { + sources += [ + "base/network_notification_thread_mac.cc", +@@ -1354,7 +1360,7 @@ component("net") { } + } -- if (is_android || is_chromeos_ash) { -+ if (is_android || is_chromeos_ash || is_bsd) { - sources += [ - "base/network_change_notifier_posix.cc", - "base/network_change_notifier_posix.h", -@@ -1411,7 +1421,7 @@ component("net") { - } +- if (is_android || is_chromeos_ash) { ++ if (is_android || is_chromeos_ash || is_bsd) { + sources += [ + "base/network_change_notifier_posix.cc", + "base/network_change_notifier_posix.h", +@@ -1387,7 +1393,7 @@ component("net") { + } - # Use getifaddrs() on POSIX platforms, except Linux. -- if (is_posix && !is_linux && !is_chromeos) { -+ if ((is_posix && !is_linux && !is_chromeos) || is_bsd) { - sources += [ - "base/network_interfaces_getifaddrs.cc", - "base/network_interfaces_getifaddrs.h", -@@ -4748,7 +4758,7 @@ test("net_unittests") { + # Use getifaddrs() on POSIX platforms, except Linux. +- if (is_posix && !is_linux && !is_chromeos) { ++ if ((is_posix && !is_linux && !is_chromeos) || is_bsd) { + sources += [ + "base/network_interfaces_getifaddrs.cc", + "base/network_interfaces_getifaddrs.h", +@@ -4708,7 +4714,7 @@ test("net_unittests") { } # Use getifaddrs() on POSIX platforms, except Linux and Android. diff --git a/www/chromium/files/patch-net_base_network__change__notifier.cc b/www/chromium/files/patch-net_base_network__change__notifier.cc index 301736f1b94c..f09f0d4d3f07 100644 --- a/www/chromium/files/patch-net_base_network__change__notifier.cc +++ b/www/chromium/files/patch-net_base_network__change__notifier.cc @@ -1,4 +1,4 @@ ---- net/base/network_change_notifier.cc.orig 2021-04-14 18:41:06 UTC +--- net/base/network_change_notifier.cc.orig 2021-07-19 18:45:19 UTC +++ net/base/network_change_notifier.cc @@ -38,7 +38,7 @@ #include "net/base/network_change_notifier_linux.h" @@ -19,3 +19,21 @@ #else NOTIMPLEMENTED(); return NULL; +@@ -435,7 +438,7 @@ const char* NetworkChangeNotifier::ConnectionTypeToStr + return kConnectionTypeNames[type]; + } + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + // static + const internal::AddressTrackerLinux* + NetworkChangeNotifier::GetAddressTracker() { +@@ -773,7 +776,7 @@ NetworkChangeNotifier::NetworkChangeNotifier( + can_add_observers_ = true; + } + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + const internal::AddressTrackerLinux* + NetworkChangeNotifier::GetAddressTrackerInternal() const { + return NULL; diff --git a/www/chromium/files/patch-net_base_network__change__notifier.h b/www/chromium/files/patch-net_base_network__change__notifier.h new file mode 100644 index 000000000000..635ad6897bd0 --- /dev/null +++ b/www/chromium/files/patch-net_base_network__change__notifier.h @@ -0,0 +1,20 @@ +--- net/base/network_change_notifier.h.orig 2021-07-28 11:56:28 UTC ++++ net/base/network_change_notifier.h +@@ -415,7 +415,7 @@ class NET_EXPORT NetworkChangeNotifier { + // Chrome net code. + static SystemDnsConfigChangeNotifier* GetSystemDnsConfigNotifier(); + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + // Returns the AddressTrackerLinux if present. + static const internal::AddressTrackerLinux* GetAddressTracker(); + #endif +@@ -571,7 +571,7 @@ class NET_EXPORT NetworkChangeNotifier { + SystemDnsConfigChangeNotifier* system_dns_config_notifier = nullptr, + bool omit_observers_in_constructor_for_testing = false); + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + // Returns the AddressTrackerLinux if present. + // TODO(szym): Retrieve AddressMap from NetworkState. http://crbug.com/144212 + virtual const internal::AddressTrackerLinux* diff --git a/www/chromium/files/patch-net_cert_cert__verifier.cc b/www/chromium/files/patch-net_cert_cert__verifier.cc index d9bf78a4a2f0..1d99d2e5abf8 100644 --- a/www/chromium/files/patch-net_cert_cert__verifier.cc +++ b/www/chromium/files/patch-net_cert_cert__verifier.cc @@ -1,8 +1,8 @@ ---- net/cert/cert_verifier.cc.orig 2021-04-14 18:41:06 UTC +--- net/cert/cert_verifier.cc.orig 2021-07-19 18:45:19 UTC +++ net/cert/cert_verifier.cc -@@ -87,7 +87,7 @@ std::unique_ptr<CertVerifier> CertVerifier::CreateDefa - return std::unique_ptr<CertVerifier>(); - #else +@@ -78,7 +78,7 @@ bool CertVerifier::RequestParams::operator<( + std::unique_ptr<CertVerifier> CertVerifier::CreateDefaultWithoutCaching( + scoped_refptr<CertNetFetcher> cert_net_fetcher) { scoped_refptr<CertVerifyProc> verify_proc; -#if defined(OS_FUCHSIA) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_FUCHSIA) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) 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 f1321276e7c3..c25aaa3115be 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-04-14 18:41:06 UTC +--- net/cert/cert_verify_proc.cc.orig 2021-07-19 18:45:19 UTC +++ net/cert/cert_verify_proc.cc -@@ -493,7 +493,7 @@ base::Value CertVerifyParams(X509Certificate* cert, +@@ -494,7 +494,7 @@ base::Value CertVerifyParams(X509Certificate* cert, } // namespace diff --git a/www/chromium/files/patch-net_cert_test__root__certs.h b/www/chromium/files/patch-net_cert_test__root__certs.h deleted file mode 100644 index f711304cf4be..000000000000 --- a/www/chromium/files/patch-net_cert_test__root__certs.h +++ /dev/null @@ -1,26 +0,0 @@ ---- net/cert/test_root_certs.h.orig 2021-04-14 18:41:06 UTC -+++ net/cert/test_root_certs.h -@@ -75,7 +75,7 @@ class NET_EXPORT TestRootCerts { - // engine is appropriate. The caller is responsible for freeing the - // returned HCERTCHAINENGINE. - HCERTCHAINENGINE GetChainEngine() const; --#elif defined(OS_FUCHSIA) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#elif defined(OS_BSD) || defined(OS_FUCHSIA) || defined(OS_LINUX) || defined(OS_CHROMEOS) - TrustStore* test_trust_store() { return &test_trust_store_; } - #endif - -@@ -93,12 +93,12 @@ class NET_EXPORT TestRootCerts { - #elif defined(OS_APPLE) - base::ScopedCFTypeRef<CFMutableArrayRef> temporary_roots_; - TrustStoreInMemory test_trust_store_; --#elif defined(OS_FUCHSIA) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#elif defined(OS_BSD) || defined(OS_FUCHSIA) || defined(OS_LINUX) || defined(OS_CHROMEOS) - TrustStoreInMemory test_trust_store_; - #endif - - #if defined(OS_WIN) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || \ -- defined(OS_LINUX) || defined(OS_CHROMEOS) -+ defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - // True if there are no temporarily trusted root certificates. - bool empty_ = true; - #endif diff --git a/www/chromium/files/patch-net_dns_BUILD.gn b/www/chromium/files/patch-net_dns_BUILD.gn index d90a2991b4c3..de2a4effb563 100644 --- a/www/chromium/files/patch-net_dns_BUILD.gn +++ b/www/chromium/files/patch-net_dns_BUILD.gn @@ -1,11 +1,11 @@ ---- net/dns/BUILD.gn.orig 2021-06-11 08:54:45 UTC +--- net/dns/BUILD.gn.orig 2021-07-19 18:45:19 UTC +++ net/dns/BUILD.gn -@@ -114,7 +114,7 @@ source_set("dns") { - "dns_config_service_android.cc", - "dns_config_service_android.h", - ] -- } else if (is_linux) { -+ } else if (is_linux && !is_bsd) { - sources += [ - "dns_config_service_linux.cc", - "dns_config_service_linux.h", +@@ -110,7 +110,7 @@ source_set("dns") { + "dns_config_service_android.cc", + "dns_config_service_android.h", + ] +- } else if (is_linux) { ++ } else if (is_linux && !is_bsd) { + sources += [ + "dns_config_service_linux.cc", + "dns_config_service_linux.h", diff --git a/www/chromium/files/patch-net_dns_dns__util.cc b/www/chromium/files/patch-net_dns_dns__util.cc index 2d25398c12d9..4453cb52e222 100644 --- a/www/chromium/files/patch-net_dns_dns__util.cc +++ b/www/chromium/files/patch-net_dns_dns__util.cc @@ -1,11 +1,11 @@ ---- net/dns/dns_util.cc.orig 2021-04-14 18:41:07 UTC +--- net/dns/dns_util.cc.orig 2021-07-19 18:45:19 UTC +++ net/dns/dns_util.cc @@ -28,6 +28,8 @@ - #include "net/third_party/uri_template/uri_template.h" + #include "third_party/abseil-cpp/absl/types/optional.h" #include "url/url_canon.h" +#include <sys/socket.h> + #if defined(OS_POSIX) #include <netinet/in.h> - #if !defined(OS_NACL) + #include <net/if.h> diff --git a/www/chromium/files/patch-net_nqe_network__quality__estimator.cc b/www/chromium/files/patch-net_nqe_network__quality__estimator.cc index a95e0fb7179a..4107f2f5eda2 100644 --- a/www/chromium/files/patch-net_nqe_network__quality__estimator.cc +++ b/www/chromium/files/patch-net_nqe_network__quality__estimator.cc @@ -1,6 +1,6 @@ ---- net/nqe/network_quality_estimator.cc.orig 2021-05-12 22:05:57 UTC +--- net/nqe/network_quality_estimator.cc.orig 2021-07-19 18:45:19 UTC +++ net/nqe/network_quality_estimator.cc -@@ -110,7 +110,7 @@ nqe::internal::NetworkID DoGetCurrentNetworkID( +@@ -109,7 +109,7 @@ nqe::internal::NetworkID DoGetCurrentNetworkID( case NetworkChangeNotifier::ConnectionType::CONNECTION_ETHERNET: break; case NetworkChangeNotifier::ConnectionType::CONNECTION_WIFI: 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 09d20182d1b7..ecfe40f88d54 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-05-12 22:05:57 UTC +--- net/proxy_resolution/proxy_config_service_linux.cc.orig 2021-07-19 18:45:19 UTC +++ net/proxy_resolution/proxy_config_service_linux.cc @@ -6,7 +6,9 @@ @@ -10,15 +10,15 @@ #include <unistd.h> #include <map> -@@ -512,6 +514,7 @@ int StringToIntOrDefault(base::StringPiece value, int - return default_value; +@@ -504,6 +506,7 @@ bool SettingGetterImplGSettings::CheckVersion( } + #endif // defined(USE_GIO) +#if !defined(OS_BSD) - // This is the KDE version that reads kioslaverc and simulates gsettings. - // Doing this allows the main Delegate code, as well as the unit tests - // for it, to stay the same - and the settings map fairly well besides. -@@ -1002,6 +1005,7 @@ class SettingGetterImplKDE : public ProxyConfigService + // 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 DISALLOW_COPY_AND_ASSIGN(SettingGetterImplKDE); }; @@ -26,12 +26,13 @@ } // namespace -@@ -1216,8 +1220,10 @@ ProxyConfigServiceLinux::Delegate::Delegate( +@@ -1217,9 +1221,11 @@ ProxyConfigServiceLinux::Delegate::Delegate( case base::nix::DESKTOP_ENVIRONMENT_KDE3: case base::nix::DESKTOP_ENVIRONMENT_KDE4: case base::nix::DESKTOP_ENVIRONMENT_KDE5: +#if !defined(OS_BSD) - setting_getter_.reset(new SettingGetterImplKDE(env_var_getter_.get())); + setting_getter_ = + std::make_unique<SettingGetterImplKDE>(env_var_getter_.get()); break; +#endif case base::nix::DESKTOP_ENVIRONMENT_XFCE: diff --git a/www/chromium/files/patch-net_socket_udp__socket__posix.cc b/www/chromium/files/patch-net_socket_udp__socket__posix.cc index bf286e78bd68..bd1b06bf26e4 100644 --- a/www/chromium/files/patch-net_socket_udp__socket__posix.cc +++ b/www/chromium/files/patch-net_socket_udp__socket__posix.cc @@ -1,6 +1,6 @@ ---- net/socket/udp_socket_posix.cc.orig 2021-05-12 22:05:57 UTC +--- net/socket/udp_socket_posix.cc.orig 2021-07-19 18:45:19 UTC +++ net/socket/udp_socket_posix.cc -@@ -74,6 +74,32 @@ const int kActivityMonitorMinimumSamplesForThroughputE +@@ -76,6 +76,32 @@ const int kActivityMonitorMinimumSamplesForThroughputE const base::TimeDelta kActivityMonitorMsThreshold = base::TimeDelta::FromMilliseconds(100); @@ -33,7 +33,7 @@ #if defined(OS_MAC) // On OSX the file descriptor is guarded to detect the cause of -@@ -622,13 +648,13 @@ int UDPSocketPosix::SetDoNotFragment() { +@@ -626,13 +652,13 @@ int UDPSocketPosix::SetDoNotFragment() { } void UDPSocketPosix::SetMsgConfirm(bool confirm) { @@ -49,7 +49,7 @@ } int UDPSocketPosix::AllowAddressReuse() { -@@ -920,7 +946,11 @@ int UDPSocketPosix::SetMulticastOptions() { +@@ -927,7 +953,11 @@ int UDPSocketPosix::SetMulticastOptions() { mreq.imr_ifindex = multicast_interface_; mreq.imr_address.s_addr = htonl(INADDR_ANY); int rv = setsockopt(socket_, IPPROTO_IP, IP_MULTICAST_IF, @@ -61,7 +61,7 @@ if (rv) return MapSystemError(errno); break; -@@ -1021,9 +1051,18 @@ int UDPSocketPosix::LeaveGroup(const IPAddress& group_ +@@ -1028,9 +1058,18 @@ int UDPSocketPosix::LeaveGroup(const IPAddress& group_ case IPAddress::kIPv4AddressSize: { if (addr_family_ != AF_INET) return ERR_ADDRESS_INVALID; diff --git a/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc b/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc index 6e38f1c09971..2707eb75e91a 100644 --- a/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc +++ b/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc @@ -1,4 +1,4 @@ ---- net/tools/cert_verify_tool/cert_verify_tool.cc.orig 2021-04-14 18:41:07 UTC +--- net/tools/cert_verify_tool/cert_verify_tool.cc.orig 2021-07-19 18:45:19 UTC +++ net/tools/cert_verify_tool/cert_verify_tool.cc @@ -29,7 +29,7 @@ #include "net/url_request/url_request_context_builder.h" @@ -18,7 +18,7 @@ // On Linux, use a fixed ProxyConfigService, since the default one // depends on glib. // -@@ -192,7 +192,7 @@ std::unique_ptr<CertVerifyImpl> CreateCertVerifyImplFr +@@ -183,7 +183,7 @@ std::unique_ptr<CertVerifyImpl> CreateCertVerifyImplFr base::StringPiece impl_name, scoped_refptr<net::CertNetFetcher> cert_net_fetcher, bool use_system_roots) { diff --git a/www/chromium/files/patch-net_tools_quic_quic__http__proxy__backend.cc b/www/chromium/files/patch-net_tools_quic_quic__http__proxy__backend.cc index 0b5e2eb7c30e..cfbd37439911 100644 --- a/www/chromium/files/patch-net_tools_quic_quic__http__proxy__backend.cc +++ b/www/chromium/files/patch-net_tools_quic_quic__http__proxy__backend.cc @@ -1,6 +1,6 @@ ---- net/tools/quic/quic_http_proxy_backend.cc.orig 2021-04-14 18:41:07 UTC +--- net/tools/quic/quic_http_proxy_backend.cc.orig 2021-07-19 18:45:19 UTC +++ net/tools/quic/quic_http_proxy_backend.cc -@@ -162,7 +162,7 @@ void QuicHttpProxyBackend::InitializeURLRequestContext +@@ -161,7 +161,7 @@ void QuicHttpProxyBackend::InitializeURLRequestContext // Enable HTTP2, but disable QUIC on the backend context_builder.SetSpdyAndQuicEnabled(true /* http2 */, false /* quic */); diff --git a/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc b/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc index 5f7c80253a9d..bbae0e27e20a 100644 --- a/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc +++ b/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc @@ -1,6 +1,6 @@ ---- pdf/pdfium/pdfium_engine.cc.orig 2021-05-12 22:05:58 UTC +--- pdf/pdfium/pdfium_engine.cc.orig 2021-07-19 18:45:19 UTC +++ pdf/pdfium/pdfium_engine.cc -@@ -77,7 +77,7 @@ +@@ -84,7 +84,7 @@ #include "v8/include/cppgc/platform.h" #endif @@ -9,7 +9,7 @@ #include "pdf/pdfium/pdfium_font_linux.h" #endif -@@ -511,7 +511,7 @@ void InitializeSDK(bool enable_v8) { +@@ -514,7 +514,7 @@ void InitializeSDK(bool enable_v8) { FPDF_InitLibraryWithConfig(&config); @@ -18,7 +18,7 @@ InitializeLinuxFontMapper(); #endif -@@ -542,7 +542,7 @@ PDFiumEngine::PDFiumEngine(PDFEngine::Client* client, +@@ -545,7 +545,7 @@ PDFiumEngine::PDFiumEngine(PDFEngine::Client* client, IFSDK_PAUSE::user = nullptr; IFSDK_PAUSE::NeedToPauseNow = Pause_NeedToPauseNow; @@ -27,7 +27,7 @@ // PreviewModeClient does not know its pp::Instance. SetLastInstance(client_->GetPluginInstance()); #endif -@@ -999,7 +999,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesAsRasterPdf( +@@ -1003,7 +1003,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesAsRasterPdf( KillFormFocus(); @@ -36,7 +36,7 @@ SetLastInstance(client_->GetPluginInstance()); #endif -@@ -3132,7 +3132,7 @@ bool PDFiumEngine::ContinuePaint(int progressive_index +@@ -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(); @@ -45,7 +45,7 @@ SetLastInstance(client_->GetPluginInstance()); #endif -@@ -3620,7 +3620,7 @@ void PDFiumEngine::SetCurrentPage(int index) { +@@ -3643,7 +3643,7 @@ void PDFiumEngine::SetCurrentPage(int index) { FORM_DoPageAAction(old_page, form(), FPDFPAGE_AACTION_CLOSE); } most_visible_page_ = index; diff --git a/www/chromium/files/patch-printing_BUILD.gn b/www/chromium/files/patch-printing_BUILD.gn index 1969545fbf08..123fa4fee5fa 100644 --- a/www/chromium/files/patch-printing_BUILD.gn +++ b/www/chromium/files/patch-printing_BUILD.gn @@ -1,7 +1,7 @@ ---- printing/BUILD.gn.orig 2021-06-10 12:12:00 UTC +--- printing/BUILD.gn.orig 2021-07-19 18:45:19 UTC +++ printing/BUILD.gn -@@ -48,7 +48,7 @@ if (use_cups_ipp && is_chromeos_ash) { - } +@@ -65,7 +65,7 @@ component("printing_base") { + ] } -if (is_linux || is_chromeos) { @@ -9,8 +9,8 @@ source_set("printing_sandbox_hook") { sources = [ "sandbox/print_backend_sandbox_hook_linux.cc", -@@ -297,7 +297,7 @@ component("printing") { - ] +@@ -213,7 +213,7 @@ component("printing") { + } } - if (is_linux || is_chromeos) { diff --git a/www/chromium/files/patch-printing_backend_cups__helper.cc b/www/chromium/files/patch-printing_backend_cups__helper.cc deleted file mode 100644 index 6f3d809262b3..000000000000 --- a/www/chromium/files/patch-printing_backend_cups__helper.cc +++ /dev/null @@ -1,38 +0,0 @@ ---- printing/backend/cups_helper.cc.orig 2021-06-10 11:43:23 UTC -+++ printing/backend/cups_helper.cc -@@ -24,7 +24,7 @@ - #include "printing/units.h" - #include "url/gurl.h" - --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) - #include <unistd.h> - - #include "base/files/scoped_file.h" -@@ -578,7 +578,7 @@ bool ParsePpdCapabilities(cups_dest_t* dest, - base::StringPiece printer_capabilities, - PrinterSemanticCapsAndDefaults* printer_info) { - base::FilePath ppd_file_path; --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) - // A file created while in a sandbox will be automatically deleted once all - // handles to it have been closed. This precludes the use of multiple - // operations against a file path. -@@ -625,7 +625,7 @@ bool ParsePpdCapabilities(cups_dest_t* dest, - ppd_status_t ppd_status = ppdLastError(&line); - LOG(ERROR) << "Failed to open PDD file: error " << ppd_status << " at line " - << line << ", " << ppdErrorString(ppd_status); --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) - if (ppd_status != PPD_FILE_OPEN_ERROR) { - // When the error is not from opening the file then the CUPS library - // internals will have already closed the file descriptor. It is -@@ -716,7 +716,7 @@ bool ParsePpdCapabilities(cups_dest_t* dest, - } - - ppdClose(ppd); --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) - // The CUPS library internals close the file descriptor upon successfully - // reading it. Explicitly release the `ScopedFD` to prevent a crash caused - // by a bad file descriptor. diff --git a/www/chromium/files/patch-printing_print__settings.cc b/www/chromium/files/patch-printing_print__settings.cc index 458ed01d9f65..0a9f0f14cc02 100644 --- a/www/chromium/files/patch-printing_print__settings.cc +++ b/www/chromium/files/patch-printing_print__settings.cc @@ -1,4 +1,4 @@ ---- printing/print_settings.cc.orig 2021-04-14 18:41:07 UTC +--- printing/print_settings.cc.orig 2021-07-19 18:45:19 UTC +++ printing/print_settings.cc @@ -278,9 +278,9 @@ void PrintSettings::Clear() { #endif @@ -9,6 +9,6 @@ advanced_settings_.clear(); -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - #if BUILDFLAG(IS_CHROMEOS_ASH) + #if defined(OS_CHROMEOS) send_user_info_ = false; username_.clear(); diff --git a/www/chromium/files/patch-printing_print__settings.h b/www/chromium/files/patch-printing_print__settings.h index 1c333b09ad0d..b68fcc21d6ac 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-05-12 22:05:58 UTC +--- printing/print_settings.h.orig 2021-07-19 18:45:19 UTC +++ printing/print_settings.h @@ -19,11 +19,11 @@ #include "ui/gfx/geometry/rect.h" @@ -14,7 +14,7 @@ namespace printing { -@@ -80,9 +80,9 @@ class PRINTING_EXPORT PrintSettings { +@@ -82,9 +82,9 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings { } }; @@ -26,7 +26,7 @@ PrintSettings(); PrintSettings(const PrintSettings&) = delete; -@@ -221,12 +221,12 @@ class PRINTING_EXPORT PrintSettings { +@@ -223,12 +223,12 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings { pages_per_sheet_ = pages_per_sheet; } @@ -39,9 +39,9 @@ -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - #if BUILDFLAG(IS_CHROMEOS_ASH) + #if defined(OS_CHROMEOS) void set_send_user_info(bool send_user_info) { -@@ -320,10 +320,10 @@ class PRINTING_EXPORT PrintSettings { +@@ -322,10 +322,10 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings { // Number of pages per sheet. int pages_per_sheet_; @@ -52,5 +52,5 @@ -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - #if BUILDFLAG(IS_CHROMEOS_ASH) + #if defined(OS_CHROMEOS) // Whether to send user info. diff --git a/www/chromium/files/patch-printing_print__settings__conversion.cc b/www/chromium/files/patch-printing_print__settings__conversion.cc index c8746d07dd5e..a1cc46f226d9 100644 --- a/www/chromium/files/patch-printing_print__settings__conversion.cc +++ b/www/chromium/files/patch-printing_print__settings__conversion.cc @@ -1,22 +1,19 @@ ---- printing/print_settings_conversion.cc.orig 2021-04-14 18:41:07 UTC +--- printing/print_settings_conversion.cc.orig 2021-07-19 18:45:19 UTC +++ printing/print_settings_conversion.cc -@@ -213,8 +213,8 @@ std::unique_ptr<PrintSettings> PrintSettingsFromJobSet +@@ -211,14 +211,14 @@ std::unique_ptr<PrintSettings> PrintSettingsFromJobSet + #endif + } - // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is - // complete. --#if defined(OS_CHROMEOS) || \ -- ((defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ -+#if defined(OS_CHROMEOS) || \ -+ ((defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) && \ - defined(USE_CUPS)) +-#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && defined(USE_CUPS)) ++#if defined(OS_CHROMEOS) || ((defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_CUPS)) const base::Value* advanced_settings = job_settings.FindDictKey(kSettingAdvancedSettings); -@@ -222,7 +222,7 @@ std::unique_ptr<PrintSettings> PrintSettingsFromJobSet + if (advanced_settings) { for (const auto& item : advanced_settings->DictItems()) settings->advanced_settings().emplace(item.first, item.second.Clone()); } --#endif // defined(OS_CHROMEOS) || ((defined(OS_LINUX) || -+#endif // defined(OS_CHROMEOS) || ((defined(OS_LINUX) || defined(OS_BSD) || - // BUILDFLAG(IS_CHROMEOS_LACROS)) && defined(USE_CUPS)) +-#endif // defined(OS_CHROMEOS) || (defined(OS_LINUX) && defined(USE_CUPS)) ++#endif // defined(OS_CHROMEOS) || ((defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_CUPS)) - #if BUILDFLAG(IS_CHROMEOS_ASH) + #if defined(OS_CHROMEOS) + bool send_user_info = diff --git a/www/chromium/files/patch-printing_printing__features.h b/www/chromium/files/patch-printing_printing__features.h index a115c8611675..e9048bff0614 100644 --- a/www/chromium/files/patch-printing_printing__features.h +++ b/www/chromium/files/patch-printing_printing__features.h @@ -1,13 +1,14 @@ ---- printing/printing_features.h.orig 2021-04-14 18:41:07 UTC +--- printing/printing_features.h.orig 2021-07-19 18:45:19 UTC +++ printing/printing_features.h -@@ -34,10 +34,10 @@ PRINTING_EXPORT bool IsXpsPrintCapabilityRequired(); - PRINTING_EXPORT bool ShouldPrintUsingXps(bool source_is_pdf); +@@ -39,11 +39,11 @@ COMPONENT_EXPORT(PRINTING_BASE) + bool ShouldPrintUsingXps(bool source_is_pdf); #endif // defined(OS_WIN) -#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) - PRINTING_EXPORT extern const base::Feature kEnableOopPrintDrivers; + COMPONENT_EXPORT(PRINTING_BASE) + extern const base::Feature kEnableOopPrintDrivers; -#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) diff --git a/www/chromium/files/patch-remoting_host_host__main.cc b/www/chromium/files/patch-remoting_host_host__main.cc index ea2637c1e9c1..53d915bac659 100644 --- a/www/chromium/files/patch-remoting_host_host__main.cc +++ b/www/chromium/files/patch-remoting_host_host__main.cc @@ -1,6 +1,6 @@ ---- remoting/host/host_main.cc.orig 2021-04-14 18:41:08 UTC +--- remoting/host/host_main.cc.orig 2021-07-19 18:45:20 UTC +++ remoting/host/host_main.cc -@@ -48,9 +48,9 @@ int DesktopProcessMain(); +@@ -47,9 +47,9 @@ int DesktopProcessMain(); int FileChooserMain(); int RdpDesktopSessionMain(); #endif // defined(OS_WIN) @@ -12,7 +12,7 @@ namespace { -@@ -61,10 +61,14 @@ const char kUsageMessage[] = +@@ -60,10 +60,14 @@ const char kUsageMessage[] = "\n" "Options:\n" @@ -29,7 +29,7 @@ #if defined(OS_APPLE) " --list-audio-devices - List all audio devices and their device " -@@ -148,10 +152,10 @@ MainRoutineFn SelectMainRoutine(const std::string& pro +@@ -147,10 +151,10 @@ MainRoutineFn SelectMainRoutine(const std::string& pro } else if (process_type == kProcessTypeRdpDesktopSession) { main_routine = &RdpDesktopSessionMain; #endif // defined(OS_WIN) diff --git a/www/chromium/files/patch-remoting_host_host__settings.cc b/www/chromium/files/patch-remoting_host_host__settings.cc new file mode 100644 index 000000000000..4e69efa74688 --- /dev/null +++ b/www/chromium/files/patch-remoting_host_host__settings.cc @@ -0,0 +1,23 @@ +--- remoting/host/host_settings.cc.orig 2021-07-28 08:16:52 UTC ++++ remoting/host/host_settings.cc +@@ -13,9 +13,9 @@ + #include "remoting/host/mac/constants_mac.h" + #endif // defined(OS_APPLE) + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "remoting/host/linux/file_path_util.h" +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + namespace remoting { + +@@ -46,7 +46,7 @@ HostSettings* HostSettings::GetInstance() { + #if defined(OS_APPLE) + static const base::FilePath settings_file(kHostSettingsFilePath); + static base::NoDestructor<FileHostSettings> instance(settings_file); +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + static base::NoDestructor<FileHostSettings> instance(base::FilePath( + GetConfigDirectoryPath().Append(GetHostHash() + ".settings.json"))); + #else 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 a593c82d7abc..40df04517d44 100644 --- a/www/chromium/files/patch-remoting_host_me2me__desktop__environment.cc +++ b/www/chromium/files/patch-remoting_host_me2me__desktop__environment.cc @@ -1,6 +1,19 @@ ---- remoting/host/me2me_desktop_environment.cc.orig 2021-05-12 22:05:58 UTC +--- remoting/host/me2me_desktop_environment.cc.orig 2021-07-19 18:45:20 UTC +++ remoting/host/me2me_desktop_environment.cc -@@ -131,7 +131,7 @@ bool Me2MeDesktopEnvironment::InitializeSecurity( +@@ -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 // the local input and create the in-session UI. diff --git a/www/chromium/files/patch-remoting_host_mojo__ipc__server.cc b/www/chromium/files/patch-remoting_host_mojo__ipc__server.cc new file mode 100644 index 000000000000..6b2618134aec --- /dev/null +++ b/www/chromium/files/patch-remoting_host_mojo__ipc__server.cc @@ -0,0 +1,32 @@ +--- 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__constants.cc b/www/chromium/files/patch-remoting_host_remote__open__url__constants.cc new file mode 100644 index 000000000000..8dcbdf05a2e2 --- /dev/null +++ b/www/chromium/files/patch-remoting_host_remote__open__url__constants.cc @@ -0,0 +1,11 @@ +--- remoting/host/remote_open_url_constants.cc.orig 2021-07-28 08:18:44 UTC ++++ remoting/host/remote_open_url_constants.cc +@@ -11,7 +11,7 @@ namespace remoting { + + namespace { + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + + // The channel name on Linux is the path to a unix domain socket, so it needs + // to be an absolute path to allow the IPC client binary to be executed from 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 0eb49af0ad5f..4472794eda80 100644 --- a/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc +++ b/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc @@ -1,4 +1,4 @@ ---- remoting/host/remoting_me2me_host.cc.orig 2021-05-12 22:05:58 UTC +--- remoting/host/remoting_me2me_host.cc.orig 2021-07-19 18:45:20 UTC +++ remoting/host/remoting_me2me_host.cc @@ -119,7 +119,7 @@ #include "remoting/host/mac/permission_utils.h" @@ -41,7 +41,7 @@ // Watch for certificate changes and kill the host when changes occur std::unique_ptr<CertificateWatcher> cert_watcher_; #endif -@@ -772,7 +772,7 @@ void HostProcess::CreateAuthenticatorFactory() { +@@ -773,7 +773,7 @@ void HostProcess::CreateAuthenticatorFactory() { DCHECK(third_party_auth_config_.token_url.is_valid()); DCHECK(third_party_auth_config_.token_validation_url.is_valid()); @@ -50,7 +50,7 @@ if (!cert_watcher_) { cert_watcher_ = std::make_unique<CertificateWatcher>( base::BindRepeating(&HostProcess::ShutdownHost, this, -@@ -861,7 +861,7 @@ void HostProcess::StartOnUiThread() { +@@ -862,7 +862,7 @@ void HostProcess::StartOnUiThread() { base::BindRepeating(&HostProcess::OnPolicyUpdate, base::Unretained(this)), base::BindRepeating(&HostProcess::OnPolicyError, base::Unretained(this))); @@ -59,7 +59,7 @@ // If an audio pipe is specific on the command-line then initialize // AudioCapturerLinux to capture from it. base::FilePath audio_pipe_name = base::CommandLine::ForCurrentProcess()-> -@@ -870,7 +870,7 @@ void HostProcess::StartOnUiThread() { +@@ -871,7 +871,7 @@ void HostProcess::StartOnUiThread() { remoting::AudioCapturerLinux::InitializePipeReader( context_->audio_task_runner(), audio_pipe_name); } @@ -68,7 +68,7 @@ #if defined(OS_POSIX) base::FilePath security_key_socket_name = -@@ -919,7 +919,7 @@ void HostProcess::ShutdownOnUiThread() { +@@ -920,7 +920,7 @@ void HostProcess::ShutdownOnUiThread() { // It is now safe for the HostProcess to be deleted. self_ = nullptr; @@ -77,7 +77,7 @@ // Cause the global AudioPipeReader to be freed, otherwise the audio // thread will remain in-use and prevent the process from exiting. // TODO(wez): DesktopEnvironmentFactory should own the pipe reader. -@@ -1763,7 +1763,7 @@ void HostProcess::OnCrash(const std::string& function_ +@@ -1764,7 +1764,7 @@ void HostProcess::OnCrash(const std::string& function_ int HostProcessMain() { HOST_LOG << "Starting host process: version " << STRINGIZE(VERSION); @@ -86,7 +86,7 @@ // Initialize Xlib for multi-threaded use, allowing non-Chromium code to // use X11 safely (such as the WebRTC capturer, GTK ...) x11::InitXlib(); -@@ -1800,7 +1800,7 @@ int HostProcessMain() { +@@ -1801,7 +1801,7 @@ int HostProcessMain() { std::unique_ptr<net::NetworkChangeNotifier> network_change_notifier( net::NetworkChangeNotifier::CreateIfNeeded()); @@ -95,7 +95,7 @@ // Create an X11EventSource on all UI threads, so the global X11 connection // (x11::Connection::Get()) can dispatch X events. auto event_source = -@@ -1809,7 +1809,7 @@ int HostProcessMain() { +@@ -1810,7 +1810,7 @@ int HostProcessMain() { input_task_runner->PostTask(FROM_HERE, base::BindOnce([]() { new ui::X11EventSource(x11::Connection::Get()); })); @@ -104,7 +104,7 @@ // Create & start the HostProcess using these threads. // TODO(wez): The HostProcess holds a reference to itself until Shutdown(). -@@ -1822,11 +1822,11 @@ int HostProcessMain() { +@@ -1823,11 +1823,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 new file mode 100644 index 000000000000..c8ac0b25f86f --- /dev/null +++ b/www/chromium/files/patch-remoting_host_scoped__url__forwarder.cc @@ -0,0 +1,19 @@ +--- 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 new file mode 100644 index 000000000000..4e79015c11c4 --- /dev/null +++ b/www/chromium/files/patch-remoting_host_setup_start__host__main.cc @@ -0,0 +1,48 @@ +--- remoting/host/setup/start_host_main.cc.orig 2021-07-28 08:19:29 UTC ++++ remoting/host/setup/start_host_main.cc +@@ -32,10 +32,10 @@ + #include <unistd.h> + #endif // defined(OS_POSIX) + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "remoting/host/setup/daemon_controller_delegate_linux.h" + #include "remoting/host/setup/start_host_as_root.h" +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + #if defined(OS_WIN) + #include "base/process/process_info.h" +@@ -124,12 +124,12 @@ void OnDone(HostStarter::Result result) { + } // namespace + + int StartHostMain(int argc, char** argv) { +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Minimize the amount of code that runs as root on Posix systems. + if (getuid() == 0) { + return remoting::StartHostAsRoot(argc, argv); + } +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + // google_apis::GetOAuth2ClientID/Secret need a static CommandLine. + base::CommandLine::Init(argc, argv); +@@ -161,7 +161,7 @@ int StartHostMain(int argc, char** argv) { + // for the account which generated |code|. + std::string host_owner = command_line->GetSwitchValueASCII("host-owner"); + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + if (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) { + // controller code, and must be configured on the Linux delegate explicitly. + DaemonControllerDelegateLinux::set_start_host_after_setup(false); + } +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + #if defined(OS_WIN) + // The tool must be run elevated on Windows so the host has access to the + // directories used to store the configuration JSON files. diff --git a/www/chromium/files/patch-sandbox_policy_BUILD.gn b/www/chromium/files/patch-sandbox_policy_BUILD.gn index 39e06988de6a..fa4576ca7f0c 100644 --- a/www/chromium/files/patch-sandbox_policy_BUILD.gn +++ b/www/chromium/files/patch-sandbox_policy_BUILD.gn @@ -1,6 +1,6 @@ ---- sandbox/policy/BUILD.gn.orig 2021-06-09 22:14:06 UTC +--- sandbox/policy/BUILD.gn.orig 2021-07-19 18:45:20 UTC +++ sandbox/policy/BUILD.gn -@@ -29,7 +29,7 @@ component("policy") { +@@ -32,7 +32,7 @@ component("policy") { "//sandbox:common", ] public_deps = [] @@ -9,7 +9,7 @@ sources += [ "linux/bpf_audio_policy_linux.cc", "linux/bpf_audio_policy_linux.h", -@@ -78,6 +78,15 @@ component("policy") { +@@ -81,6 +81,15 @@ component("policy") { "//sandbox/linux:sandbox_services", "//sandbox/linux:seccomp_bpf", "//sandbox/linux:suid_sandbox_client", diff --git a/www/chromium/files/patch-sandbox_policy_switches.cc b/www/chromium/files/patch-sandbox_policy_switches.cc index 7ef50037534f..bf10a762f441 100644 --- a/www/chromium/files/patch-sandbox_policy_switches.cc +++ b/www/chromium/files/patch-sandbox_policy_switches.cc @@ -1,6 +1,6 @@ ---- sandbox/policy/switches.cc.orig 2021-05-12 22:05:58 UTC +--- sandbox/policy/switches.cc.orig 2021-07-19 18:45:20 UTC +++ sandbox/policy/switches.cc -@@ -83,7 +83,7 @@ const char kGpuSandboxFailuresFatal[] = "gpu-sandbox-f +@@ -93,7 +93,7 @@ const char kGpuSandboxFailuresFatal[] = "gpu-sandbox-f // Meant to be used as a browser-level switch for testing purposes only. const char kNoSandbox[] = "no-sandbox"; diff --git a/www/chromium/files/patch-sandbox_policy_switches.h b/www/chromium/files/patch-sandbox_policy_switches.h index bbb515944cf3..67cc68ca76ac 100644 --- a/www/chromium/files/patch-sandbox_policy_switches.h +++ b/www/chromium/files/patch-sandbox_policy_switches.h @@ -1,6 +1,6 @@ ---- sandbox/policy/switches.h.orig 2021-05-12 22:05:58 UTC +--- sandbox/policy/switches.h.orig 2021-07-19 18:45:20 UTC +++ sandbox/policy/switches.h -@@ -55,7 +55,7 @@ SANDBOX_POLICY_EXPORT extern const char kDisableSetuid +@@ -69,7 +69,7 @@ SANDBOX_POLICY_EXPORT extern const char kDisableSetuid SANDBOX_POLICY_EXPORT extern const char kGpuSandboxAllowSysVShm[]; SANDBOX_POLICY_EXPORT extern const char kGpuSandboxFailuresFatal[]; SANDBOX_POLICY_EXPORT extern const char kNoSandbox[]; diff --git a/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc b/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc index 92fa11977008..6df9248f3107 100644 --- a/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc +++ b/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc @@ -1,6 +1,6 @@ ---- services/device/geolocation/location_arbitrator.cc.orig 2021-04-14 18:41:08 UTC +--- services/device/geolocation/location_arbitrator.cc.orig 2021-07-19 18:45:20 UTC +++ services/device/geolocation/location_arbitrator.cc -@@ -162,7 +162,7 @@ LocationArbitrator::NewNetworkLocationProvider( +@@ -161,7 +161,7 @@ LocationArbitrator::NewNetworkLocationProvider( std::unique_ptr<LocationProvider> LocationArbitrator::NewSystemLocationProvider() { @@ -8,4 +8,4 @@ +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD) return nullptr; #else - return device::NewSystemLocationProvider(); + return device::NewSystemLocationProvider(main_task_runner_, 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 d5aa38b97848..a975412af2cb 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,4 +1,4 @@ ---- services/device/hid/hid_connection_freebsd.cc.orig 2021-04-15 08:13:27 UTC +--- services/device/hid/hid_connection_freebsd.cc.orig 2021-07-28 08:43:36 UTC +++ services/device/hid/hid_connection_freebsd.cc @@ -0,0 +1,241 @@ +// Copyright (c) 2014 The Chromium Authors. All rights reserved. @@ -49,8 +49,8 @@ + base::internal::AssertBlockingAllowed(); + + file_watcher_ = base::FileDescriptorWatcher::WatchReadable( -+ fd_.get(), base::Bind(&BlockingTaskRunnerHelper::OnFileCanReadWithoutBlocking, -+ base::Unretained(this))); ++ fd_.get(), base::BindRepeating(&BlockingTaskRunnerHelper::OnFileCanReadWithoutBlocking, ++ base::Unretained(this))); + } + + void Write(scoped_refptr<base::RefCountedBytes> buffer, 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 4c6d4a904196..f37a3466fcdb 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,4 +1,4 @@ ---- services/device/hid/hid_service_freebsd.cc.orig 2021-06-10 13:30:27 UTC +--- services/device/hid/hid_service_freebsd.cc.orig 2021-07-28 08:43:36 UTC +++ services/device/hid/hid_service_freebsd.cc @@ -0,0 +1,391 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. @@ -98,7 +98,7 @@ + + task_runner_->PostTask( + FROM_HERE, -+ base::Bind(&HidServiceFreeBSD::FirstEnumerationComplete, service_)); ++ base::BindOnce(&HidServiceFreeBSD::FirstEnumerationComplete, service_)); + } + + bool HaveReadWritePermissions(std::string device_id) { @@ -186,8 +186,8 @@ + base::ScopedBlockingCall scoped_blocking_call( + FROM_HERE, base::BlockingType::MAY_BLOCK); + task_runner_->PostTask( -+ FROM_HERE, base::Bind(&HidServiceFreeBSD::RemoveDevice, service_, -+ device_id)); ++ FROM_HERE, base::BindOnce(&HidServiceFreeBSD::RemoveDevice, service_, ++ device_id)); + } + + private: @@ -236,8 +236,8 @@ + + devd_fd_.reset(devd_fd); + file_watcher_ = base::FileDescriptorWatcher::WatchReadable( -+ devd_fd_.get(), base::Bind(&BlockingTaskRunnerHelper::OnDevdMessageCanBeRead, -+ base::Unretained(this))); ++ devd_fd_.get(), base::BindRepeating(&BlockingTaskRunnerHelper::OnDevdMessageCanBeRead, ++ base::Unretained(this))); + } + + void OnDevdMessageCanBeRead() { diff --git a/www/chromium/files/patch-services_network_network__context.cc b/www/chromium/files/patch-services_network_network__context.cc index 3babf4cacbec..44a757711a14 100644 --- a/www/chromium/files/patch-services_network_network__context.cc +++ b/www/chromium/files/patch-services_network_network__context.cc @@ -1,6 +1,6 @@ ---- services/network/network_context.cc.orig 2021-06-11 09:55:35 UTC +--- services/network/network_context.cc.orig 2021-07-19 18:45:20 UTC +++ services/network/network_context.cc -@@ -2331,7 +2331,7 @@ NetworkContext::MakeSessionCleanupCookieStore() const +@@ -2333,7 +2333,7 @@ NetworkContext::MakeSessionCleanupCookieStore() const net::CookieCryptoDelegate* crypto_delegate = nullptr; if (params_->enable_encrypted_cookies) { diff --git a/www/chromium/files/patch-services_network_network__service.cc b/www/chromium/files/patch-services_network_network__service.cc index 853383a096db..58e10dbe2c29 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-05-12 22:05:58 UTC +--- services/network/network_service.cc.orig 2021-07-19 18:45:20 UTC +++ services/network/network_service.cc -@@ -71,7 +71,7 @@ +@@ -72,7 +72,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 -@@ -614,7 +614,7 @@ void NetworkService::OnCertDBChanged() { +@@ -616,7 +616,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 4e8c46106889..aa7844c7dd09 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-05-12 22:05:58 UTC +--- services/network/network_service.h.orig 2021-07-19 18:45:20 UTC +++ services/network/network_service.h -@@ -155,7 +155,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService +@@ -156,7 +156,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_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc b/www/chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc index afab6d63dbdb..a3f5cb760ec4 100644 --- a/www/chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc +++ b/www/chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc @@ -1,6 +1,6 @@ ---- services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc.orig 2021-04-14 18:41:08 UTC +--- services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc.orig 2021-07-19 18:45:20 UTC +++ services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc -@@ -50,7 +50,7 @@ namespace { +@@ -51,7 +51,7 @@ namespace { uint32_t CalculatePrivateFootprintKb(const mojom::RawOSMemDump& os_dump, uint32_t shared_resident_kb) { DCHECK(os_dump.platform_private_footprint); @@ -9,7 +9,7 @@ defined(OS_FUCHSIA) uint64_t rss_anon_bytes = os_dump.platform_private_footprint->rss_anon_bytes; uint64_t vm_swap_bytes = os_dump.platform_private_footprint->vm_swap_bytes; -@@ -90,7 +90,7 @@ memory_instrumentation::mojom::OSMemDumpPtr CreatePubl +@@ -91,7 +91,7 @@ memory_instrumentation::mojom::OSMemDumpPtr CreatePubl os_dump->is_peak_rss_resettable = internal_os_dump.is_peak_rss_resettable; os_dump->private_footprint_kb = CalculatePrivateFootprintKb(internal_os_dump, shared_resident_kb); diff --git a/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__linux.cc b/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__linux.cc index 3a574794931f..d7e52946a36d 100644 --- a/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__linux.cc +++ b/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__linux.cc @@ -1,4 +1,4 @@ ---- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc.orig 2021-04-14 18:41:08 UTC +--- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc.orig 2021-07-19 18:45:20 UTC +++ services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc @@ -5,7 +5,6 @@ #include <dlfcn.h> @@ -8,7 +8,7 @@ #include <memory> -@@ -25,8 +24,14 @@ +@@ -26,8 +25,14 @@ #include "build/build_config.h" #include "services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h" diff --git a/www/chromium/files/patch-services_tracing_public_cpp_perfetto_trace__time.cc b/www/chromium/files/patch-services_tracing_public_cpp_perfetto_trace__time.cc deleted file mode 100644 index 4376cbccdf35..000000000000 --- a/www/chromium/files/patch-services_tracing_public_cpp_perfetto_trace__time.cc +++ /dev/null @@ -1,18 +0,0 @@ ---- services/tracing/public/cpp/perfetto/trace_time.cc.orig 2021-06-14 15:19:11 UTC -+++ services/tracing/public/cpp/perfetto/trace_time.cc -@@ -12,10 +12,14 @@ namespace tracing { - - int64_t TraceBootTicksNow() { - // On Windows and Mac, TRACE_TIME_TICKS_NOW() behaves like boottime already. --#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ -+#if defined(OS_BSD) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ - defined(OS_FUCHSIA) - struct timespec ts; -+#if defined(OS_BSD) -+ int res = clock_gettime(CLOCK_MONOTONIC, &ts); -+#else - int res = clock_gettime(CLOCK_BOOTTIME, &ts); -+#endif - if (res != -1) - return static_cast<int64_t>(perfetto::base::FromPosixTimespec(ts).count()); - #endif 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 78f33bf35441..4838791a7d6a 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-05-12 22:05:58 UTC +--- 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 -@@ -630,7 +630,7 @@ void TracingSamplerProfiler::TracingProfileBuilder::Sa +@@ -588,7 +588,7 @@ TracingSamplerProfiler::TracingProfileBuilder::GetCall // static void TracingSamplerProfiler::MangleModuleIDIfNeeded(std::string* module_id) { diff --git a/www/chromium/files/patch-third__party_angle_BUILD.gn b/www/chromium/files/patch-third__party_angle_BUILD.gn index 5f100d7f1765..b4d9ecfc47e1 100644 --- a/www/chromium/files/patch-third__party_angle_BUILD.gn +++ b/www/chromium/files/patch-third__party_angle_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/angle/BUILD.gn.orig 2021-05-12 22:13:33 UTC +--- third_party/angle/BUILD.gn.orig 2021-07-19 18:47:19 UTC +++ third_party/angle/BUILD.gn -@@ -201,7 +201,7 @@ config("extra_warnings") { +@@ -206,7 +206,7 @@ config("extra_warnings") { "-Wunreachable-code", "-Wshorten-64-to-32", ] @@ -8,8 +8,8 @@ + if (!use_xcode_clang && !is_bsd) { # Mac catalyst uses a clang version that doesn't have these. cflags += [ - "-Wdeprecated-copy", -@@ -454,6 +454,7 @@ angle_static_library("angle_gpu_info_util") { + "-Wsuggest-destructor-override", +@@ -470,6 +470,7 @@ angle_static_library("angle_gpu_info_util") { "X11", "Xi", "Xext", 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 9445ea98988a..1ab26752d412 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-04-14 18:42:58 UTC +--- 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 -@@ -71,10 +71,18 @@ bool GetPCIDevicesWithLibPCI(std::vector<GPUDeviceInfo +@@ -71,6 +71,15 @@ bool GetPCIDevicesWithLibPCI(std::vector<GPUDeviceInfo bool GetSystemInfo(SystemInfo *info) { @@ -8,12 +8,17 @@ + if (!CollectMesaCardInfo(&(info->gpus))) + { + if (!GetPCIDevicesFreeBSD(&(info->gpus))) -+ return false; ++ { ++ return GetSystemInfoVulkan(info); ++ } + } +#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 d055f5573118..16c6013b2407 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-04-14 18:42:58 UTC +--- third_party/angle/src/libANGLE/Display.cpp.orig 2021-07-19 18:47:19 UTC +++ third_party/angle/src/libANGLE/Display.cpp @@ -55,7 +55,7 @@ # include "libANGLE/renderer/gl/wgl/DisplayWGL.h" @@ -36,7 +36,7 @@ # if defined(ANGLE_USE_X11) if (platformType == EGL_PLATFORM_X11_EXT && rx::IsVulkanXcbDisplayAvailable()) { -@@ -1667,7 +1667,7 @@ static ClientExtensions GenerateClientExtensions() +@@ -1675,7 +1675,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 153258696df0..3e5ad6ee6a78 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-05-12 22:13:33 UTC +--- 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 @@ -17,7 +17,7 @@ # include <sys/system_properties.h> @@ -9,7 +9,7 @@ # include <sys/utsname.h> #endif -@@ -230,7 +230,7 @@ OSVersion GetMacOSVersion() +@@ -235,7 +235,7 @@ OSVersion GetMacOSVersion() } #endif @@ -18,7 +18,7 @@ bool ParseLinuxOSVersion(const char *version, int *major, int *minor, int *patch) { errno = 0; // reset global error flag. -@@ -242,6 +242,14 @@ bool ParseLinuxOSVersion(const char *version, int *maj +@@ -247,6 +247,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; -@@ -252,6 +260,7 @@ bool ParseLinuxOSVersion(const char *version, int *maj +@@ -257,6 +265,7 @@ bool ParseLinuxOSVersion(const char *version, int *maj { return false; } @@ -41,7 +41,7 @@ return true; } -@@ -259,7 +268,7 @@ bool ParseLinuxOSVersion(const char *version, int *maj +@@ -264,7 +273,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 7764d946b3ed..c6c9b8f2302d 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-05-12 22:13:33 UTC +--- 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 -@@ -165,7 +165,7 @@ inline bool IsWindows() +@@ -166,7 +166,7 @@ inline bool IsWindows() inline bool IsLinux() { 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 feb26dff359d..4eac705578d9 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-04-14 18:41:09 UTC +--- third_party/blink/public/platform/platform.h.orig 2021-07-19 18:45:21 UTC +++ third_party/blink/public/platform/platform.h -@@ -391,7 +391,7 @@ class BLINK_PLATFORM_EXPORT Platform { +@@ -430,7 +430,7 @@ class BLINK_PLATFORM_EXPORT Platform { return nullptr; } 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 2069ac9aee7e..e261d16aa845 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,6 +1,6 @@ ---- third_party/blink/renderer/controller/blink_initializer.cc.orig 2021-05-12 22:06:00 UTC +--- third_party/blink/renderer/controller/blink_initializer.cc.orig 2021-07-19 18:45:21 UTC +++ third_party/blink/renderer/controller/blink_initializer.cc -@@ -66,11 +66,11 @@ +@@ -65,11 +65,11 @@ #include "third_party/blink/renderer/controller/oom_intervention_impl.h" #endif @@ -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" -@@ -147,7 +147,7 @@ void InitializeCommon(Platform* platform, mojo::Binder +@@ -146,7 +146,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()) -@@ -212,7 +212,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder +@@ -218,7 +218,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder main_thread->GetTaskRunner()); #endif diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_clipboard_system__clipboard.cc b/www/chromium/files/patch-third__party_blink_renderer_core_clipboard_system__clipboard.cc deleted file mode 100644 index d77698ca5edc..000000000000 --- a/www/chromium/files/patch-third__party_blink_renderer_core_clipboard_system__clipboard.cc +++ /dev/null @@ -1,15 +0,0 @@ ---- third_party/blink/renderer/core/clipboard/system_clipboard.cc.orig 2021-04-14 18:41:09 UTC -+++ third_party/blink/renderer/core/clipboard/system_clipboard.cc -@@ -43,10 +43,10 @@ SystemClipboard::SystemClipboard(LocalFrame* frame) - frame->GetBrowserInterfaceBroker().GetInterface( - clipboard_.BindNewPipeAndPassReceiver( - frame->GetTaskRunner(TaskType::kUserInteraction))); --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) - is_selection_buffer_available_ = - frame->GetSettings()->GetSelectionClipboardBufferAvailable(); --#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) - } - - bool SystemClipboard::IsSelectionMode() const { 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 1b5d2c12454c..090bf822e112 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-04-14 18:41:09 UTC +--- 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 -@@ -274,7 +274,7 @@ bool EditingBehavior::ShouldInsertCharacter(const Keyb +@@ -273,7 +273,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 4ceedb20724a..15bdba549781 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-05-24 22:05:45 UTC +--- 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 -@@ -414,7 +414,7 @@ SkFontHinting RendererPreferencesToSkiaHinting( +@@ -415,7 +415,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' -@@ -3089,12 +3089,12 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs +@@ -3106,12 +3106,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 9ce59642a1b0..236a90384601 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-05-12 22:06:00 UTC +--- 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 -@@ -6057,7 +6057,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) { +@@ -6064,7 +6064,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"); -@@ -6426,7 +6426,7 @@ TEST_P(CompositedSelectionBoundsTest, SVGBasic) { +@@ -6433,7 +6433,7 @@ TEST_P(CompositedSelectionBoundsTest, SVGBasic) { TEST_P(CompositedSelectionBoundsTest, SVGTextWithFragments) { RunTest("composited_selection_bounds_svg_text_with_fragments.html"); } diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc b/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc index 253611a7712d..e67f34c46736 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2021-04-14 18:41:10 UTC +--- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2021-07-19 18:45:22 UTC +++ third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc -@@ -139,7 +139,7 @@ bool ScrollbarThemeAura::SupportsDragSnapBack() const +@@ -151,7 +151,7 @@ bool ScrollbarThemeAura::SupportsDragSnapBack() const // is true for at least GTK and QT apps). // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. @@ -9,7 +9,7 @@ return false; #else return true; -@@ -307,7 +307,7 @@ bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scr +@@ -326,7 +326,7 @@ bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scr const WebMouseEvent& event) { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. 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 e0f02a6704d4..9ff2a6862d74 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-05-12 22:06:01 UTC +--- 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 -@@ -413,7 +413,7 @@ void ProcessedLocalAudioSource::CaptureUsingProcessor( +@@ -521,7 +521,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 f87e32425587..459922a4b5a1 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-05-12 22:06:01 UTC +--- 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 -@@ -286,7 +286,7 @@ TEST_F(MAYBE_WebRtcAudioRendererTest, DISABLED_Multipl +@@ -287,7 +287,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_webaudio_audio__worklet__thread__test.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc index 3b6c959295a5..8911c7d84a36 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc.orig 2021-04-14 18:41:10 UTC +--- third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc.orig 2021-07-19 18:45:22 UTC +++ third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc -@@ -431,8 +431,8 @@ class AudioWorkletThreadPriorityTest +@@ -409,8 +409,8 @@ class AudioWorkletThreadPriorityTest base::PlatformThread::GetCurrentThreadPriority(); // TODO(crbug.com/1022888): The worklet thread priority is always NORMAL diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc index 676fa5370b72..7c6a69dca761 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-05-12 22:06:01 UTC +--- 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 -@@ -6052,7 +6052,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid +@@ -6074,7 +6074,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 25a552edbbfe..6bd04d3158c3 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-04-14 18:41:10 UTC +--- 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 -@@ -278,7 +278,7 @@ WebGLExtensionName WebGLWebCodecsVideoFrame::GetName() +@@ -280,7 +280,7 @@ WebGLExtensionName WebGLWebCodecsVideoFrame::GetName() bool WebGLWebCodecsVideoFrame::Supported(WebGLRenderingContextBase* context) { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. @@ -8,4 +8,4 @@ +#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_FUCHSIA) || defined(OS_BSD) // TODO(jie.a.chen@intel.com): Add Linux support. return false; - #else + #elif defined(OS_MAC) diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn b/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn index 18381baa54e3..ddb638988c11 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/BUILD.gn.orig 2021-04-14 18:41:10 UTC +--- third_party/blink/renderer/platform/BUILD.gn.orig 2021-07-19 18:45:22 UTC +++ third_party/blink/renderer/platform/BUILD.gn -@@ -107,6 +107,7 @@ executable("character_data_generator") { +@@ -106,6 +106,7 @@ executable("character_data_generator") { "//build/win:default_exe_manifest", "//third_party/icu", ] 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 70c18a780b48..e067330f0f04 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-05-12 22:06:01 UTC +--- 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 -@@ -84,7 +84,7 @@ extern const char kNotoColorEmojiCompat[] = "Noto Colo +@@ -83,7 +83,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 -@@ -124,7 +124,7 @@ FontCache::FontCache() +@@ -123,7 +123,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__description.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc index b4623b2a2170..b13952408515 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/fonts/font_description.cc.orig 2021-05-12 22:06:01 UTC +--- 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 -@@ -39,7 +39,7 @@ +@@ -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" @@ -9,7 +9,7 @@ #include "third_party/blink/renderer/platform/fonts/font_cache.h" #endif -@@ -258,7 +258,7 @@ FontCacheKey FontDescription::CacheKey( +@@ -257,7 +257,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_shaping_harfbuzz__shaper__test.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_shaping_harfbuzz__shaper__test.cc index 7c1fa07d4213..61c7e5809f8d 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_shaping_harfbuzz__shaper__test.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_shaping_harfbuzz__shaper__test.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/fonts/shaping/harfbuzz_shaper_test.cc.orig 2021-05-12 22:06:01 UTC +--- third_party/blink/renderer/platform/fonts/shaping/harfbuzz_shaper_test.cc.orig 2021-07-19 18:45:22 UTC +++ third_party/blink/renderer/platform/fonts/shaping/harfbuzz_shaper_test.cc -@@ -668,7 +668,7 @@ TEST_P(ShapeParameterTest, MaxGlyphsClusterDevanagari) +@@ -665,7 +665,7 @@ TEST_P(ShapeParameterTest, MaxGlyphsClusterDevanagari) HarfBuzzShaper shaper(string); scoped_refptr<ShapeResult> result = ShapeWithParameter(&shaper); EXPECT_EQ(length, result->NumCharacters()); 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 9de7722ae0f0..1916f4a367c6 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,6 +1,6 @@ ---- third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc.orig 2021-05-12 22:06:01 UTC +--- 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 -@@ -61,7 +61,7 @@ AtomicString ToAtomicString(const SkString& str) { +@@ -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. -@@ -84,7 +84,7 @@ AtomicString FontCache::GetFamilyNameForCharacter( +@@ -83,7 +83,7 @@ AtomicString FontCache::GetFamilyNameForCharacter( typeface->getFamilyName(&skia_family_name); return ToAtomicString(skia_family_name); } @@ -18,7 +18,7 @@ void FontCache::PlatformInit() {} -@@ -229,7 +229,7 @@ sk_sp<SkTypeface> FontCache::CreateTypeface( +@@ -228,7 +228,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 -@@ -256,7 +256,7 @@ std::unique_ptr<FontPlatformData> FontCache::CreateFon +@@ -255,7 +255,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 0d0ad38e66fc..57c8f5d721ae 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,6 +1,6 @@ ---- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig 2021-05-12 22:06:01 UTC +--- 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 -@@ -201,7 +201,7 @@ void VideoFrameSubmitter::OnBeginFrame( +@@ -200,7 +200,7 @@ void VideoFrameSubmitter::OnBeginFrame( if (viz::FrameTokenGT(pair.key, *next_frame_token_)) continue; auto& feedback = pair.value.presentation_feedback; diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_scheduler_common_thread.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_scheduler_common_thread.cc index 9f5a7b76fe96..640738cda00f 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_scheduler_common_thread.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_scheduler_common_thread.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/scheduler/common/thread.cc.orig 2021-04-14 18:41:11 UTC +--- third_party/blink/renderer/platform/scheduler/common/thread.cc.orig 2021-07-19 18:45:22 UTC +++ third_party/blink/renderer/platform/scheduler/common/thread.cc -@@ -96,7 +96,7 @@ void Thread::CreateAndSetCompositorThread() { +@@ -99,7 +99,7 @@ void Thread::CreateAndSetCompositorThread() { std::make_unique<scheduler::CompositorThread>(params); compositor_thread->Init(); 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 0222f6d46c92..a16ea4cc00dc 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-04-14 18:41:11 UTC +--- 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 -@@ -18,6 +18,11 @@ +@@ -17,6 +17,11 @@ extern "C" void* __libc_stack_end; // NOLINT #endif diff --git a/www/chromium/files/patch-third__party_crashpad_crashpad_client_BUILD.gn b/www/chromium/files/patch-third__party_crashpad_crashpad_client_BUILD.gn index 08b259b34c25..969a9f597693 100644 --- a/www/chromium/files/patch-third__party_crashpad_crashpad_client_BUILD.gn +++ b/www/chromium/files/patch-third__party_crashpad_crashpad_client_BUILD.gn @@ -1,7 +1,7 @@ ---- third_party/crashpad/crashpad/client/BUILD.gn.orig 2021-04-14 18:41:33 UTC +--- third_party/crashpad/crashpad/client/BUILD.gn.orig 2021-07-19 18:45:40 UTC +++ third_party/crashpad/crashpad/client/BUILD.gn -@@ -78,6 +78,12 @@ crashpad_static_library("client") { - sources += [ "crashpad_client_fuchsia.cc" ] +@@ -44,6 +44,12 @@ crashpad_static_library("client") { + ] } + if (crashpad_is_posix) { @@ -11,5 +11,5 @@ + } + if (crashpad_is_linux || crashpad_is_android || crashpad_is_fuchsia) { - sources += [ "crash_report_database_generic.cc" ] - } + sources += [ + "client_argv_handling.cc", diff --git a/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_close__multiple.cc b/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_close__multiple.cc index 9058207e9e90..b0585d4202da 100644 --- a/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_close__multiple.cc +++ b/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_close__multiple.cc @@ -1,6 +1,6 @@ ---- third_party/crashpad/crashpad/util/posix/close_multiple.cc.orig 2021-04-14 18:41:34 UTC +--- third_party/crashpad/crashpad/util/posix/close_multiple.cc.orig 2021-07-19 18:45:40 UTC +++ third_party/crashpad/crashpad/util/posix/close_multiple.cc -@@ -181,11 +181,37 @@ void CloseMultipleNowOrOnExec(int fd, int preserve_fd) +@@ -187,11 +187,37 @@ void CloseMultipleNowOrOnExec(int fd, int preserve_fd) } #endif diff --git a/www/chromium/files/patch-third__party_dawn_src_common_Platform.h b/www/chromium/files/patch-third__party_dawn_src_common_Platform.h index 94b318f64a4e..e756612aa0ba 100644 --- a/www/chromium/files/patch-third__party_dawn_src_common_Platform.h +++ b/www/chromium/files/patch-third__party_dawn_src_common_Platform.h @@ -1,6 +1,6 @@ ---- third_party/dawn/src/common/Platform.h.orig 2021-06-11 10:04:56 UTC +--- third_party/dawn/src/common/Platform.h.orig 2021-07-19 18:47:20 UTC +++ third_party/dawn/src/common/Platform.h -@@ -45,6 +45,11 @@ +@@ -53,6 +53,11 @@ # define DAWN_PLATFORM_EMSCRIPTEN 1 # define DAWN_PLATFORM_POSIX 1 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 c21f75d63dbd..d474aa97da81 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-04-14 18:43:03 UTC +--- 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 -@@ -1641,6 +1641,8 @@ class ThreadLocal : public ThreadLocalBase { +@@ -1645,6 +1645,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_)); -@@ -1657,6 +1659,7 @@ class MutexBase { +@@ -1661,6 +1663,7 @@ class MutexBase { has_owner_ = false; GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_unlock(&mutex_)); } diff --git a/www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc b/www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc index 1d01467c975c..e7f6fe7e56f9 100644 --- a/www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc +++ b/www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc @@ -1,8 +1,8 @@ ---- third_party/leveldatabase/env_chromium.cc.orig 2021-04-14 18:41:34 UTC +--- third_party/leveldatabase/env_chromium.cc.orig 2021-07-19 18:45:41 UTC +++ third_party/leveldatabase/env_chromium.cc -@@ -39,7 +39,11 @@ +@@ -38,7 +38,11 @@ + #include "third_party/leveldatabase/chromium_logger.h" #include "third_party/leveldatabase/leveldb_chrome.h" - #include "third_party/leveldatabase/leveldb_features.h" #include "third_party/leveldatabase/src/include/leveldb/options.h" +#if defined(OS_BSD) +#include <re2/re2.h> diff --git a/www/chromium/files/patch-third__party_pdfium_core_fxge_fx__ge__linux.cpp b/www/chromium/files/patch-third__party_pdfium_core_fxge_fx__ge__linux.cpp deleted file mode 100644 index c5bea28ffa9e..000000000000 --- a/www/chromium/files/patch-third__party_pdfium_core_fxge_fx__ge__linux.cpp +++ /dev/null @@ -1,29 +0,0 @@ ---- third_party/pdfium/core/fxge/fx_ge_linux.cpp.orig 2021-04-14 18:43:07 UTC -+++ third_party/pdfium/core/fxge/fx_ge_linux.cpp -@@ -17,7 +17,7 @@ - #include "third_party/base/check.h" - #include "third_party/base/stl_util.h" - --#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ASMJS) -+#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ASMJS) && !defined(OS_BSD) - #error "Included on the wrong platform" - #endif - -@@ -166,10 +166,16 @@ class CLinuxPlatform : public CFX_GEModule::PlatformIf - std::unique_ptr<SystemFontInfoIface> CreateDefaultSystemFontInfo() override { - auto pInfo = std::make_unique<CFX_LinuxFontInfo>(); - if (!pInfo->ParseFontCfg(CFX_GEModule::Get()->GetUserFontPaths())) { -+#if defined(OS_BSD) -+ pInfo->AddPath("/usr/local/share/fonts"); -+ pInfo->AddPath("/usr/local/share/X11/fonts/Type1"); -+ pInfo->AddPath("/usr/local/share/X11/fonts/TTF"); -+#else - pInfo->AddPath("/usr/share/fonts"); - pInfo->AddPath("/usr/share/X11/fonts/Type1"); - pInfo->AddPath("/usr/share/X11/fonts/TTF"); -- pInfo->AddPath("/usr/local/share/fonts"); -+ pInfo->AddPath("/usr/local/share/fonts") -+#endif - } - return pInfo; - } 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 new file mode 100644 index 000000000000..6b00d49763ba --- /dev/null +++ b/www/chromium/files/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp @@ -0,0 +1,11 @@ +--- 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 +@@ -17,7 +17,7 @@ + #include "third_party/base/check.h" + #include "third_party/base/stl_util.h" + +-#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ASMJS) ++#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ASMJS) && !defined(OS_BSD) + #error "Included on the wrong platform" + #endif + diff --git a/www/chromium/files/patch-third__party_perfetto_src_base_ctrl__c__handler.cc b/www/chromium/files/patch-third__party_perfetto_src_base_ctrl__c__handler.cc index f98c97278962..93ef8ff92fad 100644 --- a/www/chromium/files/patch-third__party_perfetto_src_base_ctrl__c__handler.cc +++ b/www/chromium/files/patch-third__party_perfetto_src_base_ctrl__c__handler.cc @@ -1,6 +1,6 @@ ---- third_party/perfetto/src/base/ctrl_c_handler.cc.orig 2021-04-14 18:43:06 UTC +--- third_party/perfetto/src/base/ctrl_c_handler.cc.orig 2021-07-19 18:47:28 UTC +++ third_party/perfetto/src/base/ctrl_c_handler.cc -@@ -51,7 +51,8 @@ void InstallCtrCHandler(CtrlCHandlerFunction handler) +@@ -50,7 +50,8 @@ void InstallCtrCHandler(CtrlCHandlerFunction handler) ::SetConsoleCtrlHandler(trampoline, true); #elif PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \ diff --git a/www/chromium/files/patch-third__party_perfetto_src_base_test_vm__test__utils.cc b/www/chromium/files/patch-third__party_perfetto_src_base_test_vm__test__utils.cc new file mode 100644 index 000000000000..2351cd83cf4c --- /dev/null +++ b/www/chromium/files/patch-third__party_perfetto_src_base_test_vm__test__utils.cc @@ -0,0 +1,11 @@ +--- third_party/perfetto/src/base/test/vm_test_utils.cc.orig 2021-07-28 09:44:38 UTC ++++ third_party/perfetto/src/base/test/vm_test_utils.cc +@@ -97,7 +97,7 @@ bool IsMapped(void* start, size_t size) { + ignore_result(page_size); + return true; + #else +-#if PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) ++#if PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) || PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD) + using PageState = char; + static constexpr PageState kIncoreMask = MINCORE_INCORE; + #else 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 65f65894063d..edadada5d95e 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-04-14 18:43:06 UTC +--- third_party/perfetto/src/base/utils.cc.orig 2021-07-19 18:47:28 UTC +++ third_party/perfetto/src/base/utils.cc -@@ -21,7 +21,8 @@ +@@ -22,7 +22,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> // For getpagesize() and geteuid(). + #include <unistd.h> // For getpagesize() and geteuid() & fork() #endif -@@ -67,8 +68,9 @@ void MaybeReleaseAllocatorMemToOS() { +@@ -68,8 +69,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 -@@ -89,7 +91,8 @@ uint32_t GetSysPageSize() { +@@ -90,7 +92,8 @@ uint32_t GetSysPageSize() { uid_t GetCurrentUserId() { #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 d41e0a4eb537..b3069432b40d 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-04-14 18:43:07 UTC +--- third_party/perfetto/src/traced/service/service.cc.orig 2021-07-19 18:47:29 UTC +++ third_party/perfetto/src/traced/service/service.cc -@@ -28,7 +28,8 @@ +@@ -29,7 +29,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 dc81a254ffcc..93bd3bed91bd 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-05-12 22:13:43 UTC +--- 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 -@@ -42,7 +42,8 @@ +@@ -43,7 +43,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 -@@ -2743,8 +2744,9 @@ bool TracingServiceImpl::SnapshotClocks( +@@ -2846,8 +2847,9 @@ bool TracingServiceImpl::SnapshotClocks( TracingSession::ClockSnapshotData new_snapshot_data; diff --git a/www/chromium/files/patch-third__party_perfetto_src_tracing_platform__posix.cc b/www/chromium/files/patch-third__party_perfetto_src_tracing_platform__posix.cc index bb49b8941ae4..3df5b2c80c35 100644 --- a/www/chromium/files/patch-third__party_perfetto_src_tracing_platform__posix.cc +++ b/www/chromium/files/patch-third__party_perfetto_src_tracing_platform__posix.cc @@ -1,4 +1,4 @@ ---- third_party/perfetto/src/tracing/platform_posix.cc.orig 2021-04-14 18:43:07 UTC +--- third_party/perfetto/src/tracing/platform_posix.cc.orig 2021-07-19 18:47:29 UTC +++ third_party/perfetto/src/tracing/platform_posix.cc @@ -18,7 +18,8 @@ @@ -10,7 +10,7 @@ #include "perfetto/ext/base/file_utils.h" #include "perfetto/ext/base/thread_task_runner.h" -@@ -82,7 +83,8 @@ std::string PlatformPosix::GetCurrentProcessName() { +@@ -100,7 +101,8 @@ std::string PlatformPosix::GetCurrentProcessName() { std::string cmdline; base::ReadFile("/proc/self/cmdline", &cmdline); return cmdline.substr(0, cmdline.find('\0')); @@ -20,7 +20,7 @@ return std::string(getprogname()); #else return "unknown_producer"; -@@ -98,4 +100,4 @@ Platform* Platform::GetDefaultPlatform() { +@@ -116,4 +118,4 @@ Platform* Platform::GetDefaultPlatform() { } } // namespace perfetto 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 new file mode 100644 index 000000000000..782c6d85f6c9 --- /dev/null +++ b/www/chromium/files/patch-third__party_skia_src_ports_SkFontHost__FreeType__common.cpp @@ -0,0 +1,50 @@ +--- 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_swiftshader_include_vulkan_vulkan.hpp b/www/chromium/files/patch-third__party_swiftshader_include_vulkan_vulkan.hpp index f1873c090fc8..928ef72a11f8 100644 --- a/www/chromium/files/patch-third__party_swiftshader_include_vulkan_vulkan.hpp +++ b/www/chromium/files/patch-third__party_swiftshader_include_vulkan_vulkan.hpp @@ -1,56 +1,56 @@ ---- third_party/swiftshader/include/vulkan/vulkan.hpp.orig 2021-04-14 18:43:08 UTC +--- third_party/swiftshader/include/vulkan/vulkan.hpp.orig 2021-07-19 18:47:29 UTC +++ third_party/swiftshader/include/vulkan/vulkan.hpp @@ -67,7 +67,7 @@ #endif #if VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL == 1 --# if defined( __linux__ ) || defined( __APPLE__ ) -+# if defined( __unix__ ) || defined( __APPLE__ ) +-# if defined( __linux__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ ) ++# if defined( __linux__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ ) || defined(__FreeBSD__) # include <dlfcn.h> # elif defined( _WIN32 ) typedef struct HINSTANCE__ * HINSTANCE; -@@ -92157,7 +92157,7 @@ namespace VULKAN_HPP_NAMESPACE +@@ -123090,7 +123090,7 @@ namespace VULKAN_HPP_NAMESPACE { if ( !vulkanLibraryName.empty() ) { --# if defined( __linux__ ) || defined( __APPLE__ ) -+# if defined( __unix__ ) || defined( __APPLE__ ) +-# if defined( __linux__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ ) ++# if defined( __linux__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ ) || defined(__FreeBSD__) m_library = dlopen( vulkanLibraryName.c_str(), RTLD_NOW | RTLD_LOCAL ); # elif defined( _WIN32 ) m_library = ::LoadLibraryA( vulkanLibraryName.c_str() ); -@@ -92167,7 +92167,7 @@ namespace VULKAN_HPP_NAMESPACE +@@ -123100,7 +123100,7 @@ namespace VULKAN_HPP_NAMESPACE } else { --# if defined( __linux__ ) -+# if defined( __unix__ ) +-# if defined( __linux__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ ) ++# if defined( __linux__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ ) || defined(__FreeBSD__) m_library = dlopen( "libvulkan.so", RTLD_NOW | RTLD_LOCAL ); if ( m_library == nullptr ) { -@@ -92210,7 +92210,7 @@ namespace VULKAN_HPP_NAMESPACE +@@ -123144,7 +123144,7 @@ namespace VULKAN_HPP_NAMESPACE { if ( m_library ) { --# if defined( __linux__ ) || defined( __APPLE__ ) -+# if defined( __unix__ ) || defined( __APPLE__ ) +-# if defined( __linux__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ ) ++# if defined( __linux__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ ) || defined(__FreeBSD__) dlclose( m_library ); # elif defined( _WIN32 ) ::FreeLibrary( m_library ); -@@ -92223,7 +92223,7 @@ namespace VULKAN_HPP_NAMESPACE +@@ -123157,7 +123157,7 @@ namespace VULKAN_HPP_NAMESPACE template <typename T> - T getProcAddress( const char* function ) const VULKAN_HPP_NOEXCEPT + T getProcAddress( const char * function ) const VULKAN_HPP_NOEXCEPT { --# if defined( __linux__ ) || defined( __APPLE__ ) -+# if defined( __unix__ ) || defined( __APPLE__ ) +-# if defined( __linux__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ ) ++# if defined( __linux__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ ) || defined(__FreeBSD__) return (T)dlsym( m_library, function ); # elif defined( _WIN32 ) - return (T)::GetProcAddress( m_library, function ); -@@ -92235,7 +92235,7 @@ namespace VULKAN_HPP_NAMESPACE - bool success() const VULKAN_HPP_NOEXCEPT { return m_library != nullptr; } + return ( T )::GetProcAddress( m_library, function ); +@@ -123172,7 +123172,7 @@ namespace VULKAN_HPP_NAMESPACE + } private: --# if defined( __linux__ ) || defined( __APPLE__ ) -+# if defined( __unix__ ) || defined( __APPLE__ ) +-# if defined( __linux__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ ) ++# if defined( __linux__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ ) || defined(__FreeBSD__) void * m_library; # elif defined( _WIN32 ) ::HINSTANCE m_library; diff --git a/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Display.cpp b/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Display.cpp index f908b7f995d5..2542f8c316a7 100644 --- a/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Display.cpp +++ b/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Display.cpp @@ -1,6 +1,6 @@ ---- third_party/swiftshader/src/OpenGL/libEGL/Display.cpp.orig 2021-04-14 18:43:08 UTC +--- third_party/swiftshader/src/OpenGL/libEGL/Display.cpp.orig 2021-07-19 18:47:29 UTC +++ third_party/swiftshader/src/OpenGL/libEGL/Display.cpp -@@ -684,7 +684,7 @@ bool Display::isValidWindow(EGLNativeWindowType window +@@ -677,7 +677,7 @@ bool Display::isValidWindow(EGLNativeWindowType window return status != 0; } return false; @@ -9,7 +9,7 @@ return false; // Non X11 linux is headless only #elif defined(__APPLE__) return sw::OSX::IsValidWindow(window); -@@ -862,7 +862,7 @@ sw::Format Display::getDisplayFormat() const +@@ -855,7 +855,7 @@ sw::Format Display::getDisplayFormat() const { return sw::FORMAT_X8R8G8B8; } diff --git a/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Surface.cpp b/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Surface.cpp index f51128b5d18a..bdbfb7516b6b 100644 --- a/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Surface.cpp +++ b/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Surface.cpp @@ -1,6 +1,6 @@ ---- third_party/swiftshader/src/OpenGL/libEGL/Surface.cpp.orig 2021-04-14 18:43:08 UTC +--- third_party/swiftshader/src/OpenGL/libEGL/Surface.cpp.orig 2021-07-19 18:47:29 UTC +++ third_party/swiftshader/src/OpenGL/libEGL/Surface.cpp -@@ -357,7 +357,7 @@ bool WindowSurface::checkForResize() +@@ -349,7 +349,7 @@ bool WindowSurface::checkForResize() int windowWidth = windowAttributes.width; int windowHeight = windowAttributes.height; diff --git a/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libGLES__CM_libGLES__CM.hpp b/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libGLES__CM_libGLES__CM.hpp deleted file mode 100644 index b75ddb1d5223..000000000000 --- a/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libGLES__CM_libGLES__CM.hpp +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/swiftshader/src/OpenGL/libGLES_CM/libGLES_CM.hpp.orig 2021-04-14 18:43:08 UTC -+++ third_party/swiftshader/src/OpenGL/libGLES_CM/libGLES_CM.hpp -@@ -261,7 +261,7 @@ class LibGLES_CM (private) - #endif - #elif defined(__ANDROID__) - const char *libGLES_CM_lib[] = {"libGLESv1_CM_swiftshader.so", "libGLESv1_CM_swiftshader.so"}; -- #elif defined(__linux__) -+ #elif defined(__linux__) || defined(__FreeBSD__) - #if defined(__LP64__) - const char *libGLES_CM_lib[] = {"lib64GLES_CM_translator.so", "libGLES_CM.so.1", "libGLES_CM.so"}; - #else 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 8b29048940d5..8a0e78a94c74 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-04-14 18:43:13 UTC +--- 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 @@ -253,7 +253,7 @@ void *loader_device_heap_realloc(const struct loader_d } // Environment variables --#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) -+#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__FreeBSD__) +-#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(); diff --git a/www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h b/www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h index 1a8183c31b4b..473202d3247a 100644 --- a/www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h +++ b/www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h @@ -1,11 +1,11 @@ ---- third_party/vulkan-deps/vulkan-loader/src/loader/vk_loader_platform.h.orig 2021-04-14 18:43:13 UTC +--- third_party/vulkan-deps/vulkan-loader/src/loader/vk_loader_platform.h.orig 2021-07-19 18:47:36 UTC +++ third_party/vulkan-deps/vulkan-loader/src/loader/vk_loader_platform.h @@ -35,7 +35,7 @@ #include "vulkan/vk_platform.h" #include "vulkan/vk_sdk_platform.h" --#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) -+#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__FreeBSD__) +-#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__) ++#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__) || defined(__FreeBSD__) /* Linux-specific common code: */ // Headers: diff --git a/www/chromium/files/patch-third__party_webrtc_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_BUILD.gn index bb440f7de6f0..6c5202a31144 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-05-12 22:13:47 UTC +--- third_party/webrtc/BUILD.gn.orig 2021-07-19 18:47:32 UTC +++ third_party/webrtc/BUILD.gn -@@ -181,6 +181,9 @@ config("common_inherited_config") { +@@ -185,6 +185,9 @@ config("common_inherited_config") { if (is_linux || is_chromeos) { defines += [ "WEBRTC_LINUX" ] } 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 784a76c41ca2..e24411bf32a7 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,6 +1,6 @@ ---- tools/json_schema_compiler/feature_compiler.py.orig 2021-04-14 18:41:36 UTC +--- tools/json_schema_compiler/feature_compiler.py.orig 2021-07-19 18:45:43 UTC +++ tools/json_schema_compiler/feature_compiler.py -@@ -257,6 +257,7 @@ FEATURE_GRAMMAR = ({ +@@ -259,6 +259,7 @@ FEATURE_GRAMMAR = ({ 'chromeos': 'Feature::CHROMEOS_PLATFORM', 'lacros': 'Feature::LACROS_PLATFORM', 'linux': 'Feature::LINUX_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 5503c80f21cb..14aa86d81f5d 100644 --- a/www/chromium/files/patch-tools_json__schema__compiler_model.py +++ b/www/chromium/files/patch-tools_json__schema__compiler_model.py @@ -1,6 +1,6 @@ ---- tools/json_schema_compiler/model.py.orig 2021-05-12 22:06:45 UTC +--- tools/json_schema_compiler/model.py.orig 2021-07-19 18:45:43 UTC +++ tools/json_schema_compiler/model.py -@@ -865,7 +865,7 @@ class Platforms(object): +@@ -872,7 +872,7 @@ class Platforms(object): """ CHROMEOS = _PlatformInfo("chromeos") LACROS = _PlatformInfo("lacros") 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 9d6f9178b24b..58bdbb4a33f7 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-04-14 18:41:37 UTC +--- tools/perf/chrome_telemetry_build/BUILD.gn.orig 2021-07-19 18:45:43 UTC +++ tools/perf/chrome_telemetry_build/BUILD.gn -@@ -62,7 +62,7 @@ group("telemetry_chrome_test") { +@@ -59,7 +59,7 @@ group("telemetry_chrome_test") { data_deps += [ "//chrome:reorder_imports" ] } diff --git a/www/chromium/files/patch-ui_base_clipboard_clipboard__constants.cc b/www/chromium/files/patch-ui_base_clipboard_clipboard__constants.cc index 3cdbee8978ee..551609f2394f 100644 --- a/www/chromium/files/patch-ui_base_clipboard_clipboard__constants.cc +++ b/www/chromium/files/patch-ui_base_clipboard_clipboard__constants.cc @@ -1,8 +1,8 @@ ---- ui/base/clipboard/clipboard_constants.cc.orig 2021-04-14 18:41:37 UTC +--- ui/base/clipboard/clipboard_constants.cc.orig 2021-07-19 18:45:43 UTC +++ ui/base/clipboard/clipboard_constants.cc -@@ -18,11 +18,11 @@ const char kMimeTypeSvg[] = "image/svg+xml"; - const char kMimeTypeRTF[] = "text/rtf"; - const char kMimeTypePNG[] = "image/png"; +@@ -20,11 +20,11 @@ const char kMimeTypePNG[] = "image/png"; + // Used for image drag & drop from LaCrOS. + const char kMimeTypeOctetStream[] = "application/octet-stream"; -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD) diff --git a/www/chromium/files/patch-ui_base_clipboard_clipboard__constants.h b/www/chromium/files/patch-ui_base_clipboard_clipboard__constants.h index 5dc11760d490..8bb7450ab663 100644 --- a/www/chromium/files/patch-ui_base_clipboard_clipboard__constants.h +++ b/www/chromium/files/patch-ui_base_clipboard_clipboard__constants.h @@ -1,7 +1,7 @@ ---- ui/base/clipboard/clipboard_constants.h.orig 2021-04-14 18:41:37 UTC +--- ui/base/clipboard/clipboard_constants.h.orig 2021-07-19 18:45:43 UTC +++ ui/base/clipboard/clipboard_constants.h -@@ -37,14 +37,14 @@ COMPONENT_EXPORT(UI_BASE_CLIPBOARD_TYPES) extern const - COMPONENT_EXPORT(UI_BASE_CLIPBOARD_TYPES) extern const char kMimeTypePNG[]; +@@ -38,14 +38,14 @@ COMPONENT_EXPORT(UI_BASE_CLIPBOARD_TYPES) + extern const char kMimeTypeOctetStream[]; // Linux-specific MIME type constants (also used in Fuchsia). -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) diff --git a/www/chromium/files/patch-ui_base_cursor_cursor__factory.cc b/www/chromium/files/patch-ui_base_cursor_cursor__factory.cc index 5c0defb80bf4..7803034f0511 100644 --- a/www/chromium/files/patch-ui_base_cursor_cursor__factory.cc +++ b/www/chromium/files/patch-ui_base_cursor_cursor__factory.cc @@ -1,6 +1,6 @@ ---- ui/base/cursor/cursor_factory.cc.orig 2021-05-12 22:06:46 UTC +--- ui/base/cursor/cursor_factory.cc.orig 2021-07-19 18:45:43 UTC +++ ui/base/cursor/cursor_factory.cc -@@ -69,7 +69,7 @@ void CursorFactory::ObserveThemeChanges() { +@@ -80,7 +80,7 @@ void CursorFactory::ObserveThemeChanges() { void CursorFactory::SetDeviceScaleFactor(float scale) {} @@ -9,7 +9,7 @@ // Returns a cursor name compatible with either X11 or the FreeDesktop.org // cursor spec ([1] and [2]), followed by fallbacks that can work as -@@ -190,6 +190,6 @@ std::vector<std::string> CursorNamesFromType(mojom::Cu +@@ -201,6 +201,6 @@ std::vector<std::string> CursorNamesFromType(mojom::Cu return {"left_ptr"}; } diff --git a/www/chromium/files/patch-ui_base_cursor_cursor__factory.h b/www/chromium/files/patch-ui_base_cursor_cursor__factory.h index 22c3fac0ff59..832c1112c529 100644 --- a/www/chromium/files/patch-ui_base_cursor_cursor__factory.h +++ b/www/chromium/files/patch-ui_base_cursor_cursor__factory.h @@ -1,7 +1,7 @@ ---- ui/base/cursor/cursor_factory.h.orig 2021-05-12 22:06:46 UTC +--- ui/base/cursor/cursor_factory.h.orig 2021-07-19 18:45:43 UTC +++ ui/base/cursor/cursor_factory.h -@@ -73,7 +73,7 @@ class COMPONENT_EXPORT(UI_BASE_CURSOR_BASE) CursorFact - virtual void SetDeviceScaleFactor(float scale); +@@ -81,7 +81,7 @@ class COMPONENT_EXPORT(UI_BASE_CURSOR_BASE) CursorFact + base::ObserverList<CursorFactoryObserver>::Unchecked observers_; }; -#if defined(OS_LINUX) || defined(OS_CHROMEOS) 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 60986274920f..2d11a32224c0 100644 --- a/www/chromium/files/patch-ui_base_resource_resource__bundle.cc +++ b/www/chromium/files/patch-ui_base_resource_resource__bundle.cc @@ -1,6 +1,6 @@ ---- ui/base/resource/resource_bundle.cc.orig 2021-04-14 18:41:37 UTC +--- ui/base/resource/resource_bundle.cc.orig 2021-07-19 18:45:43 UTC +++ ui/base/resource/resource_bundle.cc -@@ -808,7 +808,7 @@ void ResourceBundle::ReloadFonts() { +@@ -817,7 +817,7 @@ void ResourceBundle::ReloadFonts() { } ScaleFactor ResourceBundle::GetMaxScaleFactor() const { @@ -9,12 +9,12 @@ return max_scale_factor_; #else return GetSupportedScaleFactors().back(); -@@ -861,7 +861,7 @@ void ResourceBundle::InitSharedInstance(Delegate* dele +@@ -870,7 +870,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); --#if defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -+#if defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ +-#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) supported_scale_factors.push_back(SCALE_FACTOR_200P); #endif 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 6b515c0bdfbb..e8c9f725bfc6 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-04-14 18:41:37 UTC +--- ui/base/test/skia_gold_pixel_diff.cc.orig 2021-07-19 18:45:43 UTC +++ ui/base/test/skia_gold_pixel_diff.cc -@@ -168,7 +168,7 @@ std::string SkiaGoldPixelDiff::GetPlatform() { +@@ -134,7 +134,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 e1aa9a97d0da..797740705274 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-05-12 22:06:46 UTC +--- ui/base/ui_base_features.cc.orig 2021-07-19 18:45:43 UTC +++ ui/base/ui_base_features.cc -@@ -147,7 +147,7 @@ const base::Feature kExperimentalFlingAnimation { +@@ -139,7 +139,7 @@ const base::Feature kExperimentalFlingAnimation { "ExperimentalFlingAnimation", // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,16 +9,16 @@ !BUILDFLAG(IS_CHROMEOS_LACROS)) base::FEATURE_ENABLED_BY_DEFAULT #else -@@ -180,7 +180,7 @@ const base::Feature kPrecisionTouchpadLogging{ - "PrecisionTouchpadLogging", base::FEATURE_DISABLED_BY_DEFAULT}; - #endif // defined(OS_WIN) +@@ -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 = { -@@ -191,7 +191,7 @@ const base::Feature kDirectManipulationStylus = { +@@ -205,7 +205,7 @@ const base::Feature kDirectManipulationStylus = { base::FEATURE_DISABLED_BY_DEFAULT #endif }; @@ -27,7 +27,7 @@ // defined(OS_CHROMEOS) // Enables forced colors mode for web content. -@@ -209,7 +209,7 @@ bool IsForcedColorsEnabled() { +@@ -223,7 +223,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 index 794a0f0439a0..b87beffd4e2e 100644 --- a/www/chromium/files/patch-ui_base_ui__base__features.h +++ b/www/chromium/files/patch-ui_base_ui__base__features.h @@ -1,8 +1,8 @@ ---- ui/base/ui_base_features.h.orig 2021-05-12 22:06:46 UTC +--- ui/base/ui_base_features.h.orig 2021-07-19 18:45:43 UTC +++ ui/base/ui_base_features.h -@@ -65,11 +65,11 @@ COMPONENT_EXPORT(UI_BASE_FEATURES) extern const base:: - COMPONENT_EXPORT(UI_BASE_FEATURES) bool IsUsingWMPointerForTouch(); - #endif // defined(OS_WIN) +@@ -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) || \ diff --git a/www/chromium/files/patch-ui_compositor_compositor.cc b/www/chromium/files/patch-ui_compositor_compositor.cc index 42f182b27b96..562f41317262 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-05-12 22:06:46 UTC +--- ui/compositor/compositor.cc.orig 2021-07-19 18:45:44 UTC +++ ui/compositor/compositor.cc -@@ -769,7 +769,7 @@ void Compositor::CancelThroughtputTracker(TrackerId tr +@@ -792,7 +792,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 16cae6cda76b..403887ab0b40 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-04-14 18:41:39 UTC +--- ui/compositor/compositor.h.orig 2021-07-19 18:45:44 UTC +++ ui/compositor/compositor.h -@@ -375,7 +375,7 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerT +@@ -377,7 +377,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_events_event.cc b/www/chromium/files/patch-ui_events_event.cc index bf9d99e86aed..27f5d07e5ed0 100644 --- a/www/chromium/files/patch-ui_events_event.cc +++ b/www/chromium/files/patch-ui_events_event.cc @@ -1,6 +1,6 @@ ---- ui/events/event.cc.orig 2021-05-12 22:06:46 UTC +--- ui/events/event.cc.orig 2021-07-19 18:45:44 UTC +++ ui/events/event.cc -@@ -450,7 +450,7 @@ std::string LocatedEvent::ToString() const { +@@ -455,7 +455,7 @@ std::string LocatedEvent::ToString() const { MouseEvent::MouseEvent(const PlatformEvent& native_event) : LocatedEvent(native_event), changed_button_flags_(GetChangedMouseButtonFlagsFromNative(native_event)), diff --git a/www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.cc b/www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.cc index e6b81cc8a287..18b29f18bdf6 100644 --- a/www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.cc +++ b/www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.cc @@ -1,4 +1,4 @@ ---- ui/events/keycodes/dom/keycode_converter.cc.orig 2021-04-20 18:58:56 UTC +--- ui/events/keycodes/dom/keycode_converter.cc.orig 2021-07-19 18:45:44 UTC +++ ui/events/keycodes/dom/keycode_converter.cc @@ -24,7 +24,7 @@ namespace { #if defined(OS_WIN) @@ -33,4 +33,4 @@ +#endif #endif - // static + #if defined(OS_CHROMEOS) diff --git a/www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.h b/www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.h index 70a277dbe0b0..60cebabf41d6 100644 --- a/www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.h +++ b/www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.h @@ -1,6 +1,6 @@ ---- ui/events/keycodes/dom/keycode_converter.h.orig 2021-04-22 08:32:20 UTC +--- ui/events/keycodes/dom/keycode_converter.h.orig 2021-07-19 18:45:44 UTC +++ ui/events/keycodes/dom/keycode_converter.h -@@ -59,18 +59,20 @@ class KeycodeConverter { +@@ -63,18 +63,20 @@ class KeycodeConverter { // Convert a DomCode into a native keycode. static int DomCodeToNativeKeycode(DomCode code); @@ -21,4 +21,4 @@ +#endif #endif - // Convert a UI Events |code| string value into a DomCode. + #if defined(OS_CHROMEOS) diff --git a/www/chromium/files/patch-ui_events_ozone_keyboard__hook__ozone.cc b/www/chromium/files/patch-ui_events_ozone_keyboard__hook__ozone.cc index b82afcca0aa9..e40ae19fd953 100644 --- a/www/chromium/files/patch-ui_events_ozone_keyboard__hook__ozone.cc +++ b/www/chromium/files/patch-ui_events_ozone_keyboard__hook__ozone.cc @@ -1,11 +1,11 @@ ---- ui/events/ozone/keyboard_hook_ozone.cc.orig 2021-04-14 18:41:39 UTC +--- ui/events/ozone/keyboard_hook_ozone.cc.orig 2021-07-19 18:45:44 UTC +++ ui/events/ozone/keyboard_hook_ozone.cc -@@ -29,7 +29,7 @@ bool KeyboardHookOzone::RegisterHook() { - return true; +@@ -34,7 +34,7 @@ bool KeyboardHookOzone::IsKeyLocked(DomCode dom_code) + return platform_keyboard_hook_->IsKeyLocked(dom_code); } -#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_BSD) // static std::unique_ptr<KeyboardHook> KeyboardHook::CreateModifierKeyboardHook( - base::Optional<base::flat_set<DomCode>> dom_codes, + absl::optional<base::flat_set<DomCode>> dom_codes, diff --git a/www/chromium/files/patch-ui_gfx_BUILD.gn b/www/chromium/files/patch-ui_gfx_BUILD.gn index 8a0bb21980dc..9779b882db6b 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-05-12 22:06:47 UTC +--- ui/gfx/BUILD.gn.orig 2021-07-19 18:45:44 UTC +++ ui/gfx/BUILD.gn -@@ -603,7 +603,7 @@ source_set("memory_buffer_sources") { +@@ -607,7 +607,7 @@ source_set("memory_buffer_sources") { deps += [ "//build/config/linux/libdrm" ] } diff --git a/www/chromium/files/patch-ui_gfx_linux_client__native__pixmap__dmabuf.cc b/www/chromium/files/patch-ui_gfx_linux_client__native__pixmap__dmabuf.cc index 0564ce3a97fc..447d4fb57fe5 100644 --- a/www/chromium/files/patch-ui_gfx_linux_client__native__pixmap__dmabuf.cc +++ b/www/chromium/files/patch-ui_gfx_linux_client__native__pixmap__dmabuf.cc @@ -1,4 +1,4 @@ ---- ui/gfx/linux/client_native_pixmap_dmabuf.cc.orig 2021-04-14 18:41:39 UTC +--- ui/gfx/linux/client_native_pixmap_dmabuf.cc.orig 2021-07-19 18:45:44 UTC +++ ui/gfx/linux/client_native_pixmap_dmabuf.cc @@ -5,7 +5,9 @@ #include "ui/gfx/linux/client_native_pixmap_dmabuf.h" @@ -10,7 +10,7 @@ #include <stddef.h> #include <sys/ioctl.h> #include <sys/mman.h> -@@ -28,11 +30,7 @@ +@@ -27,11 +29,7 @@ #include "ui/gfx/buffer_format_util.h" #include "ui/gfx/switches.h" diff --git a/www/chromium/files/patch-ui_gfx_native__pixmap__handle.h b/www/chromium/files/patch-ui_gfx_native__pixmap__handle.h index 32ff3aa13e9b..5e1680118cc2 100644 --- a/www/chromium/files/patch-ui_gfx_native__pixmap__handle.h +++ b/www/chromium/files/patch-ui_gfx_native__pixmap__handle.h @@ -1,7 +1,7 @@ ---- ui/gfx/native_pixmap_handle.h.orig 2021-04-14 18:41:39 UTC +--- ui/gfx/native_pixmap_handle.h.orig 2021-07-19 18:45:44 UTC +++ ui/gfx/native_pixmap_handle.h @@ -15,7 +15,7 @@ - #include "build/build_config.h" + #include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/gfx/gfx_export.h" -#if defined(OS_LINUX) || defined(OS_CHROMEOS) diff --git a/www/chromium/files/patch-ui_gfx_render__text.cc b/www/chromium/files/patch-ui_gfx_render__text.cc index 953e941ae1a5..32ede3f97b6b 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-05-12 22:06:47 UTC +--- ui/gfx/render_text.cc.orig 2021-07-19 18:45:44 UTC +++ ui/gfx/render_text.cc -@@ -1203,23 +1203,24 @@ void RenderText::SetDisplayOffset(Vector2d offset) { +@@ -1201,23 +1201,24 @@ void RenderText::SetDisplayOffset(Vector2d offset) { const int extra_content = GetContentWidth() - display_rect_.width(); const int cursor_width = cursor_enabled_ ? 1 : 0; @@ -31,7 +31,7 @@ break; default: break; -@@ -1227,7 +1228,7 @@ void RenderText::SetDisplayOffset(Vector2d offset) { +@@ -1225,7 +1226,7 @@ void RenderText::SetDisplayOffset(Vector2d offset) { } const int horizontal_offset = diff --git a/www/chromium/files/patch-ui_gl_BUILD.gn b/www/chromium/files/patch-ui_gl_BUILD.gn index 77cd3bde206c..0e92bc019335 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-04-14 18:41:39 UTC +--- ui/gl/BUILD.gn.orig 2021-07-19 18:45:44 UTC +++ ui/gl/BUILD.gn -@@ -224,7 +224,7 @@ component("gl") { +@@ -226,7 +226,7 @@ component("gl") { ] } diff --git a/www/chromium/files/patch-ui_gl_gl__features.cc b/www/chromium/files/patch-ui_gl_gl__features.cc index aff3a02c591f..51c5ccad09bb 100644 --- a/www/chromium/files/patch-ui_gl_gl__features.cc +++ b/www/chromium/files/patch-ui_gl_gl__features.cc @@ -1,6 +1,6 @@ ---- ui/gl/gl_features.cc.orig 2021-04-14 18:41:39 UTC +--- ui/gl/gl_features.cc.orig 2021-07-19 18:45:44 UTC +++ ui/gl/gl_features.cc -@@ -23,8 +23,8 @@ const base::Feature kGpuVsync{"GpuVsync", base::FEATUR +@@ -71,8 +71,8 @@ bool IsDeviceBlocked(const char* field, const std::str // Launched on Windows, still experimental on other platforms. const base::Feature kDefaultPassthroughCommandDecoder{ "DefaultPassthroughCommandDecoder", diff --git a/www/chromium/files/patch-ui_gtk_printing_print__dialog__gtk.cc b/www/chromium/files/patch-ui_gtk_printing_print__dialog__gtk.cc index c20fd5c934fb..9396fa618d2e 100644 --- a/www/chromium/files/patch-ui_gtk_printing_print__dialog__gtk.cc +++ b/www/chromium/files/patch-ui_gtk_printing_print__dialog__gtk.cc @@ -1,6 +1,6 @@ ---- ui/gtk/printing/print_dialog_gtk.cc.orig 2021-05-12 22:06:47 UTC +--- ui/gtk/printing/print_dialog_gtk.cc.orig 2021-07-19 18:45:44 UTC +++ ui/gtk/printing/print_dialog_gtk.cc -@@ -392,7 +392,7 @@ void PrintDialogGtk::ShowDialog( +@@ -391,7 +391,7 @@ void PrintDialogGtk::ShowDialog( // Since we only generate PDF, only show printers that support PDF. // TODO(thestig) Add more capabilities to support? GtkPrintCapabilities cap = static_cast<GtkPrintCapabilities>( diff --git a/www/chromium/files/patch-ui_message__center_views_message__popup__view.cc b/www/chromium/files/patch-ui_message__center_views_message__popup__view.cc index bafd2a6a31d9..c17c8212cf61 100644 --- a/www/chromium/files/patch-ui_message__center_views_message__popup__view.cc +++ b/www/chromium/files/patch-ui_message__center_views_message__popup__view.cc @@ -1,6 +1,6 @@ ---- ui/message_center/views/message_popup_view.cc.orig 2021-04-14 18:41:39 UTC +--- ui/message_center/views/message_popup_view.cc.orig 2021-07-19 18:45:44 UTC +++ ui/message_center/views/message_popup_view.cc -@@ -114,7 +114,7 @@ void MessagePopupView::Show() { +@@ -115,7 +115,7 @@ void MessagePopupView::Show() { params.z_order = ui::ZOrderLevel::kFloatingWindow; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -8,4 +8,4 @@ +#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) // Make the widget explicitly activatable as TYPE_POPUP is not activatable by // default but we need focus for the inline reply textarea. - params.activatable = views::Widget::InitParams::ACTIVATABLE_YES; + params.activatable = views::Widget::InitParams::Activatable::kYes; 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 06a133c34395..3f5c18ca2958 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-05-12 22:06:47 UTC +--- ui/native_theme/native_theme_base.cc.orig 2021-07-19 18:45:44 UTC +++ ui/native_theme/native_theme_base.cc -@@ -274,7 +274,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas, +@@ -280,7 +280,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 bbc5bbe1ad53..6d12f17e5f9a 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,4 +1,4 @@ ---- ui/platform_window/platform_window_init_properties.h.orig 2021-04-14 18:41:39 UTC +--- ui/platform_window/platform_window_init_properties.h.orig 2021-07-19 18:45:44 UTC +++ ui/platform_window/platform_window_init_properties.h @@ -47,7 +47,7 @@ enum class PlatformWindowShadowType { @@ -17,4 +17,4 @@ +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) bool prefer_dark_theme = false; gfx::ImageSkia* icon = nullptr; - base::Optional<int> background_color; + absl::optional<int> background_color; diff --git a/www/chromium/files/patch-ui_views_controls_label.cc b/www/chromium/files/patch-ui_views_controls_label.cc deleted file mode 100644 index d157b0839c8c..000000000000 --- a/www/chromium/files/patch-ui_views_controls_label.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- ui/views/controls/label.cc.orig 2021-04-14 18:41:39 UTC -+++ ui/views/controls/label.cc -@@ -817,7 +817,7 @@ bool Label::OnMousePressed(const ui::MouseEvent& event - - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) - if (event.IsOnlyMiddleMouseButton() && GetFocusManager() && !had_focus) - GetFocusManager()->SetFocusedView(this); - #endif -@@ -1006,7 +1006,7 @@ bool Label::PasteSelectionClipboard() { - void Label::UpdateSelectionClipboard() { - // 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 (!GetObscured()) { - ui::ScopedClipboardWriter(ui::ClipboardBuffer::kSelection) - .WriteText(GetSelectedText()); 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 0d3ef96600cf..28048e78623a 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-05-12 22:06:47 UTC +--- ui/views/controls/textfield/textfield.cc.orig 2021-07-19 18:45:44 UTC +++ ui/views/controls/textfield/textfield.cc -@@ -72,7 +72,7 @@ +@@ -74,7 +74,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 -@@ -169,7 +169,7 @@ bool IsControlKeyModifier(int flags) { +@@ -171,7 +171,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,16 +18,7 @@ return flags & ui::EF_CONTROL_DOWN; #else return false; -@@ -675,7 +675,7 @@ bool Textfield::OnMousePressed(const ui::MouseEvent& e - - // 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 (!handled && !had_focus && event.IsOnlyMiddleMouseButton()) - RequestFocusWithPointer(ui::EventPointerType::kMouse); - #endif -@@ -727,7 +727,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event +@@ -731,7 +731,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. @@ -36,7 +27,7 @@ ui::TextEditKeyBindingsDelegateAuraLinux* delegate = ui::GetTextEditKeyBindingsDelegate(); std::vector<ui::TextEditCommandAuraLinux> commands; -@@ -883,7 +883,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo +@@ -877,7 +877,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. @@ -45,7 +36,7 @@ // Skip any accelerator handling that conflicts with custom keybindings. ui::TextEditKeyBindingsDelegateAuraLinux* delegate = ui::GetTextEditKeyBindingsDelegate(); -@@ -2258,14 +2258,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( +@@ -2252,14 +2252,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( #endif return ui::TextEditCommand::DELETE_BACKWARD; } @@ -62,12 +53,3 @@ // Only erase by line break on Linux and ChromeOS. if (shift && control) return ui::TextEditCommand::DELETE_TO_END_OF_LINE; -@@ -2357,7 +2357,7 @@ bool Textfield::PasteSelectionClipboard() { - void Textfield::UpdateSelectionClipboard() { - // 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 (text_input_type_ != ui::TEXT_INPUT_TYPE_PASSWORD) { - ui::ScopedClipboardWriter(ui::ClipboardBuffer::kSelection) - .WriteText(GetSelectedText()); 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 7cfaeebe1676..df26b1f20f8c 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-05-12 22:06:47 UTC +--- ui/views/focus/focus_manager.cc.orig 2021-07-19 18:45:44 UTC +++ ui/views/focus/focus_manager.cc -@@ -628,7 +628,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi +@@ -636,7 +636,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 -@@ -645,7 +645,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi +@@ -653,7 +653,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_selection__controller.cc b/www/chromium/files/patch-ui_views_selection__controller.cc deleted file mode 100644 index bf119e4e8796..000000000000 --- a/www/chromium/files/patch-ui_views_selection__controller.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- ui/views/selection_controller.cc.orig 2021-04-14 18:41:39 UTC -+++ ui/views/selection_controller.cc -@@ -26,7 +26,7 @@ SelectionController::SelectionController(SelectionCont - // On Linux, update the selection clipboard on a text selection. - // 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) - set_handles_selection_clipboard(true); - #endif - 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 10d08c9fe147..dc4a75e85a01 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-04-14 18:41:39 UTC +--- ui/views/style/platform_style.cc.orig 2021-07-19 18:45:44 UTC +++ ui/views/style/platform_style.cc -@@ -58,7 +58,7 @@ const View::FocusBehavior PlatformStyle::kDefaultFocus +@@ -57,7 +57,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,8 +9,8 @@ false; #else true; -@@ -88,7 +88,7 @@ gfx::Range PlatformStyle::RangeToDeleteBackwards(const - #endif // OS_APPLE +@@ -87,7 +87,7 @@ gfx::Range PlatformStyle::RangeToDeleteBackwards(const + #endif // OS_MAC #if !BUILDFLAG(ENABLE_DESKTOP_AURA) || \ - (!defined(OS_LINUX) && !defined(OS_CHROMEOS)) diff --git a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__screen__ozone.cc b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__screen__ozone.cc index 0e076a23fc9e..7b95f8caa088 100644 --- a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__screen__ozone.cc +++ b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__screen__ozone.cc @@ -1,11 +1,11 @@ ---- ui/views/widget/desktop_aura/desktop_screen_ozone.cc.orig 2021-04-14 18:41:39 UTC +--- ui/views/widget/desktop_aura/desktop_screen_ozone.cc.orig 2021-07-19 18:45:44 UTC +++ ui/views/widget/desktop_aura/desktop_screen_ozone.cc -@@ -26,7 +26,7 @@ gfx::NativeWindow DesktopScreenOzone::GetNativeWindowF +@@ -28,7 +28,7 @@ gfx::NativeWindow DesktopScreenOzone::GetNativeWindowF // To avoid multiple definitions when use_x11 && use_ozone is true, disable this // factory method for OS_LINUX as Linux has a factory method that decides what // screen to use based on IsUsingOzonePlatform feature flag. -#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_BSD) - display::Screen* CreateDesktopScreen() { - return new DesktopScreenOzone(); + std::unique_ptr<display::Screen> CreateDesktopScreen() { + return std::make_unique<aura::ScreenOzone>(); } 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 7ad29be00c3a..88f3b8ea9475 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-05-12 22:06:47 UTC +--- 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 -@@ -851,7 +851,7 @@ bool DesktopWindowTreeHostPlatform::ShouldUseLayerForS +@@ -883,7 +883,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 9c67324de548..dc70e2e58e3e 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,15 +1,15 @@ ---- ui/views/widget/native_widget_aura.cc.orig 2021-05-12 22:06:47 UTC +--- ui/views/widget/native_widget_aura.cc.orig 2021-07-19 18:45:44 UTC +++ ui/views/widget/native_widget_aura.cc -@@ -70,7 +70,7 @@ +@@ -69,7 +69,7 @@ #endif #if BUILDFLAG(ENABLE_DESKTOP_AURA) && \ - (defined(OS_LINUX) || defined(OS_CHROMEOS)) + (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) - #include "ui/views/linux_ui/linux_ui.h" #include "ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h" #endif -@@ -1124,7 +1124,7 @@ void NativeWidgetAura::SetInitialFocus(ui::WindowShowS + +@@ -1133,7 +1133,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); -@@ -1155,7 +1155,7 @@ void Widget::CloseAllSecondaryWidgets() { +@@ -1164,7 +1164,7 @@ void Widget::CloseAllSecondaryWidgets() { #endif #if BUILDFLAG(ENABLE_DESKTOP_AURA) && \ @@ -27,12 +27,3 @@ DesktopWindowTreeHostLinux::CleanUpWindowList(CloseWindow); #endif } -@@ -1168,7 +1168,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const - } - - #if BUILDFLAG(ENABLE_DESKTOP_AURA) && \ -- (defined(OS_LINUX) || defined(OS_CHROMEOS)) -+ (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) - const LinuxUI* linux_ui = LinuxUI::instance(); - if (linux_ui) { - ui::NativeTheme* native_theme = diff --git a/www/chromium/files/patch-ui_views_widget_widget.cc b/www/chromium/files/patch-ui_views_widget_widget.cc new file mode 100644 index 000000000000..9e2e5c053af3 --- /dev/null +++ b/www/chromium/files/patch-ui_views_widget_widget.cc @@ -0,0 +1,20 @@ +--- ui/views/widget/widget.cc.orig 2021-07-28 08:23:02 UTC ++++ ui/views/widget/widget.cc +@@ -48,7 +48,7 @@ + #include "ui/views/window/custom_frame_view.h" + #include "ui/views/window/dialog_delegate.h" + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "ui/views/linux_ui/linux_ui.h" + #endif + +@@ -1664,7 +1664,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const + parent_) + return parent_->GetNativeTheme(); + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + if (const views::LinuxUI* linux_ui = views::LinuxUI::instance()) { + if (auto* native_theme = linux_ui->GetNativeTheme(GetNativeWindow())) + return native_theme; diff --git a/www/chromium/files/patch-ui_views_window_custom__frame__view.cc b/www/chromium/files/patch-ui_views_window_custom__frame__view.cc index 3a586fbd36af..33be5e812c2f 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-04-14 18:41:39 UTC +--- ui/views/window/custom_frame_view.cc.orig 2021-07-19 18:45:44 UTC +++ ui/views/window/custom_frame_view.cc -@@ -258,7 +258,7 @@ int CustomFrameView::CaptionButtonY() const { +@@ -259,7 +259,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-v8_BUILD.gn b/www/chromium/files/patch-v8_BUILD.gn index da9898743c7f..35dc5ad8b269 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-05-12 22:13:52 UTC +--- v8/BUILD.gn.orig 2021-07-19 18:47:37 UTC +++ v8/BUILD.gn -@@ -4600,9 +4600,15 @@ v8_component("v8_libbase") { +@@ -4667,9 +4667,15 @@ v8_component("v8_libbase") { } } @@ -17,7 +17,7 @@ "src/base/platform/platform-linux.cc", ] -@@ -5097,6 +5103,7 @@ if (current_toolchain == v8_generator_toolchain) { +@@ -5204,6 +5210,7 @@ if (current_toolchain == v8_generator_toolchain) { "src/interpreter/bytecodes.cc", "src/interpreter/bytecodes.h", ] diff --git a/www/chromium/files/patch-v8_src_api_api.cc b/www/chromium/files/patch-v8_src_api_api.cc index df1cc416d2be..ac8435d35c6e 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-05-12 22:13:52 UTC +--- v8/src/api/api.cc.orig 2021-07-19 18:47:37 UTC +++ v8/src/api/api.cc -@@ -5764,7 +5764,7 @@ bool v8::V8::Initialize(const int build_config) { +@@ -5833,7 +5833,7 @@ bool v8::V8::Initialize(const int build_config) { return true; } diff --git a/www/chromium/files/patch-v8_src_d8_d8.cc b/www/chromium/files/patch-v8_src_d8_d8.cc index 88e45b5e70dc..c8ca133c81f9 100644 --- a/www/chromium/files/patch-v8_src_d8_d8.cc +++ b/www/chromium/files/patch-v8_src_d8_d8.cc @@ -1,4 +1,4 @@ ---- v8/src/d8/d8.cc.orig 2021-05-12 22:13:52 UTC +--- v8/src/d8/d8.cc.orig 2021-07-19 18:47:38 UTC +++ v8/src/d8/d8.cc @@ -73,7 +73,7 @@ #include "unicode/locid.h" @@ -27,7 +27,7 @@ v8::Platform* g_default_platform; std::unique_ptr<v8::Platform> g_platform; -@@ -4099,7 +4099,7 @@ bool Shell::SetOptions(int argc, char* argv[]) { +@@ -4171,7 +4171,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 -@@ -4735,19 +4735,19 @@ int Shell::Main(int argc, char* argv[]) { +@@ -4808,19 +4808,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 0be6797287f9..607bb0317575 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-05-12 22:06:47 UTC +--- weblayer/BUILD.gn.orig 2021-07-19 18:45:45 UTC +++ weblayer/BUILD.gn -@@ -749,6 +749,14 @@ source_set("weblayer_lib_base") { +@@ -752,6 +752,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 655c2b1c957a..066262c5d029 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-05-12 22:06:47 UTC +--- weblayer/app/content_main_delegate_impl.cc.orig 2021-07-19 18:45:45 UTC +++ weblayer/app/content_main_delegate_impl.cc -@@ -229,8 +229,8 @@ bool ContentMainDelegateImpl::ShouldCreateFeatureList( +@@ -242,8 +242,8 @@ bool ContentMainDelegateImpl::ShouldCreateFeatureList( 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_browser__main__parts__impl.cc b/www/chromium/files/patch-weblayer_browser_browser__main__parts__impl.cc index 2283f11f3ec6..912bd3c48934 100644 --- a/www/chromium/files/patch-weblayer_browser_browser__main__parts__impl.cc +++ b/www/chromium/files/patch-weblayer_browser_browser__main__parts__impl.cc @@ -1,6 +1,6 @@ ---- weblayer/browser/browser_main_parts_impl.cc.orig 2021-05-12 22:06:47 UTC +--- weblayer/browser/browser_main_parts_impl.cc.orig 2021-08-17 00:17:09 UTC +++ weblayer/browser/browser_main_parts_impl.cc -@@ -77,7 +77,7 @@ +@@ -79,7 +79,7 @@ #endif // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. @@ -9,7 +9,7 @@ #include "ui/base/ime/init/input_method_initializer.h" #endif -@@ -195,7 +195,7 @@ int BrowserMainPartsImpl::PreEarlyInitialization() { +@@ -202,7 +202,7 @@ int BrowserMainPartsImpl::PreEarlyInitialization() { // 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 4f95583060e1..19ec3bb4ae7c 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-05-12 22:06:47 UTC +--- weblayer/browser/content_browser_client_impl.cc.orig 2021-07-19 18:45:45 UTC +++ weblayer/browser/content_browser_client_impl.cc -@@ -147,7 +147,7 @@ +@@ -148,7 +148,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 -@@ -476,7 +476,7 @@ void ContentBrowserClientImpl::OnNetworkServiceCreated +@@ -488,7 +488,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 -@@ -966,7 +966,7 @@ SafeBrowsingService* ContentBrowserClientImpl::GetSafe +@@ -974,7 +974,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, -@@ -1000,7 +1000,7 @@ void ContentBrowserClientImpl::GetAdditionalMappedFile +@@ -1008,7 +1008,7 @@ void ContentBrowserClientImpl::GetAdditionalMappedFile mappings->Share(kCrashDumpSignal, crash_signal_fd); #endif // defined(OS_ANDROID) } diff --git a/www/chromium/files/sndio_input.cc b/www/chromium/files/sndio_input.cc index e607418d1944..d0604dcc8792 100644 --- a/www/chromium/files/sndio_input.cc +++ b/www/chromium/files/sndio_input.cc @@ -43,17 +43,17 @@ SndioAudioInputStream::~SndioAudioInputStream() { Close(); } -bool SndioAudioInputStream::Open() { +AudioInputStream::OpenOutcome SndioAudioInputStream::Open() { struct sio_par par; int sig; if (state != kClosed) - return false; + return OpenOutcome::kFailed; if (params.format() != AudioParameters::AUDIO_PCM_LINEAR && params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) { LOG(WARNING) << "Unsupported audio format."; - return false; + return OpenOutcome::kFailed; } sio_initpar(&par); @@ -69,7 +69,7 @@ bool SndioAudioInputStream::Open() { if (hdl == NULL) { LOG(ERROR) << "Couldn't open audio device."; - return false; + return OpenOutcome::kFailed; } if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) { @@ -89,10 +89,10 @@ bool SndioAudioInputStream::Open() { state = kStopped; buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)]; sio_onmove(hdl, &OnMoveCallback, this); - return true; + return OpenOutcome::kSuccess; bad_close: sio_close(hdl); - return false; + return OpenOutcome::kFailed; } void SndioAudioInputStream::Start(AudioInputCallback* cb) { diff --git a/www/chromium/files/sndio_input.h b/www/chromium/files/sndio_input.h index d868e0469db5..2d57ebef8d7f 100644 --- a/www/chromium/files/sndio_input.h +++ b/www/chromium/files/sndio_input.h @@ -39,7 +39,7 @@ class SndioAudioInputStream : public AgcAudioStream<AudioInputStream> { ~SndioAudioInputStream() override; // Implementation of AudioInputStream. - bool Open() override; + OpenOutcome Open() override; void Start(AudioInputCallback* callback) override; void Stop() override; void Close() override; |