diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2020-12-05 12:29:57 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2020-12-05 12:29:57 +0000 |
| commit | 06a5d2111549478c2f0e505de2e21fee4186dee1 (patch) | |
| tree | 301ba3fa32c36a85fe8fcebea9a731920a500679 | |
| parent | 373b40e4870c76510a1a7a6469e515f8ece5e379 (diff) | |
| download | ports-06a5d2111549478c2f0e505de2e21fee4186dee1.tar.gz ports-06a5d2111549478c2f0e505de2e21fee4186dee1.zip | |
www/chromium: Synchronize with HEAD
MFH: r552588 r553068 r553141 r554786 r554895 r555115 r556709 r556720 r556921
www/chromium: drop pkg-message which was only useful for FreeBSD <= 11.2
Phabricator: D26646
www/chromium: Update to version 85.0.4183.121
Submitted by: cem, rene
Obtained from: some patches from OpenBSD port
www/chromium: Use SNDIO instead of ALSA for audio by default
There are stuttering sound issues when using ALSA, so switch to something
that works.
PR: 250370
www/chromium: attempt to fix build on aarch64
PR: 246982
Reported by: Bob Prohaska
Approved by: portmgr (tier-2 blanket)
www/chromium: improve cpu features detection on aarch64
Approved by: portmgr (tier-2 blanket)
www/chromium: Make online detection always positive
Summary: navigator.onLine is currently broken in www/chromium. This change
introduce a workaround that always return positive for online detection.
Sponsored by: The FreeBSD Foundation
Submitted by: Ka Ho Ng <khng300@gmail.com>
Differential Revision: https://reviews.freebsd.org/D26490
www/chromium: Update to version 87.0.4280.66
Submitted by: Matthias Wolf, cem, rene
Obtained from: Some patches from OpenBSD port (robert@openbsd.org)
Unbreak INDEX
www/chromium: Update to 87.0.4280.88
https://chromereleases.googleblog.com/2020/12/stable-channel-update-for-desktop.html
Changes: https://chromium.googlesource.com/chromium/src/+log/87.0.4280.67..87.0.4280.88?pretty=fuller&n=10000
Approved by: jrm
Differential Revision: https://reviews.freebsd.org/D27452
Notes
Notes:
svn path=/branches/2020Q4/; revision=557055
925 files changed, 7464 insertions, 6087 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile index 9dda00dd9295..d20ead143d91 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 84.0.4147.135 +PORTVERSION= 87.0.4280.88 CATEGORIES?= www java MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ - LOCAL/cpm/chromium/:fonts + LOCAL/rene/chromium/:fonts DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER?= chromium@FreeBSD.org @@ -59,7 +59,8 @@ LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-atk \ libsecret-1.so:security/libsecret \ libnss3.so:security/nss \ libexpat.so:textproc/expat2 \ - libfontconfig.so:x11-fonts/fontconfig + libfontconfig.so:x11-fonts/fontconfig \ + libxkbcommon.so:x11/libxkbcommon RUN_DEPENDS= xdg-open:devel/xdg-utils \ noto-basic>0:x11-fonts/noto-basic @@ -137,7 +138,7 @@ GN_ARGS+= google_api_key="AIzaSyBsp9n41JLW8jCokwn7vhoaMejDFRd1mp8" \ google_default_client_secret="IR1za9-1VK0zZ0f_O8MVFicn" .if !defined(GN_ONLY) -SUB_FILES= chromium-browser.desktop chrome pkg-message +SUB_FILES= chromium-browser.desktop chrome SUB_LIST+= COMMENT="${COMMENT}" OPTIONS_DEFINE= CODECS CUPS DEBUG DRIVER KERBEROS TEST @@ -146,7 +147,7 @@ DRIVER_DESC= Install chromedriver OPTIONS_GROUP= AUDIO OPTIONS_GROUP_AUDIO= ALSA PULSEAUDIO SNDIO -OPTIONS_DEFAULT= ALSA CODECS CUPS DRIVER KERBEROS +OPTIONS_DEFAULT= CODECS CUPS DRIVER KERBEROS SNDIO OPTIONS_SUB= yes ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib @@ -199,10 +200,14 @@ SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false .include "Makefile.tests" TEST_ALL_TARGET= ${TEST_TARGETS} TEST_DISTFILES= ${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX} \ - test_fonts${EXTRACT_SUFX}:fonts + test_fonts-85${EXTRACT_SUFX}:fonts .include <bsd.port.options.mk> +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1300000 +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-build_config_compiler_pgo_pgo.gni +.endif + # swiftshader/lib/{libEGL.so,libGLESv2.so} is x86 only .if ${ARCH} == aarch64 PLIST_SUB+= NOT_AARCH64="@comment " @@ -236,11 +241,6 @@ post-extract-TEST-on: @${MKDIR} ${WRKSRC}/third_party/test_fonts/test_fonts @${MV} ${WRKDIR}/test_fonts ${WRKSRC}/third_party/test_fonts/ -post-patch: - @${REINPLACE_CMD} -e 's|@@PACKAGE@@|chromium|' \ - -e 's|@@MENUNAME@@|Chromium Web Browser|' \ - ${WRKSRC}/chrome/app/resources/manpage.1.in - post-patch-SNDIO-on: @${MKDIR} ${WRKSRC}/media/audio/sndio ${WRKSRC}/media/audio/openbsd @${CP} ${FILESDIR}/sndio_output.* ${WRKSRC}/media/audio/sndio diff --git a/www/chromium/distinfo b/www/chromium/distinfo index 6ae16e577f89..09969f01994c 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1597780235 -SHA256 (chromium-84.0.4147.135.tar.xz) = dd41001596d0e17051ddcece3db6c0cdbe92fe23375d56fbcfba624a5f4996d8 -SIZE (chromium-84.0.4147.135.tar.xz) = 815136236 -SHA256 (chromium-84.0.4147.135-testdata.tar.xz) = cef39a11f7df8ff9655b9e70b9d774dc65cf6a15a726c048389eb87613d80ef2 -SIZE (chromium-84.0.4147.135-testdata.tar.xz) = 257190224 -SHA256 (test_fonts.tar.xz) = cf9cbe3b7f1c4c42d426bddc65ec178d333ad7e205a36fe0a606a3c0c545ece1 -SIZE (test_fonts.tar.xz) = 200040 +TIMESTAMP = 1606957721 +SHA256 (chromium-87.0.4280.88.tar.xz) = 3e4645328735ef60db78d1a313efb3770a3edeaede90d076414df52f567a09c0 +SIZE (chromium-87.0.4280.88.tar.xz) = 856266548 +SHA256 (chromium-87.0.4280.88-testdata.tar.xz) = 35c4676c9cb699aa76335757ec2a71a246102f2e6e6a3536e43c1c4afb04e494 +SIZE (chromium-87.0.4280.88-testdata.tar.xz) = 257423892 +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 new file mode 100644 index 000000000000..b963da3a6dbf --- /dev/null +++ b/www/chromium/files/extra-patch-build_config_compiler_pgo_pgo.gni @@ -0,0 +1,11 @@ +--- build/config/compiler/pgo/pgo.gni.orig 2020-11-24 12:45:30 UTC ++++ build/config/compiler/pgo/pgo.gni +@@ -12,7 +12,7 @@ declare_args() { + # 2 : Used during the PGO (optimization) phase. + chrome_pgo_phase = 0 + if (is_official_build && +- (is_win || is_mac || (is_desktop_linux && !chromeos_is_browser_only))) { ++ (is_win || is_mac || (is_desktop_linux && !chromeos_is_browser_only && !is_bsd))) { + chrome_pgo_phase = 2 + } + diff --git a/www/chromium/files/extra-patch-clang b/www/chromium/files/extra-patch-clang index 887a416b5f2d..104bbce09cda 100644 --- a/www/chromium/files/extra-patch-clang +++ b/www/chromium/files/extra-patch-clang @@ -27,14 +27,3 @@ if (*ptr == kFinalTlsValue) return; // We've been called enough times. ASSERT_LT(kFinalTlsValue, *ptr); ---- media/audio/audio_output_proxy_unittest.cc.orig 2019-03-11 22:00:59 UTC -+++ media/audio/audio_output_proxy_unittest.cc -@@ -410,7 +410,7 @@ class AudioOutputProxyTest : public testing::Test { - // |stream| is closed at this point. Start() should reopen it again. - EXPECT_CALL(manager(), MakeAudioOutputStream(_, _, _)) - .Times(2) -- .WillRepeatedly(Return(reinterpret_cast<AudioOutputStream*>(NULL))); -+ .WillRepeatedly(Return(static_cast<AudioOutputStream*>(NULL))); - - EXPECT_CALL(callback_, OnError()).Times(2); - 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 0a68f59a615e..9fe3b4985016 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,11 +1,11 @@ ---- third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2020-07-07 22:03:25 UTC +--- third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2020-11-13 06:42:21 UTC +++ third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h @@ -16,7 +16,7 @@ #if defined(OS_ANDROID) #include <sys/prctl.h> #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include <sys/resource.h> #include <algorithm> diff --git a/www/chromium/files/patch-BUILD.gn b/www/chromium/files/patch-BUILD.gn index 0b6c77a3ab72..37720bb5f096 100644 --- a/www/chromium/files/patch-BUILD.gn +++ b/www/chromium/files/patch-BUILD.gn @@ -1,15 +1,15 @@ ---- BUILD.gn.orig 2020-07-07 21:58:11 UTC +--- BUILD.gn.orig 2020-11-13 06:36:33 UTC +++ BUILD.gn -@@ -417,7 +417,7 @@ group("gn_all") { +@@ -422,7 +422,7 @@ group("gn_all") { ] } -- if (is_linux || is_android) { -+ if ((is_linux && !is_bsd) || is_android) { +- if (is_linux || is_chromeos || is_android) { ++ if ((is_linux && !is_bsd) || is_chromeos || is_android) { deps += [ "//third_party/breakpad:breakpad_unittests", "//third_party/breakpad:core-2-minidump", -@@ -459,8 +459,6 @@ group("gn_all") { +@@ -463,8 +463,6 @@ group("gn_all") { "//net:disk_cache_memory_test", "//net:quic_client", "//net:quic_server", @@ -18,7 +18,7 @@ "//testing:empty_main", ] -@@ -515,10 +513,6 @@ group("gn_all") { +@@ -519,10 +517,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", -@@ -578,10 +572,6 @@ group("gn_all") { +@@ -582,10 +576,6 @@ group("gn_all") { "//mojo:mojo_perftests", "//services/service_manager/public/cpp", "//testing/gmock:gmock_main", @@ -40,7 +40,7 @@ ] if (!is_android) { -@@ -655,7 +645,7 @@ group("gn_all") { +@@ -663,7 +653,7 @@ group("gn_all") { host_os == "win") { deps += [ "//chrome/test/mini_installer:mini_installer_tests" ] } @@ -49,16 +49,25 @@ deps += [ "//third_party/breakpad:symupload($host_toolchain)" ] } -@@ -788,7 +778,6 @@ group("gn_all") { +@@ -678,7 +668,7 @@ group("gn_all") { + } + } + +- if (is_mac || is_win || is_android || (is_linux && !is_chromeos)) { ++ if (is_mac || is_win || is_android || (is_linux && !is_chromeos && !is_bsd)) { + deps += [ + "//third_party/crashpad/crashpad:crashpad_tests", + "//third_party/crashpad/crashpad/handler:crashpad_handler", +@@ -797,7 +787,6 @@ group("gn_all") { "//chrome/browser/vr:vr_common_perftests", "//chrome/browser/vr:vr_common_unittests", "//chrome/browser/vr:vr_pixeltests", - "//tools/perf/contrib/vr_benchmarks:vr_perf_tests", ] - if (is_desktop_linux && use_ozone) { - deps += [ "//chrome/browser/vr/testapp:vr_testapp" ] -@@ -1074,7 +1063,7 @@ if (!is_ios) { - ] + if (is_android) { + deps += [ "//chrome/browser/android/vr:vr_android_unittests" ] +@@ -1090,7 +1079,7 @@ if (!is_ios) { + data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ] } - if (!is_win && !is_android) { @@ -66,16 +75,16 @@ data_deps += [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } -@@ -1083,7 +1072,7 @@ if (!is_ios) { +@@ -1099,7 +1088,7 @@ if (!is_ios) { data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } -- if (is_linux) { -+ if (is_linux && !is_bsd) { +- if (is_linux || is_chromeos) { ++ if ((is_linux && !is_bsd) || is_chromeos) { data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } -@@ -1276,9 +1265,6 @@ group("chromium_builder_perf") { +@@ -1296,9 +1285,6 @@ group("chromium_builder_perf") { if (is_win) { data_deps += [ "//chrome/installer/mini_installer:mini_installer" ] diff --git a/www/chromium/files/patch-apps_app__restore__service__browsertest.cc b/www/chromium/files/patch-apps_app__restore__service__browsertest.cc index 44a112bec769..7ae6215349f4 100644 --- a/www/chromium/files/patch-apps_app__restore__service__browsertest.cc +++ b/www/chromium/files/patch-apps_app__restore__service__browsertest.cc @@ -1,11 +1,11 @@ ---- apps/app_restore_service_browsertest.cc.orig 2020-07-07 21:57:29 UTC +--- apps/app_restore_service_browsertest.cc.orig 2020-11-13 06:36:34 UTC +++ apps/app_restore_service_browsertest.cc @@ -148,7 +148,7 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, FileAcc } // Flaky: crbug.com/269613 --#if defined(OS_LINUX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_BSD) #define MAYBE_FileAccessIsRestored DISABLED_FileAccessIsRestored #else #define MAYBE_FileAccessIsRestored FileAccessIsRestored diff --git a/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc b/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc index 8f6bd623a3b3..8a96c5b88c47 100644 --- a/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc +++ b/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc @@ -1,6 +1,6 @@ ---- apps/ui/views/app_window_frame_view.cc.orig 2019-06-04 18:55:14 UTC +--- apps/ui/views/app_window_frame_view.cc.orig 2020-11-13 06:36:34 UTC +++ apps/ui/views/app_window_frame_view.cc -@@ -125,7 +125,7 @@ gfx::Rect AppWindowFrameView::GetBoundsForClientView() +@@ -132,7 +132,7 @@ gfx::Rect AppWindowFrameView::GetBoundsForClientView() gfx::Rect AppWindowFrameView::GetWindowBoundsForClientBounds( const gfx::Rect& client_bounds) const { gfx::Rect window_bounds = client_bounds; 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 838875d71ad0..f7124e6daed6 100644 --- a/www/chromium/files/patch-ash_display_mirror__window__controller.cc +++ b/www/chromium/files/patch-ash_display_mirror__window__controller.cc @@ -1,4 +1,4 @@ ---- ash/display/mirror_window_controller.cc.orig 2020-05-13 18:39:35 UTC +--- ash/display/mirror_window_controller.cc.orig 2020-11-13 06:36:34 UTC +++ ash/display/mirror_window_controller.cc @@ -275,7 +275,11 @@ void MirrorWindowController::UpdateWindow( return info.id() == iter->first; diff --git a/www/chromium/files/patch-base_BUILD.gn b/www/chromium/files/patch-base_BUILD.gn index 15bb859a84f8..0ff1f5c9a661 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 2020-07-07 21:58:11 UTC +--- base/BUILD.gn.orig 2020-11-13 06:36:34 UTC +++ base/BUILD.gn -@@ -60,7 +60,7 @@ declare_args() { +@@ -53,7 +53,7 @@ declare_args() { # replacement base::Location::Current(). On by default in non-official builds # for testing purposes. # TODO(https://crbug.com/974061): remove this eventually. @@ -9,20 +9,19 @@ # Unsafe developer build. Has developer-friendly features that may weaken or # disable security measures like sandboxing or ASLR. -@@ -936,7 +936,7 @@ jumbo_component("base") { +@@ -878,7 +878,7 @@ component("base") { "timer/hi_res_timer_manager_posix.cc", ] -- if (!is_nacl && !is_mac && !is_ios) { -+ if (!is_nacl && !is_mac && !is_ios && !is_bsd) { +- if (!is_nacl && !is_apple) { ++ if (!is_nacl && !is_apple && !is_bsd) { sources += [ - "profiler/stack_copier_signal.cc", - "profiler/stack_copier_signal.h", -@@ -945,6 +945,12 @@ jumbo_component("base") { + "cpu_affinity_posix.cc", + "cpu_affinity_posix.h", +@@ -889,6 +889,11 @@ component("base") { "profiler/thread_delegate_posix.h", ] } -+ + if (is_bsd) { + sources += [ + "profiler/stack_sampler_posix.cc", @@ -31,25 +30,34 @@ } if (is_win) { -@@ -1329,7 +1335,7 @@ jumbo_component("base") { - # Needed for <atomic> if using newer C++ library than sysroot, except if +@@ -1295,7 +1300,7 @@ component("base") { # building inside the cros_sdk environment - use host_toolchain as a # more robust check for this. -- if (!use_sysroot && (is_android || (is_linux && !is_chromecast)) && -+ if (!use_sysroot && (is_android || (is_linux && !is_chromecast) && !is_clang) && + if (!use_sysroot && +- (is_android || ((is_linux || is_chromeos) && !is_chromecast)) && ++ (is_android || ((is_linux || is_chromeos) && !is_chromecast) && !is_clang) && host_toolchain != "//build/toolchain/cros:host") { libs += [ "atomic" ] } -@@ -1355,7 +1361,7 @@ jumbo_component("base") { - "allocator/allocator_shim_override_glibc_weak_symbols.h", - ] - deps += [ "//base/allocator:tcmalloc" ] -- } else if (is_linux && use_allocator == "none") { -+ } else if ((is_linux && !is_bsd) && use_allocator == "none") { - sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ] - } else if (is_android && use_allocator == "none") { - sources += [ -@@ -1952,6 +1958,33 @@ jumbo_component("base") { +@@ -1342,7 +1347,7 @@ component("base") { + "allocator/allocator_shim_default_dispatch_to_mac_zoned_malloc.cc", + ] + } +- if (is_chromeos || is_linux) { ++ if ((is_chromeos || is_linux) && !is_bsd) { + sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ] + } + if (is_win) { +@@ -1811,7 +1816,7 @@ component("base") { + ] + } + +- if (is_linux || is_chromeos || is_android) { ++ if ((is_linux || is_chromeos || is_android) && !is_bsd) { + sources += [ + "allocator/partition_allocator/spinning_futex_linux.cc", + "allocator/partition_allocator/spinning_futex_linux.h", +@@ -1956,6 +1961,34 @@ component("base") { } } @@ -80,28 +88,25 @@ + ] + } + ++ # iOS if (is_ios) { sources -= [ -@@ -2946,7 +2979,7 @@ test("base_unittests") { - "posix/unix_domain_socket_unittest.cc", - "task/thread_pool/task_tracker_posix_unittest.cc", +@@ -3069,7 +3102,7 @@ test("base_unittests") { ] -- if (!is_nacl && !is_mac && !is_ios) { -+ if (!is_nacl && !is_mac && !is_ios && !is_bsd) { - sources += [ "profiler/stack_copier_signal_unittest.cc" ] - } } -@@ -3154,6 +3187,12 @@ test("base_unittests") { - manifest = "//build/config/fuchsia/tests.cmx" +- if (is_linux || is_chromeos) { ++ if ((is_linux || is_chromeos) && !is_bsd) { + sources += [ "debug/proc_maps_linux_unittest.cc" ] } -+ -+ if (is_bsd) { -+ sources -= [ -+ "debug/proc_maps_linux_unittest.cc", -+ ] -+ } - if (!is_fuchsia && !is_ios) { - sources += [ "files/file_locking_unittest.cc" ] +@@ -3110,7 +3143,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__shim.cc b/www/chromium/files/patch-base_allocator_allocator__shim.cc deleted file mode 100644 index 208a8d93617a..000000000000 --- a/www/chromium/files/patch-base_allocator_allocator__shim.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- base/allocator/allocator_shim.cc.orig 2019-10-21 19:06:18 UTC -+++ base/allocator/allocator_shim.cc -@@ -71,7 +71,7 @@ inline const base::allocator::AllocatorDispatch* GetCh - // Unfortunately due to that bug NoBarrier_Load() is mistakenly fully - // barriered on Linux+Clang, and that causes visible perf regressons. - return reinterpret_cast<const base::allocator::AllocatorDispatch*>( --#if defined(OS_LINUX) && defined(__clang__) -+#if (defined(OS_BSD) || defined(OS_LINUX)) && defined(__clang__) - *static_cast<const volatile base::subtle::AtomicWord*>(&g_chain_head) - #else - base::subtle::NoBarrier_Load(&g_chain_head) diff --git a/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc b/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc index c7b4ac21c804..d8774004de47 100644 --- a/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc +++ b/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc @@ -1,4 +1,4 @@ ---- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig 2020-02-03 21:52:37 UTC +--- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig 2020-11-13 06:36:34 UTC +++ base/allocator/allocator_shim_default_dispatch_to_glibc.cc @@ -6,18 +6,28 @@ #include "base/compiler_specific.h" diff --git a/www/chromium/files/patch-base_allocator_allocator__shim__override__libc__symbols.h b/www/chromium/files/patch-base_allocator_allocator__shim__override__libc__symbols.h index fc9a47bd3daf..212e4561c6c2 100644 --- a/www/chromium/files/patch-base_allocator_allocator__shim__override__libc__symbols.h +++ b/www/chromium/files/patch-base_allocator_allocator__shim__override__libc__symbols.h @@ -1,4 +1,4 @@ ---- base/allocator/allocator_shim_override_libc_symbols.h.orig 2019-03-11 22:00:51 UTC +--- base/allocator/allocator_shim_override_libc_symbols.h.orig 2020-11-13 06:36:34 UTC +++ base/allocator/allocator_shim_override_libc_symbols.h @@ -10,7 +10,7 @@ #endif diff --git a/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc b/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc index 9b1fc5b916e6..21de4b8f7dc2 100644 --- a/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc +++ b/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc @@ -1,45 +1,47 @@ ---- base/allocator/allocator_shim_unittest.cc.orig 2020-07-07 21:57:30 UTC +--- base/allocator/allocator_shim_unittest.cc.orig 2020-11-13 06:36:34 UTC +++ base/allocator/allocator_shim_unittest.cc -@@ -355,7 +355,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) { - ASSERT_GE(aligned_allocs_intercepted_by_size[61], 1u); +@@ -367,7 +367,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) { + #endif // !OS_WIN --#if !defined(OS_WIN) && !defined(OS_MACOSX) -+#if !defined(OS_WIN) && !defined(OS_MACOSX) && !defined(OS_BSD) +-#if !defined(OS_WIN) && !defined(OS_APPLE) ++#if !defined(OS_WIN) && !defined(OS_APPLE) && !defined(OS_BSD) void* memalign_ptr = memalign(128, 53); ASSERT_NE(nullptr, memalign_ptr); ASSERT_EQ(0u, reinterpret_cast<uintptr_t>(memalign_ptr) % 128); -@@ -368,7 +368,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) { - ASSERT_GE(aligned_allocs_intercepted_by_alignment[kPageSize], 1u); - // pvalloc rounds the size up to the next page. +@@ -383,7 +383,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) { ASSERT_GE(aligned_allocs_intercepted_by_size[kPageSize], 1u); --#endif // !OS_WIN && !OS_MACOSX -+#endif // !OS_WIN && !OS_MACOSX && !OS_BSD + #endif // !defined(OS_ANDROID) + +-#endif // !OS_WIN && !OS_APPLE ++#endif // !OS_WIN && !OS_APPLE && !OS_BSD - char* realloc_ptr = static_cast<char*>(malloc(10)); - strcpy(realloc_ptr, "foobar"); -@@ -384,13 +384,13 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) { + // See allocator_shim_override_glibc_weak_symbols.h for why we intercept + // internal libc symbols. +@@ -410,7 +410,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) { free(zero_alloc_ptr); ASSERT_GE(frees_intercepted_by_addr[Hash(zero_alloc_ptr)], 1u); --#if !defined(OS_WIN) && !defined(OS_MACOSX) -+#if !defined(OS_WIN) && !defined(OS_MACOSX) && !defined(OS_BSD) +-#if !defined(OS_WIN) && !defined(OS_APPLE) ++#if !defined(OS_WIN) && !defined(OS_APPLE) && !defined(OS_BSD) free(memalign_ptr); ASSERT_GE(frees_intercepted_by_addr[Hash(memalign_ptr)], 1u); - free(pvalloc_ptr); +@@ -419,7 +419,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) { ASSERT_GE(frees_intercepted_by_addr[Hash(pvalloc_ptr)], 1u); --#endif // !OS_WIN && !OS_MACOSX -+#endif // !OS_WIN && !OS_MACOSX && !OS_BSD + #endif // !defined(OS_ANDROID) + +-#endif // !OS_WIN && !OS_APPLE ++#endif // !OS_WIN && !OS_APPLE && !OS_BSD #if !defined(OS_WIN) free(posix_memalign_ptr); -@@ -557,7 +557,7 @@ static size_t GetAllocatedSize(void* ptr) { +@@ -595,7 +595,7 @@ static size_t GetAllocatedSize(void* ptr) { static size_t GetAllocatedSize(void* ptr) { return malloc_size(ptr); } --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) ++#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) static size_t GetAllocatedSize(void* ptr) { return malloc_usable_size(ptr); } 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 07ed8ef2f09e..b9db7cc31cd5 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,11 +1,11 @@ ---- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2020-05-13 18:39:35 UTC +--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2020-11-13 06:36:34 UTC +++ base/allocator/partition_allocator/page_allocator_internals_posix.h -@@ -22,7 +22,7 @@ +@@ -24,7 +24,7 @@ #if defined(OS_ANDROID) #include <sys/prctl.h> #endif --#if defined(OS_LINUX) -+#if defined(OS_BSD) || defined(OS_LINUX) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include <sys/resource.h> #include <algorithm> diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.cc b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.cc new file mode 100644 index 000000000000..9b1a187130ab --- /dev/null +++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.cc @@ -0,0 +1,12 @@ +--- base/allocator/partition_allocator/partition_alloc.cc.orig 2020-11-30 16:06:59 UTC ++++ base/allocator/partition_allocator/partition_alloc.cc +@@ -197,6 +197,9 @@ void PartitionAllocGlobalInit(OomFunction on_out_of_me + // Check that some of our zanier calculations worked out as expected. + #if ENABLE_TAG_FOR_MTE_CHECKED_PTR + static_assert(kSmallestBucket >= kAlignment, "generic smallest bucket"); ++#elif defined(__i386__) && defined(OS_FREEBSD) ++ // alignof(std::max_align_t) is only 4 on FreeBSD/i386 ++ static_assert(kSmallestBucket >= kAlignment, "generic smallest bucket"); + #else + static_assert(kSmallestBucket == kAlignment, "generic smallest bucket"); + #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 fdfc9604fefd..01c57fe8a78a 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,17 +1,26 @@ ---- base/allocator/partition_allocator/partition_alloc_unittest.cc.orig 2020-07-07 21:58:11 UTC +--- base/allocator/partition_allocator/partition_alloc_unittest.cc.orig 2020-11-13 06:36:34 UTC +++ base/allocator/partition_allocator/partition_alloc_unittest.cc -@@ -307,9 +307,13 @@ void FreeFullPage(PartitionRoot* root, PartitionRoot:: +@@ -333,9 +333,13 @@ void FreeFullPage(PartitionRoot<base::internal::Thread } } --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) bool CheckPageInCore(void* ptr, bool in_core) { +#if defined(OS_BSD) + char ret = 0; +#else unsigned char ret = 0; +#endif - EXPECT_EQ(0, mincore(ptr, kSystemPageSize, &ret)); + EXPECT_EQ(0, mincore(ptr, SystemPageSize(), &ret)); return in_core == (ret & 1); } +@@ -344,7 +348,7 @@ bool CheckPageInCore(void* ptr, bool in_core) { + EXPECT_TRUE(CheckPageInCore(ptr, in_core)) + #else + #define CHECK_PAGE_IN_CORE(ptr, in_core) (void)(0) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + class MockPartitionStatsDumper : public PartitionStatsDumper { + public: diff --git a/www/chromium/files/patch-base_base__switches.cc b/www/chromium/files/patch-base_base__switches.cc index 92ed9217882d..629e1c6e6a11 100644 --- a/www/chromium/files/patch-base_base__switches.cc +++ b/www/chromium/files/patch-base_base__switches.cc @@ -1,20 +1,20 @@ ---- base/base_switches.cc.orig 2019-10-21 19:06:18 UTC +--- base/base_switches.cc.orig 2020-11-13 06:36:34 UTC +++ base/base_switches.cc @@ -117,7 +117,7 @@ const char kDisableHighResTimer[] = "disable-highres-t const char kDisableUsbKeyboardDetect[] = "disable-usb-keyboard-detect"; #endif --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_LACROS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_LACROS)) || defined(OS_BSD) // The /dev/shm partition is too small in certain VM environments, causing // Chrome to fail or crash (see http://crbug.com/715363). Use this flag to // work-around this issue (a temporary directory will always be used to create -@@ -138,7 +138,7 @@ const char kEnableCrashReporterForTesting[] = - const char kEnableReachedCodeProfiler[] = "enable-reached-code-profiler"; +@@ -152,7 +152,7 @@ const char kForceFieldTrialParams[] = "force-fieldtria + #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Controls whether or not retired instruction counts are surfaced for threads // in trace events on Linux. // diff --git a/www/chromium/files/patch-base_base__switches.h b/www/chromium/files/patch-base_base__switches.h index f2be6f05c697..e251bbebd896 100644 --- a/www/chromium/files/patch-base_base__switches.h +++ b/www/chromium/files/patch-base_base__switches.h @@ -1,20 +1,20 @@ ---- base/base_switches.h.orig 2019-10-21 19:06:18 UTC +--- base/base_switches.h.orig 2020-11-13 06:36:34 UTC +++ base/base_switches.h -@@ -38,7 +38,7 @@ extern const char kDisableHighResTimer[]; +@@ -39,7 +39,7 @@ extern const char kDisableHighResTimer[]; extern const char kDisableUsbKeyboardDetect[]; #endif --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_LACROS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_LACROS)) || defined(OS_BSD) extern const char kDisableDevShmUsage[]; #endif -@@ -51,7 +51,7 @@ extern const char kEnableReachedCodeProfiler[]; - extern const char kOrderfileMemoryOptimization[]; +@@ -55,7 +55,7 @@ extern const char kEnableIdleTracing[]; + extern const char kForceFieldTrialParams[]; #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) extern const char kEnableThreadInstructionCount[]; #endif diff --git a/www/chromium/files/patch-base_cpu.cc b/www/chromium/files/patch-base_cpu.cc index ac9765934a12..f07b964997d3 100644 --- a/www/chromium/files/patch-base_cpu.cc +++ b/www/chromium/files/patch-base_cpu.cc @@ -1,38 +1,44 @@ ---- base/cpu.cc.orig 2020-07-07 21:57:30 UTC +--- base/cpu.cc.orig 2020-11-13 06:36:34 UTC +++ base/cpu.cc -@@ -15,7 +15,7 @@ +@@ -16,7 +16,7 @@ #include "base/stl_util.h" --#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX)) -+#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) || \ + defined(OS_AIX) + #include "base/containers/flat_set.h" #include "base/files/file_util.h" +@@ -31,7 +31,7 @@ #endif -@@ -136,7 +136,7 @@ uint64_t xgetbv(uint32_t xcr) { + #if defined(ARCH_CPU_ARM_FAMILY) && \ +- (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS)) ++ (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS)) + #include "base/files/file_util.h" + #endif - #endif // ARCH_CPU_X86_FAMILY +@@ -182,6 +182,14 @@ std::string* CpuInfoBrand() { --#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX)) -+#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)) - std::string* CpuInfoBrand() { - static std::string* brand = []() { - // This function finds the value from /proc/cpuinfo under the key "model -@@ -166,7 +166,7 @@ std::string* CpuInfoBrand() { return brand; } ++#elif defined(OS_BSD) ++std::string* CpuInfoBrand() { ++ static std::string* brand = []() { ++ return new std::string(SysInfo::CPUModelName()); ++ }(); ++ ++ return brand; ++} #endif // defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || -- // defined(OS_LINUX)) -+ // defined(OS_LINUX) || defined(OS_BSD)) - - } // namespace + // defined(OS_LINUX) || defined(OS_CHROMEOS)) -@@ -288,7 +288,7 @@ void CPU::Initialize() { +@@ -305,7 +313,7 @@ void CPU::Initialize() { } } #elif defined(ARCH_CPU_ARM_FAMILY) --#if (defined(OS_ANDROID) || defined(OS_LINUX)) -+#if (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)) +-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) cpu_brand_ = *CpuInfoBrand(); #elif defined(OS_WIN) // Windows makes high-resolution thread timing information available in diff --git a/www/chromium/files/patch-base_cpu.h b/www/chromium/files/patch-base_cpu.h new file mode 100644 index 000000000000..76db98bf057a --- /dev/null +++ b/www/chromium/files/patch-base_cpu.h @@ -0,0 +1,20 @@ +--- base/cpu.h.orig 2020-11-16 17:24:49 UTC ++++ base/cpu.h +@@ -73,7 +73,7 @@ class BASE_EXPORT CPU final { + IntelMicroArchitecture GetIntelMicroArchitecture() const; + const std::string& cpu_brand() const { return cpu_brand_; } + +-#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) + enum class CoreType { + kUnknown = 0, +@@ -124,7 +124,7 @@ class BASE_EXPORT CPU final { + // cpuidle driver. + using CoreIdleTimes = std::vector<TimeDelta>; + static bool GetCumulativeCoreIdleTimes(CoreIdleTimes&); +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) + // defined(OS_AIX) + + private: diff --git a/www/chromium/files/patch-base_debug_debugger__posix.cc b/www/chromium/files/patch-base_debug_debugger__posix.cc index dd1e1658fd34..56b47676b47f 100644 --- a/www/chromium/files/patch-base_debug_debugger__posix.cc +++ b/www/chromium/files/patch-base_debug_debugger__posix.cc @@ -1,4 +1,4 @@ ---- base/debug/debugger_posix.cc.orig 2020-07-07 21:58:11 UTC +--- base/debug/debugger_posix.cc.orig 2020-11-13 06:36:34 UTC +++ base/debug/debugger_posix.cc @@ -98,7 +98,7 @@ bool BeingDebugged() { KERN_PROC, diff --git a/www/chromium/files/patch-base_debug_elf__reader.cc b/www/chromium/files/patch-base_debug_elf__reader.cc index 706190c26d34..b89af4f16bf9 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 2020-07-07 21:57:30 UTC +--- base/debug/elf_reader.cc.orig 2020-11-13 06:36:34 UTC +++ base/debug/elf_reader.cc -@@ -36,7 +36,9 @@ using Nhdr = Elf64_Nhdr; +@@ -38,7 +38,9 @@ using Nhdr = Elf64_Nhdr; using Word = Elf64_Word; #endif @@ -8,9 +8,9 @@ constexpr char kGnuNoteName[] = "GNU"; +#endif - // Returns a pointer to the header of the ELF binary mapped into memory, - // or a null pointer if the header is invalid. -@@ -99,6 +101,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base, + // 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, 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); -@@ -108,6 +111,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base, +@@ -84,6 +87,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base, break; } } diff --git a/www/chromium/files/patch-base_debug_proc__maps__linux.cc b/www/chromium/files/patch-base_debug_proc__maps__linux.cc index 69cc11ea867b..71602a3cfa56 100644 --- a/www/chromium/files/patch-base_debug_proc__maps__linux.cc +++ b/www/chromium/files/patch-base_debug_proc__maps__linux.cc @@ -1,11 +1,11 @@ ---- base/debug/proc_maps_linux.cc.orig 2020-07-07 21:57:30 UTC +--- base/debug/proc_maps_linux.cc.orig 2020-11-13 06:36:34 UTC +++ base/debug/proc_maps_linux.cc @@ -13,7 +13,7 @@ #include "base/strings/string_split.h" #include "build/build_config.h" --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_BSD) || defined(OS_ANDROID) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) #include <inttypes.h> #endif diff --git a/www/chromium/files/patch-base_debug_stack__trace.cc b/www/chromium/files/patch-base_debug_stack__trace.cc index 8d2156f365ff..39376795491e 100644 --- a/www/chromium/files/patch-base_debug_stack__trace.cc +++ b/www/chromium/files/patch-base_debug_stack__trace.cc @@ -1,11 +1,11 @@ ---- base/debug/stack_trace.cc.orig 2019-03-17 21:37:51 UTC +--- base/debug/stack_trace.cc.orig 2020-11-13 06:36:34 UTC +++ base/debug/stack_trace.cc -@@ -14,7 +14,7 @@ +@@ -15,7 +15,7 @@ #if BUILDFLAG(CAN_UNWIND_WITH_FRAME_POINTERS) --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) #include <pthread.h> #include "base/process/process_handle.h" #include "base/threading/platform_thread.h" diff --git a/www/chromium/files/patch-base_debug_stack__trace.h b/www/chromium/files/patch-base_debug_stack__trace.h index 6b4e63dd1e32..4900241415b6 100644 --- a/www/chromium/files/patch-base_debug_stack__trace.h +++ b/www/chromium/files/patch-base_debug_stack__trace.h @@ -1,4 +1,4 @@ ---- base/debug/stack_trace.h.orig 2019-09-09 21:55:05 UTC +--- base/debug/stack_trace.h.orig 2020-11-13 06:36:34 UTC +++ base/debug/stack_trace.h @@ -19,6 +19,7 @@ #if !defined(OS_NACL) 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 f3b967c844e2..66bf850fd83e 100644 --- a/www/chromium/files/patch-base_debug_stack__trace__posix.cc +++ b/www/chromium/files/patch-base_debug_stack__trace__posix.cc @@ -1,11 +1,11 @@ ---- base/debug/stack_trace_posix.cc.orig 2020-03-16 18:39:41 UTC +--- base/debug/stack_trace_posix.cc.orig 2020-11-13 06:36:34 UTC +++ base/debug/stack_trace_posix.cc @@ -35,7 +35,7 @@ #include <AvailabilityMacros.h> #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "base/debug/proc_maps_linux.h" #endif 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 933a8e8ce401..bdbdb57fe408 100644 --- a/www/chromium/files/patch-base_debug_stack__trace__unittest.cc +++ b/www/chromium/files/patch-base_debug_stack__trace__unittest.cc @@ -1,14 +1,14 @@ ---- base/debug/stack_trace_unittest.cc.orig 2020-03-23 14:01:09 UTC +--- base/debug/stack_trace_unittest.cc.orig 2020-11-13 06:36:34 UTC +++ base/debug/stack_trace_unittest.cc -@@ -86,6 +86,7 @@ TEST_F(StackTraceTest, OutputToStream) { +@@ -88,6 +88,7 @@ TEST_F(StackTraceTest, OutputToStream) { std::string::npos) << "Unable to resolve symbols."; +#if !defined(OS_BSD) // Expect a demangled symbol. // Note that Windows Release builds omit the function parameters from the - // demangled stack output, otherwise this could be "testing::Test::Run()". -@@ -103,9 +104,10 @@ TEST_F(StackTraceTest, OutputToStream) { + // demangled stack output, otherwise this could be "testing::UnitTest::Run()". +@@ -106,9 +107,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) { -@@ -119,7 +121,7 @@ TEST_F(StackTraceTest, TruncatedTrace) { +@@ -122,7 +124,7 @@ TEST_F(StackTraceTest, TruncatedTrace) { truncated.Addresses(&count); EXPECT_EQ(2u, count); } diff --git a/www/chromium/files/patch-base_files_file__path__unittest.cc b/www/chromium/files/patch-base_files_file__path__unittest.cc index 26521d022831..ca4d131daf7c 100644 --- a/www/chromium/files/patch-base_files_file__path__unittest.cc +++ b/www/chromium/files/patch-base_files_file__path__unittest.cc @@ -1,11 +1,11 @@ ---- base/files/file_path_unittest.cc.orig 2020-03-16 18:39:41 UTC +--- base/files/file_path_unittest.cc.orig 2020-11-13 06:36:34 UTC +++ base/files/file_path_unittest.cc @@ -1149,7 +1149,7 @@ TEST_F(FilePathTest, FromUTF8Unsafe_And_AsUTF8Unsafe) "\xEF\xBC\xA1\xEF\xBC\xA2\xEF\xBC\xA3.txt" }, }; --#if !defined(SYSTEM_NATIVE_UTF8) && defined(OS_LINUX) -+#if !defined(SYSTEM_NATIVE_UTF8) && (defined(OS_LINUX) || defined(OS_BSD)) +-#if !defined(SYSTEM_NATIVE_UTF8) && (defined(OS_LINUX) || defined(OS_CHROMEOS)) ++#if !defined(SYSTEM_NATIVE_UTF8) && (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) ScopedLocale locale("en_US.UTF-8"); #endif diff --git a/www/chromium/files/patch-base_files_file__path__watcher.cc b/www/chromium/files/patch-base_files_file__path__watcher.cc deleted file mode 100644 index 87abcb7fbda1..000000000000 --- a/www/chromium/files/patch-base_files_file__path__watcher.cc +++ /dev/null @@ -1,15 +0,0 @@ ---- base/files/file_path_watcher.cc.orig 2020-03-16 18:39:41 UTC -+++ base/files/file_path_watcher.cc -@@ -20,10 +20,10 @@ FilePathWatcher::~FilePathWatcher() { - // static - bool FilePathWatcher::RecursiveWatchAvailable() { - #if (defined(OS_MACOSX) && !defined(OS_IOS)) || defined(OS_WIN) || \ -- defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) -+ (defined(OS_LINUX) && !defined(OS_BSD)) || defined(OS_ANDROID) || defined(OS_AIX) - return true; - #else -- // FSEvents isn't available on iOS. -+ // FSEvents isn't available on iOS and the kqueue watcher. - return false; - #endif - } diff --git a/www/chromium/files/patch-base_files_file__path__watcher__kqueue.h b/www/chromium/files/patch-base_files_file__path__watcher__kqueue.h index d5712de7a389..949735362ed9 100644 --- a/www/chromium/files/patch-base_files_file__path__watcher__kqueue.h +++ b/www/chromium/files/patch-base_files_file__path__watcher__kqueue.h @@ -1,4 +1,4 @@ ---- base/files/file_path_watcher_kqueue.h.orig 2019-03-11 22:00:51 UTC +--- base/files/file_path_watcher_kqueue.h.orig 2020-11-13 06:36:34 UTC +++ base/files/file_path_watcher_kqueue.h @@ -5,6 +5,10 @@ #ifndef BASE_FILES_FILE_PATH_WATCHER_KQUEUE_H_ diff --git a/www/chromium/files/patch-base_files_file__path__watcher__stub.cc b/www/chromium/files/patch-base_files_file__path__watcher__stub.cc index fc76cd1b16b3..9905dc61e18e 100644 --- a/www/chromium/files/patch-base_files_file__path__watcher__stub.cc +++ b/www/chromium/files/patch-base_files_file__path__watcher__stub.cc @@ -1,4 +1,4 @@ ---- base/files/file_path_watcher_stub.cc.orig 2020-03-16 18:39:41 UTC +--- base/files/file_path_watcher_stub.cc.orig 2020-11-13 06:36:34 UTC +++ base/files/file_path_watcher_stub.cc @@ -1,14 +1,15 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. diff --git a/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc b/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc index ba8a788b98a9..a54a03a1849e 100644 --- a/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc +++ b/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc @@ -1,41 +1,65 @@ ---- base/files/file_path_watcher_unittest.cc.orig 2020-07-07 21:58:11 UTC +--- base/files/file_path_watcher_unittest.cc.orig 2020-11-13 06:36:34 UTC +++ base/files/file_path_watcher_unittest.cc -@@ -424,7 +424,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) { +@@ -425,12 +425,12 @@ TEST_F(FilePathWatcherTest, WatchDirectory) { VLOG(1) << "Waiting for file1 creation"; ASSERT_TRUE(WaitForEvents()); --#if !defined(OS_MACOSX) -+#if !defined(OS_MACOSX) && !defined(OS_BSD) +-#if !defined(OS_APPLE) ++#if !defined(OS_APPLE) && !defined(OS_BSD) // Mac implementation does not detect files modified in a directory. ASSERT_TRUE(WriteFile(file1, "content v2")); VLOG(1) << "Waiting for file1 modification"; -@@ -797,7 +797,7 @@ enum Permission { + ASSERT_TRUE(WaitForEvents()); +-#endif // !OS_APPLE ++#endif // !OS_APPLE && !OS_BSD + + ASSERT_TRUE(base::DeleteFile(file1)); + VLOG(1) << "Waiting for file1 deletion"; +@@ -632,7 +632,7 @@ TEST_F(FilePathWatcherTest, FileAttributesChanged) { + ASSERT_TRUE(WaitForEvents()); + } + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + // Verify that creating a symlink is caught. + TEST_F(FilePathWatcherTest, CreateLink) { +@@ -790,7 +790,7 @@ TEST_F(FilePathWatcherTest, LinkedDirectoryPart3) { + ASSERT_TRUE(WaitForEvents()); + } + +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + enum Permission { + Read, +@@ -798,7 +798,7 @@ enum Permission { Execute }; --#if defined(OS_MACOSX) -+#if defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_APPLE) ++#if defined(OS_APPLE) || defined(OS_BSD) bool ChangeFilePermissions(const FilePath& path, Permission perm, bool allow) { struct stat stat_buf; -@@ -826,9 +826,9 @@ bool ChangeFilePermissions(const FilePath& path, Permi +@@ -827,9 +827,9 @@ bool ChangeFilePermissions(const FilePath& path, Permi } return chmod(path.value().c_str(), stat_buf.st_mode) == 0; } --#endif // defined(OS_MACOSX) -+#endif // defined(OS_MACOSX) || defined(OS_BSD) +-#endif // defined(OS_APPLE) ++#endif // defined(OS_APPLE) || defined(OS_BSD) --#if defined(OS_MACOSX) -+#if defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_APPLE) ++#if defined(OS_APPLE) || defined(OS_BSD) // Linux implementation of FilePathWatcher doesn't catch attribute changes. // http://crbug.com/78043 // Windows implementation of FilePathWatcher catches attribute changes that -@@ -863,7 +863,7 @@ TEST_F(FilePathWatcherTest, DirAttributesChanged) { +@@ -864,7 +864,7 @@ TEST_F(FilePathWatcherTest, DirAttributesChanged) { ASSERT_TRUE(ChangeFilePermissions(test_dir1, Execute, true)); } --#endif // OS_MACOSX -+#endif // OS_MACOSX || OS_BSD +-#endif // OS_APPLE ++#endif // OS_APPLE || OS_BSD } // namespace } // namespace base diff --git a/www/chromium/files/patch-base_files_file__util.h b/www/chromium/files/patch-base_files_file__util.h index 7b393a0021a0..bf2c4dce52dd 100644 --- a/www/chromium/files/patch-base_files_file__util.h +++ b/www/chromium/files/patch-base_files_file__util.h @@ -1,11 +1,28 @@ ---- base/files/file_util.h.orig 2020-07-07 21:58:11 UTC +--- base/files/file_util.h.orig 2020-11-13 06:36:34 UTC +++ base/files/file_util.h -@@ -552,7 +552,7 @@ BASE_EXPORT bool VerifyPathControlledByAdmin(const bas +@@ -278,14 +278,14 @@ BASE_EXPORT bool SetPosixFilePermissions(const FilePat + BASE_EXPORT bool ExecutableExistsInPath(Environment* env, + const FilePath::StringType& executable); + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) || defined(OS_BSD) + // Determine if files under a given |path| can be mapped and then mprotect'd + // PROT_EXEC. This depends on the mount options used for |path|, which vary + // among different Linux distributions and possibly local configuration. It also + // depends on details of kernel--ChromeOS uses the noexec option for /dev/shm + // but its kernel allows mprotect with PROT_EXEC anyway. + BASE_EXPORT bool IsPathExecutable(const FilePath& path); +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) || defined(OS_BSD) + + #endif // OS_POSIX + +@@ -592,7 +592,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); --#if defined(OS_LINUX) || defined(OS_AIX) -+#if defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) || defined(OS_BSD) // Broad categories of file systems as returned by statfs() on Linux. enum FileSystemType { FILE_SYSTEM_UNKNOWN, // statfs failed. 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 4342a618c454..7c9c399872b9 100644 --- a/www/chromium/files/patch-base_files_file__util__posix.cc +++ b/www/chromium/files/patch-base_files_file__util__posix.cc @@ -1,11 +1,60 @@ ---- base/files/file_util_posix.cc.orig 2020-02-03 21:52:37 UTC +--- base/files/file_util_posix.cc.orig 2020-11-13 06:36:34 UTC +++ base/files/file_util_posix.cc -@@ -411,7 +411,7 @@ bool CreatePipe(ScopedFD* read_fd, ScopedFD* write_fd, +@@ -412,7 +412,7 @@ bool CreatePipe(ScopedFD* read_fd, ScopedFD* write_fd, } bool CreateLocalNonBlockingPipe(int fds[2]) { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) return pipe2(fds, O_CLOEXEC | O_NONBLOCK) == 0; #else int raw_fds[2]; +@@ -947,8 +947,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. + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) ++#if defined(OS_BSD) ++ if (HANDLE_EINTR(posix_fallocate(file->GetPlatformFile(), offset, size)) != -1) ++#else + if (HANDLE_EINTR(fallocate(file->GetPlatformFile(), 0, offset, size)) != -1) ++#endif + return true; + DPLOG(ERROR) << "fallocate"; + #elif defined(OS_APPLE) +@@ -1172,7 +1176,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. +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || \ ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ + (defined(OS_ANDROID) && __ANDROID_API__ >= 21) + File file(file_path, File::FLAG_OPEN | File::FLAG_READ); + if (!file.IsValid()) +@@ -1208,7 +1212,7 @@ PrefetchResult PreReadFile(const FilePath& file_path, + return internal::PreReadFileSlow(file_path, max_bytes) + ? PrefetchResult{PrefetchResultCode::kSlowSuccess} + : PrefetchResult{PrefetchResultCode::kSlowFailed}; +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || (defined(OS_ANDROID) && ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || (defined(OS_ANDROID) && + // __ANDROID_API__ >= 21) + } + +@@ -1243,7 +1247,7 @@ bool MoveUnsafe(const FilePath& from_path, const FileP + + #endif // !defined(OS_NACL_NONSFI) + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) || defined(OS_BSD) + BASE_EXPORT bool IsPathExecutable(const FilePath& path) { + bool result = false; + FilePath tmp_file_path; +@@ -1264,6 +1268,6 @@ BASE_EXPORT bool IsPathExecutable(const FilePath& path + } + return result; + } +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) || defined(OS_BSD) + + } // namespace base diff --git a/www/chromium/files/patch-base_files_file__util__unittest.cc b/www/chromium/files/patch-base_files_file__util__unittest.cc index 8b5814ae79df..5bec8bb9694e 100644 --- a/www/chromium/files/patch-base_files_file__util__unittest.cc +++ b/www/chromium/files/patch-base_files_file__util__unittest.cc @@ -1,20 +1,38 @@ ---- base/files/file_util_unittest.cc.orig 2020-07-07 21:58:11 UTC +--- base/files/file_util_unittest.cc.orig 2020-11-13 06:36:34 UTC +++ base/files/file_util_unittest.cc -@@ -3465,7 +3465,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) { +@@ -1639,7 +1639,7 @@ TEST_F(FileUtilTest, DeleteDirRecursiveWithOpenFile) { + #endif + } + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + // This test will validate that files which would block when read result in a + // failure on a call to ReadFileToStringNonBlocking. To accomplish this we will + // use a named pipe because it appears as a file on disk and we can control how +@@ -1672,7 +1672,7 @@ TEST_F(FileUtilTest, TestNonBlockingFileReadLinux) { + ASSERT_EQ(result.size(), 1u); + EXPECT_EQ(result[0], 'a'); + } +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + TEST_F(FileUtilTest, MoveFileNew) { + // Create a file +@@ -3507,7 +3507,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) { } #endif // defined(OS_WIN) --#if defined(OS_POSIX) && !defined(OS_MACOSX) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) +-#if defined(OS_POSIX) && !defined(OS_APPLE) ++#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_BSD) TEST_F(FileUtilTest, ReadFileToStringWithProcFileSystem) { FilePath file_path("/proc/cpuinfo"); std::string data = "temp"; -@@ -3483,7 +3483,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithProcFileSyste +@@ -3525,7 +3525,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithProcFileSyste EXPECT_FALSE(ReadFileToStringWithMaxSize(file_path, nullptr, 4)); } --#endif // defined(OS_POSIX) && !defined(OS_MACOSX) -+#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) +-#endif // defined(OS_POSIX) && !defined(OS_APPLE) ++#endif // defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_BSD) TEST_F(FileUtilTest, ReadFileToStringWithLargeFile) { std::string data(kLargeFileSize, 'c'); diff --git a/www/chromium/files/patch-base_files_scoped__file.cc b/www/chromium/files/patch-base_files_scoped__file.cc index 84ba47ff6aeb..16f73156a2bc 100644 --- a/www/chromium/files/patch-base_files_scoped__file.cc +++ b/www/chromium/files/patch-base_files_scoped__file.cc @@ -1,11 +1,11 @@ ---- base/files/scoped_file.cc.orig 2019-07-29 18:17:43 UTC +--- base/files/scoped_file.cc.orig 2020-11-13 06:36:34 UTC +++ base/files/scoped_file.cc @@ -30,7 +30,7 @@ void ScopedFDCloseTraits::Free(int fd) { // a single open directory would bypass the entire security model. int ret = IGNORE_EINTR(close(fd)); --#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_FUCHSIA) || \ -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_FUCHSIA) || defined(OS_BSD) || \ - defined(OS_ANDROID) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_APPLE) || \ ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || defined(OS_APPLE) || \ + defined(OS_FUCHSIA) || defined(OS_ANDROID) // NB: Some file descriptors can return errors from close() e.g. network // filesystems such as NFS and Linux input devices. On Linux, macOS, and diff --git a/www/chromium/files/patch-base_i18n_icu__util.cc b/www/chromium/files/patch-base_i18n_icu__util.cc index bf29624ac4ec..ba15ad8b4ded 100644 --- a/www/chromium/files/patch-base_i18n_icu__util.cc +++ b/www/chromium/files/patch-base_i18n_icu__util.cc @@ -1,20 +1,20 @@ ---- base/i18n/icu_util.cc.orig 2020-05-13 18:39:35 UTC +--- base/i18n/icu_util.cc.orig 2020-11-13 06:36:34 UTC +++ base/i18n/icu_util.cc -@@ -49,7 +49,7 @@ +@@ -48,7 +48,7 @@ + #include "third_party/icu/source/common/unicode/unistr.h" #endif - #if defined(OS_ANDROID) || defined(OS_FUCHSIA) || \ -- (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) -+ (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) || defined(OS_BSD) +-#if defined(OS_ANDROID) || defined(OS_FUCHSIA) || \ ++#if defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD) || \ + ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && !BUILDFLAG(IS_CHROMECAST)) #include "third_party/icu/source/i18n/unicode/timezone.h" #endif - @@ -341,7 +341,7 @@ void InitializeIcuTimeZone() { fuchsia::IntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization(); icu::TimeZone::adoptDefault( icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id))); --#elif defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST) -+#elif (defined(OS_LINUX) || defined(OS_BSD)) && !BUILDFLAG(IS_CHROMECAST) +-#elif (defined(OS_LINUX) || defined(OS_CHROMEOS)) && !BUILDFLAG(IS_CHROMECAST) ++#elif (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && !BUILDFLAG(IS_CHROMECAST) // To respond to the time zone change properly, the default time zone // cache in ICU has to be populated on starting up. // See TimeZoneMonitorLinux::NotifyClientsFromImpl(). diff --git a/www/chromium/files/patch-base_linux__util.cc b/www/chromium/files/patch-base_linux__util.cc index 97ea99e3d97b..4bbbf448b605 100644 --- a/www/chromium/files/patch-base_linux__util.cc +++ b/www/chromium/files/patch-base_linux__util.cc @@ -1,6 +1,14 @@ ---- base/linux_util.cc.orig 2020-05-13 18:39:35 UTC +--- base/linux_util.cc.orig 2020-11-13 06:36:34 UTC +++ base/linux_util.cc -@@ -78,6 +78,9 @@ class DistroNameGetter { +@@ -15,6 +15,7 @@ + + #include <iomanip> + #include <memory> ++#include <sstream> + + #include "base/files/dir_reader_posix.h" + #include "base/files/file_util.h" +@@ -78,6 +79,9 @@ class DistroNameGetter { public: DistroNameGetter() { static const char* const kFilesToCheck[] = {"/etc/os-release", @@ -10,3 +18,21 @@ "/usr/lib/os-release"}; for (const char* file : kFilesToCheck) { if (ReadDistroFromOSReleaseFile(file)) +@@ -134,6 +138,9 @@ void SetLinuxDistro(const std::string& distro) { + } + + bool GetThreadsForProcess(pid_t pid, std::vector<pid_t>* tids) { ++#if defined(OS_BSD) ++ return false; ++#else + // 25 > strlen("/proc//task") + strlen(std::to_string(INT_MAX)) + 1 = 22 + char buf[25]; + strings::SafeSPrintf(buf, "/proc/%d/task", pid); +@@ -153,6 +160,7 @@ bool GetThreadsForProcess(pid_t pid, std::vector<pid_t + } + + return true; ++#endif + } + + pid_t FindThreadIDWithSyscall(pid_t pid, const std::string& expected_data, diff --git a/www/chromium/files/patch-base_location__unittest.cc b/www/chromium/files/patch-base_location__unittest.cc index c43a0034dd90..72a479368ddb 100644 --- a/www/chromium/files/patch-base_location__unittest.cc +++ b/www/chromium/files/patch-base_location__unittest.cc @@ -1,4 +1,4 @@ ---- base/location_unittest.cc.orig 2020-05-26 09:56:30 UTC +--- base/location_unittest.cc.orig 2020-11-13 06:36:34 UTC +++ base/location_unittest.cc @@ -32,7 +32,7 @@ TEST(LocationTest, CurrentYieldsCorrectValue) { EXPECT_EQ(here.line_number(), previous_line + 1); diff --git a/www/chromium/files/patch-base_logging__unittest.cc b/www/chromium/files/patch-base_logging__unittest.cc index 3dfe829adc81..d7b25141cc08 100644 --- a/www/chromium/files/patch-base_logging__unittest.cc +++ b/www/chromium/files/patch-base_logging__unittest.cc @@ -1,11 +1,20 @@ ---- base/logging_unittest.cc.orig 2020-07-07 21:58:11 UTC +--- base/logging_unittest.cc.orig 2020-11-13 06:36:34 UTC +++ base/logging_unittest.cc -@@ -552,7 +552,7 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo +@@ -29,7 +29,7 @@ + #include "base/posix/eintr_wrapper.h" + #endif // OS_POSIX + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) + #include <ucontext.h> + #endif + +@@ -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; --#if defined(OS_MACOSX) -+#if defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_MAC) ++#if defined(OS_MAC) || defined(OS_BSD) crash_addr = reinterpret_cast<uintptr_t>(info->si_addr); - #else // OS_POSIX && !OS_MACOSX + #else // OS_* ucontext_t* context = reinterpret_cast<ucontext_t*>(context_ptr); diff --git a/www/chromium/files/patch-base_memory_discardable__memory.cc b/www/chromium/files/patch-base_memory_discardable__memory.cc index b50f404a2764..77084937a2c5 100644 --- a/www/chromium/files/patch-base_memory_discardable__memory.cc +++ b/www/chromium/files/patch-base_memory_discardable__memory.cc @@ -1,11 +1,11 @@ ---- base/memory/discardable_memory.cc.orig 2020-02-07 10:23:12 UTC +--- base/memory/discardable_memory.cc.orig 2020-11-13 06:36:34 UTC +++ base/memory/discardable_memory.cc @@ -23,7 +23,7 @@ const base::Feature kMadvFreeDiscardableMemory{ "MadvFreeDiscardableMemory", base::FEATURE_DISABLED_BY_DEFAULT}; #endif // defined(OS_POSIX) --#if defined(OS_ANDROID) || defined(OS_LINUX) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) const base::Feature kDiscardableMemoryBackingTrial{ "DiscardableMemoryBackingTrial", base::FEATURE_DISABLED_BY_DEFAULT}; @@ -13,15 +13,15 @@ DiscardableMemoryTrialGroup::kEmulatedSharedMemory, &kDiscardableMemoryBackingParamOptions}; --#endif // defined(OS_ANDROID) || defined(OS_LINUX) -+#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) } // namespace features namespace { --#if defined(OS_ANDROID) || defined(OS_LINUX) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) DiscardableMemoryBacking GetBackingForFieldTrial() { DiscardableMemoryTrialGroup trial_group = @@ -29,13 +29,13 @@ } NOTREACHED(); } --#endif // defined(OS_ANDROID) || defined(OS_LINUX) -+#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) } // namespace --#if defined(OS_ANDROID) || defined(OS_LINUX) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Probe capabilities of this device to determine whether we should participate // in the discardable memory backing trial. @@ -43,21 +43,21 @@ DCHECK(DiscardableMemoryBackingFieldTrialIsEnabled()); return features::kDiscardableMemoryBackingParam.Get(); } --#endif // defined(OS_ANDROID) || defined(OS_LINUX) -+#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) DiscardableMemory::DiscardableMemory() = default; DiscardableMemory::~DiscardableMemory() = default; DiscardableMemoryBacking GetDiscardableMemoryBacking() { --#if defined(OS_ANDROID) || defined(OS_LINUX) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) if (DiscardableMemoryBackingFieldTrialIsEnabled()) { return GetBackingForFieldTrial(); } --#endif // defined(OS_ANDROID) || defined(OS_LINUX) -+#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #if defined(OS_ANDROID) if (ashmem_device_is_supported()) diff --git a/www/chromium/files/patch-base_memory_discardable__memory__internal.h b/www/chromium/files/patch-base_memory_discardable__memory__internal.h index c8225e74d049..bf535550931b 100644 --- a/www/chromium/files/patch-base_memory_discardable__memory__internal.h +++ b/www/chromium/files/patch-base_memory_discardable__memory__internal.h @@ -1,11 +1,11 @@ ---- base/memory/discardable_memory_internal.h.orig 2020-02-07 10:22:39 UTC +--- base/memory/discardable_memory_internal.h.orig 2020-11-13 06:36:34 UTC +++ base/memory/discardable_memory_internal.h @@ -10,7 +10,7 @@ #include "base/metrics/field_trial_params.h" #include "build/build_config.h" --#if defined(OS_ANDROID) || defined(OS_LINUX) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) namespace base { @@ -13,7 +13,7 @@ } // namespace base --#endif // defined(OS_LINUX) || defined(OS_ANDROID) -+#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) #endif // BASE_MEMORY_DISCARDABLE_MEMORY_INTERNAL_H_ diff --git a/www/chromium/files/patch-base_memory_madv__free__discardable__memory__posix.cc b/www/chromium/files/patch-base_memory_madv__free__discardable__memory__posix.cc index 5368440e775b..82feab1e734f 100644 --- a/www/chromium/files/patch-base_memory_madv__free__discardable__memory__posix.cc +++ b/www/chromium/files/patch-base_memory_madv__free__discardable__memory__posix.cc @@ -1,11 +1,11 @@ ---- base/memory/madv_free_discardable_memory_posix.cc.orig 2020-03-16 18:39:41 UTC +--- base/memory/madv_free_discardable_memory_posix.cc.orig 2020-11-13 06:36:34 UTC +++ base/memory/madv_free_discardable_memory_posix.cc -@@ -282,7 +282,7 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT +@@ -292,7 +292,7 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT bool MadvFreeDiscardableMemoryPosix::IsResident() const { DFAKE_SCOPED_RECURSIVE_LOCK(thread_collision_warner_); --#ifdef OS_MACOSX -+#if defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_APPLE) ++#if defined(OS_APPLE) || defined(OS_BSD) std::vector<char> vec(allocated_pages_); #else std::vector<unsigned char> vec(allocated_pages_); 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 477b8029c4a6..abcb85a3f032 100644 --- a/www/chromium/files/patch-base_memory_platform__shared__memory__region.h +++ b/www/chromium/files/patch-base_memory_platform__shared__memory__region.h @@ -1,29 +1,29 @@ ---- base/memory/platform_shared_memory_region.h.orig 2020-02-03 21:52:37 UTC +--- base/memory/platform_shared_memory_region.h.orig 2020-11-13 06:36:34 UTC +++ base/memory/platform_shared_memory_region.h @@ -27,7 +27,7 @@ #include "base/files/scoped_file.h" #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) namespace content { class SandboxIPCHandler; } -@@ -121,7 +121,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { +@@ -120,7 +120,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { kMaxValue = GET_SHMEM_TEMP_DIR_FAILURE }; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Structure to limit access to executable region creation. struct ExecutableRegion { private: -@@ -266,7 +266,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { +@@ -264,7 +264,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { CheckPlatformHandlePermissionsCorrespondToMode); static PlatformSharedMemoryRegion Create(Mode mode, size_t size --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) , bool executable = false #endif diff --git a/www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc b/www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc index 0e287f7202b7..0ad1585fc316 100644 --- a/www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc +++ b/www/chromium/files/patch-base_memory_platform__shared__memory__region__posix.cc @@ -1,11 +1,11 @@ ---- base/memory/platform_shared_memory_region_posix.cc.orig 2020-07-07 21:57:30 UTC +--- base/memory/platform_shared_memory_region_posix.cc.orig 2020-11-13 06:36:34 UTC +++ base/memory/platform_shared_memory_region_posix.cc @@ -70,7 +70,7 @@ FDPair ScopedFDPair::get() const { return {fd.get(), readonly_fd.get()}; } --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // static ScopedFD PlatformSharedMemoryRegion::ExecutableRegion::CreateFD(size_t size) { PlatformSharedMemoryRegion region = @@ -13,8 +13,8 @@ return region.PassPlatformHandle().fd; return ScopedFD(); } --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // static PlatformSharedMemoryRegion PlatformSharedMemoryRegion::Take( @@ -22,8 +22,8 @@ // static PlatformSharedMemoryRegion PlatformSharedMemoryRegion::Create(Mode mode, size_t size --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) , bool executable #endif @@ -31,8 +31,8 @@ // flag. FilePath directory; if (!GetShmemTempDir( --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) executable, #else false /* executable */, diff --git a/www/chromium/files/patch-base_memory_shared__memory__region__unittest.cc b/www/chromium/files/patch-base_memory_shared__memory__region__unittest.cc index b2525b4381ee..1a73cb134a5c 100644 --- a/www/chromium/files/patch-base_memory_shared__memory__region__unittest.cc +++ b/www/chromium/files/patch-base_memory_shared__memory__region__unittest.cc @@ -1,4 +1,4 @@ ---- base/memory/shared_memory_region_unittest.cc.orig 2020-03-23 16:31:23 UTC +--- base/memory/shared_memory_region_unittest.cc.orig 2020-11-13 06:36:34 UTC +++ base/memory/shared_memory_region_unittest.cc @@ -188,10 +188,13 @@ TYPED_TEST(SharedMemoryRegionTest, MapAtNotAlignedOffs std::tie(region, rw_mapping) = CreateMappedRegion<TypeParam>(kDataSize); diff --git a/www/chromium/files/patch-base_message__loop_message__pump__glib.cc b/www/chromium/files/patch-base_message__loop_message__pump__glib.cc new file mode 100644 index 000000000000..a52248fa1ebc --- /dev/null +++ b/www/chromium/files/patch-base_message__loop_message__pump__glib.cc @@ -0,0 +1,28 @@ +--- base/message_loop/message_pump_glib.cc.orig 2020-11-20 15:15:51 UTC ++++ base/message_loop/message_pump_glib.cc +@@ -8,6 +8,11 @@ + #include <glib.h> + #include <math.h> + ++#if defined(OS_BSD) ++#include <pthread.h> ++#include <pthread_np.h> ++#endif ++ + #include "base/logging.h" + #include "base/numerics/safe_conversions.h" + #include "base/posix/eintr_wrapper.h" +@@ -48,9 +53,13 @@ int GetTimeIntervalMilliseconds(TimeTicks next_task_ti + } + + bool RunningOnMainThread() { ++#if defined(OS_BSD) ++ return pthread_main_np(); ++#else + auto pid = getpid(); + auto tid = PlatformThread::CurrentId(); + return pid > 0 && tid > 0 && pid == tid; ++#endif + } + + // A brief refresher on GLib: diff --git a/www/chromium/files/patch-base_native__library__posix.cc b/www/chromium/files/patch-base_native__library__posix.cc index ba6a16756b10..a01e74227fa9 100644 --- a/www/chromium/files/patch-base_native__library__posix.cc +++ b/www/chromium/files/patch-base_native__library__posix.cc @@ -1,4 +1,4 @@ ---- base/native_library_posix.cc.orig 2019-03-11 22:00:51 UTC +--- base/native_library_posix.cc.orig 2020-11-13 06:36:34 UTC +++ base/native_library_posix.cc @@ -29,7 +29,7 @@ NativeLibrary LoadNativeLibraryWithOptions(const FileP // http://crbug.com/17943, http://crbug.com/17557, http://crbug.com/36892, diff --git a/www/chromium/files/patch-base_native__library__unittest.cc b/www/chromium/files/patch-base_native__library__unittest.cc index f76c5f8fd986..51a1badf2d5b 100644 --- a/www/chromium/files/patch-base_native__library__unittest.cc +++ b/www/chromium/files/patch-base_native__library__unittest.cc @@ -1,6 +1,6 @@ ---- base/native_library_unittest.cc.orig 2019-03-11 22:00:51 UTC +--- base/native_library_unittest.cc.orig 2020-11-13 06:36:34 UTC +++ base/native_library_unittest.cc -@@ -120,7 +120,7 @@ TEST(NativeLibraryTest, LoadLibrary) { +@@ -118,7 +118,7 @@ TEST(NativeLibraryTest, LoadLibrary) { // Android dlopen() requires further investigation, as it might vary across // versions with respect to symbol resolution scope. // TSan and MSan error out on RTLD_DEEPBIND, https://crbug.com/705255 diff --git a/www/chromium/files/patch-base_numerics_safe__math__shared__impl.h b/www/chromium/files/patch-base_numerics_safe__math__shared__impl.h index c088ad9451d0..c6b968c45687 100644 --- a/www/chromium/files/patch-base_numerics_safe__math__shared__impl.h +++ b/www/chromium/files/patch-base_numerics_safe__math__shared__impl.h @@ -1,6 +1,6 @@ ---- base/numerics/safe_math_shared_impl.h.orig 2019-09-09 21:55:05 UTC +--- base/numerics/safe_math_shared_impl.h.orig 2020-11-13 06:36:34 UTC +++ base/numerics/safe_math_shared_impl.h -@@ -23,8 +23,7 @@ +@@ -24,8 +24,7 @@ // Where available use builtin math overflow support on Clang and GCC. #elif !defined(__native_client__) && \ ((defined(__clang__) && \ diff --git a/www/chromium/files/patch-base_path__service__unittest.cc b/www/chromium/files/patch-base_path__service__unittest.cc index 1a1b1bef1ebb..de693d8b3e30 100644 --- a/www/chromium/files/patch-base_path__service__unittest.cc +++ b/www/chromium/files/patch-base_path__service__unittest.cc @@ -1,11 +1,11 @@ ---- base/path_service_unittest.cc.orig 2020-07-07 21:57:30 UTC +--- base/path_service_unittest.cc.orig 2020-11-13 06:36:34 UTC +++ base/path_service_unittest.cc -@@ -37,7 +37,7 @@ bool ReturnsValidPath(int dir_type) { +@@ -38,7 +38,7 @@ bool ReturnsValidPath(int dir_type) { if (dir_type == DIR_CACHE) check_path_exists = false; #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // On the linux try-bots: a path is returned (e.g. /home/chrome-bot/Desktop), // but it doesn't exist. if (dir_type == DIR_USER_DESKTOP) diff --git a/www/chromium/files/patch-base_posix_can__lower__nice__to.cc b/www/chromium/files/patch-base_posix_can__lower__nice__to.cc index 3b13c89d4813..c18e8b24aff5 100644 --- a/www/chromium/files/patch-base_posix_can__lower__nice__to.cc +++ b/www/chromium/files/patch-base_posix_can__lower__nice__to.cc @@ -1,4 +1,4 @@ ---- base/posix/can_lower_nice_to.cc.orig 2019-03-11 22:00:51 UTC +--- base/posix/can_lower_nice_to.cc.orig 2020-11-13 06:36:34 UTC +++ base/posix/can_lower_nice_to.cc @@ -31,6 +31,9 @@ bool CanLowerNiceTo(int nice_value) { if (geteuid() == 0) diff --git a/www/chromium/files/patch-base_posix_unix__domain__socket.cc b/www/chromium/files/patch-base_posix_unix__domain__socket.cc index 8820cb063006..ab63f30e73d6 100644 --- a/www/chromium/files/patch-base_posix_unix__domain__socket.cc +++ b/www/chromium/files/patch-base_posix_unix__domain__socket.cc @@ -1,4 +1,4 @@ ---- base/posix/unix_domain_socket.cc.orig 2019-03-11 22:00:51 UTC +--- base/posix/unix_domain_socket.cc.orig 2020-11-13 06:36:34 UTC +++ base/posix/unix_domain_socket.cc @@ -5,7 +5,10 @@ #include "base/posix/unix_domain_socket.h" @@ -7,11 +7,11 @@ +#include <sys/param.h> #include <sys/socket.h> +#include <sys/types.h> -+#include <sys/ucred.h> ++#include <sys/ucred.h>a #if !defined(OS_NACL_NONSFI) #include <sys/un.h> #endif -@@ -28,6 +31,14 @@ namespace base { +@@ -29,6 +32,14 @@ namespace base { const size_t UnixDomainSocket::kMaxFileDescriptors = 16; @@ -26,16 +26,16 @@ #if !defined(OS_NACL_NONSFI) bool CreateSocketPair(ScopedFD* one, ScopedFD* two) { int raw_socks[2]; -@@ -150,7 +161,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, - #if !defined(OS_NACL_NONSFI) && !defined(OS_MACOSX) +@@ -151,7 +162,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, + #if !defined(OS_NACL_NONSFI) && !defined(OS_APPLE) // The PNaCl toolchain for Non-SFI binary build and macOS do not support // ucred. macOS supports xucred, but this structure is insufficient. - + CMSG_SPACE(sizeof(struct ucred)) + + CMSG_SPACE(sizeof(struct cmsgcred)) - #endif // OS_NACL_NONSFI or OS_MACOSX + #endif // !defined(OS_NACL_NONSFI) && !defined(OS_APPLE) ; char control_buffer[kControlBufferSize]; -@@ -180,9 +191,9 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, +@@ -181,9 +192,9 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, // SCM_CREDENTIALS. if (cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_type == SCM_CREDENTIALS) { @@ -45,5 +45,5 @@ - pid = reinterpret_cast<struct ucred*>(CMSG_DATA(cmsg))->pid; + pid = getpid(); } - #endif // !defined(OS_NACL_NONSFI) && !defined(OS_MACOSX) + #endif // !defined(OS_NACL_NONSFI) && !defined(OS_APPLE) } diff --git a/www/chromium/files/patch-base_posix_unix__domain__socket__unittest.cc b/www/chromium/files/patch-base_posix_unix__domain__socket__unittest.cc index 0336334a6583..31ec32ebcdd9 100644 --- a/www/chromium/files/patch-base_posix_unix__domain__socket__unittest.cc +++ b/www/chromium/files/patch-base_posix_unix__domain__socket__unittest.cc @@ -1,4 +1,4 @@ ---- base/posix/unix_domain_socket_unittest.cc.orig 2019-03-11 22:00:51 UTC +--- base/posix/unix_domain_socket_unittest.cc.orig 2020-11-13 06:36:34 UTC +++ base/posix/unix_domain_socket_unittest.cc @@ -8,6 +8,9 @@ #include <stdint.h> diff --git a/www/chromium/files/patch-base_process_internal__linux.cc b/www/chromium/files/patch-base_process_internal__linux.cc index abfff7cd44ce..78ad2a755e47 100644 --- a/www/chromium/files/patch-base_process_internal__linux.cc +++ b/www/chromium/files/patch-base_process_internal__linux.cc @@ -1,6 +1,6 @@ ---- base/process/internal_linux.cc.orig 2020-03-16 18:39:41 UTC +--- base/process/internal_linux.cc.orig 2020-11-13 06:36:34 UTC +++ base/process/internal_linux.cc -@@ -29,7 +29,11 @@ namespace internal { +@@ -30,7 +30,11 @@ namespace internal { const char kProcDir[] = "/proc"; @@ -12,7 +12,7 @@ FilePath GetProcPidDir(pid_t pid) { return FilePath(kProcDir).Append(NumberToString(pid)); -@@ -64,6 +68,7 @@ bool ReadProcFile(const FilePath& file, std::string* b +@@ -66,6 +70,7 @@ bool ReadProcFile(const FilePath& file, std::string* b DLOG(WARNING) << "Failed to read " << file.MaybeAsASCII(); return false; } @@ -20,7 +20,7 @@ return !buffer->empty(); } -@@ -79,6 +84,22 @@ bool ParseProcStats(const std::string& stats_data, +@@ -81,6 +86,22 @@ bool ParseProcStats(const std::string& stats_data, if (stats_data.empty()) return false; @@ -43,7 +43,7 @@ // The stat file is formatted as: // pid (process name) data1 data2 .... dataN // Look for the closing paren by scanning backwards, to avoid being fooled by -@@ -108,6 +129,7 @@ bool ParseProcStats(const std::string& stats_data, +@@ -110,6 +131,7 @@ bool ParseProcStats(const std::string& stats_data, base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); for (const auto& i : other_stats) proc_stats->push_back(i); @@ -51,7 +51,7 @@ return true; } -@@ -155,7 +177,11 @@ int64_t ReadProcStatsAndGetFieldAsInt64(pid_t pid, Pro +@@ -157,7 +179,11 @@ int64_t ReadProcStatsAndGetFieldAsInt64(pid_t pid, Pro } int64_t ReadProcSelfStatsAndGetFieldAsInt64(ProcStatsFields field_num) { @@ -63,7 +63,7 @@ return ReadStatFileAndGetFieldAsInt64(stat_file, field_num); } -@@ -171,6 +197,9 @@ size_t ReadProcStatsAndGetFieldAsSizeT(pid_t pid, +@@ -173,6 +199,9 @@ size_t ReadProcStatsAndGetFieldAsSizeT(pid_t pid, } Time GetBootTime() { @@ -73,7 +73,7 @@ FilePath path("/proc/stat"); std::string contents; if (!ReadProcFile(path, &contents)) -@@ -184,9 +213,13 @@ Time GetBootTime() { +@@ -186,9 +215,13 @@ Time GetBootTime() { if (!StringToInt(btime_it->second, &btime)) return Time(); return Time::FromTimeT(btime); @@ -87,7 +87,7 @@ FilePath path("/proc/stat"); std::string contents; if (!ReadProcFile(path, &contents)) -@@ -210,6 +243,7 @@ TimeDelta GetUserCpuTimeSinceBoot() { +@@ -212,6 +245,7 @@ TimeDelta GetUserCpuTimeSinceBoot() { return TimeDelta(); return ClockTicksToTimeDelta(user + nice); diff --git a/www/chromium/files/patch-base_process_internal__linux.h b/www/chromium/files/patch-base_process_internal__linux.h index bfa9c8630afd..94e172d31aa3 100644 --- a/www/chromium/files/patch-base_process_internal__linux.h +++ b/www/chromium/files/patch-base_process_internal__linux.h @@ -1,15 +1,15 @@ ---- base/process/internal_linux.h.orig 2020-03-16 18:39:41 UTC +--- base/process/internal_linux.h.orig 2020-11-13 06:36:34 UTC +++ base/process/internal_linux.h -@@ -14,6 +14,8 @@ - - #include "base/files/file_path.h" +@@ -18,6 +18,8 @@ + #include "base/strings/string_number_conversions.h" + #include "base/threading/platform_thread.h" +#include <unistd.h> /* pid_t */ + namespace base { class Time; -@@ -50,6 +52,14 @@ bool ParseProcStats(const std::string& stats_data, +@@ -59,6 +61,14 @@ bool ParseProcStats(const std::string& stats_data, // If the ordering ever changes, carefully review functions that use these // values. enum ProcStatsFields { @@ -24,7 +24,7 @@ VM_COMM = 1, // Filename of executable, without parentheses. VM_STATE = 2, // Letter indicating the state of the process. VM_PPID = 3, // PID of the parent. -@@ -62,6 +72,7 @@ enum ProcStatsFields { +@@ -71,6 +81,7 @@ enum ProcStatsFields { VM_STARTTIME = 21, // The time the process started in clock ticks. VM_VSIZE = 22, // Virtual memory size in bytes. VM_RSS = 23, // Resident Set Size in pages. diff --git a/www/chromium/files/patch-base_process_kill.h b/www/chromium/files/patch-base_process_kill.h index 2e871559c90e..81a2d28914ee 100644 --- a/www/chromium/files/patch-base_process_kill.h +++ b/www/chromium/files/patch-base_process_kill.h @@ -1,16 +1,16 @@ ---- base/process/kill.h.orig 2019-12-16 21:50:40 UTC +--- base/process/kill.h.orig 2020-11-13 06:36:34 UTC +++ base/process/kill.h -@@ -118,11 +118,11 @@ BASE_EXPORT TerminationStatus GetTerminationStatus(Pro +@@ -113,11 +113,11 @@ BASE_EXPORT TerminationStatus GetTerminationStatus(Pro BASE_EXPORT TerminationStatus GetKnownDeadTerminationStatus( ProcessHandle handle, int* exit_code); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Spawns a thread to wait asynchronously for the child |process| to exit // and then reaps it. BASE_EXPORT void EnsureProcessGetsReaped(Process process); --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #endif // defined(OS_POSIX) // Registers |process| to be asynchronously monitored for termination, forcibly diff --git a/www/chromium/files/patch-base_process_kill__posix.cc b/www/chromium/files/patch-base_process_kill__posix.cc index 69e4dbc6c05e..975a055cb51a 100644 --- a/www/chromium/files/patch-base_process_kill__posix.cc +++ b/www/chromium/files/patch-base_process_kill__posix.cc @@ -1,20 +1,20 @@ ---- base/process/kill_posix.cc.orig 2019-06-04 18:55:15 UTC +--- base/process/kill_posix.cc.orig 2020-11-13 06:36:34 UTC +++ base/process/kill_posix.cc -@@ -168,7 +168,7 @@ void EnsureProcessTerminated(Process process) { +@@ -160,7 +160,7 @@ void EnsureProcessTerminated(Process process) { 0, new BackgroundReaper(std::move(process), TimeDelta::FromSeconds(2))); } --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) void EnsureProcessGetsReaped(Process process) { DCHECK(!process.is_current()); -@@ -179,7 +179,7 @@ void EnsureProcessGetsReaped(Process process) { +@@ -171,7 +171,7 @@ void EnsureProcessGetsReaped(Process process) { PlatformThread::CreateNonJoinable( 0, new BackgroundReaper(std::move(process), TimeDelta())); } --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - #endif // !defined(OS_MACOSX) + #endif // !defined(OS_APPLE) #endif // !defined(OS_NACL_NONSFI) diff --git a/www/chromium/files/patch-base_process_launch.cc b/www/chromium/files/patch-base_process_launch.cc index bd174cd496bc..02727ceffbb8 100644 --- a/www/chromium/files/patch-base_process_launch.cc +++ b/www/chromium/files/patch-base_process_launch.cc @@ -1,11 +1,11 @@ ---- base/process/launch.cc.orig 2019-03-11 22:00:51 UTC +--- base/process/launch.cc.orig 2020-11-13 06:36:34 UTC +++ base/process/launch.cc @@ -15,7 +15,7 @@ LaunchOptions::~LaunchOptions() = default; LaunchOptions LaunchOptionsForTest() { LaunchOptions options; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // To prevent accidental privilege sharing to an untrusted child, processes // are started with PR_SET_NO_NEW_PRIVS. Do not set that here, since this // new child will be used for testing only. diff --git a/www/chromium/files/patch-base_process_launch.h b/www/chromium/files/patch-base_process_launch.h index 75708ea5561e..67808bf9ee1e 100644 --- a/www/chromium/files/patch-base_process_launch.h +++ b/www/chromium/files/patch-base_process_launch.h @@ -1,11 +1,11 @@ ---- base/process/launch.h.orig 2020-02-03 21:52:37 UTC +--- base/process/launch.h.orig 2020-11-13 06:36:34 UTC +++ base/process/launch.h @@ -180,7 +180,7 @@ struct BASE_EXPORT LaunchOptions { bool clear_environment = false; #endif // OS_WIN || OS_POSIX || OS_FUCHSIA --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // 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 @@ -13,8 +13,17 @@ // Sets parent process death signal to SIGKILL. bool kill_on_parent_death = false; --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - #if defined(OS_MACOSX) && !defined(OS_IOS) + #if defined(OS_MAC) // Mach ports that will be accessible to the child process. These are not +@@ -408,7 +408,7 @@ BASE_EXPORT void RaiseProcessToHighPriority(); + // binary. This should not be called in production/released code. + BASE_EXPORT LaunchOptions LaunchOptionsForTest(); + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_NACL_NONSFI) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_NACL_NONSFI) || defined(OS_BSD) + // A wrapper for clone with fork-like behavior, meaning that it returns the + // child's pid in the parent and 0 in the child. |flags|, |ptid|, and |ctid| are + // as in the clone system call (the CLONE_VM flag is not supported). diff --git a/www/chromium/files/patch-base_process_launch__posix.cc b/www/chromium/files/patch-base_process_launch__posix.cc index ce6054a8ff79..3fea66d7bfda 100644 --- a/www/chromium/files/patch-base_process_launch__posix.cc +++ b/www/chromium/files/patch-base_process_launch__posix.cc @@ -1,4 +1,4 @@ ---- base/process/launch_posix.cc.orig 2019-06-04 18:55:15 UTC +--- base/process/launch_posix.cc.orig 2020-11-13 06:36:34 UTC +++ base/process/launch_posix.cc @@ -65,6 +65,7 @@ #error "macOS should use launch_mac.cc" @@ -8,3 +8,32 @@ extern char** environ; namespace base { +@@ -228,6 +229,28 @@ void CloseSuperfluousFds(const base::InjectiveMultimap + DirReaderPosix fd_dir(kFDDir); + if (!fd_dir.IsValid()) { + // Fallback case: Try every possible fd. ++ ++#if defined(OS_FREEBSD) ++ // CEM: blast away most of the range with closefrom(). A common use case ++ // of this function only maps STDIN/STDOUT/STDERR and closefrom(3) is much ++ // cheaper than x00,000 close(2) invocations with a high RLIMIT_NOFILE. ++ // ++ // In the other caller, it is still very likely that the fds we care about ++ // are in relatively low number space and we can save hundreds of thousands ++ // of syscalls. ++ int max_valid_fd = -1; ++ for (size_t j = 0; j < saved_mapping.size(); j++) { ++ int fd = saved_mapping[j].dest; ++ if (fd > max_valid_fd) ++ max_valid_fd = fd; ++ } ++ if (max_valid_fd < STDERR_FILENO) ++ max_valid_fd = STDERR_FILENO; ++ ++ closefrom(max_valid_fd + 1); ++ max_fds = static_cast<size_t>(max_valid_fd) + 1; ++#endif ++ + 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) diff --git a/www/chromium/files/patch-base_process_memory.cc b/www/chromium/files/patch-base_process_memory.cc index 050320e9d7dc..5b6243421fee 100644 --- a/www/chromium/files/patch-base_process_memory.cc +++ b/www/chromium/files/patch-base_process_memory.cc @@ -1,6 +1,6 @@ ---- base/process/memory.cc.orig 2020-07-07 21:57:30 UTC +--- base/process/memory.cc.orig 2020-11-13 06:36:34 UTC +++ base/process/memory.cc -@@ -44,7 +44,7 @@ NOINLINE void OnNoMemoryInternal(size_t size) { +@@ -55,7 +55,7 @@ NOINLINE void OnNoMemoryInternal(size_t size) { } // namespace internal // Defined in memory_win.cc for Windows. @@ -9,12 +9,12 @@ namespace { -@@ -63,7 +63,7 @@ void TerminateBecauseOutOfMemory(size_t size) { +@@ -74,7 +74,7 @@ void TerminateBecauseOutOfMemory(size_t size) { #endif // !defined(OS_WIN) // Defined in memory_mac.mm for Mac. --#if !defined(OS_MACOSX) -+#if !defined(OS_MACOSX) && !defined(OS_BSD) +-#if !defined(OS_APPLE) ++#if !defined(OS_APPLE) && !defined(OS_BSD) bool UncheckedCalloc(size_t num_items, size_t size, void** result) { const size_t alloc_size = num_items * size; diff --git a/www/chromium/files/patch-base_process_memory.h b/www/chromium/files/patch-base_process_memory.h index 007e8593b35d..203ced37f125 100644 --- a/www/chromium/files/patch-base_process_memory.h +++ b/www/chromium/files/patch-base_process_memory.h @@ -1,11 +1,11 @@ ---- base/process/memory.h.orig 2019-10-21 19:06:18 UTC +--- base/process/memory.h.orig 2020-11-13 06:36:34 UTC +++ base/process/memory.h @@ -24,7 +24,7 @@ BASE_EXPORT void EnableTerminationOnOutOfMemory(); // Crash reporting classifies such crashes as OOM. BASE_EXPORT void TerminateBecauseOutOfMemory(size_t size); --#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) || \ + defined(OS_AIX) BASE_EXPORT extern size_t g_oom_size; - // The maximum allowed value for the OOM score. diff --git a/www/chromium/files/patch-base_process_memory__unittest.cc b/www/chromium/files/patch-base_process_memory__unittest.cc index 82dcfd37c1c7..f219ce1737a7 100644 --- a/www/chromium/files/patch-base_process_memory__unittest.cc +++ b/www/chromium/files/patch-base_process_memory__unittest.cc @@ -1,18 +1,66 @@ ---- base/process/memory_unittest.cc.orig 2020-03-16 18:39:41 UTC +--- base/process/memory_unittest.cc.orig 2020-11-13 06:36:34 UTC +++ base/process/memory_unittest.cc -@@ -106,7 +106,7 @@ TEST(MemoryTest, AllocatorShimWorking) { - // OpenBSD does not support these tests. Don't test these on ASan/TSan/MSan +@@ -38,6 +38,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) +@@ -105,9 +107,9 @@ TEST(MemoryTest, AllocatorShimWorking) { + #endif + } + +-// OpenBSD does not support these tests. Don't test these on ASan/TSan/MSan ++// BSD does not support these tests. Don't test these on ASan/TSan/MSan // configurations: only test the real allocator. - // Windows only supports these tests with the allocator shim in place. -#if !defined(OS_OPENBSD) && BUILDFLAG(USE_ALLOCATOR_SHIM) && \ +#if !defined(OS_BSD) && BUILDFLAG(USE_ALLOCATOR_SHIM) && \ !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) namespace { -@@ -589,5 +589,5 @@ TEST_F(OutOfMemoryHandledTest, UncheckedCalloc) { - EXPECT_FALSE(base::UncheckedCalloc(1, test_size_, &value_)); - EXPECT_TRUE(value_ == nullptr); +@@ -299,7 +301,7 @@ TEST_F(OutOfMemoryDeathTest, SecurityAlignedRealloc) { + #endif // defined(OS_WIN) + #endif // !defined(OS_MAC) && !defined(OS_ANDROID) + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + TEST_F(OutOfMemoryDeathTest, Valloc) { + ASSERT_OOM_DEATH({ +@@ -345,7 +347,7 @@ TEST_F(OutOfMemoryDeathTest, ViaSharedLibraries) { + value_ = MallocWrapper(test_size_); + }); + } +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + // Android doesn't implement posix_memalign(). + #if defined(OS_POSIX) && !defined(OS_ANDROID) +@@ -496,7 +498,7 @@ TEST_F(OutOfMemoryTest, TerminateBecauseOutOfMemoryRep + #endif // OS_WIN + + #if defined(ARCH_CPU_32_BITS) && \ +- (defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)) ++ (defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) + + void TestAllocationsReleaseReservation(void* (*alloc_fn)(size_t), + void (*free_fn)(void*)) { +@@ -554,7 +556,7 @@ TEST_F(OutOfMemoryHandledTest, NewReleasesReservation) + [](size_t size) { return static_cast<void*>(new char[size]); }, + [](void* ptr) { delete[] static_cast<char*>(ptr); }); } --#endif // !defined(OS_OPENBSD) && BUILDFLAG(ENABLE_WIN_ALLOCATOR_SHIM_TESTS) && -+#endif // !defined(OS_BSD) && BUILDFLAG(ENABLE_WIN_ALLOCATOR_SHIM_TESTS) && +-#endif // defined(ARCH_CPU_32_BITS) && (defined(OS_WIN) || defined(OS_LINUX) || ++#endif // defined(ARCH_CPU_32_BITS) && (defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || + // defined(OS_CHROMEOS)) + + // See the comment in |UncheckedMalloc()|, it behaves as malloc() in these +@@ -616,5 +618,5 @@ TEST_F(OutOfMemoryHandledTest, UncheckedCalloc) { + + #endif // BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) || defined(OS_ANDROID) + +-#endif // !defined(OS_OPENBSD) && BUILDFLAG(USE_ALLOCATOR_SHIM) && ++#endif // !defined(OS_BSD) && BUILDFLAG(USE_ALLOCATOR_SHIM) && // !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) diff --git a/www/chromium/files/patch-base_process_process__handle.cc b/www/chromium/files/patch-base_process_process__handle.cc index 13812613f73f..6b50c9ec1e52 100644 --- a/www/chromium/files/patch-base_process_process__handle.cc +++ b/www/chromium/files/patch-base_process_process__handle.cc @@ -1,11 +1,11 @@ ---- base/process/process_handle.cc.orig 2019-10-21 19:06:18 UTC +--- base/process/process_handle.cc.orig 2020-11-13 06:36:34 UTC +++ base/process/process_handle.cc -@@ -28,7 +28,7 @@ UniqueProcId GetUniqueIdForProcess() { +@@ -30,7 +30,7 @@ UniqueProcId GetUniqueIdForProcess() { : UniqueProcId(GetCurrentProcId()); } --#if defined(OS_LINUX) || defined(OS_AIX) -+#if defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) || defined(OS_BSD) void InitUniqueIdForProcessInPidNamespace(ProcessId pid_outside_of_namespace) { DCHECK(pid_outside_of_namespace != kNullProcessId); diff --git a/www/chromium/files/patch-base_process_process__handle.h b/www/chromium/files/patch-base_process_process__handle.h index 502beff310e6..e323278cceb9 100644 --- a/www/chromium/files/patch-base_process_process__handle.h +++ b/www/chromium/files/patch-base_process_process__handle.h @@ -1,11 +1,11 @@ ---- base/process/process_handle.h.orig 2019-10-21 19:06:18 UTC +--- base/process/process_handle.h.orig 2020-11-13 06:36:34 UTC +++ base/process/process_handle.h @@ -103,7 +103,7 @@ BASE_EXPORT ProcessId GetCurrentProcId(); // processes may be reused. BASE_EXPORT UniqueProcId GetUniqueIdForProcess(); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // When a process is started in a different PID namespace from the browser // process, this function must be called with the process's PID in the browser's // PID namespace in order to initialize its unique ID. Not thread safe. diff --git a/www/chromium/files/patch-base_process_process__handle__freebsd.cc b/www/chromium/files/patch-base_process_process__handle__freebsd.cc index 13a07c3075fd..911926ae9833 100644 --- a/www/chromium/files/patch-base_process_process__handle__freebsd.cc +++ b/www/chromium/files/patch-base_process_process__handle__freebsd.cc @@ -1,4 +1,4 @@ ---- base/process/process_handle_freebsd.cc.orig 2019-03-11 22:00:51 UTC +--- base/process/process_handle_freebsd.cc.orig 2020-11-13 06:36:34 UTC +++ base/process/process_handle_freebsd.cc @@ -16,10 +16,13 @@ namespace base { diff --git a/www/chromium/files/patch-base_process_process__iterator__freebsd.cc b/www/chromium/files/patch-base_process_process__iterator__freebsd.cc index a89546ccb49d..6978712eb3bc 100644 --- a/www/chromium/files/patch-base_process_process__iterator__freebsd.cc +++ b/www/chromium/files/patch-base_process_process__iterator__freebsd.cc @@ -1,4 +1,4 @@ ---- base/process/process_iterator_freebsd.cc.orig 2019-03-11 22:00:51 UTC +--- base/process/process_iterator_freebsd.cc.orig 2020-11-13 06:36:34 UTC +++ base/process/process_iterator_freebsd.cc @@ -10,6 +10,10 @@ #include <sys/sysctl.h> diff --git a/www/chromium/files/patch-base_process_process__linux.cc b/www/chromium/files/patch-base_process_process__linux.cc index 3d7fab63a87b..1d8cfc75e2a1 100644 --- a/www/chromium/files/patch-base_process_process__linux.cc +++ b/www/chromium/files/patch-base_process_process__linux.cc @@ -1,16 +1,33 @@ ---- base/process/process_linux.cc.orig 2020-07-07 21:57:30 UTC +--- base/process/process_linux.cc.orig 2020-11-13 06:36:34 UTC +++ base/process/process_linux.cc -@@ -80,6 +80,9 @@ Time Process::CreationTime() const { - internal::VM_STARTTIME) - : internal::ReadProcStatsAndGetFieldAsInt64( - Pid(), internal::VM_STARTTIME); +@@ -24,7 +24,9 @@ namespace base { + + namespace { + ++#if !defined(OS_BSD) + const int kForegroundPriority = 0; ++#endif + + #if defined(OS_CHROMEOS) || BUILDFLAG(IS_LACROS) + // We are more aggressive in our lowering of background process priority +@@ -69,7 +71,7 @@ struct CGroups { + return groups; + } + }; +-#else ++#elif !defined(OS_BSD) + const int kBackgroundPriority = 5; + #endif // defined(OS_CHROMEOS) || BUILDFLAG(IS_LACROS) + +@@ -96,13 +98,18 @@ Time Process::CreationTime() const { + if (!start_ticks) + return Time(); + +#if defined(OS_BSD) + return Time::FromTimeT(start_ticks); +#else - if (!start_ticks) - return Time(); TimeDelta start_offset = internal::ClockTicksToTimeDelta(start_ticks); -@@ -87,8 +90,10 @@ Time Process::CreationTime() const { + Time boot_time = internal::GetBootTime(); if (boot_time.is_null()) return Time(); return Time(boot_time + start_offset); @@ -20,12 +37,12 @@ +#if !defined(OS_BSD) // static bool Process::CanBackgroundProcesses() { - #if defined(OS_CHROMEOS) -@@ -140,6 +145,7 @@ bool Process::SetProcessBackgrounded(bool background) + #if defined(OS_CHROMEOS) || BUILDFLAG(IS_LACROS) +@@ -154,6 +161,7 @@ bool Process::SetProcessBackgrounded(bool background) DPCHECK(result == 0); return result == 0; } +#endif // !defined(OS_BSD) - #if defined(OS_CHROMEOS) + #if defined(OS_CHROMEOS) || BUILDFLAG(IS_LACROS) bool IsProcessBackgroundedCGroup(const StringPiece& cgroup_contents) { diff --git a/www/chromium/files/patch-base_process_process__metrics.cc b/www/chromium/files/patch-base_process_process__metrics.cc index 489d846f2778..7712b3ca8733 100644 --- a/www/chromium/files/patch-base_process_process__metrics.cc +++ b/www/chromium/files/patch-base_process_process__metrics.cc @@ -1,38 +1,38 @@ ---- base/process/process_metrics.cc.orig 2020-07-07 21:57:30 UTC +--- base/process/process_metrics.cc.orig 2020-11-13 06:36:34 UTC +++ base/process/process_metrics.cc -@@ -58,7 +58,7 @@ SystemMetrics SystemMetrics::Sample() { +@@ -49,7 +49,7 @@ SystemMetrics SystemMetrics::Sample() { SystemMetrics system_metrics; system_metrics.committed_memory_ = GetSystemCommitCharge(); --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) GetSystemMemoryInfo(&system_metrics.memory_info_); GetVmStatInfo(&system_metrics.vmstat_info_); GetSystemDiskInfo(&system_metrics.disk_info_); -@@ -76,7 +76,7 @@ std::unique_ptr<Value> SystemMetrics::ToValue() const +@@ -68,7 +68,7 @@ std::unique_ptr<Value> SystemMetrics::ToValue() const std::unique_ptr<DictionaryValue> res(new DictionaryValue()); res->SetIntKey("committed_memory", static_cast<int>(committed_memory_)); --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) std::unique_ptr<DictionaryValue> meminfo = memory_info_.ToValue(); std::unique_ptr<DictionaryValue> vmstat = vmstat_info_.ToValue(); meminfo->MergeDictionary(vmstat.get()); -@@ -127,7 +127,7 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage( +@@ -119,7 +119,7 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage( } #endif --#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) -+#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) +-#if defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ ++#if defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ + defined(OS_AIX) int ProcessMetrics::CalculateIdleWakeupsPerSecond( uint64_t absolute_idle_wakeups) { - return CalculateEventsPerSecond(absolute_idle_wakeups, -@@ -139,7 +139,7 @@ int ProcessMetrics::GetIdleWakeupsPerSecond() { +@@ -132,7 +132,7 @@ int ProcessMetrics::GetIdleWakeupsPerSecond() { NOTIMPLEMENTED(); // http://crbug.com/120488 return 0; } --#endif // defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) -+#endif // defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) +-#endif // defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || ++#endif // defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || + // defined(OS_AIX) - #if defined(OS_MACOSX) - int ProcessMetrics::CalculatePackageIdleWakeupsPerSecond( + #if defined(OS_APPLE) diff --git a/www/chromium/files/patch-base_process_process__metrics.h b/www/chromium/files/patch-base_process_process__metrics.h index 420d563e5b29..bfd237e3f277 100644 --- a/www/chromium/files/patch-base_process_process__metrics.h +++ b/www/chromium/files/patch-base_process_process__metrics.h @@ -1,131 +1,163 @@ ---- base/process/process_metrics.h.orig 2019-10-21 19:06:18 UTC +--- base/process/process_metrics.h.orig 2020-11-13 06:36:34 UTC +++ base/process/process_metrics.h -@@ -41,7 +41,7 @@ namespace base { +@@ -47,7 +47,7 @@ namespace base { // Full declaration is in process_metrics_iocounters.h. struct IoCounters; --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) // Minor and major page fault counts since the process creation. // Both counts are process-wide, and exclude child processes. // -@@ -51,7 +51,7 @@ struct PageFaultCounts { +@@ -57,7 +57,7 @@ struct PageFaultCounts { int64_t minor; int64_t major; }; --#endif // defined(OS_LINUX) || defined(OS_ANDROID) -+#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) // Convert a POSIX timeval to microseconds. BASE_EXPORT int64_t TimeValToMicroseconds(const struct timeval& tv); -@@ -92,7 +92,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -98,7 +98,7 @@ class BASE_EXPORT ProcessMetrics { // convenience wrapper for CreateProcessMetrics(). static std::unique_ptr<ProcessMetrics> CreateCurrentProcessMetrics(); --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) // 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; -@@ -172,14 +172,14 @@ class BASE_EXPORT ProcessMetrics { +@@ -124,7 +124,7 @@ class BASE_EXPORT ProcessMetrics { + // will result in a time delta of 2 seconds/per 1 wall-clock second. + TimeDelta GetCumulativeCPUUsage(); + +-#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 { + bool ParseProcTimeInState(const std::string& content, + PlatformThreadId tid, + TimeInStatePerThread& time_in_state_per_thread); +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) || + // defined(OS_AIX) + + // Returns the number of average idle cpu wakeups per second since the last +@@ -216,14 +216,14 @@ class BASE_EXPORT ProcessMetrics { int GetOpenFdSoftLimit() const; #endif // defined(OS_POSIX) --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) // Bytes of swap as reported by /proc/[pid]/status. uint64_t GetVmSwapBytes() const; // Minor and major page fault count as reported by /proc/[pid]/stat. // Returns true for success. bool GetPageFaultCounts(PageFaultCounts* counts) const; --#endif // defined(OS_LINUX) || defined(OS_ANDROID) -+#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) // Returns total memory usage of malloc. size_t GetMallocUsage(); -@@ -191,7 +191,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -235,7 +235,7 @@ class BASE_EXPORT ProcessMetrics { ProcessMetrics(ProcessHandle process, PortProvider* port_provider); - #endif // !defined(OS_MACOSX) || defined(OS_IOS) + #endif // !defined(OS_MAC) --#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) -+#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) +-#if defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ ++#if defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ + defined(OS_AIX) int CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups); #endif - #if defined(OS_MACOSX) -@@ -220,7 +220,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -246,10 +246,10 @@ class BASE_EXPORT ProcessMetrics { + uint64_t absolute_package_idle_wakeups); + #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) + CPU::CoreType GetCoreType(int core_index); +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) || + // defined(OS_AIX) + + #if defined(OS_WIN) +@@ -271,7 +271,7 @@ class BASE_EXPORT ProcessMetrics { // Number of bytes transferred to/from disk in bytes. uint64_t last_cumulative_disk_usage_ = 0; --#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) -+#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) +-#if defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ ++#if defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ + defined(OS_AIX) // Same thing for idle wakeups. TimeTicks last_idle_wakeups_time_; - uint64_t last_absolute_idle_wakeups_; -@@ -271,7 +271,7 @@ BASE_EXPORT size_t GetHandleLimit(); +@@ -323,7 +323,7 @@ BASE_EXPORT size_t GetHandleLimit(); BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_descriptors); #endif // defined(OS_POSIX) --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ - defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) +-#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_AIX) || \ + defined(OS_FUCHSIA) // Data about system-wide memory consumption. Values are in KB. Available on - // Windows, Mac, Linux, Android and Chrome OS. -@@ -305,7 +305,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -358,7 +358,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { int avail_phys = 0; #endif --#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) || \ + defined(OS_AIX) // This provides an estimate of available memory as described here: // https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773 - // NOTE: this is ONLY valid in kernels 3.14 and up. Its value will always -@@ -319,7 +319,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -373,7 +373,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { int swap_free = 0; #endif --#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || \ -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) || \ - defined(OS_FUCHSIA) +-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ + defined(OS_AIX) || defined(OS_FUCHSIA) int buffers = 0; int cached = 0; -@@ -329,7 +329,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -383,7 +383,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { int inactive_file = 0; int dirty = 0; int reclaimable = 0; --#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || -+#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) || - // defined(OS_FUCHSIA) +-#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || ++#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || + // defined(OS_AIX) defined(OS_FUCHSIA) - #if defined(OS_CHROMEOS) -@@ -355,10 +355,10 @@ struct BASE_EXPORT SystemMemoryInfoKB { + #if defined(OS_CHROMEOS) || BUILDFLAG(IS_LACROS) +@@ -406,11 +406,11 @@ struct BASE_EXPORT SystemMemoryInfoKB { // Exposed for memory debugging widget. BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoKB* meminfo); --#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || -+#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - // defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) +-#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || + // defined(OS_CHROMEOS) defined(OS_ANDROID) || defined(OS_AIX) || + // defined(OS_FUCHSIA) --#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) || \ + defined(OS_AIX) // Parse the data found in /proc/<pid>/stat and return the sum of the // CPU-related ticks. Returns -1 on parse error. - // Exposed for testing. -@@ -431,7 +431,7 @@ BASE_EXPORT bool GetSystemDiskInfo(SystemDiskInfo* dis +@@ -485,7 +485,7 @@ BASE_EXPORT bool GetSystemDiskInfo(SystemDiskInfo* dis // Returns the amount of time spent in user space since boot across all CPUs. BASE_EXPORT TimeDelta GetUserCpuTimeSinceBoot(); --#endif // defined(OS_LINUX) || defined(OS_ANDROID) -+#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) || + // defined(OS_AIX) - #if defined(OS_CHROMEOS) - // Data from files in directory /sys/block/zram0 about ZRAM usage. -@@ -526,7 +526,7 @@ class BASE_EXPORT SystemMetrics { + #if defined(OS_CHROMEOS) || BUILDFLAG(IS_LACROS) +@@ -597,7 +597,7 @@ class BASE_EXPORT SystemMetrics { FRIEND_TEST_ALL_PREFIXES(SystemMetricsTest, SystemMetrics); size_t committed_memory_; --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) SystemMemoryInfoKB memory_info_; VmStatInfo vmstat_info_; SystemDiskInfo disk_info_; 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 1dc5323f3252..524b56b16e85 100644 --- a/www/chromium/files/patch-base_process_process__metrics__freebsd.cc +++ b/www/chromium/files/patch-base_process_process__metrics__freebsd.cc @@ -1,14 +1,17 @@ ---- base/process/process_metrics_freebsd.cc.orig 2019-07-24 18:58:02 UTC +--- base/process/process_metrics_freebsd.cc.orig 2020-11-13 06:36:34 UTC +++ base/process/process_metrics_freebsd.cc -@@ -5,6 +5,7 @@ +@@ -3,8 +3,10 @@ + // found in the LICENSE file. + #include "base/process/process_metrics.h" ++#include "base/notreached.h" #include <stddef.h> +#include <sys/types.h> #include <sys/sysctl.h> #include <sys/user.h> #include <unistd.h> -@@ -14,11 +15,29 @@ +@@ -14,11 +16,29 @@ #include "base/process/process_metrics_iocounters.h" #include "base/stl_util.h" @@ -40,7 +43,7 @@ // static std::unique_ptr<ProcessMetrics> ProcessMetrics::CreateProcessMetrics( -@@ -69,4 +88,216 @@ size_t GetSystemCommitCharge() { +@@ -69,4 +89,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 04d68b92dcf2..46408ab62d44 100644 --- a/www/chromium/files/patch-base_process_process__metrics__posix.cc +++ b/www/chromium/files/patch-base_process_process__metrics__posix.cc @@ -1,8 +1,8 @@ ---- base/process/process_metrics_posix.cc.orig 2020-07-07 21:57:30 UTC +--- base/process/process_metrics_posix.cc.orig 2020-11-13 06:36:34 UTC +++ base/process/process_metrics_posix.cc @@ -20,6 +20,8 @@ - #if defined(OS_MACOSX) + #if defined(OS_APPLE) #include <malloc/malloc.h> +#elif defined(OS_FREEBSD) +#include <stdlib.h> diff --git a/www/chromium/files/patch-base_process_process__unittest.cc b/www/chromium/files/patch-base_process_process__unittest.cc index 3e5aac5b4da7..4054f8582e62 100644 --- a/www/chromium/files/patch-base_process_process__unittest.cc +++ b/www/chromium/files/patch-base_process_process__unittest.cc @@ -1,11 +1,11 @@ ---- base/process/process_unittest.cc.orig 2019-03-18 19:16:37 UTC +--- base/process/process_unittest.cc.orig 2020-11-13 06:36:34 UTC +++ base/process/process_unittest.cc -@@ -148,7 +148,7 @@ TEST_F(ProcessTest, CreationTimeOtherProcess) { +@@ -153,7 +153,7 @@ TEST_F(ProcessTest, CreationTimeOtherProcess) { // was spawned and a time recorded after it was spawned. However, since the // base::Time and process creation clocks don't match, tolerate some error. constexpr base::TimeDelta kTolerance = --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // On Linux, process creation time is relative to boot time which has a // 1-second resolution. Tolerate 1 second for the imprecise boot time and // 100 ms for the imprecise clock. diff --git a/www/chromium/files/patch-base_process_process__util__unittest.cc b/www/chromium/files/patch-base_process_process__util__unittest.cc index e6378dd51b22..37f708f1d1f3 100644 --- a/www/chromium/files/patch-base_process_process__util__unittest.cc +++ b/www/chromium/files/patch-base_process_process__util__unittest.cc @@ -1,16 +1,16 @@ ---- base/process/process_util_unittest.cc.orig 2020-03-23 15:26:12 UTC +--- base/process/process_util_unittest.cc.orig 2020-11-13 06:36:34 UTC +++ base/process/process_util_unittest.cc @@ -1307,11 +1307,11 @@ std::string TestLaunchProcess(const CommandLine& cmdli options.fds_to_remap.emplace_back(fds[1], STDOUT_FILENO); #endif // defined(OS_WIN) --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) options.clone_flags = clone_flags; #else CHECK_EQ(0, clone_flags); --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) EXPECT_TRUE(LaunchProcess(cmdline, options).IsValid()); write_pipe.Close(); diff --git a/www/chromium/files/patch-base_profiler_register__context.h b/www/chromium/files/patch-base_profiler_register__context.h index ea2c126353b4..79ee85b05e84 100644 --- a/www/chromium/files/patch-base_profiler_register__context.h +++ b/www/chromium/files/patch-base_profiler_register__context.h @@ -1,15 +1,15 @@ ---- base/profiler/register_context.h.orig 2020-03-16 18:39:41 UTC +--- base/profiler/register_context.h.orig 2020-11-13 06:36:34 UTC +++ base/profiler/register_context.h @@ -17,7 +17,7 @@ #include <windows.h> - #elif defined(OS_MACOSX) + #elif defined(OS_APPLE) #include <mach/machine/thread_status.h> --#elif defined(OS_ANDROID) || defined(OS_LINUX) -+#elif defined(OS_ANDROID) || defined(OS_LINUX) || 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) #include <sys/ucontext.h> #endif -@@ -165,6 +165,48 @@ inline uintptr_t& RegisterContextInstructionPointer(mc +@@ -190,6 +190,48 @@ inline uintptr_t& RegisterContextInstructionPointer(mc } #endif // #if defined(ARCH_CPU_ARM_FAMILY) && defined(ARCH_CPU_32_BITS) diff --git a/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.cc b/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.cc index 96db1204abdd..ec7f92d52984 100644 --- a/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.cc +++ b/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.cc @@ -1,11 +1,11 @@ ---- base/profiler/sampling_profiler_thread_token.cc.orig 2020-02-07 10:24:19 UTC +--- base/profiler/sampling_profiler_thread_token.cc.orig 2020-11-13 06:36:34 UTC +++ base/profiler/sampling_profiler_thread_token.cc @@ -7,7 +7,7 @@ namespace base { SamplingProfilerThreadToken GetSamplingProfilerCurrentThreadToken() { --#if defined(OS_ANDROID) || defined(OS_LINUX) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) return {PlatformThread::CurrentId(), pthread_self()}; #else return {PlatformThread::CurrentId()}; diff --git a/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.h b/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.h index 589e083be74d..c36c1078ab26 100644 --- a/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.h +++ b/www/chromium/files/patch-base_profiler_sampling__profiler__thread__token.h @@ -1,11 +1,11 @@ ---- base/profiler/sampling_profiler_thread_token.h.orig 2020-02-07 10:24:33 UTC +--- base/profiler/sampling_profiler_thread_token.h.orig 2020-11-13 06:36:34 UTC +++ base/profiler/sampling_profiler_thread_token.h @@ -9,7 +9,7 @@ #include "base/threading/platform_thread.h" #include "build/build_config.h" --#if defined(OS_ANDROID) || defined(OS_LINUX) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include <pthread.h> #endif @@ -13,8 +13,8 @@ // functions used to obtain the stack base address. struct SamplingProfilerThreadToken { PlatformThreadId id; --#if defined(OS_ANDROID) || defined(OS_LINUX) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) pthread_t pthread_id; #endif }; 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 fcbc9bacbce2..47eefaa173d1 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 2020-05-13 18:40:16 UTC +--- base/profiler/stack_copier_signal.cc.orig 2020-11-13 06:36:34 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> -@@ -33,8 +40,13 @@ class AsyncSafeWaitableEvent { +@@ -34,8 +41,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) -@@ -44,8 +56,12 @@ class AsyncSafeWaitableEvent { +@@ -45,8 +57,12 @@ class AsyncSafeWaitableEvent { void Signal() { futex_.store(1, std::memory_order_release); @@ -42,7 +42,7 @@ } private: -@@ -215,11 +231,18 @@ bool StackCopierSignal::CopyStack(StackBuffer* stack_b +@@ -216,11 +232,18 @@ bool StackCopierSignal::CopyStack(StackBuffer* stack_b if (!scoped_sigaction.succeeded()) return false; diff --git a/www/chromium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc b/www/chromium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc index 5547d3a09a32..29ebf0d0b33e 100644 --- a/www/chromium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc +++ b/www/chromium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc @@ -1,6 +1,6 @@ ---- base/profiler/stack_sampling_profiler_test_util.cc.orig 2020-07-13 13:09:53 UTC +--- base/profiler/stack_sampling_profiler_test_util.cc.orig 2020-11-13 06:36:34 UTC +++ base/profiler/stack_sampling_profiler_test_util.cc -@@ -23,7 +23,7 @@ +@@ -32,7 +32,7 @@ // Fortunately, it provides _alloca, which functions identically. #include <malloc.h> #define alloca _alloca diff --git a/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc b/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc index 19b34c4fe031..5f14491af9cc 100644 --- a/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc +++ b/www/chromium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc @@ -1,6 +1,6 @@ ---- base/profiler/stack_sampling_profiler_unittest.cc.orig 2020-07-07 21:58:11 UTC +--- base/profiler/stack_sampling_profiler_unittest.cc.orig 2020-11-13 06:36:34 UTC +++ base/profiler/stack_sampling_profiler_unittest.cc -@@ -41,7 +41,7 @@ +@@ -42,7 +42,7 @@ #include <intrin.h> #include <malloc.h> #include <windows.h> diff --git a/www/chromium/files/patch-base_profiler_thread__delegate__posix.cc b/www/chromium/files/patch-base_profiler_thread__delegate__posix.cc index 74d564e70740..849d40187045 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,16 @@ ---- base/profiler/thread_delegate_posix.cc.orig 2020-05-13 18:39:35 UTC +--- base/profiler/thread_delegate_posix.cc.orig 2020-11-13 06:36:34 UTC +++ base/profiler/thread_delegate_posix.cc -@@ -9,6 +9,9 @@ +@@ -12,6 +12,9 @@ + #include "base/profiler/thread_delegate_posix.h" #include "base/stl_util.h" - #include "build/build_config.h" +#if defined(OS_FREEBSD) +#include <pthread_np.h> +#endif - namespace base { - -@@ -17,7 +20,12 @@ namespace { + #if defined(OS_ANDROID) + #include "base/files/file_util.h" +@@ -43,7 +46,12 @@ base::Optional<uintptr_t> GetAndroidMainThreadStackBas uintptr_t GetThreadStackBaseAddressImpl( SamplingProfilerThreadToken thread_token) { pthread_attr_t attr; @@ -23,7 +23,7 @@ // See crbug.com/617730 for limitations of this approach on Linux. void* address; size_t size; -@@ -93,16 +101,33 @@ std::vector<uintptr_t*> ThreadDelegatePosix::GetRegist +@@ -130,16 +138,33 @@ std::vector<uintptr_t*> ThreadDelegatePosix::GetRegist return { // Return the set of callee-save registers per the i386 System V ABI // section 2.2.3, plus the stack pointer. @@ -57,7 +57,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]), -@@ -110,6 +135,7 @@ std::vector<uintptr_t*> ThreadDelegatePosix::GetRegist +@@ -147,6 +172,7 @@ std::vector<uintptr_t*> ThreadDelegatePosix::GetRegist reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_R14]), reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_R15]), reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_RSP]), diff --git a/www/chromium/files/patch-base_sampling__heap__profiler_sampling__heap__profiler.cc b/www/chromium/files/patch-base_sampling__heap__profiler_sampling__heap__profiler.cc index 44e3b0aae8ef..63a4e3b68dd8 100644 --- a/www/chromium/files/patch-base_sampling__heap__profiler_sampling__heap__profiler.cc +++ b/www/chromium/files/patch-base_sampling__heap__profiler_sampling__heap__profiler.cc @@ -1,6 +1,6 @@ ---- base/sampling_heap_profiler/sampling_heap_profiler.cc.orig 2019-09-09 21:55:05 UTC +--- base/sampling_heap_profiler/sampling_heap_profiler.cc.orig 2020-11-13 06:36:34 UTC +++ base/sampling_heap_profiler/sampling_heap_profiler.cc -@@ -29,6 +29,10 @@ +@@ -30,6 +30,10 @@ #include <sys/prctl.h> #endif @@ -10,9 +10,9 @@ + #if defined(OS_ANDROID) && BUILDFLAG(CAN_UNWIND_WITH_CFI_TABLE) && \ defined(OFFICIAL_BUILD) - #include "base/trace_event/cfi_backtrace_android.h" -@@ -64,6 +68,10 @@ const char* GetAndLeakThreadName() { - #elif defined(OS_MACOSX) + #include "base/trace_event/cfi_backtrace_android.h" // no-presubmit-check +@@ -65,6 +69,10 @@ const char* GetAndLeakThreadName() { + #elif defined(OS_APPLE) int err = pthread_getname_np(pthread_self(), name, kBufferLen); if (err == 0 && *name != '\0') + return strdup(name); @@ -20,5 +20,5 @@ + pthread_get_name_np(pthread_self(), name, kBufferLen); + if (*name != '\0') return strdup(name); - #endif // defined(OS_LINUX) || defined(OS_ANDROID) + #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) diff --git a/www/chromium/files/patch-base_security__unittest.cc b/www/chromium/files/patch-base_security__unittest.cc index 7db1096b3d49..132ea807512e 100644 --- a/www/chromium/files/patch-base_security__unittest.cc +++ b/www/chromium/files/patch-base_security__unittest.cc @@ -1,11 +1,28 @@ ---- base/security_unittest.cc.orig 2020-07-07 21:57:30 UTC +--- base/security_unittest.cc.orig 2020-11-13 06:36:34 UTC +++ base/security_unittest.cc -@@ -59,7 +59,7 @@ NOINLINE Type HideValueFromCompiler(volatile Type valu - // FAILS_ is too clunky. +@@ -61,7 +61,7 @@ NOINLINE Type HideValueFromCompiler(volatile Type valu void OverflowTestsSoftExpectTrue(bool overflow_detected) { if (!overflow_detected) { --#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_MACOSX) -+#if defined(OS_POSIX) && !defined(OS_NACL) + #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ +- defined(OS_APPLE) ++ defined(OS_APPLE) || defined(OS_BSD) // Sadly, on Linux, Android, and OSX we don't have a good story yet. Don't // fail the test, but report. printf("Platform has overflow: %s\n", +@@ -123,7 +123,7 @@ TEST(SecurityTest, MAYBE_NewOverflow) { + #endif // !defined(OS_WIN) || !defined(ARCH_CPU_64_BITS) + } + +-#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(__x86_64__) ++#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(__x86_64__) + // Check if ptr1 and ptr2 are separated by less than size chars. + bool ArePointersToSameArea(void* ptr1, void* ptr2, size_t size) { + ptrdiff_t ptr_diff = reinterpret_cast<char*>(std::max(ptr1, ptr2)) - +@@ -177,6 +177,6 @@ TEST(SecurityTest, MALLOC_OVERFLOW_TEST(RandomMemoryAl + EXPECT_FALSE(impossible_random_address); + } + +-#endif // (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(__x86_64__) ++#endif // (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(__x86_64__) + + } // namespace diff --git a/www/chromium/files/patch-base_stl__util.h b/www/chromium/files/patch-base_stl__util.h deleted file mode 100644 index b203dbd723ef..000000000000 --- a/www/chromium/files/patch-base_stl__util.h +++ /dev/null @@ -1,47 +0,0 @@ ---- base/stl_util.h.orig 2020-05-18 14:07:28 UTC -+++ base/stl_util.h -@@ -561,14 +561,6 @@ size_t EraseIf(std::vector<T, Allocator>& container, P - return removed; - } - --template <class T, class Allocator, class Value> --size_t Erase(std::forward_list<T, Allocator>& container, const Value& value) { -- // Unlike std::forward_list::remove, this function template accepts -- // heterogeneous types and does not force a conversion to the container's -- // value type before invoking the == operator. -- return EraseIf(container, [&](const T& cur) { return cur == value; }); --} -- - template <class T, class Allocator, class Predicate> - size_t EraseIf(std::forward_list<T, Allocator>& container, Predicate pred) { - // Note: std::forward_list does not have a size() API, thus we need to use the -@@ -580,10 +572,10 @@ size_t EraseIf(std::forward_list<T, Allocator>& contai - } - - template <class T, class Allocator, class Value> --size_t Erase(std::list<T, Allocator>& container, const Value& value) { -- // Unlike std::list::remove, this function template accepts heterogeneous -- // types and does not force a conversion to the container's value type before -- // invoking the == operator. -+size_t Erase(std::forward_list<T, Allocator>& container, const Value& value) { -+ // Unlike std::forward_list::remove, this function template accepts -+ // heterogeneous types and does not force a conversion to the container's -+ // value type before invoking the == operator. - return EraseIf(container, [&](const T& cur) { return cur == value; }); - } - -@@ -592,6 +584,14 @@ size_t EraseIf(std::list<T, Allocator>& container, Pre - size_t old_size = container.size(); - container.remove_if(pred); - return old_size - container.size(); -+} -+ -+template <class T, class Allocator, class Value> -+size_t Erase(std::list<T, Allocator>& container, const Value& value) { -+ // Unlike std::list::remove, this function template accepts heterogeneous -+ // types and does not force a conversion to the container's value type before -+ // invoking the == operator. -+ return EraseIf(container, [&](const T& cur) { return cur == value; }); - } - - template <class Key, class T, class Compare, class Allocator, class Predicate> diff --git a/www/chromium/files/patch-base_strings_sys__string__conversions__unittest.cc b/www/chromium/files/patch-base_strings_sys__string__conversions__unittest.cc new file mode 100644 index 000000000000..c05afd11e6c2 --- /dev/null +++ b/www/chromium/files/patch-base_strings_sys__string__conversions__unittest.cc @@ -0,0 +1,19 @@ +--- base/strings/sys_string_conversions_unittest.cc.orig 2020-11-16 14:00:26 UTC ++++ base/strings/sys_string_conversions_unittest.cc +@@ -76,7 +76,7 @@ TEST(SysStrings, SysUTF8ToWide) { + } + + // Tests depend on setting a specific Linux locale. +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + TEST(SysStrings, SysWideToNativeMB) { + #if !defined(SYSTEM_NATIVE_UTF8) + ScopedLocale locale("en_US.UTF-8"); +@@ -191,6 +191,6 @@ TEST(SysStrings, SysNativeMBAndWide) { + EXPECT_EQ(wide, trip); + } + } +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + } // namespace base diff --git a/www/chromium/files/patch-base_synchronization_lock__impl.h b/www/chromium/files/patch-base_synchronization_lock__impl.h index 0b0f9b3ce953..ba9ba2a6221b 100644 --- a/www/chromium/files/patch-base_synchronization_lock__impl.h +++ b/www/chromium/files/patch-base_synchronization_lock__impl.h @@ -1,12 +1,15 @@ ---- base/synchronization/lock_impl.h.orig 2020-07-07 21:58:11 UTC +--- base/synchronization/lock_impl.h.orig 2020-11-13 06:36:34 UTC +++ base/synchronization/lock_impl.h -@@ -69,10 +69,13 @@ void LockImpl::Unlock() { - ::ReleaseSRWLockExclusive(reinterpret_cast<PSRWLOCK>(&native_handle_)); +@@ -105,6 +105,8 @@ void LockImpl::Unlock() { } + #elif defined(OS_POSIX) || defined(OS_FUCHSIA) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wthread-safety-analysis" - void LockImpl::Unlock() { + + bool LockImpl::Try() { + int rv = pthread_mutex_trylock(&native_handle_); +@@ -116,6 +118,7 @@ void LockImpl::Unlock() { int rv = pthread_mutex_unlock(&native_handle_); DCHECK_EQ(rv, 0) << ". " << strerror(rv); } diff --git a/www/chromium/files/patch-base_syslog__logging.cc b/www/chromium/files/patch-base_syslog__logging.cc index d719219ca50b..6df3281f7cf2 100644 --- a/www/chromium/files/patch-base_syslog__logging.cc +++ b/www/chromium/files/patch-base_syslog__logging.cc @@ -1,20 +1,20 @@ ---- base/syslog_logging.cc.orig 2019-10-21 19:06:18 UTC +--- base/syslog_logging.cc.orig 2020-11-13 06:36:34 UTC +++ base/syslog_logging.cc -@@ -14,7 +14,7 @@ - #include "base/debug/stack_trace.h" +@@ -13,7 +13,7 @@ #include "base/strings/string_util.h" + #include "base/win/scoped_handle.h" #include "base/win/win_util.h" --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) ++#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // <syslog.h> defines LOG_INFO, LOG_WARNING macros that could conflict with // base::LOG_INFO, base::LOG_WARNING. #include <syslog.h> -@@ -113,7 +113,7 @@ EventLogMessage::~EventLogMessage() { +@@ -134,7 +134,7 @@ EventLogMessage::~EventLogMessage() { if (user_sid != nullptr) ::LocalFree(user_sid); --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) ++#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) const char kEventSource[] = "chrome"; openlog(kEventSource, LOG_NOWAIT | LOG_PID, LOG_USER); // We can't use the defined names for the logging severity from syslog.h diff --git a/www/chromium/files/patch-base_system_sys__info.cc b/www/chromium/files/patch-base_system_sys__info.cc index acf115c95c91..f5ba828fa6e0 100644 --- a/www/chromium/files/patch-base_system_sys__info.cc +++ b/www/chromium/files/patch-base_system_sys__info.cc @@ -1,11 +1,11 @@ ---- base/system/sys_info.cc.orig 2020-06-25 12:19:57 UTC +--- base/system/sys_info.cc.orig 2020-11-13 06:36:34 UTC +++ base/system/sys_info.cc -@@ -102,7 +102,7 @@ void SysInfo::GetHardwareInfo(base::OnceCallback<void( - #elif defined(OS_ANDROID) || defined(OS_MACOSX) +@@ -104,7 +104,7 @@ void SysInfo::GetHardwareInfo(base::OnceCallback<void( + #elif defined(OS_ANDROID) || defined(OS_APPLE) base::ThreadPool::PostTaskAndReplyWithResult( FROM_HERE, {}, base::BindOnce(&GetHardwareInfoSync), std::move(callback)); --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) ++#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) base::ThreadPool::PostTaskAndReplyWithResult( FROM_HERE, {base::MayBlock()}, base::BindOnce(&GetHardwareInfoSync), std::move(callback)); diff --git a/www/chromium/files/patch-base_system_sys__info.h b/www/chromium/files/patch-base_system_sys__info.h index f35e63c372a9..4e19767b60bf 100644 --- a/www/chromium/files/patch-base_system_sys__info.h +++ b/www/chromium/files/patch-base_system_sys__info.h @@ -1,6 +1,6 @@ ---- base/system/sys_info.h.orig 2020-05-13 18:39:35 UTC +--- base/system/sys_info.h.orig 2020-11-13 06:36:34 UTC +++ base/system/sys_info.h -@@ -197,6 +197,8 @@ class BASE_EXPORT SysInfo { +@@ -202,6 +202,8 @@ class BASE_EXPORT SysInfo { // On Desktop this returns true when memory <= 512MB. static bool IsLowEndDevice(); @@ -9,12 +9,12 @@ private: FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory); FRIEND_TEST_ALL_PREFIXES(debug::SystemMetricsTest, ParseMeminfo); -@@ -206,7 +208,7 @@ class BASE_EXPORT SysInfo { +@@ -211,7 +213,7 @@ class BASE_EXPORT SysInfo { static bool IsLowEndDeviceImpl(); static HardwareInfo GetHardwareInfoSync(); --#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) || \ + defined(OS_AIX) static int64_t AmountOfAvailablePhysicalMemory( const SystemMemoryInfoKB& meminfo); - #endif diff --git a/www/chromium/files/patch-base_system_sys__info__freebsd.cc b/www/chromium/files/patch-base_system_sys__info__freebsd.cc index fa607f36fcfb..7bacdbf34b96 100644 --- a/www/chromium/files/patch-base_system_sys__info__freebsd.cc +++ b/www/chromium/files/patch-base_system_sys__info__freebsd.cc @@ -1,9 +1,10 @@ ---- base/system/sys_info_freebsd.cc.orig 2020-07-07 21:57:30 UTC +--- base/system/sys_info_freebsd.cc.orig 2020-11-13 06:36:34 UTC +++ base/system/sys_info_freebsd.cc -@@ -9,30 +9,86 @@ +@@ -9,30 +9,95 @@ #include <sys/sysctl.h> #include "base/notreached.h" ++#include "base/process/process_metrics.h" +#include "base/strings/string_util.h" namespace base { @@ -53,6 +54,14 @@ +} + // static ++int64_t SysInfo::AmountOfAvailablePhysicalMemory(const SystemMemoryInfoKB& info) { ++ int64_t res_kb = info.available != 0 ++ ? info.available - info.active_file ++ : info.free + info.reclaimable + info.inactive_file; ++ return res_kb * 1024; ++} ++ ++// static +std::string SysInfo::CPUModelName() { + int mib[] = { CTL_HW, HW_MODEL }; + char name[256]; diff --git a/www/chromium/files/patch-base_system_sys__info__posix.cc b/www/chromium/files/patch-base_system_sys__info__posix.cc index 5b79b03dce8a..87f69159c3cd 100644 --- a/www/chromium/files/patch-base_system_sys__info__posix.cc +++ b/www/chromium/files/patch-base_system_sys__info__posix.cc @@ -1,6 +1,6 @@ ---- base/system/sys_info_posix.cc.orig 2019-09-09 21:55:05 UTC +--- base/system/sys_info_posix.cc.orig 2020-11-13 06:36:34 UTC +++ base/system/sys_info_posix.cc -@@ -220,6 +220,8 @@ std::string SysInfo::OperatingSystemArchitecture() { +@@ -223,6 +223,8 @@ std::string SysInfo::OperatingSystemArchitecture() { arch = "x86"; } else if (arch == "amd64") { arch = "x86_64"; diff --git a/www/chromium/files/patch-base_system_sys__info__unittest.cc b/www/chromium/files/patch-base_system_sys__info__unittest.cc new file mode 100644 index 000000000000..d77d55ffd491 --- /dev/null +++ b/www/chromium/files/patch-base_system_sys__info__unittest.cc @@ -0,0 +1,46 @@ +--- base/system/sys_info_unittest.cc.orig 2020-11-16 14:01:04 UTC ++++ base/system/sys_info_unittest.cc +@@ -50,13 +50,13 @@ TEST_F(SysInfoTest, AmountOfMem) { + EXPECT_GE(SysInfo::AmountOfVirtualMemory(), 0); + } + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + #define MAYBE_AmountOfAvailablePhysicalMemory \ + DISABLED_AmountOfAvailablePhysicalMemory + #else + #define MAYBE_AmountOfAvailablePhysicalMemory AmountOfAvailablePhysicalMemory +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + TEST_F(SysInfoTest, MAYBE_AmountOfAvailablePhysicalMemory) { + // Note: info is in _K_bytes. + SystemMemoryInfoKB info; +@@ -87,7 +87,7 @@ TEST_F(SysInfoTest, MAYBE_AmountOfAvailablePhysicalMem + EXPECT_GT(amount, static_cast<int64_t>(info.free) * 1024); + EXPECT_LT(amount / 1024, info.total); + } +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSDD) + + #if defined(OS_FUCHSIA) + // TODO(crbug.com/851734): Implementation depends on statvfs, which is not +@@ -117,7 +117,7 @@ TEST_F(SysInfoTest, MAYBE_AmountOfTotalDiskSpace) { + EXPECT_GT(SysInfo::AmountOfTotalDiskSpace(tmp_path), 0) << tmp_path.value(); + } + +-#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) || defined(OS_FUCHSIA) + TEST_F(SysInfoTest, OperatingSystemVersionNumbers) { + int32_t os_major_version = -1; +@@ -178,7 +178,7 @@ TEST_F(SysInfoTest, GetHardwareInfo) { + EXPECT_TRUE(IsStringUTF8(hardware_info->model)); + bool empty_result_expected = + #if defined(OS_ANDROID) || defined(OS_APPLE) || defined(OS_WIN) || \ +- defined(OS_LINUX) || defined(OS_CHROMEOS) ++ defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + false; + #else + true; diff --git a/www/chromium/files/patch-base_task_thread__pool_environment__config__unittest.cc b/www/chromium/files/patch-base_task_thread__pool_environment__config__unittest.cc index 92b120193ada..2b31585fd9f1 100644 --- a/www/chromium/files/patch-base_task_thread__pool_environment__config__unittest.cc +++ b/www/chromium/files/patch-base_task_thread__pool_environment__config__unittest.cc @@ -1,8 +1,8 @@ ---- base/task/thread_pool/environment_config_unittest.cc.orig 2019-07-29 13:26:54 UTC +--- base/task/thread_pool/environment_config_unittest.cc.orig 2020-11-13 06:36:34 UTC +++ base/task/thread_pool/environment_config_unittest.cc @@ -14,7 +14,7 @@ namespace internal { TEST(ThreadPoolEnvironmentConfig, CanUseBackgroundPriorityForWorker) { - #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_IOS) + #if defined(OS_WIN) || defined(OS_APPLE) EXPECT_TRUE(CanUseBackgroundPriorityForWorkerThread()); -#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || \ +#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD) || \ diff --git a/www/chromium/files/patch-base_test_BUILD.gn b/www/chromium/files/patch-base_test_BUILD.gn index c2b8e3134a48..b19569faecac 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 2020-07-13 15:42:25 UTC +--- base/test/BUILD.gn.orig 2020-11-13 06:36:34 UTC +++ base/test/BUILD.gn -@@ -408,7 +408,11 @@ if (is_linux) { +@@ -415,7 +415,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 e205455fbc37..f688a93a4820 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 2020-07-07 21:58:11 UTC +--- base/test/launcher/test_launcher.cc.orig 2020-11-13 06:36:34 UTC +++ base/test/launcher/test_launcher.cc -@@ -55,6 +55,7 @@ +@@ -58,6 +58,7 @@ #include "testing/gtest/include/gtest/gtest.h" #if defined(OS_POSIX) @@ -8,12 +8,21 @@ #include <fcntl.h> #include "base/files/file_descriptor_watcher_posix.h" -@@ -557,7 +558,7 @@ ChildProcessResults DoLaunchChildTestProcess( +@@ -588,7 +589,7 @@ ChildProcessResults DoLaunchChildTestProcess( #if !defined(OS_FUCHSIA) options.new_process_group = true; #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) options.kill_on_parent_death = true; #endif +@@ -1529,7 +1530,7 @@ bool TestLauncher::Init(CommandLine* command_line) { + results_tracker_.AddGlobalTag("OS_IOS"); + #endif + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + results_tracker_.AddGlobalTag("OS_LINUX"); + #endif + diff --git a/www/chromium/files/patch-base_test_test__file__util__posix.cc b/www/chromium/files/patch-base_test_test__file__util__posix.cc index c48082540b08..07fa4b159c80 100644 --- a/www/chromium/files/patch-base_test_test__file__util__posix.cc +++ b/www/chromium/files/patch-base_test_test__file__util__posix.cc @@ -1,11 +1,11 @@ ---- base/test/test_file_util_posix.cc.orig 2020-07-07 21:57:30 UTC +--- base/test/test_file_util_posix.cc.orig 2020-11-13 06:36:34 UTC +++ base/test/test_file_util_posix.cc -@@ -85,7 +85,7 @@ void SyncPageCacheToDisk() { +@@ -87,7 +87,7 @@ void SyncPageCacheToDisk() { sync(); } --#if !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) -+#if !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) +-#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_APPLE) && \ ++#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_APPLE) && !defined(OS_BSD) && \ + !defined(OS_ANDROID) bool EvictFileFromSystemCache(const FilePath& file) { // There doesn't seem to be a POSIX way to cool the disk cache. - NOTIMPLEMENTED(); diff --git a/www/chromium/files/patch-base_test_test__suite.cc b/www/chromium/files/patch-base_test_test__suite.cc index 3afe0098808a..b9f1034ae5ac 100644 --- a/www/chromium/files/patch-base_test_test__suite.cc +++ b/www/chromium/files/patch-base_test_test__suite.cc @@ -1,37 +1,37 @@ ---- base/test/test_suite.cc.orig 2020-05-13 18:39:35 UTC +--- base/test/test_suite.cc.orig 2020-11-13 06:36:34 UTC +++ base/test/test_suite.cc -@@ -69,7 +69,7 @@ - #include "base/test/test_support_ios.h" +@@ -66,7 +66,7 @@ + #include "base/test/test_support_android.h" #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "base/test/fontconfig_util_linux.h" #endif -@@ -385,14 +385,14 @@ void TestSuite::PreInitialize() { +@@ -382,14 +382,14 @@ void TestSuite::PreInitialize() { testing::GTEST_FLAG(catch_exceptions) = false; #endif EnableTerminationOnHeapCorruption(); --#if defined(OS_LINUX) && defined(USE_AURA) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_AURA) +-#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(USE_AURA) ++#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(USE_AURA) // When calling native char conversion functions (e.g wrctomb) we need to // have the locale set. In the absence of such a call the "C" locale is the // default. In the gtk code (below) gtk_init() implicitly sets a locale. setlocale(LC_ALL, ""); // We still need number to string conversions to be locale insensitive. setlocale(LC_NUMERIC, "C"); --#endif // defined(OS_LINUX) && defined(USE_AURA) -+#endif // (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_AURA) +-#endif // (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(USE_AURA) ++#endif // (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(USE_AURA) // On Android, AtExitManager is created in // testing/android/native_test_wrapper.cc before main() is called. -@@ -623,7 +623,7 @@ void TestSuite::Initialize() { +@@ -650,7 +650,7 @@ void TestSuite::Initialize() { // TODO(jshin): Should we set the locale via an OS X locale API here? i18n::SetICUDefaultLocale("en_US"); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) SetUpFontconfig(); #endif diff --git a/www/chromium/files/patch-base_third__party_libevent_BUILD.gn b/www/chromium/files/patch-base_third__party_libevent_BUILD.gn index 67042d6ca3e5..b7bd8c4fd45a 100644 --- a/www/chromium/files/patch-base_third__party_libevent_BUILD.gn +++ b/www/chromium/files/patch-base_third__party_libevent_BUILD.gn @@ -1,11 +1,11 @@ ---- base/third_party/libevent/BUILD.gn.orig 2019-03-11 22:00:51 UTC +--- base/third_party/libevent/BUILD.gn.orig 2020-11-13 06:36:34 UTC +++ base/third_party/libevent/BUILD.gn @@ -43,13 +43,20 @@ static_library("libevent") { "mac/event-config.h", ] include_dirs = [ "mac" ] -- } else if (is_linux) { -+ } else if (is_linux && !is_bsd) { +- } else if (is_linux || is_chromeos) { ++ } else if ((is_linux || is_chromeos) && !is_bsd) { sources += [ "epoll.c", "linux/config.h", @@ -13,7 +13,7 @@ ] include_dirs = [ "linux" ] + } else if (is_bsd) { -+ sources += [ ++ sources += [ + "kqueue.c", + "freebsd/config.h", + "freebsd/event-config.h", diff --git a/www/chromium/files/patch-base_threading_platform__thread.h b/www/chromium/files/patch-base_threading_platform__thread.h index 0ff2fc68f36a..a75b61323372 100644 --- a/www/chromium/files/patch-base_threading_platform__thread.h +++ b/www/chromium/files/patch-base_threading_platform__thread.h @@ -1,11 +1,11 @@ ---- base/threading/platform_thread.h.orig 2019-10-21 19:06:18 UTC +--- base/threading/platform_thread.h.orig 2020-11-13 06:36:34 UTC +++ base/threading/platform_thread.h -@@ -221,7 +221,7 @@ class BASE_EXPORT PlatformThread { +@@ -230,7 +230,7 @@ class BASE_EXPORT PlatformThread { + // Returns a realtime period provided by |delegate|. + static TimeDelta GetRealtimePeriod(Delegate* delegate); - static ThreadPriority GetCurrentThreadPriority(); - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Toggles a specific thread's priority at runtime. This can be used to // change the priority of a thread in a different process and will fail // if the calling process does not have proper permissions. The diff --git a/www/chromium/files/patch-base_threading_platform__thread__internal__posix.h b/www/chromium/files/patch-base_threading_platform__thread__internal__posix.h new file mode 100644 index 000000000000..5bcd713380b3 --- /dev/null +++ b/www/chromium/files/patch-base_threading_platform__thread__internal__posix.h @@ -0,0 +1,18 @@ +--- base/threading/platform_thread_internal_posix.h.orig 2020-11-16 17:28:09 UTC ++++ base/threading/platform_thread_internal_posix.h +@@ -47,13 +47,13 @@ bool SetCurrentThreadPriorityForPlatform(ThreadPriorit + // of CanIncreaseThreadPriority(). + Optional<ThreadPriority> GetCurrentThreadPriorityForPlatform(); + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + // Current thread id is cached in thread local storage for performance reasons. + // In some rare cases it's important to clear that cache explicitly (e.g. after + // going through clone() syscall which does not call pthread_atfork() + // handlers). + BASE_EXPORT void ClearTidCache(); +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + } // namespace internal + 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 78123188b58a..ffb57676d50a 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 2019-03-11 22:00:51 UTC +--- base/threading/platform_thread_linux.cc.orig 2020-11-13 06:36:34 UTC +++ base/threading/platform_thread_linux.cc -@@ -18,7 +18,9 @@ +@@ -24,7 +24,9 @@ #if !defined(OS_NACL) && !defined(OS_AIX) #include <pthread.h> @@ -10,7 +10,7 @@ #include <sys/resource.h> #include <sys/time.h> #include <sys/types.h> -@@ -99,7 +101,7 @@ const ThreadPriorityToNiceValuePair kThreadPriorityToN +@@ -264,7 +266,7 @@ const ThreadPriorityToNiceValuePair kThreadPriorityToN Optional<bool> CanIncreaseCurrentThreadPriorityForPlatform( ThreadPriority priority) { @@ -19,7 +19,7 @@ // A non-zero soft-limit on RLIMIT_RTPRIO is required to be allowed to invoke // pthread_setschedparam in SetCurrentThreadPriorityForPlatform(). struct rlimit rlim; -@@ -141,7 +143,7 @@ Optional<ThreadPriority> GetCurrentThreadPriorityForPl +@@ -314,7 +316,7 @@ Optional<ThreadPriority> GetCurrentThreadPriorityForPl 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 e2681e175e63..459b2c3b0328 100644 --- a/www/chromium/files/patch-base_threading_platform__thread__posix.cc +++ b/www/chromium/files/patch-base_threading_platform__thread__posix.cc @@ -1,11 +1,54 @@ ---- base/threading/platform_thread_posix.cc.orig 2019-03-11 22:00:51 UTC +--- base/threading/platform_thread_posix.cc.orig 2020-11-13 06:36:34 UTC +++ base/threading/platform_thread_posix.cc -@@ -66,7 +66,7 @@ void* ThreadFunc(void* params) { - if (!thread_params->joinable) - base::ThreadRestrictions::SetSingletonAllowed(false); - --#if !defined(OS_NACL) -+#if !defined(OS_NACL) && !defined(OS_BSD) - // Threads on linux/android may inherit their priority from the thread - // where they were created. This explicitly sets the priority of all new - // threads. +@@ -32,6 +32,10 @@ + #include <sys/syscall.h> + #endif + ++#if defined(OS_BSD) ++#include <pthread_np.h> ++#endif ++ + #if defined(OS_FUCHSIA) + #include <zircon/process.h> + #else +@@ -141,7 +145,7 @@ bool CreateThread(size_t stack_size, + return success; + } + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + // Store the thread ids in local storage since calling the SWI can + // expensive and PlatformThread::CurrentId is used liberally. Clear +@@ -159,11 +163,11 @@ class InitAtFork { + InitAtFork() { pthread_atfork(nullptr, nullptr, internal::ClearTidCache); } + }; + +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSSD) + + } // namespace + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + namespace internal { + +@@ -173,7 +177,7 @@ void ClearTidCache() { + + } // namespace internal + +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + // static + PlatformThreadId PlatformThread::CurrentId() { +@@ -181,6 +185,8 @@ PlatformThreadId PlatformThread::CurrentId() { + // into the kernel. + #if defined(OS_APPLE) + return pthread_mach_thread_np(pthread_self()); ++#elif defined(OS_BSD) ++ return pthread_getthreadid_np(); + #elif defined(OS_LINUX) || defined(OS_CHROMEOS) + static NoDestructor<InitAtFork> init_at_fork; + if (g_thread_id == -1) { diff --git a/www/chromium/files/patch-base_threading_platform__thread__unittest.cc b/www/chromium/files/patch-base_threading_platform__thread__unittest.cc index b998b2d83f2c..4a1997aa7402 100644 --- a/www/chromium/files/patch-base_threading_platform__thread__unittest.cc +++ b/www/chromium/files/patch-base_threading_platform__thread__unittest.cc @@ -1,20 +1,24 @@ ---- base/threading/platform_thread_unittest.cc.orig 2020-03-23 15:31:47 UTC +--- base/threading/platform_thread_unittest.cc.orig 2020-11-13 06:36:34 UTC +++ base/threading/platform_thread_unittest.cc -@@ -302,7 +302,7 @@ TEST(PlatformThreadTest, +@@ -311,7 +311,7 @@ TEST(PlatformThreadTest, // and hardcodes what we know. Please inform scheduler-dev@chromium.org if this // proprerty changes for a given platform. TEST(PlatformThreadTest, CanIncreaseThreadPriority) { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // On Ubuntu, RLIMIT_NICE and RLIMIT_RTPRIO are 0 by default, so we won't be // able to increase priority to any level. constexpr bool kCanIncreasePriority = false; -@@ -398,7 +398,7 @@ TEST(PlatformThreadTest, SetHugeThreadName) { +@@ -405,9 +405,9 @@ TEST(PlatformThreadTest, SetHugeThreadName) { + TEST(PlatformThreadTest, GetDefaultThreadStackSize) { size_t stack_size = PlatformThread::GetDefaultThreadStackSize(); - #if defined(OS_WIN) || defined(OS_IOS) || defined(OS_FUCHSIA) || \ -- (defined(OS_LINUX) && !defined(THREAD_SANITIZER)) || \ -+ ((defined(OS_LINUX) || defined(OS_BSD)) && !defined(THREAD_SANITIZER)) || \ +-#if defined(OS_WIN) || defined(OS_IOS) || defined(OS_FUCHSIA) || \ +- ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && \ +- !defined(THREAD_SANITIZER)) || \ ++#if defined(OS_WIN) || defined(OS_IOS) || defined(OS_FUCHSIA) || \ ++ ((defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && \ ++ !defined(THREAD_SANITIZER)) || \ (defined(OS_ANDROID) && !defined(ADDRESS_SANITIZER)) EXPECT_EQ(0u, stack_size); #else diff --git a/www/chromium/files/patch-base_threading_scoped__blocking__call__unittest.cc b/www/chromium/files/patch-base_threading_scoped__blocking__call__unittest.cc index 43c62689cd83..755f30ed7957 100644 --- a/www/chromium/files/patch-base_threading_scoped__blocking__call__unittest.cc +++ b/www/chromium/files/patch-base_threading_scoped__blocking__call__unittest.cc @@ -1,4 +1,4 @@ ---- base/threading/scoped_blocking_call_unittest.cc.orig 2020-07-13 13:43:07 UTC +--- base/threading/scoped_blocking_call_unittest.cc.orig 2020-11-13 06:36:34 UTC +++ base/threading/scoped_blocking_call_unittest.cc @@ -273,7 +273,7 @@ TEST_F(ScopedBlockingCallIOJankMonitoringTest, ManyInA } @@ -9,3 +9,12 @@ internal::IOJankMonitoringWindow::kMonitoringWindow * 3 + internal::IOJankMonitoringWindow::kIOJankInterval * 5; +@@ -530,7 +530,7 @@ TEST_F(ScopedBlockingCallIOJankMonitoringTest, MultiTh + // First one starting at 10 seconds (can't start later than that or we'll trip + // the kTimeDiscrepancyTimeout per TaskEnvironment's inability to RunUntilIdle() + // with pending blocked tasks). +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + // https://crbug.com/1071166 + #define MAYBE_MultiThreadedOverlappedWindows \ + DISABLED_MultiThreadedOverlappedWindows diff --git a/www/chromium/files/patch-base_threading_thread__task__runner__handle.cc b/www/chromium/files/patch-base_threading_thread__task__runner__handle.cc index 65da82eaa5d9..de0f014549d6 100644 --- a/www/chromium/files/patch-base_threading_thread__task__runner__handle.cc +++ b/www/chromium/files/patch-base_threading_thread__task__runner__handle.cc @@ -1,4 +1,4 @@ ---- base/threading/thread_task_runner_handle.cc.orig 2020-07-07 21:57:30 UTC +--- base/threading/thread_task_runner_handle.cc.orig 2020-11-13 06:36:34 UTC +++ base/threading/thread_task_runner_handle.cc @@ -8,6 +8,7 @@ #include <utility> diff --git a/www/chromium/files/patch-base_time_time__unittest.cc b/www/chromium/files/patch-base_time_time__unittest.cc new file mode 100644 index 000000000000..7aa69a9a96ed --- /dev/null +++ b/www/chromium/files/patch-base_time_time__unittest.cc @@ -0,0 +1,18 @@ +--- base/time/time_unittest.cc.orig 2020-11-16 17:58:27 UTC ++++ base/time/time_unittest.cc +@@ -1969,6 +1969,7 @@ TEST(TimeDelta, Overflows) { + EXPECT_TRUE((kLargeDelta / 0.5).is_max()); + EXPECT_TRUE((kLargeDelta / -0.5).is_min()); + ++#if !defined(OS_BSD) + static_assert( + TimeDelta::Max() / kOneSecond == std::numeric_limits<double>::infinity(), + ""); +@@ -1997,6 +1998,7 @@ TEST(TimeDelta, Overflows) { + static_assert(TimeDelta::Max() % -kOneSecond == TimeDelta::Max(), ""); + static_assert(TimeDelta::Min() % kOneSecond == TimeDelta::Min(), ""); + static_assert(TimeDelta::Min() % -kOneSecond == TimeDelta::Min(), ""); ++#endif + + // Division by zero. + static_assert((kOneSecond / 0).is_max(), ""); diff --git a/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc b/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc index fef6ba833abf..411d0893d684 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,8 +1,8 @@ ---- base/trace_event/malloc_dump_provider.cc.orig 2020-03-16 18:39:41 UTC +--- base/trace_event/malloc_dump_provider.cc.orig 2020-11-13 06:36:34 UTC +++ base/trace_event/malloc_dump_provider.cc @@ -17,6 +17,8 @@ - #if defined(OS_MACOSX) + #if defined(OS_APPLE) #include <malloc/malloc.h> +#elif defined(OS_BSD) +#include <stdlib.h> 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 6624e1d04af6..f7ca678e981c 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,11 +1,11 @@ ---- base/trace_event/process_memory_dump.cc.orig 2019-03-11 22:00:51 UTC +--- base/trace_event/process_memory_dump.cc.orig 2020-11-13 06:36:34 UTC +++ base/trace_event/process_memory_dump.cc -@@ -94,7 +94,7 @@ size_t ProcessMemoryDump::CountResidentBytes(void* sta +@@ -95,7 +95,7 @@ size_t ProcessMemoryDump::CountResidentBytes(void* sta #if defined(OS_WIN) std::unique_ptr<PSAPI_WORKING_SET_EX_INFORMATION[]> vec( new PSAPI_WORKING_SET_EX_INFORMATION[max_vec_size]); --#elif defined(OS_MACOSX) -+#elif defined(OS_MACOSX) || defined(OS_BSD) +-#elif defined(OS_APPLE) ++#elif defined(OS_APPLE) || defined(OS_BSD) std::unique_ptr<char[]> vec(new char[max_vec_size]); #elif defined(OS_POSIX) || defined(OS_FUCHSIA) std::unique_ptr<unsigned char[]> vec(new unsigned char[max_vec_size]); diff --git a/www/chromium/files/patch-base_trace__event_process__memory__dump.h b/www/chromium/files/patch-base_trace__event_process__memory__dump.h index 1ae1b93e6409..dea3b589c4d3 100644 --- a/www/chromium/files/patch-base_trace__event_process__memory__dump.h +++ b/www/chromium/files/patch-base_trace__event_process__memory__dump.h @@ -1,4 +1,4 @@ ---- base/trace_event/process_memory_dump.h.orig 2019-03-11 22:00:51 UTC +--- base/trace_event/process_memory_dump.h.orig 2020-11-13 06:36:34 UTC +++ base/trace_event/process_memory_dump.h @@ -22,7 +22,7 @@ diff --git a/www/chromium/files/patch-base_util_memory__pressure_system__memory__pressure__evaluator.cc b/www/chromium/files/patch-base_util_memory__pressure_system__memory__pressure__evaluator.cc new file mode 100644 index 000000000000..6f4603a02a7e --- /dev/null +++ b/www/chromium/files/patch-base_util_memory__pressure_system__memory__pressure__evaluator.cc @@ -0,0 +1,20 @@ +--- base/util/memory_pressure/system_memory_pressure_evaluator.cc.orig 2020-11-16 14:03:42 UTC ++++ base/util/memory_pressure/system_memory_pressure_evaluator.cc +@@ -14,7 +14,7 @@ + #elif defined(OS_WIN) + #include "base/util/memory_pressure/system_memory_pressure_evaluator_win.h" + #include "base/win/windows_version.h" +-#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + #include "base/util/memory_pressure/system_memory_pressure_evaluator_linux.h" + #endif + +@@ -45,7 +45,7 @@ SystemMemoryPressureEvaluator::CreateDefaultSystemEval + evaluator->CreateOSSignalPressureEvaluator(monitor->CreateVoter()); + } + return evaluator; +-#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + return std::make_unique<util::os_linux::SystemMemoryPressureEvaluator>( + monitor->CreateVoter()); + #endif diff --git a/www/chromium/files/patch-build_config_BUILD.gn b/www/chromium/files/patch-build_config_BUILD.gn index 72706cf4aaef..18dad57ca637 100644 --- a/www/chromium/files/patch-build_config_BUILD.gn +++ b/www/chromium/files/patch-build_config_BUILD.gn @@ -1,17 +1,17 @@ ---- build/config/BUILD.gn.orig 2020-05-13 18:39:35 UTC +--- build/config/BUILD.gn.orig 2020-11-13 06:36:34 UTC +++ build/config/BUILD.gn @@ -133,7 +133,7 @@ config("debug") { # builds, and we have to tell it to turn it off. defines += [ "_HAS_ITERATOR_DEBUGGING=0" ] } -- } else if (is_linux && current_cpu == "x64" && enable_iterator_debugging) { -+ } else if ((is_linux || is_bsd) && current_cpu == "x64" && enable_iterator_debugging) { +- } else if ((is_linux || is_chromeos) && current_cpu == "x64" && enable_iterator_debugging) { ++ } else if ((is_linux || is_chromeos || is_bsd) && current_cpu == "x64" && enable_iterator_debugging) { # Enable libstdc++ debugging facilities to help catch problems early, see # http://crbug.com/65151 . # TODO(phajdan.jr): Should we enable this for all of POSIX? @@ -231,9 +231,7 @@ config("default_libs") { ] - } else if (is_linux) { + } else if (is_linux || is_chromeos) { libs = [ - "dl", "pthread", @@ -23,8 +23,8 @@ "//build/config/ios:ios_dynamic_flags", "//build/config/ios:ios_executable_flags", ] -- } else if (is_linux || is_android || current_os == "aix") { -+ } else if (is_linux || is_bsd || is_android || current_os == "aix") { +- } else if (is_linux || is_chromeos || is_android || current_os == "aix") { ++ } else if (is_linux || is_bsd || is_chromeos || is_android || current_os == "aix") { configs += [ "//build/config/gcc:executable_config" ] if (is_chromecast) { configs += [ "//build/config/chromecast:executable_config" ] diff --git a/www/chromium/files/patch-build_config_BUILDCONFIG.gn b/www/chromium/files/patch-build_config_BUILDCONFIG.gn index 7c6d307fbd22..e38336dcdf13 100644 --- a/www/chromium/files/patch-build_config_BUILDCONFIG.gn +++ b/www/chromium/files/patch-build_config_BUILDCONFIG.gn @@ -1,4 +1,4 @@ ---- build/config/BUILDCONFIG.gn.orig 2019-06-04 18:55:15 UTC +--- build/config/BUILDCONFIG.gn.orig 2020-11-13 06:36:34 UTC +++ build/config/BUILDCONFIG.gn @@ -131,10 +131,10 @@ declare_args() { is_official_build = false @@ -33,16 +33,16 @@ # See comments in build/toolchain/cros/BUILD.gn about board compiles. if (is_clang) { _default_toolchain = "//build/toolchain/linux:clang_$target_cpu" -@@ -288,10 +288,11 @@ is_android = current_os == "android" +@@ -285,10 +285,11 @@ if (custom_toolchain != "") { + # current_os value directly. + + is_android = current_os == "android" ++is_bsd = current_os == "freebsd" is_chromeos = current_os == "chromeos" is_fuchsia = current_os == "fuchsia" is_ios = current_os == "ios" --is_linux = current_os == "chromeos" || current_os == "linux" -+is_linux = current_os == "chromeos" || current_os == "linux" || current_os == "freebsd" +-is_linux = current_os == "linux" ++is_linux = current_os == "linux" || current_os == "freebsd" is_mac = current_os == "mac" is_nacl = current_os == "nacl" is_win = current_os == "win" || current_os == "winuwp" -+is_bsd = current_os == "freebsd" - - is_posix = !is_win && !is_fuchsia - diff --git a/www/chromium/files/patch-build_config_compiler_BUILD.gn b/www/chromium/files/patch-build_config_compiler_BUILD.gn index 732c4ac683d7..fc8c2c97e48c 100644 --- a/www/chromium/files/patch-build_config_compiler_BUILD.gn +++ b/www/chromium/files/patch-build_config_compiler_BUILD.gn @@ -1,24 +1,24 @@ ---- build/config/compiler/BUILD.gn.orig 2020-07-07 21:58:11 UTC +--- build/config/compiler/BUILD.gn.orig 2020-11-13 06:36:34 UTC +++ build/config/compiler/BUILD.gn -@@ -133,7 +133,7 @@ declare_args() { - # 'is_android' breaks content_shell_test_apk on android-kitkat-arm-rel. - # 'use_xcode_clang' may call old clang. - init_stack_vars = -- !is_android && !use_xcode_clang && (!is_official_build || is_linux) -+ !is_android && !use_xcode_clang && (!is_official_build || is_linux) && !is_bsd +@@ -128,7 +128,7 @@ declare_args() { + # + # TODO(crbug.com/977230): Enabling this when 'use_xcode_clang' is true may + # call an old clang that doesn't support auto-init. +- init_stack_vars = !is_android && !use_xcode_clang ++ init_stack_vars = !is_android && !use_xcode_clang && !is_bsd # This argument is to control whether enabling text section splitting in the # final binary. When enabled, the separated text sections with prefix -@@ -287,7 +287,7 @@ config("compiler") { +@@ -291,7 +291,7 @@ config("compiler") { } # Linker warnings. -- if (fatal_linker_warnings && !is_mac && !is_ios && current_os != "aix") { -+ if (fatal_linker_warnings && !is_mac && !is_ios && !is_bsd && current_os != "aix") { +- if (fatal_linker_warnings && !is_apple && current_os != "aix") { ++ if (fatal_linker_warnings && !is_apple && !is_bsd && current_os != "aix") { ldflags += [ "-Wl,--fatal-warnings" ] } - if (fatal_linker_warnings && (is_mac || is_ios)) { -@@ -381,7 +381,7 @@ config("compiler") { + if (fatal_linker_warnings && is_apple && +@@ -389,7 +389,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,16 +27,16 @@ ldflags += [ "-Wl,-z,defs", "-Wl,--as-needed", -@@ -472,7 +472,7 @@ config("compiler") { +@@ -480,7 +480,7 @@ config("compiler") { ldflags += [ "-Wl,-z,keep-text-section-prefix" ] } - if (is_clang && !is_nacl && !use_xcode_clang) { + if (is_clang && !is_nacl && !use_xcode_clang && !is_bsd) { - cflags += [ "-fcrash-diagnostics-dir=" + - rebase_path("//tools/clang/crashreports", root_build_dir) ] + cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ] -@@ -735,7 +735,7 @@ config("compiler_cpu_abi") { + cflags += [ +@@ -776,7 +776,7 @@ config("compiler_cpu_abi") { cflags += [ "-mtune=$arm_tune" ] } } else if (current_cpu == "arm64") { @@ -45,7 +45,7 @@ cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] } -@@ -1085,7 +1085,7 @@ config("compiler_deterministic") { +@@ -1129,7 +1129,7 @@ config("compiler_deterministic") { "-Xclang", ".", ] @@ -54,8 +54,8 @@ # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167) asmflags = [ "-Wa,-fdebug-compilation-dir,." ] } -@@ -1476,7 +1476,7 @@ config("default_warnings") { - cflags += [ "-Wno-max-tokens" ] +@@ -1512,7 +1512,7 @@ config("default_warnings") { + cflags += [ "-Wno-nonportable-include-path" ] } - if (current_toolchain == host_toolchain || !use_xcode_clang) { @@ -63,7 +63,7 @@ # Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not # recognize. cflags += [ -@@ -1638,7 +1638,7 @@ config("no_chromium_code") { +@@ -1686,7 +1686,7 @@ config("no_chromium_code") { # suppressing them individually, we just blanket suppress them here. "-Wno-unused-variable", ] @@ -72,16 +72,16 @@ cflags += [ # TODO(https://crbug.com/1031169): Clean up and enable. "-Wno-misleading-indentation", -@@ -1716,7 +1716,7 @@ config("thin_archive") { +@@ -1764,7 +1764,7 @@ config("thin_archive") { # Mac and iOS use the mac-specific "libtool" command, not ar, which doesn't # have a "thin archive" mode (it does accept -T, but it means truncating # archive names to 16 characters, which is not what we want). -- if ((is_posix && !is_nacl && !is_mac && !is_ios) || is_fuchsia) { -+ if ((is_posix && !is_nacl && !is_mac && !is_ios && !is_bsd) || is_fuchsia) { +- if ((is_posix && !is_nacl && !is_apple) || is_fuchsia) { ++ if ((is_posix && !is_nacl && !is_apple && !is_bsd) || is_fuchsia) { arflags = [ "-T" ] } else if (is_win && use_lld) { arflags = [ "/llvmlibthin" ] -@@ -2246,7 +2246,7 @@ config("symbols") { +@@ -2297,7 +2297,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) { @@ -89,11 +89,11 @@ + cflags += [ "-g0" ] } - if (is_clang && !is_nacl && !use_xcode_clang) { -@@ -2274,7 +2274,7 @@ config("symbols") { + # TODO(https://crbug.com/1050118): Investigate missing debug info on mac. +@@ -2339,7 +2339,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_mac && !is_ios && !is_nacl && current_cpu != "x86" && + if (!is_apple && !is_nacl && current_cpu != "x86" && - (use_gold || use_lld)) { + (use_gold || use_lld) && !is_bsd) { if (is_clang) { diff --git a/www/chromium/files/patch-build_config_compiler_compiler.gni b/www/chromium/files/patch-build_config_compiler_compiler.gni index 32358d823ffa..b49ed2337d43 100644 --- a/www/chromium/files/patch-build_config_compiler_compiler.gni +++ b/www/chromium/files/patch-build_config_compiler_compiler.gni @@ -1,6 +1,6 @@ ---- build/config/compiler/compiler.gni.orig 2020-07-07 21:58:11 UTC +--- build/config/compiler/compiler.gni.orig 2020-11-13 06:36:34 UTC +++ build/config/compiler/compiler.gni -@@ -176,7 +176,7 @@ declare_args() { +@@ -192,7 +192,7 @@ declare_args() { declare_args() { # Whether to use the gold linker from binutils instead of lld or bfd. use_gold = diff --git a/www/chromium/files/patch-build_config_features.gni b/www/chromium/files/patch-build_config_features.gni index c98a61186fa9..247dd9c8c76f 100644 --- a/www/chromium/files/patch-build_config_features.gni +++ b/www/chromium/files/patch-build_config_features.gni @@ -1,11 +1,11 @@ ---- build/config/features.gni.orig 2019-10-21 19:06:18 UTC +--- build/config/features.gni.orig 2020-11-13 06:36:34 UTC +++ build/config/features.gni @@ -26,7 +26,7 @@ declare_args() { proprietary_codecs = is_chrome_branded || is_chromecast # libudev usage. This currently only affects the content layer. -- use_udev = is_linux && !is_chromecast -+ use_udev = is_linux && !is_chromecast && !is_bsd +- use_udev = (is_linux || is_chromeos) && !is_chromecast ++ use_udev = (is_linux || is_chromeos) && !is_chromecast && !is_bsd - use_dbus = is_linux && !is_chromecast + use_dbus = (is_linux || is_chromeos) && !is_chromecast diff --git a/www/chromium/files/patch-build_config_freetype_freetype.gni b/www/chromium/files/patch-build_config_freetype_freetype.gni index 17bed01510f8..6431f9760dd8 100644 --- a/www/chromium/files/patch-build_config_freetype_freetype.gni +++ b/www/chromium/files/patch-build_config_freetype_freetype.gni @@ -1,4 +1,4 @@ ---- build/config/freetype/freetype.gni.orig 2019-03-18 08:59:45 UTC +--- build/config/freetype/freetype.gni.orig 2020-11-13 06:36:34 UTC +++ build/config/freetype/freetype.gni @@ -10,5 +10,5 @@ declare_args() { # than version 2.7.1 and have color bitmap support compiled in. WARNING: diff --git a/www/chromium/files/patch-build_config_linux_BUILD.gn b/www/chromium/files/patch-build_config_linux_BUILD.gn index e1ce0cbb1905..bc9748b2552c 100644 --- a/www/chromium/files/patch-build_config_linux_BUILD.gn +++ b/www/chromium/files/patch-build_config_linux_BUILD.gn @@ -1,4 +1,4 @@ ---- build/config/linux/BUILD.gn.orig 2020-05-13 18:39:36 UTC +--- build/config/linux/BUILD.gn.orig 2020-11-13 06:36:34 UTC +++ build/config/linux/BUILD.gn @@ -30,7 +30,7 @@ config("runtime_library") { diff --git a/www/chromium/files/patch-build_config_linux_pkg-config.py b/www/chromium/files/patch-build_config_linux_pkg-config.py index 8a2865a024c0..3ac955321e36 100644 --- a/www/chromium/files/patch-build_config_linux_pkg-config.py +++ b/www/chromium/files/patch-build_config_linux_pkg-config.py @@ -1,4 +1,4 @@ ---- build/config/linux/pkg-config.py.orig 2019-07-24 18:58:02 UTC +--- build/config/linux/pkg-config.py.orig 2020-11-13 06:36:34 UTC +++ build/config/linux/pkg-config.py @@ -59,8 +59,12 @@ def SetConfigPath(options): print("You must specify an architecture via -a if using a sysroot.") diff --git a/www/chromium/files/patch-build_config_sysroot.gni b/www/chromium/files/patch-build_config_sysroot.gni index 8b68404769fb..9e340d8b8801 100644 --- a/www/chromium/files/patch-build_config_sysroot.gni +++ b/www/chromium/files/patch-build_config_sysroot.gni @@ -1,4 +1,4 @@ ---- build/config/sysroot.gni.orig 2020-05-13 18:39:36 UTC +--- build/config/sysroot.gni.orig 2020-11-13 06:36:34 UTC +++ build/config/sysroot.gni @@ -21,9 +21,9 @@ declare_args() { diff --git a/www/chromium/files/patch-build_detect__host__arch.py b/www/chromium/files/patch-build_detect__host__arch.py index 588896662607..9d0ebae9f514 100644 --- a/www/chromium/files/patch-build_detect__host__arch.py +++ b/www/chromium/files/patch-build_detect__host__arch.py @@ -1,4 +1,4 @@ ---- build/detect_host_arch.py.orig 2019-07-24 18:58:02 UTC +--- build/detect_host_arch.py.orig 2020-11-13 06:36:34 UTC +++ build/detect_host_arch.py @@ -21,6 +21,8 @@ def HostArch(): host_arch = 'ia32' diff --git a/www/chromium/files/patch-build_gn__run__binary.py b/www/chromium/files/patch-build_gn__run__binary.py index d9e733834b4a..bf433af332eb 100644 --- a/www/chromium/files/patch-build_gn__run__binary.py +++ b/www/chromium/files/patch-build_gn__run__binary.py @@ -1,4 +1,4 @@ ---- build/gn_run_binary.py.orig 2019-07-24 18:58:02 UTC +--- build/gn_run_binary.py.orig 2020-11-13 06:36:34 UTC +++ build/gn_run_binary.py @@ -24,7 +24,7 @@ if not os.path.isabs(path): # The rest of the arguments are passed directly to the executable. diff --git a/www/chromium/files/patch-build_linux_chrome.map b/www/chromium/files/patch-build_linux_chrome.map index 7465bc9773c5..d4b5568948cc 100644 --- a/www/chromium/files/patch-build_linux_chrome.map +++ b/www/chromium/files/patch-build_linux_chrome.map @@ -1,4 +1,4 @@ ---- build/linux/chrome.map.orig 2019-03-11 22:00:52 UTC +--- build/linux/chrome.map.orig 2020-11-13 06:36:34 UTC +++ build/linux/chrome.map @@ -1,4 +1,7 @@ { diff --git a/www/chromium/files/patch-build_linux_libpci_BUILD.gn b/www/chromium/files/patch-build_linux_libpci_BUILD.gn index 86373b5ebf39..aae9271ac587 100644 --- a/www/chromium/files/patch-build_linux_libpci_BUILD.gn +++ b/www/chromium/files/patch-build_linux_libpci_BUILD.gn @@ -1,4 +1,4 @@ ---- build/linux/libpci/BUILD.gn.orig 2019-03-11 22:00:52 UTC +--- build/linux/libpci/BUILD.gn.orig 2020-11-13 06:36:34 UTC +++ build/linux/libpci/BUILD.gn @@ -3,20 +3,36 @@ # found in the LICENSE file. diff --git a/www/chromium/files/patch-build_linux_unbundle_libusb.gn b/www/chromium/files/patch-build_linux_unbundle_libusb.gn index 1cc0b00012c6..cc33eba51a20 100644 --- a/www/chromium/files/patch-build_linux_unbundle_libusb.gn +++ b/www/chromium/files/patch-build_linux_unbundle_libusb.gn @@ -1,4 +1,4 @@ ---- build/linux/unbundle/libusb.gn.orig 2019-03-17 01:47:13 UTC +--- build/linux/unbundle/libusb.gn.orig 2020-11-16 10:04:40 UTC +++ build/linux/unbundle/libusb.gn @@ -0,0 +1,24 @@ +# Copyright 2016 The Chromium Authors. All rights reserved. diff --git a/www/chromium/files/patch-build_linux_unbundle_replace__gn__files.py b/www/chromium/files/patch-build_linux_unbundle_replace__gn__files.py index ca2d4fd5e12e..ba6689409b13 100644 --- a/www/chromium/files/patch-build_linux_unbundle_replace__gn__files.py +++ b/www/chromium/files/patch-build_linux_unbundle_replace__gn__files.py @@ -1,4 +1,4 @@ ---- build/linux/unbundle/replace_gn_files.py.orig 2019-03-11 22:00:52 UTC +--- build/linux/unbundle/replace_gn_files.py.orig 2020-11-13 06:36:34 UTC +++ build/linux/unbundle/replace_gn_files.py @@ -27,6 +27,7 @@ REPLACEMENTS = { 'libevent': 'base/third_party/libevent/BUILD.gn', diff --git a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni index ca744b0b239e..1cf6de3f5faa 100644 --- a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni +++ b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni @@ -1,7 +1,7 @@ ---- build/toolchain/gcc_toolchain.gni.orig 2020-05-13 18:40:16 UTC +--- build/toolchain/gcc_toolchain.gni.orig 2020-11-13 06:36:34 UTC +++ build/toolchain/gcc_toolchain.gni -@@ -36,6 +36,11 @@ if (is_linux && target_os == "android") { - enable_resource_whitelist_generation = false +@@ -50,6 +50,11 @@ if (enable_resource_allowlist_generation) { + "enable_resource_allowlist_generation=true does not work for target_os=$target_os") } +declare_args() { @@ -12,7 +12,7 @@ # This template defines a toolchain for something that works like gcc # (including clang). # -@@ -589,13 +594,23 @@ template("clang_toolchain") { +@@ -641,13 +646,23 @@ template("clang_toolchain") { } gcc_toolchain(target_name) { 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 45bc3d0a520e..fe86ac61f4b5 100644 --- a/www/chromium/files/patch-build_toolchain_get__concurrent__links.py +++ b/www/chromium/files/patch-build_toolchain_get__concurrent__links.py @@ -1,6 +1,6 @@ ---- build/toolchain/get_concurrent_links.py.orig 2019-06-04 18:55:15 UTC +--- build/toolchain/get_concurrent_links.py.orig 2020-11-13 06:36:34 UTC +++ build/toolchain/get_concurrent_links.py -@@ -48,6 +48,14 @@ def _GetTotalMemoryInBytes(): +@@ -53,6 +53,14 @@ def _GetTotalMemoryInBytes(): return int(subprocess.check_output(['sysctl', '-n', 'hw.memsize'])) except Exception: return 0 diff --git a/www/chromium/files/patch-build_toolchain_linux_BUILD.gn b/www/chromium/files/patch-build_toolchain_linux_BUILD.gn index 29b9160f7b07..24073ea8f674 100644 --- a/www/chromium/files/patch-build_toolchain_linux_BUILD.gn +++ b/www/chromium/files/patch-build_toolchain_linux_BUILD.gn @@ -1,4 +1,4 @@ ---- build/toolchain/linux/BUILD.gn.orig 2019-04-30 22:22:28 UTC +--- build/toolchain/linux/BUILD.gn.orig 2020-11-13 06:36:34 UTC +++ build/toolchain/linux/BUILD.gn @@ -22,7 +22,6 @@ clang_toolchain("clang_arm") { } diff --git a/www/chromium/files/patch-cc_BUILD.gn b/www/chromium/files/patch-cc_BUILD.gn index 4678bfd491de..ddeec9370073 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 2020-07-07 21:58:11 UTC +--- cc/BUILD.gn.orig 2020-11-13 06:36:34 UTC +++ cc/BUILD.gn -@@ -599,7 +599,7 @@ cc_test_static_library("test_support") { +@@ -615,7 +615,7 @@ cc_test_static_library("test_support") { if (enable_vulkan) { deps += [ "//gpu/vulkan/init" ] } @@ -9,11 +9,11 @@ data_deps = [ "//third_party/mesa_headers" ] } } -@@ -801,7 +801,6 @@ cc_test("cc_unittests") { +@@ -824,7 +824,6 @@ cc_test("cc_unittests") { ] data_deps = [ "//testing/buildbot/filters:cc_unittests_filters", - "//third_party/mesa_headers", ] - defines = [] + if (is_fuchsia) { diff --git a/www/chromium/files/patch-cc_layers_scrollbar__layer__impl__base.cc b/www/chromium/files/patch-cc_layers_scrollbar__layer__impl__base.cc index f1df08621e85..9ecfbba672a6 100644 --- a/www/chromium/files/patch-cc_layers_scrollbar__layer__impl__base.cc +++ b/www/chromium/files/patch-cc_layers_scrollbar__layer__impl__base.cc @@ -1,4 +1,4 @@ ---- cc/layers/scrollbar_layer_impl_base.cc.orig 2020-07-07 21:58:11 UTC +--- cc/layers/scrollbar_layer_impl_base.cc.orig 2020-11-13 06:36:34 UTC +++ cc/layers/scrollbar_layer_impl_base.cc @@ -219,8 +219,8 @@ gfx::Rect ScrollbarLayerImplBase::ComputeThumbQuadRect int thumb_offset = TrackStart(); 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 d3df654755cb..9e1df01e2f56 100644 --- a/www/chromium/files/patch-cc_test_layer__tree__test.cc +++ b/www/chromium/files/patch-cc_test_layer__tree__test.cc @@ -1,11 +1,11 @@ ---- cc/test/layer_tree_test.cc.orig 2020-07-13 09:14:49 UTC +--- cc/test/layer_tree_test.cc.orig 2020-11-13 06:36:34 UTC +++ cc/test/layer_tree_test.cc -@@ -645,7 +645,7 @@ LayerTreeTest::LayerTreeTest(LayerTreeTest::RendererTy +@@ -669,7 +669,7 @@ LayerTreeTest::LayerTreeTest(viz::RendererType rendere init_vulkan = true; - } else if (renderer_type_ == RENDERER_SKIA_DAWN) { + } else if (renderer_type_ == viz::RendererType::kSkiaDawn) { scoped_feature_list_.InitAndEnableFeature(features::kSkiaDawn); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) init_vulkan = true; #elif defined(OS_WIN) // TODO(sgilhuly): 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 2412d1a501d7..432cdf4546a4 100644 --- a/www/chromium/files/patch-cc_test_pixel__test.cc +++ b/www/chromium/files/patch-cc_test_pixel__test.cc @@ -1,11 +1,11 @@ ---- cc/test/pixel_test.cc.orig 2020-07-13 09:15:14 UTC +--- cc/test/pixel_test.cc.orig 2020-11-13 06:36:34 UTC +++ cc/test/pixel_test.cc @@ -69,7 +69,7 @@ PixelTest::PixelTest(GraphicsBackend backend) init_vulkan = true; } else if (backend == kSkiaDawn) { scoped_feature_list_.InitAndEnableFeature(features::kSkiaDawn); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) init_vulkan = true; #elif defined(OS_WIN) // TODO(sgilhuly): Initialize D3D12 for Windows. diff --git a/www/chromium/files/patch-cc_trees_frame__rate__estimator.cc b/www/chromium/files/patch-cc_trees_frame__rate__estimator.cc index 71229ec3ab6f..ac015f4ea0f3 100644 --- a/www/chromium/files/patch-cc_trees_frame__rate__estimator.cc +++ b/www/chromium/files/patch-cc_trees_frame__rate__estimator.cc @@ -1,4 +1,4 @@ ---- cc/trees/frame_rate_estimator.cc.orig 2020-07-13 17:25:44 UTC +--- cc/trees/frame_rate_estimator.cc.orig 2020-11-13 06:36:34 UTC +++ cc/trees/frame_rate_estimator.cc @@ -48,7 +48,7 @@ void FrameRateEstimator::WillDraw(base::TimeTicks now) // frequency is lower than that, then using a lower frame rate is permitted. diff --git a/www/chromium/files/patch-cc_trees_property__tree.cc b/www/chromium/files/patch-cc_trees_property__tree.cc index 19a809976d50..8e7377fb50a9 100644 --- a/www/chromium/files/patch-cc_trees_property__tree.cc +++ b/www/chromium/files/patch-cc_trees_property__tree.cc @@ -1,6 +1,6 @@ ---- cc/trees/property_tree.cc.orig 2020-07-07 21:58:11 UTC +--- cc/trees/property_tree.cc.orig 2020-11-13 06:36:34 UTC +++ cc/trees/property_tree.cc -@@ -1245,13 +1245,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro +@@ -1285,13 +1285,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro gfx::Size clip_layer_bounds = container_bounds(scroll_node->id); diff --git a/www/chromium/files/patch-chrome_BUILD.gn b/www/chromium/files/patch-chrome_BUILD.gn new file mode 100644 index 000000000000..00783fba5d2d --- /dev/null +++ b/www/chromium/files/patch-chrome_BUILD.gn @@ -0,0 +1,13 @@ +--- chrome/BUILD.gn.orig 2020-11-16 16:03:08 UTC ++++ chrome/BUILD.gn +@@ -1214,6 +1214,10 @@ group("browser_dependencies") { + public_deps += [ "//chromeos/lacros" ] + } + ++ if (is_bsd) { ++ public_deps -= [ "//components/crash/core/app" ] ++ } ++ + if (is_chromeos) { + public_deps += [ + "//chrome/browser/chromeos", diff --git a/www/chromium/files/patch-chrome_app_BUILD.gn b/www/chromium/files/patch-chrome_app_BUILD.gn index 40561b36dbe4..d1904bdbb5cf 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 2020-07-07 21:58:12 UTC +--- chrome/app/BUILD.gn.orig 2020-11-13 06:36:35 UTC +++ chrome/app/BUILD.gn -@@ -139,7 +139,7 @@ static_library("test_support") { +@@ -140,7 +140,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 574ea4322784..f7cf60b9affa 100644 --- a/www/chromium/files/patch-chrome_app_chrome__command__ids.h +++ b/www/chromium/files/patch-chrome_app_chrome__command__ids.h @@ -1,8 +1,8 @@ ---- chrome/app/chrome_command_ids.h.orig 2020-05-13 18:39:36 UTC +--- chrome/app/chrome_command_ids.h.orig 2020-11-13 06:36:35 UTC +++ chrome/app/chrome_command_ids.h -@@ -60,7 +60,7 @@ - #define IDC_MAXIMIZE_WINDOW 34047 +@@ -61,7 +61,7 @@ #define IDC_ALL_WINDOWS_FRONT 34048 + #define IDC_NAME_WINDOW 34049 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) diff --git a/www/chromium/files/patch-chrome_app_chrome__main.cc b/www/chromium/files/patch-chrome_app_chrome__main.cc index c4e0477762da..d40216695f0b 100644 --- a/www/chromium/files/patch-chrome_app_chrome__main.cc +++ b/www/chromium/files/patch-chrome_app_chrome__main.cc @@ -1,16 +1,17 @@ ---- chrome/app/chrome_main.cc.orig 2019-09-09 21:55:07 UTC +--- chrome/app/chrome_main.cc.orig 2020-11-13 06:36:35 UTC +++ chrome/app/chrome_main.cc -@@ -101,11 +101,11 @@ int ChromeMain(int argc, const char** argv) { - MainThreadStackSamplingProfiler scoped_sampling_profiler; +@@ -109,12 +109,12 @@ int ChromeMain(int argc, const char** argv) { // Chrome-specific process modes. --#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) + #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ +- defined(OS_WIN) ++ defined(OS_WIN) || defined(OS_BSD) if (command_line->HasSwitch(switches::kHeadless)) { return headless::HeadlessShellMain(params); } --#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) -+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) + #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || +- // defined(OS_WIN) ++ // defined(OS_WIN) || defined(OS_BSD) int rv = content::ContentMain(params); 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 aa0cbdac9e82..e1ea6214cf7a 100644 --- a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc +++ b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc @@ -1,55 +1,55 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2020-07-07 21:58:12 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2020-11-13 06:36:35 UTC +++ chrome/app/chrome_main_delegate.cc -@@ -107,7 +107,7 @@ +@@ -108,7 +108,7 @@ #include "chrome/app/shutdown_signal_handlers_posix.h" #endif --#if BUILDFLAG(ENABLE_NACL) && defined(OS_LINUX) -+#if BUILDFLAG(ENABLE_NACL) && defined(OS_LINUX) && !defined(OS_BSD) +-#if BUILDFLAG(ENABLE_NACL) && (defined(OS_LINUX) || defined(OS_CHROMEOS)) ++#if BUILDFLAG(ENABLE_NACL) && (defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(OS_BSD) #include "components/nacl/common/nacl_paths.h" #include "components/nacl/zygote/nacl_fork_delegate_linux.h" #endif -@@ -144,12 +144,12 @@ +@@ -147,12 +147,12 @@ #include "v8/include/v8.h" #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "base/environment.h" #endif - #if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_ANDROID) || \ -- defined(OS_LINUX) -+ defined(OS_LINUX) || defined(OS_BSD) + #if defined(OS_MAC) || defined(OS_WIN) || defined(OS_ANDROID) || \ +- defined(OS_LINUX) || defined(OS_CHROMEOS) ++ defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "chrome/browser/policy/policy_path_parser.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -266,7 +266,7 @@ void SetUpExtendedCrashReporting(bool is_browser_proce +@@ -258,7 +258,7 @@ void SetUpExtendedCrashReporting(bool is_browser_proce #endif // defined(OS_WIN) --#if defined(OS_LINUX) -+#if defined(OS_LINUX) && !defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(OS_BSD) void AdjustLinuxOOMScore(const std::string& process_type) { int score = -1; -@@ -306,13 +306,13 @@ void AdjustLinuxOOMScore(const std::string& process_ty +@@ -294,13 +294,13 @@ void AdjustLinuxOOMScore(const std::string& process_ty if (score > -1) base::AdjustOOMScore(base::GetCurrentProcId(), score); } --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) && !defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // (defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(OS_BSD) // Returns true if this subprocess type needs the ResourceBundle initialized // and resources loaded. bool SubprocessNeedsResourceBundle(const std::string& process_type) { return --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // The zygote process opens the resources for the renderers. - process_type == service_manager::switches::kZygoteProcess || + process_type == switches::kZygoteProcess || #endif -@@ -351,7 +351,7 @@ bool HandleVersionSwitches(const base::CommandLine& co +@@ -339,7 +339,7 @@ bool HandleVersionSwitches(const base::CommandLine& co return false; } @@ -58,52 +58,52 @@ // Show the man page if --help or -h is on the command line. void HandleHelpSwitches(const base::CommandLine& command_line) { if (command_line.HasSwitch(switches::kHelp) || -@@ -361,7 +361,7 @@ void HandleHelpSwitches(const base::CommandLine& comma +@@ -349,7 +349,7 @@ void HandleHelpSwitches(const base::CommandLine& comma PLOG(FATAL) << "execlp failed"; } } -#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) +#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - #if !defined(OS_MACOSX) && !defined(OS_ANDROID) + #if !defined(OS_MAC) && !defined(OS_ANDROID) void SIGTERMProfilingShutdown(int signal) { -@@ -415,7 +415,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -403,7 +403,7 @@ void InitializeUserDataDir(base::CommandLine* command_ std::string process_type = command_line->GetSwitchValueASCII(switches::kProcessType); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // On Linux, Chrome does not support running multiple copies under different // DISPLAYs, so the profile directory can be specified in the environment to // support the virtual desktop use-case. -@@ -427,7 +427,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -415,7 +415,7 @@ void InitializeUserDataDir(base::CommandLine* command_ user_data_dir = base::FilePath::FromUTF8Unsafe(user_data_dir_string); } } --#endif // OS_LINUX -+#endif // OS_LINUX || OS_BSD - #if defined(OS_MACOSX) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + #if defined(OS_MAC) policy::path_parser::CheckUserDataDirPolicy(&user_data_dir); #endif // OS_MAC -@@ -498,7 +498,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat - startup_metric_utils::RecordApplicationStartTime(now); +@@ -487,7 +487,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat #endif --#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) -+#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) - // Record the startup process creation time on supported platforms. + #if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || \ +- defined(OS_CHROMEOS) ++ defined(OS_CHROMEOS) || defined(OS_BSD) + // Record the startup process creation time on supported platforms. On Android + // this is recorded in ChromeMainDelegateAndroid. startup_metric_utils::RecordStartupProcessCreationTime( - base::Process::Current().CreationTime()); -@@ -691,7 +691,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -705,7 +705,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi v8_crashpad_support::SetUp(); #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) && !defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(OS_BSD) if (!crash_reporter::IsCrashpadEnabled()) { breakpad::SetFirstChanceExceptionHandler(v8::TryHandleWebAssemblyTrapPosix); } -@@ -702,7 +702,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -716,7 +716,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi *exit_code = 0; return true; // Got a --version switch; exit with a success error code. } @@ -112,16 +112,16 @@ // This will directly exit if the user asked for help. HandleHelpSwitches(command_line); #endif -@@ -726,7 +726,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -744,7 +744,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi #if defined(OS_CHROMEOS) chromeos::RegisterPathProvider(); #endif --#if BUILDFLAG(ENABLE_NACL) && defined(OS_LINUX) -+#if BUILDFLAG(ENABLE_NACL) && defined(OS_LINUX) && !defined(OS_BSD) +-#if BUILDFLAG(ENABLE_NACL) && (defined(OS_LINUX) || defined(OS_CHROMEOS)) ++#if BUILDFLAG(ENABLE_NACL) && (defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(OS_BSD) nacl::RegisterPathProvider(); #endif -@@ -906,7 +906,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -924,7 +924,7 @@ void ChromeMainDelegate::PreSandboxStartup() { crash_reporter::InitializeCrashKeys(); @@ -130,66 +130,66 @@ ChromeCrashReporterClient::Create(); #endif -@@ -918,7 +918,7 @@ void ChromeMainDelegate::PreSandboxStartup() { - #if defined(OS_WIN) +@@ -937,7 +937,7 @@ void ChromeMainDelegate::PreSandboxStartup() { child_process_logging::Init(); #endif --#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX)) -+#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)) + #if defined(ARCH_CPU_ARM_FAMILY) && \ +- (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS)) ++ (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) // Create an instance of the CPU class to parse /proc/cpuinfo and cache // cpu_brand info. base::CPU cpu_info; -@@ -1037,7 +1037,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1056,7 +1056,7 @@ void ChromeMainDelegate::PreSandboxStartup() { locale; } --#if defined(OS_POSIX) && !defined(OS_MACOSX) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) +-#if defined(OS_POSIX) && !defined(OS_MAC) ++#if defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_BSD) // Zygote needs to call InitCrashReporter() in RunZygote(). - if (process_type != service_manager::switches::kZygoteProcess) { + if (process_type != switches::kZygoteProcess) { #if defined(OS_ANDROID) -@@ -1058,7 +1058,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1077,7 +1077,7 @@ void ChromeMainDelegate::PreSandboxStartup() { } #endif // defined(OS_ANDROID) } --#endif // defined(OS_POSIX) && !defined(OS_MACOSX) -+#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) +-#endif // defined(OS_POSIX) && !defined(OS_MAC) ++#endif // defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_BSD) - // After all the platform Breakpads have been initialized, store the command - // line for crash reporting. -@@ -1072,7 +1072,7 @@ void ChromeMainDelegate::PreSandboxStartup() { + #if defined(OS_ANDROID) + CHECK_EQ(base::android::GetLibraryProcessType(), +@@ -1097,7 +1097,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. --#if defined(OS_LINUX) -+#if defined(OS_LINUX) && !defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(OS_BSD) AdjustLinuxOOMScore(process_type); #endif #if defined(OS_WIN) -@@ -1114,7 +1114,7 @@ int ChromeMainDelegate::RunProcess( +@@ -1139,7 +1139,7 @@ int ChromeMainDelegate::RunProcess( // This entry is not needed on Linux, where the NaCl loader // process is launched via nacl_helper instead. --#if BUILDFLAG(ENABLE_NACL) && !defined(OS_LINUX) -+#if BUILDFLAG(ENABLE_NACL) && !defined(OS_LINUX) && !defined(OS_BSD) +-#if BUILDFLAG(ENABLE_NACL) && !defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if BUILDFLAG(ENABLE_NACL) && !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_BSD) {switches::kNaClLoaderProcess, NaClMain}, #else {"<invalid>", nullptr}, // To avoid constant array of size 0 -@@ -1142,7 +1142,7 @@ void ChromeMainDelegate::ProcessExiting(const std::str +@@ -1167,7 +1167,7 @@ void ChromeMainDelegate::ProcessExiting(const std::str #endif // !defined(OS_ANDROID) } --#if defined(OS_LINUX) -+#if defined(OS_LINUX) && !defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(OS_BSD) void ChromeMainDelegate::ZygoteStarting( - std::vector<std::unique_ptr<service_manager::ZygoteForkDelegate>>* - delegates) { -@@ -1180,7 +1180,7 @@ void ChromeMainDelegate::ZygoteForked() { + std::vector<std::unique_ptr<content::ZygoteForkDelegate>>* delegates) { + #if defined(OS_CHROMEOS) +@@ -1204,7 +1204,7 @@ void ChromeMainDelegate::ZygoteForked() { crash_keys::SetCrashKeysFromCommandLine(*command_line); } --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) && !defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // (defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(OS_BSD) content::ContentClient* ChromeMainDelegate::CreateContentClient() { return &chrome_content_client_; diff --git a/www/chromium/files/patch-chrome_app_chromium__strings.grd b/www/chromium/files/patch-chrome_app_chromium__strings.grd index 6793780fc70e..bdca535dc0f3 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 2020-07-07 21:58:12 UTC +--- chrome/app/chromium_strings.grd.orig 2020-11-13 06:36:35 UTC +++ chrome/app/chromium_strings.grd -@@ -681,7 +681,7 @@ Chromium is unable to recover your settings. +@@ -698,7 +698,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> -@@ -782,7 +782,7 @@ Chromium is unable to recover your settings. +@@ -809,7 +809,7 @@ Chromium is unable to recover your settings. </message> <!-- ProcessSingleton --> @@ -18,7 +18,7 @@ <message name="IDS_PROFILE_IN_USE_POSIX" desc="Message shown when the browser cannot start because the profile is in use on a different host."> The profile appears to be in use by another Chromium process (<ph name="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME">$2<ex>example.com</ex></ph>). Chromium has locked the profile so that it doesn't get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chromium. </message> -@@ -1004,7 +1004,7 @@ Chromium is unable to recover your settings. +@@ -1028,7 +1028,7 @@ Chromium is unable to recover your settings. </message> <!-- Plugin Placeholders --> diff --git a/www/chromium/files/patch-chrome_app_generated__resources.grd b/www/chromium/files/patch-chrome_app_generated__resources.grd index 4e2871b96ffb..cda37d0c9fd8 100644 --- a/www/chromium/files/patch-chrome_app_generated__resources.grd +++ b/www/chromium/files/patch-chrome_app_generated__resources.grd @@ -1,6 +1,6 @@ ---- chrome/app/generated_resources.grd.orig 2020-07-07 21:58:12 UTC +--- chrome/app/generated_resources.grd.orig 2020-11-13 06:36:35 UTC +++ chrome/app/generated_resources.grd -@@ -5181,7 +5181,7 @@ Keep your key file in a safe place. You will need it t +@@ -5245,7 +5245,7 @@ Keep your key file in a safe place. You will need it t </if> <!-- chrome://browser-switch strings --> @@ -9,7 +9,7 @@ <message name="IDS_ABOUT_BROWSER_SWITCH_TITLE" desc="about:browser-switch page title"> Legacy Browser Support </message> -@@ -6928,7 +6928,7 @@ the Bookmarks menu."> +@@ -7236,7 +7236,7 @@ the Bookmarks menu."> Google Pay </message> @@ -18,7 +18,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> -@@ -7854,7 +7854,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -8212,7 +8212,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 0f869c267011..28217b08089e 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 2020-07-07 21:58:12 UTC +--- chrome/app/google_chrome_strings.grd.orig 2020-11-13 06:36:35 UTC +++ chrome/app/google_chrome_strings.grd -@@ -688,7 +688,7 @@ Google Chrome is unable to recover your settings. +@@ -705,7 +705,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> -@@ -789,7 +789,7 @@ Google Chrome is unable to recover your settings. +@@ -816,7 +816,7 @@ Google Chrome is unable to recover your settings. </message> <!-- ProcessSingleton --> @@ -18,7 +18,7 @@ <message name="IDS_PROFILE_IN_USE_POSIX" desc="Message shown when the browser cannot start because the profile is in use on a different host."> The profile appears to be in use by another Google Chrome process (<ph name="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME">$2<ex>example.com</ex></ph>). Chrome has locked the profile so that it doesn't get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chrome. </message> -@@ -1018,7 +1018,7 @@ Google Chrome is unable to recover your settings. +@@ -1042,7 +1042,7 @@ Google Chrome is unable to recover your settings. </message> <!-- Plugin Placeholders --> diff --git a/www/chromium/files/patch-chrome_app_settings__strings.grdp b/www/chromium/files/patch-chrome_app_settings__strings.grdp index bed697f91496..0df7e092f2ce 100644 --- a/www/chromium/files/patch-chrome_app_settings__strings.grdp +++ b/www/chromium/files/patch-chrome_app_settings__strings.grdp @@ -1,7 +1,7 @@ ---- chrome/app/settings_strings.grdp.orig 2020-07-07 21:58:13 UTC +--- chrome/app/settings_strings.grdp.orig 2020-11-13 06:36:36 UTC +++ chrome/app/settings_strings.grdp -@@ -83,7 +83,7 @@ - Themes +@@ -110,7 +110,7 @@ + Theme </message> </if> - <if expr="is_linux and not chromeos"> @@ -9,7 +9,7 @@ <message name="IDS_SETTINGS_SYSTEM_THEME" desc="Text of the label describing the system (GTK+) browser theme on Linux"> GTK+ </message> -@@ -97,7 +97,7 @@ +@@ -124,7 +124,7 @@ Use Classic </message> </if> diff --git a/www/chromium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc b/www/chromium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc index 3678715840b5..be7ad2247838 100644 --- a/www/chromium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc +++ b/www/chromium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc @@ -1,4 +1,4 @@ ---- chrome/app/shutdown_signal_handlers_posix.cc.orig 2019-04-30 22:22:32 UTC +--- chrome/app/shutdown_signal_handlers_posix.cc.orig 2020-11-13 06:36:36 UTC +++ chrome/app/shutdown_signal_handlers_posix.cc @@ -186,12 +186,18 @@ void InstallShutdownSignalHandlers( g_pipe_pid = getpid(); diff --git a/www/chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd b/www/chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd index 34bf723d2edc..875a420e4354 100644 --- a/www/chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd +++ b/www/chromium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd @@ -1,4 +1,4 @@ ---- chrome/app/theme/chrome_unscaled_resources.grd.orig 2020-02-03 21:53:28 UTC +--- chrome/app/theme/chrome_unscaled_resources.grd.orig 2020-11-13 06:36:36 UTC +++ chrome/app/theme/chrome_unscaled_resources.grd @@ -18,7 +18,7 @@ <include name="IDR_PRODUCT_LOGO_64" file="google_chrome/product_logo_64.png" type="BINDATA" /> diff --git a/www/chromium/files/patch-chrome_app_theme_theme__resources.grd b/www/chromium/files/patch-chrome_app_theme_theme__resources.grd index a6e63ac69942..cf59148f8edb 100644 --- a/www/chromium/files/patch-chrome_app_theme_theme__resources.grd +++ b/www/chromium/files/patch-chrome_app_theme_theme__resources.grd @@ -1,4 +1,4 @@ ---- chrome/app/theme/theme_resources.grd.orig 2019-10-30 15:46:23 UTC +--- chrome/app/theme/theme_resources.grd.orig 2020-11-13 06:36:36 UTC +++ chrome/app/theme/theme_resources.grd @@ -25,7 +25,7 @@ <!-- KEEP THESE IN ALPHABETICAL ORDER! DO NOT ADD TO RANDOM PLACES JUST diff --git a/www/chromium/files/patch-chrome_browser_BUILD.gn b/www/chromium/files/patch-chrome_browser_BUILD.gn index 69f475ebc373..3c4b4a7a0881 100644 --- a/www/chromium/files/patch-chrome_browser_BUILD.gn +++ b/www/chromium/files/patch-chrome_browser_BUILD.gn @@ -1,22 +1,11 @@ ---- chrome/browser/BUILD.gn.orig 2020-07-07 21:58:13 UTC +--- chrome/browser/BUILD.gn.orig 2020-11-13 06:36:36 UTC +++ chrome/browser/BUILD.gn -@@ -4209,7 +4209,9 @@ static_library("browser") { - if (use_x11) { - deps += [ "//ui/gfx/x" ] - } -- deps += [ "//services/service_manager/zygote" ] -+ if (!is_bsd) { -+ deps += [ "//services/service_manager/zygote" ] -+ } - - if (use_allocator == "tcmalloc") { - deps += [ "//chrome/common/performance_manager/mojom" ] -@@ -4424,7 +4426,7 @@ static_library("browser") { +@@ -4999,7 +4999,7 @@ static_library("browser") { ] } - if (is_posix && !is_mac) { + if (is_posix && !is_mac && !is_bsd) { - # TODO(crbug.com/753619): Enable crash reporting on Fuchsia. + # TODO(crbug.com / 753619): Enable crash reporting on Fuchsia. sources += [ "//chrome/app/chrome_crash_reporter_client.cc", diff --git a/www/chromium/files/patch-chrome_browser_about__flags.cc b/www/chromium/files/patch-chrome_browser_about__flags.cc index aef1d325eaa1..fced5539e0f5 100644 --- a/www/chromium/files/patch-chrome_browser_about__flags.cc +++ b/www/chromium/files/patch-chrome_browser_about__flags.cc @@ -1,36 +1,45 @@ ---- chrome/browser/about_flags.cc.orig 2020-08-18 18:40:04 UTC +--- chrome/browser/about_flags.cc.orig 2020-11-16 14:15:55 UTC +++ chrome/browser/about_flags.cc -@@ -179,7 +179,7 @@ - #include "ui/gl/gl_switches.h" - #include "ui/native_theme/native_theme_features.h" - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - #include "base/allocator/buildflags.h" - #endif - -@@ -879,7 +879,7 @@ const FeatureEntry::Choice kMemlogSamplingRateChoices[ +@@ -881,7 +881,7 @@ const FeatureEntry::Choice kMemlogSamplingRateChoices[ heap_profiling::kMemlogSamplingRate5MB}, }; --#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) || \ + defined(OS_WIN) const FeatureEntry::FeatureParam kOmniboxDocumentProviderServerScoring[] = { {"DocumentUseServerScore", "true"}, - {"DocumentUseClientScore", "false"}, -@@ -1044,7 +1044,7 @@ const FeatureEntry::FeatureVariation kOmniboxRichAutoc - nullptr, - }}; +@@ -1231,7 +1231,7 @@ const FeatureEntry::FeatureVariation kOmniboxBookmarkP + }, + }; --#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) -+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) +-#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::FeatureParam kOmniboxOnFocusSuggestionsParamSERP[] = { - {"ZeroSuggestVariant:6:*", "RemoteSendUrl"}, -@@ -2485,13 +2485,13 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kCloudPrintXpsDescription, kOsWin, - SINGLE_VALUE_TYPE(switches::kEnableCloudPrintXps)}, - #endif // OS_WIN +@@ -2857,7 +2857,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(ash::features::kSystemTrayMicGainSetting)}, + #endif // OS_CHROMEOS + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)) || defined(OS_BSD) + { + "enable-accelerated-video-decode", + flag_descriptions::kAcceleratedVideoDecodeName, +@@ -2873,7 +2873,7 @@ const FeatureEntry kFeatureEntries[] = { + kOsMac | kOsWin | kOsCrOS | kOsAndroid, + SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode), + }, +-#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID) ++#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)) || defined(OS_BSD) + { + "disable-accelerated-video-encode", + flag_descriptions::kAcceleratedVideoEncodeName, +@@ -2979,13 +2979,13 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kForceEnableDevicesPageName, + flag_descriptions::kForceEnableDevicesPageDescription, kOsDesktop, + FEATURE_VALUE_TYPE(features::kForceEnableDevicesPage)}, -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) {"enable-webgl2-compute-context", @@ -43,23 +52,7 @@ {"enable-webgl-draft-extensions", flag_descriptions::kWebglDraftExtensionsName, flag_descriptions::kWebglDraftExtensionsDescription, kOsAll, -@@ -2614,13 +2614,13 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kTerminalSystemAppSplitsDescription, kOsCrOS, - FEATURE_VALUE_TYPE(features::kTerminalSystemAppSplits)}, - #endif // OS_CHROMEOS --#if defined(OS_CHROMEOS) || defined(OS_LINUX) -+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) - #if BUILDFLAG(USE_TCMALLOC) - {"dynamic-tcmalloc-tuning", flag_descriptions::kDynamicTcmallocName, - flag_descriptions::kDynamicTcmallocDescription, kOsCrOS | kOsLinux, - FEATURE_VALUE_TYPE(performance_manager::features::kDynamicTcmallocTuning)}, - #endif // BUILDFLAG(USE_TCMALLOC) --#endif // OS_CHROMEOS || OS_LINUX -+#endif // OS_CHROMEOS || OS_LINUX || defined(OS_BSD) - #if defined(OS_ANDROID) - {"enable-credit-card-assist", flag_descriptions::kCreditCardAssistName, - flag_descriptions::kCreditCardAssistDescription, kOsAndroid, -@@ -2675,7 +2675,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3182,7 +3182,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kEnableOfflinePreviewsDescription, kOsAndroid, FEATURE_VALUE_TYPE(previews::features::kOfflinePreviews)}, #endif // OS_ANDROID @@ -68,7 +61,7 @@ {"enable-save-data", flag_descriptions::kEnableSaveDataName, flag_descriptions::kEnableSaveDataDescription, kOsCrOS | kOsLinux, SINGLE_VALUE_TYPE( -@@ -2685,7 +2685,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3192,7 +3192,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kEnableNavigationPredictorDescription, kOsCrOS | kOsLinux, FEATURE_VALUE_TYPE(blink::features::kNavigationPredictor)}, @@ -77,107 +70,117 @@ {"enable-preconnect-to-search", flag_descriptions::kEnablePreconnectToSearchName, flag_descriptions::kEnablePreconnectToSearchDescription, kOsAll, -@@ -3403,7 +3403,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE( - omnibox::kHistoryQuickProviderAllowMidwordContinuations)}, +@@ -3990,7 +3990,7 @@ const FeatureEntry kFeatureEntries[] = { + kOsAll, + FEATURE_VALUE_TYPE(omnibox::kOmniboxTrendingZeroPrefixSuggestionsOnNTP)}, --#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) || \ + defined(OS_WIN) {"omnibox-experimental-keyword-mode", flag_descriptions::kOmniboxExperimentalKeywordModeName, - flag_descriptions::kOmniboxExperimentalKeywordModeDescription, kOsDesktop, -@@ -3458,7 +3458,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_WITH_PARAMS_VALUE_TYPE(omnibox::kRichAutocompletion, - kOmniboxRichAutocompletionVariations, +@@ -4067,7 +4067,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_WITH_PARAMS_VALUE_TYPE(omnibox::kBookmarkPaths, + kOmniboxBookmarkPathsVariations, "OmniboxBundledExperimentV1")}, --#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) -+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) +-#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", - flag_descriptions::kSpeculativeServiceWorkerStartOnQueryInputName, -@@ -3674,13 +3674,13 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4376,14 +4376,14 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kClickToOpenPDFDescription, kOsAll, FEATURE_VALUE_TYPE(features::kClickToOpenPDFPlaceholder)}, --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) {"direct-manipulation-stylus", flag_descriptions::kDirectManipulationStylusName, flag_descriptions::kDirectManipulationStylusDescription, kOsWin | kOsMac | kOsLinux, FEATURE_VALUE_TYPE(features::kDirectManipulationStylus)}, --#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || + // defined(OS_CHROMEOS) #if !defined(OS_ANDROID) - {"ntp-confirm-suggestion-removals", -@@ -4365,7 +4365,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5083,7 +5083,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(kClickToCallUI)}, #endif // BUILDFLAG(ENABLE_CLICK_TO_CALL) --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) {"remote-copy-receiver", flag_descriptions::kRemoteCopyReceiverName, flag_descriptions::kRemoteCopyReceiverDescription, kOsDesktop, -@@ -4382,7 +4382,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5100,7 +5100,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kRemoteCopyProgressNotificationName, flag_descriptions::kRemoteCopyProgressNotificationDescription, kOsDesktop, FEATURE_VALUE_TYPE(kRemoteCopyProgressNotification)}, --#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || -+#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || +-#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || // defined(OS_CHROMEOS) - {"shared-clipboard-ui", flag_descriptions::kSharedClipboardUIName, -@@ -4408,7 +4408,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE( - send_tab_to_self::kSendTabToSelfOmniboxSendingAnimation)}, + {"restrict-gamepad-access", flag_descriptions::kRestrictGamepadAccessName, +@@ -5687,7 +5687,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(autofill::features::kAutofillTouchToFill)}, + #endif // defined(OS_ANDROID) --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) - {"sharing-peer-connection-receiver", - flag_descriptions::kSharingPeerConnectionReceiverName, -@@ -4419,7 +4419,7 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kSharingPeerConnectionSenderName, - flag_descriptions::kSharingPeerConnectionSenderDescription, kOsDesktop, - FEATURE_VALUE_TYPE(kSharingPeerConnectionSender)}, --#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || -+#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + {"global-media-controls", flag_descriptions::kGlobalMediaControlsName, + flag_descriptions::kGlobalMediaControlsDescription, +@@ -5728,7 +5728,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kGlobalMediaControlsOverlayControlsDescription, + kOsWin | kOsMac | kOsLinux, + FEATURE_VALUE_TYPE(media::kGlobalMediaControlsOverlayControls)}, +-#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) - {"sharing-prefer-vapid", flag_descriptions::kSharingPreferVapidName, -@@ -4494,13 +4494,13 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(printing::features::kEnableCustomMacPaperSizes)}, - #endif + #if BUILDFLAG(ENABLE_SPELLCHECK) && defined(OS_WIN) +@@ -5914,7 +5914,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE( + password_manager::features::kEnablePasswordsAccountStorage)}, --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) - {"enable-reopen-tab-in-product-help", - flag_descriptions::kReopenTabInProductHelpName, - flag_descriptions::kReopenTabInProductHelpDescription, kOsDesktop, - FEATURE_VALUE_TYPE(feature_engagement::kIPHReopenTabFeature)}, --#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || -+#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || + {"passwords-account-storage-iph", + flag_descriptions::kEnablePasswordsAccountStorageIPHName, +@@ -5922,7 +5922,7 @@ const FeatureEntry kFeatureEntries[] = { + kOsWin | kOsMac | kOsLinux, + FEATURE_VALUE_TYPE( + feature_engagement::kIPHPasswordsAccountStorageFeature)}, +-#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || // defined(OS_CHROMEOS) - {"enable-audio-focus-enforcement", -@@ -4941,7 +4941,7 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kEnableSyncUSSNigoriDescription, kOsAll, - FEATURE_VALUE_TYPE(switches::kSyncUSSNigori)}, + {"autofill-always-return-cloud-tokenized-card", +@@ -6655,7 +6655,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(ash::features::kEnhancedDeskAnimations)}, + #endif --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - {"global-media-controls", flag_descriptions::kGlobalMediaControlsName, - flag_descriptions::kGlobalMediaControlsDescription, - kOsWin | kOsMac | kOsLinux, -@@ -4958,7 +4958,7 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kGlobalMediaControlsPictureInPictureDescription, - kOsWin | kOsMac | kOsLinux | kOsCrOS, - FEATURE_VALUE_TYPE(media::kGlobalMediaControlsPictureInPicture)}, --#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + {"enable-oop-print-drivers", flag_descriptions::kEnableOopPrintDriversName, + flag_descriptions::kEnableOopPrintDriversDescription, kOsDesktop, +@@ -6689,13 +6689,13 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(features::kMuteNotificationsDuringScreenShare)}, + #endif // !defined(OS_ANDROID) + +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) || defined(OS_BSD) + {"enable-ephemeral-guest-profiles-on-desktop", + flag_descriptions::kEnableEphemeralGuestProfilesOnDesktopName, + flag_descriptions::kEnableEphemeralGuestProfilesOnDesktopDescription, + kOsWin | kOsLinux | kOsMac, + FEATURE_VALUE_TYPE(features::kEnableEphemeralGuestProfilesOnDesktop)}, +-#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) ++#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) || defined(OS_BSD) - #if BUILDFLAG(ENABLE_SPELLCHECK) && defined(OS_WIN) - {"win-use-native-spellchecker", + #if defined(OS_ANDROID) + {"decouple-sync-from-android-auto-sync", 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 fb5b5d6cd963..22cb8782590f 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 2020-03-16 18:39:43 UTC +--- chrome/browser/after_startup_task_utils.cc.orig 2020-11-13 06:36:36 UTC +++ chrome/browser/after_startup_task_utils.cc -@@ -33,7 +33,7 @@ +@@ -32,7 +32,7 @@ #include "chrome/browser/ui/tabs/tab_strip_model.h" #endif @@ -9,25 +9,25 @@ #include "ui/views/linux_ui/linux_ui.h" #endif -@@ -120,7 +120,7 @@ void QueueTask(std::unique_ptr<AfterStartupTask> queue +@@ -119,7 +119,7 @@ void QueueTask(std::unique_ptr<AfterStartupTask> queue void SetBrowserStartupIsComplete() { DCHECK_CURRENTLY_ON(BrowserThread::UI); --#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) -+#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) +-#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 = - base::Process::Current().CreationTime(); @@ -128,7 +128,7 @@ void SetBrowserStartupIsComplete() { UMA_HISTOGRAM_LONG_TIMES("Startup.AfterStartupTaskDelayedUntilTime", base::Time::Now() - process_creation_time); } --#endif // defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) -+#endif // defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || ++#endif // defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || + // defined(OS_CHROMEOS) UMA_HISTOGRAM_COUNTS_10000("Startup.AfterStartupTaskCount", g_after_startup_tasks.Get().size()); - g_startup_complete_flag.Get().Set(); -@@ -137,7 +137,7 @@ void SetBrowserStartupIsComplete() { +@@ -138,7 +138,7 @@ void SetBrowserStartupIsComplete() { g_after_startup_tasks.Get().clear(); g_after_startup_tasks.Get().shrink_to_fit(); diff --git a/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_music__manager__private_device__id__linux.cc b/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_music__manager__private_device__id__linux.cc index 7482f7147a70..b87d7fc20313 100644 --- a/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_music__manager__private_device__id__linux.cc +++ b/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_music__manager__private_device__id__linux.cc @@ -1,4 +1,4 @@ ---- chrome/browser/apps/platform_apps/api/music_manager_private/device_id_linux.cc.orig 2019-04-30 22:22:32 UTC +--- chrome/browser/apps/platform_apps/api/music_manager_private/device_id_linux.cc.orig 2020-11-13 06:36:36 UTC +++ chrome/browser/apps/platform_apps/api/music_manager_private/device_id_linux.cc @@ -4,6 +4,11 @@ @@ -12,7 +12,7 @@ #include <ifaddrs.h> #include <net/if.h> #include <stddef.h> -@@ -106,9 +111,36 @@ class MacAddressProcessor { +@@ -105,9 +110,36 @@ class MacAddressProcessor { const char* const prefixes[], size_t prefixes_count) { const int MAC_LENGTH = 6; @@ -49,7 +49,7 @@ strncpy(ifinfo.ifr_name, ifaddr->ifa_name, sizeof(ifinfo.ifr_name) - 1); int sd = socket(AF_INET, SOCK_DGRAM, 0); -@@ -120,11 +152,18 @@ class MacAddressProcessor { +@@ -119,11 +151,18 @@ class MacAddressProcessor { const char* mac_address = static_cast<const char*>(ifinfo.ifr_hwaddr.sa_data); diff --git a/www/chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc b/www/chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc index e27f41b91fab..5d4e1b1a1d9a 100644 --- a/www/chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc +++ b/www/chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc @@ -1,11 +1,11 @@ ---- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig 2020-05-13 18:40:22 UTC +--- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig 2020-11-13 06:36:36 UTC +++ chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc @@ -86,7 +86,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForSch return metrics::OmniboxInputType::QUERY; case ExternalProtocolHandler::UNKNOWN: { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Linux impl of GetApplicationNameForProtocol doesn't distinguish // between URL schemes with handers and those without. This will // make the default behaviour be search on Linux. @@ -13,8 +13,8 @@ shell_integration::GetApplicationNameForProtocol(url); return application_name.empty() ? metrics::OmniboxInputType::EMPTY : metrics::OmniboxInputType::URL; --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) } } NOTREACHED(); diff --git a/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc b/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc index b9d9a0b171a8..f8c604310dfc 100644 --- a/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc +++ b/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc @@ -1,11 +1,11 @@ ---- chrome/browser/background/background_mode_manager.cc.orig 2020-07-07 21:58:13 UTC +--- chrome/browser/background/background_mode_manager.cc.orig 2020-11-13 06:36:36 UTC +++ chrome/browser/background/background_mode_manager.cc @@ -849,7 +849,7 @@ gfx::ImageSkia GetStatusTrayIcon() { return gfx::ImageSkia(); return family->CreateExact(size).AsImageSkia(); --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) ++#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) return *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed( IDR_PRODUCT_LOGO_128); - #elif defined(OS_MACOSX) + #elif defined(OS_MAC) diff --git a/www/chromium/files/patch-chrome_browser_background_background__mode__optimizer.cc b/www/chromium/files/patch-chrome_browser_background_background__mode__optimizer.cc index de595924ceb4..484ab71421b7 100644 --- a/www/chromium/files/patch-chrome_browser_background_background__mode__optimizer.cc +++ b/www/chromium/files/patch-chrome_browser_background_background__mode__optimizer.cc @@ -1,15 +1,15 @@ ---- chrome/browser/background/background_mode_optimizer.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/background/background_mode_optimizer.cc.orig 2020-11-13 06:36:36 UTC +++ chrome/browser/background/background_mode_optimizer.cc @@ -30,10 +30,10 @@ std::unique_ptr<BackgroundModeOptimizer> BackgroundMod switches::kKeepAliveForTest)) return nullptr; --#if defined(OS_WIN) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) if (base::FeatureList::IsEnabled(features::kBackgroundModeAllowRestart)) return base::WrapUnique(new BackgroundModeOptimizer()); --#endif // defined(OS_WIN) || defined(OS_LINUX) -+#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) return nullptr; } diff --git a/www/chromium/files/patch-chrome_browser_browser__resources.grd b/www/chromium/files/patch-chrome_browser_browser__resources.grd index b8411abaa1cd..f964e5bca392 100644 --- a/www/chromium/files/patch-chrome_browser_browser__resources.grd +++ b/www/chromium/files/patch-chrome_browser_browser__resources.grd @@ -1,11 +1,11 @@ ---- chrome/browser/browser_resources.grd.orig 2020-07-07 21:58:13 UTC +--- chrome/browser/browser_resources.grd.orig 2020-11-13 06:36:36 UTC +++ chrome/browser/browser_resources.grd -@@ -64,7 +64,7 @@ - <include name="IDR_DISCARDS_SITE_DATA_MOJOM_LITE_JS" file="${root_gen_dir}\chrome\browser\ui\webui\discards\site_data.mojom-lite.js" compress="gzip" use_base_dir="false" type="BINDATA" /> - <include name="IDR_DISCARDS_SORTED_TABLE_BEHAVIOR_JS" file="resources\discards\sorted_table_behavior.js" compress="gzip" type="BINDATA" /> +@@ -67,7 +67,7 @@ + <include name="IDR_DISCARDS_SITE_DATA_MOJOM_LITE_JS" file="${root_gen_dir}\chrome\browser\ui\webui\discards\site_data.mojom-lite.js" use_base_dir="false" type="BINDATA" /> + <include name="IDR_DISCARDS_SORTED_TABLE_BEHAVIOR_JS" file="resources\discards\sorted_table_behavior.js" type="BINDATA" /> </if> - <if expr="is_win or is_macosx or (is_linux and not chromeos)"> + <if expr="is_win or is_macosx or (is_posix and not chromeos)"> - <include name="IDR_BROWSER_SWITCH_APP_JS" file="${root_gen_dir}\chrome\browser\resources\browser_switch\app.js" compress="gzip" use_base_dir="false" type="BINDATA" /> - <include name="IDR_BROWSER_SWITCH_PROXY_JS" file="resources\browser_switch\browser_switch_proxy.js" compress="gzip" type="BINDATA" /> - <include name="IDR_BROWSER_SWITCH_HTML" file="resources\browser_switch\browser_switch.html" compress="gzip" allowexternalscript="true" type="BINDATA" /> + <include name="IDR_BROWSER_SWITCH_APP_JS" file="${root_gen_dir}\chrome\browser\resources\browser_switch\app.js" use_base_dir="false" type="BINDATA" /> + <include name="IDR_BROWSER_SWITCH_PROXY_JS" file="resources\browser_switch\browser_switch_proxy.js" type="BINDATA" /> + <include name="IDR_BROWSER_SWITCH_HTML" file="resources\browser_switch\browser_switch.html" allowexternalscript="true" type="BINDATA" /> diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc index fd63dec830de..53ba6f36a598 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,20 +1,20 @@ ---- chrome/browser/chrome_browser_interface_binders.cc.orig 2020-07-07 21:58:13 UTC +--- chrome/browser/chrome_browser_interface_binders.cc.orig 2020-11-13 06:36:36 UTC +++ chrome/browser/chrome_browser_interface_binders.cc -@@ -113,7 +113,7 @@ +@@ -128,7 +128,7 @@ #include "media/mojo/mojom/speech_recognition_service.mojom.h" #endif --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) #include "chrome/browser/ui/webui/discards/discards.mojom.h" #include "chrome/browser/ui/webui/discards/discards_ui.h" -@@ -551,7 +551,7 @@ void PopulateChromeWebUIFrameBinders( - media_app_ui::mojom::PageHandlerFactory, chromeos::MediaAppUI>(map); +@@ -733,7 +733,7 @@ void PopulateChromeWebUIFrameBinders( + } #endif --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) RegisterWebUIControllerInterfaceBinder<discards::mojom::DetailsProvider, DiscardsUI>(map); diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc index 7c8276fc2158..1bd2c375e286 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc @@ -1,67 +1,52 @@ ---- chrome/browser/chrome_browser_main.cc.orig 2020-07-07 21:58:13 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2020-11-13 06:36:36 UTC +++ chrome/browser/chrome_browser_main.cc -@@ -207,11 +207,11 @@ - #include "components/arc/metrics/stability_metrics_manager.h" - #endif // defined(OS_CHROMEOS) - --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) - #include "chrome/browser/first_run/upgrade_util_linux.h" --#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#endif // (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) && !defined(OS_BSD) - #include "components/crash/core/app/breakpad_linux.h" - #include "components/crash/core/app/crashpad.h" - #endif -@@ -245,7 +245,7 @@ +@@ -246,7 +246,7 @@ #endif // defined(OS_WIN) - #if defined(OS_WIN) || defined(OS_MACOSX) || \ + #if defined(OS_WIN) || defined(OS_MAC) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+ (defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) #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" - #endif -@@ -918,7 +918,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -925,7 +925,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { AddFirstRunNewTabs(browser_creator_.get(), master_prefs_->new_tabs); } --#if defined(OS_MACOSX) || defined(OS_LINUX) -+#if defined(OS_MACOSX) || defined(OS_LINUX) || 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) // 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 . -@@ -927,7 +927,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -934,7 +934,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { &user_native_messaging_dir)); if (!base::PathExists(user_native_messaging_dir)) base::CreateDirectory(user_native_messaging_dir); --#endif // defined(OS_MACOSX) || defined(OS_LINUX) -+#endif // defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) } #endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS) -@@ -954,7 +954,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { - #endif // BUILDFLAG(ENABLE_VR) && OS_WIN +@@ -956,7 +956,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { + #endif // defined(OS_MAC) - #if defined(OS_WIN) || defined(OS_MACOSX) || \ + #if defined(OS_WIN) || defined(OS_MAC) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+ (defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) metrics::DesktopSessionDurationTracker::Initialize(); ProfileActivityMetricsRecorder::Initialize(); - #endif -@@ -1107,6 +1107,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { + TouchModeStatsTracker::Initialize( +@@ -1113,6 +1113,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { base::TimeDelta::FromMinutes(1)); #if !defined(OS_ANDROID) +#if !defined(OS_BSD) if (base::FeatureList::IsEnabled(features::kWebUsb)) { web_usb_detector_.reset(new WebUsbDetector()); - base::PostTask( -@@ -1115,6 +1116,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { - base::BindOnce(&WebUsbDetector::Initialize, - base::Unretained(web_usb_detector_.get()))); + content::GetUIThreadTaskRunner({base::TaskPriority::BEST_EFFORT}) +@@ -1120,6 +1121,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { + base::BindOnce(&WebUsbDetector::Initialize, + base::Unretained(web_usb_detector_.get()))); } +#endif if (base::FeatureList::IsEnabled(features::kTabMetricsLogging)) { 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 d7386b1bb87f..c493e50d957f 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_main_linux.cc.orig 2020-05-13 18:39:37 UTC +--- chrome/browser/chrome_browser_main_linux.cc.orig 2020-11-13 06:36:36 UTC +++ chrome/browser/chrome_browser_main_linux.cc -@@ -83,6 +83,7 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() { +@@ -81,6 +81,7 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() { void ChromeBrowserMainPartsLinux::PostProfileInit() { ChromeBrowserMainPartsPosix::PostProfileInit(); @@ -8,7 +8,7 @@ bool breakpad_registered; if (crash_reporter::IsCrashpadEnabled()) { // If we're using crashpad, there's no breakpad and crashpad is always -@@ -100,10 +101,11 @@ void ChromeBrowserMainPartsLinux::PostProfileInit() { +@@ -98,10 +99,11 @@ void ChromeBrowserMainPartsLinux::PostProfileInit() { } g_browser_process->metrics_service()->RecordBreakpadRegistration( breakpad_registered); @@ -21,7 +21,7 @@ bluez::BluezDBusManager::Initialize(nullptr /* system_bus */); #endif -@@ -111,7 +113,7 @@ void ChromeBrowserMainPartsLinux::PostMainMessageLoopS +@@ -109,7 +111,7 @@ void ChromeBrowserMainPartsLinux::PostMainMessageLoopS } void ChromeBrowserMainPartsLinux::PostDestroyThreads() { diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc index e2a0324ea2d0..376071a0f4bc 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_main_posix.cc.orig 2020-07-07 21:58:13 UTC +--- chrome/browser/chrome_browser_main_posix.cc.orig 2020-11-13 06:36:36 UTC +++ chrome/browser/chrome_browser_main_posix.cc -@@ -71,7 +71,7 @@ void ExitHandler::ExitWhenPossibleOnUIThread(int signa +@@ -70,7 +70,7 @@ void ExitHandler::ExitWhenPossibleOnUIThread(int signa // ExitHandler takes care of deleting itself. new ExitHandler(); } else { @@ -9,12 +9,3 @@ switch (signal) { case SIGINT: case SIGHUP: -@@ -167,7 +167,7 @@ void ChromeBrowserMainPartsPosix::PostMainMessageLoopS - void ChromeBrowserMainPartsPosix::ShowMissingLocaleMessageBox() { - #if defined(OS_CHROMEOS) - NOTREACHED(); // Should not ever happen on ChromeOS. --#elif defined(OS_MACOSX) -+#elif defined(OS_MACOSX) || defined(OS_BSD) - // Not called on Mac because we load the locale files differently. - NOTREACHED(); - #elif defined(USE_AURA) 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 f4725b2779ae..eca704213545 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 2020-07-07 21:58:13 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2020-11-13 06:36:36 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -407,7 +407,7 @@ +@@ -424,7 +424,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,22 +9,16 @@ #include "chrome/browser/chrome_browser_main_linux.h" #elif defined(OS_ANDROID) #include "base/android/application_status_listener.h" -@@ -460,12 +460,12 @@ +@@ -482,7 +482,7 @@ #endif // !defined(OS_ANDROID) - #if defined(OS_WIN) || defined(OS_MACOSX) || \ + #if defined(OS_WIN) || defined(OS_MAC) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) #include "chrome/browser/browser_switcher/browser_switcher_navigation_throttle.h" - #include "services/service_manager/sandbox/features.h" #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) && !defined(OS_BSD) - #include "components/crash/core/app/crash_switches.h" - #include "components/crash/core/app/crashpad.h" - #endif -@@ -493,7 +493,7 @@ +@@ -514,7 +514,7 @@ #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h" #endif @@ -33,7 +27,7 @@ #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h" #endif -@@ -801,11 +801,13 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHos +@@ -833,11 +833,13 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHos } int GetCrashSignalFD(const base::CommandLine& command_line) { @@ -47,7 +41,7 @@ // Extensions have the same process type as renderers. if (command_line.HasSwitch(extensions::switches::kExtensionProcess)) { -@@ -1311,7 +1313,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( +@@ -1354,7 +1356,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( #elif defined(OS_CHROMEOS) main_parts = std::make_unique<chromeos::ChromeBrowserMainPartsChromeos>( parameters, startup_data_); @@ -56,16 +50,16 @@ main_parts = std::make_unique<ChromeBrowserMainPartsLinux>(parameters, startup_data_); #elif defined(OS_ANDROID) -@@ -1337,7 +1339,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( +@@ -1380,7 +1382,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( // Construct additional browser parts. Stages are called in the order in // which they are added. #if defined(TOOLKIT_VIEWS) -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinux()); + main_parts->AddParts( + std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>()); #else - main_parts->AddParts(new ChromeBrowserMainExtraPartsViews()); -@@ -2082,7 +2084,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2134,7 +2136,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin command_line->AppendSwitchASCII(switches::kMetricsClientID, client_info->client_id); } @@ -74,46 +68,37 @@ #if defined(OS_ANDROID) bool enable_crash_reporter = true; #else -@@ -2377,7 +2379,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin - StackSamplingConfiguration::Get()->AppendCommandLineSwitchForChildProcess( - process_type, command_line); - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || 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(service_manager::switches::kNoSandbox)) { -@@ -3638,7 +3640,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst +@@ -3728,7 +3730,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst } } --#if defined(OS_POSIX) && !defined(OS_MACOSX) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) +-#if defined(OS_POSIX) && !defined(OS_MAC) ++#if defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_BSD) void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -3758,7 +3760,7 @@ bool ChromeContentBrowserClient::IsRendererCodeIntegri - #endif // defined(OS_WIN) +@@ -3763,7 +3765,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFi + mappings->Share(kCrashDumpSignal, crash_signal_fd); + } + } +-#endif // defined(OS_POSIX) && !defined(OS_MAC) ++#endif // defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_BSD) - #if defined(OS_WIN) || defined(OS_MACOSX) || \ -- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - bool ShouldEnableAudioSandbox(const policy::PolicyMap& policies) { - const base::Value* audio_sandbox_enabled_policy_value = - policies.GetValue(policy::key::kAudioSandboxEnabled); -@@ -3776,7 +3778,7 @@ bool ShouldEnableAudioSandbox(const policy::PolicyMap& + #if defined(OS_WIN) + base::string16 ChromeContentBrowserClient::GetAppContainerSidForSandboxType( +@@ -3852,7 +3854,7 @@ bool ChromeContentBrowserClient::IsRendererCodeIntegri void ChromeContentBrowserClient::WillStartServiceManager() { - #if defined(OS_WIN) || defined(OS_MACOSX) || \ + #if defined(OS_WIN) || defined(OS_MAC) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) if (startup_data_) { auto* chrome_feature_list_creator = startup_data_->chrome_feature_list_creator(); -@@ -4043,7 +4045,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -4094,7 +4096,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati } - #if defined(OS_WIN) || defined(OS_MACOSX) || \ + #if defined(OS_WIN) || defined(OS_MAC) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle:: 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 289d5a459dee..27f74011b88f 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,17 +1,17 @@ ---- chrome/browser/chrome_content_browser_client.h.orig 2020-07-07 21:58:13 UTC +--- chrome/browser/chrome_content_browser_client.h.orig 2020-11-13 06:36:36 UTC +++ chrome/browser/chrome_content_browser_client.h -@@ -377,12 +377,12 @@ class ChromeContentBrowserClient : public content::Con +@@ -394,12 +394,12 @@ class ChromeContentBrowserClient : public content::Con void OverridePageVisibilityState( content::RenderFrameHost* render_frame_host, content::PageVisibilityState* visibility_state) override; --#if defined(OS_POSIX) && !defined(OS_MACOSX) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) +-#if defined(OS_POSIX) && !defined(OS_MAC) ++#if defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_BSD) void GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, content::PosixFileDescriptorInfo* mappings) override; --#endif // defined(OS_POSIX) && !defined(OS_MACOSX) -+#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) +-#endif // defined(OS_POSIX) && !defined(OS_MAC) ++#endif // defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_BSD) #if defined(OS_WIN) bool PreSpawnRenderer(sandbox::TargetPolicy* policy, RendererSpawnFlags flags) override; diff --git a/www/chromium/files/patch-chrome_browser_crash__upload__list_crash__upload__list.cc b/www/chromium/files/patch-chrome_browser_crash__upload__list_crash__upload__list.cc index 740824d61e61..5f623d2a942d 100644 --- a/www/chromium/files/patch-chrome_browser_crash__upload__list_crash__upload__list.cc +++ b/www/chromium/files/patch-chrome_browser_crash__upload__list_crash__upload__list.cc @@ -1,4 +1,4 @@ ---- chrome/browser/crash_upload_list/crash_upload_list.cc.orig 2019-12-31 13:55:02 UTC +--- chrome/browser/crash_upload_list/crash_upload_list.cc.orig 2020-11-13 06:36:36 UTC +++ chrome/browser/crash_upload_list/crash_upload_list.cc @@ -38,7 +38,7 @@ scoped_refptr<UploadList> CreateCrashUploadList() { // ChromeOS uses crash_sender as its uploader even when Crashpad is enabled, diff --git a/www/chromium/files/patch-chrome_browser_crash__upload__list_crash__upload__list__crashpad.cc b/www/chromium/files/patch-chrome_browser_crash__upload__list_crash__upload__list__crashpad.cc index 0f0d4137c678..dd5533beb0b2 100644 --- a/www/chromium/files/patch-chrome_browser_crash__upload__list_crash__upload__list__crashpad.cc +++ b/www/chromium/files/patch-chrome_browser_crash__upload__list_crash__upload__list__crashpad.cc @@ -1,4 +1,4 @@ ---- chrome/browser/crash_upload_list/crash_upload_list_crashpad.cc.orig 2019-12-31 13:56:21 UTC +--- chrome/browser/crash_upload_list/crash_upload_list_crashpad.cc.orig 2020-11-13 06:36:36 UTC +++ chrome/browser/crash_upload_list/crash_upload_list_crashpad.cc @@ -42,6 +42,9 @@ CrashUploadListCrashpad::CrashUploadListCrashpad() = d CrashUploadListCrashpad::~CrashUploadListCrashpad() = default; 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 91fecdcbc11b..b7f5388358ec 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,11 +1,11 @@ ---- chrome/browser/custom_handlers/protocol_handler_registry.cc.orig 2020-07-07 21:57:32 UTC +--- chrome/browser/custom_handlers/protocol_handler_registry.cc.orig 2020-11-13 06:36:36 UTC +++ chrome/browser/custom_handlers/protocol_handler_registry.cc @@ -43,7 +43,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() { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // We don't do this on Linux as the OS registration there is not reliable, // and Chrome OS doesn't have any notion of OS registration. // TODO(benwells): When Linux support is more reliable remove this diff --git a/www/chromium/files/patch-chrome_browser_defaults.cc b/www/chromium/files/patch-chrome_browser_defaults.cc index 4cf8684d29d3..98d87662a554 100644 --- a/www/chromium/files/patch-chrome_browser_defaults.cc +++ b/www/chromium/files/patch-chrome_browser_defaults.cc @@ -1,4 +1,4 @@ ---- chrome/browser/defaults.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/defaults.cc.orig 2020-11-13 06:36:36 UTC +++ chrome/browser/defaults.cc @@ -43,7 +43,7 @@ const bool kSyncAutoStarts = true; const bool kSyncAutoStarts = false; diff --git a/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd b/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd index b57482f51663..e8d62f2f17ce 100644 --- a/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd +++ b/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd @@ -1,11 +1,11 @@ ---- chrome/browser/dev_ui_browser_resources.grd.orig 2020-05-13 18:40:22 UTC +--- chrome/browser/dev_ui_browser_resources.grd.orig 2020-11-13 06:36:36 UTC +++ chrome/browser/dev_ui_browser_resources.grd -@@ -61,7 +61,7 @@ This file specifies browser resources for developer-fa - <include name="IDR_MEDIA_SESSION_MOJOM_LITE_JS" file="${root_gen_dir}\services\media_session\public\mojom\media_session.mojom-lite.js" use_base_dir="false" type="BINDATA" compress="gzip" /> - <include name="IDR_UI_GEOMETRY_MOJOM_LITE_JS" file="${root_gen_dir}\ui\gfx\geometry\mojom\geometry.mojom-lite.js" use_base_dir="false" type="BINDATA" compress="gzip" /> +@@ -57,7 +57,7 @@ This file specifies browser resources for developer-fa + <include name="IDR_MEDIA_SESSION_MOJOM_LITE_JS" file="${root_gen_dir}\services\media_session\public\mojom\media_session.mojom-lite.js" use_base_dir="false" type="BINDATA" /> + <include name="IDR_UI_GEOMETRY_MOJOM_LITE_JS" file="${root_gen_dir}\ui\gfx\geometry\mojom\geometry.mojom-lite.js" use_base_dir="false" type="BINDATA" /> - <if expr="is_android or is_linux"> + <if expr="is_android or is_posix"> - <include name="IDR_SANDBOX_INTERNALS_HTML" file="resources\sandbox_internals\sandbox_internals.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" compress="gzip" /> - <include name="IDR_SANDBOX_INTERNALS_JS" file="resources\sandbox_internals\sandbox_internals.js" type="BINDATA" compress="gzip" /> + <include name="IDR_SANDBOX_INTERNALS_HTML" file="resources\sandbox_internals\sandbox_internals.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> + <include name="IDR_SANDBOX_INTERNALS_JS" file="resources\sandbox_internals\sandbox_internals.js" type="BINDATA" /> </if> diff --git a/www/chromium/files/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc b/www/chromium/files/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc index 45d466568060..ca42fa004943 100644 --- a/www/chromium/files/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc +++ b/www/chromium/files/patch-chrome_browser_device__identity_device__oauth2__token__service__factory.cc @@ -1,11 +1,11 @@ ---- chrome/browser/device_identity/device_oauth2_token_service_factory.cc.orig 2020-05-15 14:52:43 UTC +--- chrome/browser/device_identity/device_oauth2_token_service_factory.cc.orig 2020-11-13 06:36:36 UTC +++ chrome/browser/device_identity/device_oauth2_token_service_factory.cc @@ -28,7 +28,7 @@ std::unique_ptr<DeviceOAuth2TokenStore> CreatePlatform #if defined(OS_CHROMEOS) return std::make_unique<chromeos::DeviceOAuth2TokenStoreChromeOS>( local_state); --#elif defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#elif defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - DCHECK(base::FeatureList::IsEnabled(policy::features::kCBCMServiceAccounts)); +-#elif defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) ++#elif defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) + DCHECK( + base::FeatureList::IsEnabled(policy::features::kCBCMPolicyInvalidations)); return std::make_unique<DeviceOAuth2TokenStoreDesktop>(local_state); - #else diff --git a/www/chromium/files/patch-chrome_browser_devtools_devtools__eye__dropper.cc b/www/chromium/files/patch-chrome_browser_devtools_devtools__eye__dropper.cc index d53ca3e6d56b..c8a20014a154 100644 --- a/www/chromium/files/patch-chrome_browser_devtools_devtools__eye__dropper.cc +++ b/www/chromium/files/patch-chrome_browser_devtools_devtools__eye__dropper.cc @@ -1,11 +1,11 @@ ---- chrome/browser/devtools/devtools_eye_dropper.cc.orig 2020-02-03 21:53:29 UTC +--- chrome/browser/devtools/devtools_eye_dropper.cc.orig 2020-11-13 06:36:36 UTC +++ chrome/browser/devtools/devtools_eye_dropper.cc -@@ -164,7 +164,7 @@ void DevToolsEyeDropper::UpdateCursor() { +@@ -163,7 +163,7 @@ void DevToolsEyeDropper::UpdateCursor() { // magnified projection only with centered hotspot. // Mac Retina requires cursor to be > 120px in order to render smoothly. --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) const float kCursorSize = 63; const float kDiameter = 63; const float kHotspotOffset = 32; diff --git a/www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.h b/www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.h index e77c2c353dd8..eb170bb7f4e1 100644 --- a/www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.h +++ b/www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.h @@ -1,4 +1,4 @@ ---- chrome/browser/diagnostics/diagnostics_writer.h.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/diagnostics/diagnostics_writer.h.orig 2020-11-13 06:36:36 UTC +++ chrome/browser/diagnostics/diagnostics_writer.h @@ -15,6 +15,8 @@ namespace diagnostics { // Console base class used internally. 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 77a0fc6ac2ed..5a6f0ae78a96 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,20 +1,20 @@ ---- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2020-07-07 21:58:13 UTC +--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2020-11-13 06:36:36 UTC +++ chrome/browser/download/chrome_download_manager_delegate.cc -@@ -1266,7 +1266,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1393,7 +1393,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe target_info->is_filetype_handled_safely) DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) if (item->GetOriginalMimeType() == "application/x-x509-user-cert") DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true); #endif -@@ -1290,7 +1290,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1445,7 +1445,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile( const base::FilePath& path) { --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ + defined(OS_MAC) if (path.MatchesExtension(FILE_PATH_LITERAL(".pdf"))) { return !download_prefs_->ShouldOpenPdfInSystemReader(); - } diff --git a/www/chromium/files/patch-chrome_browser_download_download__commands.cc b/www/chromium/files/patch-chrome_browser_download_download__commands.cc index 981280a09128..b96ac86ba7b7 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__commands.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__commands.cc @@ -1,35 +1,35 @@ ---- chrome/browser/download/download_commands.cc.orig 2020-05-13 18:39:37 UTC +--- chrome/browser/download/download_commands.cc.orig 2020-11-13 06:36:36 UTC +++ chrome/browser/download/download_commands.cc @@ -27,7 +27,7 @@ #include "net/base/url_util.h" #include "ui/base/clipboard/scoped_clipboard_writer.h" --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ + defined(OS_MAC) #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" - #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" -@@ -154,7 +154,7 @@ void DownloadCommands::ExecuteCommand(Command command) +@@ -155,7 +155,7 @@ void DownloadCommands::ExecuteCommand(Command command) model_->ExecuteCommand(this, command); } --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) Browser* DownloadCommands::GetBrowser() const { - chrome::ScopedTabbedBrowserDisplayer browser_displayer(model_->profile()); -@@ -177,12 +177,12 @@ bool DownloadCommands::CanOpenPdfInSystemViewer() cons +@@ -179,12 +179,12 @@ bool DownloadCommands::CanOpenPdfInSystemViewer() cons return IsDownloadPdf() && (IsAdobeReaderDefaultPDFViewer() ? is_adobe_pdf_reader_up_to_date : true); --#elif defined(OS_MACOSX) || defined(OS_LINUX) -+#elif defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) +-#elif defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#elif defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) return IsDownloadPdf(); #endif } --#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || + // defined(OS_CHROMEOS) void DownloadCommands::CopyFileAsImageToClipboard() { - if (model_->GetState() != download::DownloadItem::COMPLETE || 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 126f0123875b..2c1f4554fc6c 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__commands.h +++ b/www/chromium/files/patch-chrome_browser_download_download__commands.h @@ -1,11 +1,11 @@ ---- chrome/browser/download/download_commands.h.orig 2020-03-16 18:39:43 UTC +--- chrome/browser/download/download_commands.h.orig 2020-11-13 06:36:36 UTC +++ chrome/browser/download/download_commands.h @@ -48,7 +48,7 @@ class DownloadCommands { bool IsCommandVisible(Command command) const; void ExecuteCommand(Command command); --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ + defined(OS_MAC) bool IsDownloadPdf() const; bool CanOpenPdfInSystemViewer() const; - Browser* GetBrowser() const; diff --git a/www/chromium/files/patch-chrome_browser_download_download__item__model.cc b/www/chromium/files/patch-chrome_browser_download_download__item__model.cc index ff25c7af87ec..32eccd31fd46 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__item__model.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__item__model.cc @@ -1,20 +1,20 @@ ---- chrome/browser/download/download_item_model.cc.orig 2020-07-07 21:58:13 UTC +--- chrome/browser/download/download_item_model.cc.orig 2020-11-13 06:36:36 UTC +++ chrome/browser/download/download_item_model.cc -@@ -599,7 +599,7 @@ bool DownloadItemModel::IsCommandChecked( +@@ -571,7 +571,7 @@ bool DownloadItemModel::IsCommandChecked( return download_->GetOpenWhenComplete() || download_crx_util::IsExtensionDownload(*download_); case DownloadCommands::ALWAYS_OPEN_TYPE: --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ + defined(OS_MAC) if (download_commands->CanOpenPdfInSystemViewer()) { DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile()); - return prefs->ShouldOpenPdfInSystemReader(); -@@ -639,7 +639,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand +@@ -612,7 +612,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand bool is_checked = IsCommandChecked(download_commands, DownloadCommands::ALWAYS_OPEN_TYPE); DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile()); --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ + defined(OS_MAC) if (download_commands->CanOpenPdfInSystemViewer()) { prefs->SetShouldOpenPdfInSystemReader(!is_checked); - SetShouldPreferOpeningInBrowser(is_checked); diff --git a/www/chromium/files/patch-chrome_browser_download_download__prefs.cc b/www/chromium/files/patch-chrome_browser_download_download__prefs.cc index d25ba4cc5354..7417997e3766 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__prefs.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__prefs.cc @@ -1,65 +1,65 @@ ---- chrome/browser/download/download_prefs.cc.orig 2020-07-07 21:58:13 UTC +--- chrome/browser/download/download_prefs.cc.orig 2020-11-13 06:36:36 UTC +++ chrome/browser/download/download_prefs.cc -@@ -66,7 +66,7 @@ namespace { +@@ -67,7 +67,7 @@ namespace { // Consider downloads 'dangerous' if they go to the home directory on Linux and // to the desktop on any platform. bool DownloadPathIsDangerous(const base::FilePath& download_path) { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) base::FilePath home_dir = base::GetHomeDir(); if (download_path == home_dir) { return true; -@@ -171,7 +171,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi +@@ -172,7 +172,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi GetDefaultDownloadDirectoryForProfile())); #endif // defined(OS_CHROMEOS) --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ + defined(OS_MAC) should_open_pdf_in_system_reader_ = prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader); - #endif -@@ -291,7 +291,7 @@ void DownloadPrefs::RegisterProfilePrefs( +@@ -300,7 +300,7 @@ void DownloadPrefs::RegisterProfilePrefs( default_download_path); registry->RegisterFilePathPref(prefs::kSaveFileDefaultDirectory, default_download_path); --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ + defined(OS_MAC) registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false); #endif - #if defined(OS_ANDROID) -@@ -391,7 +391,7 @@ bool DownloadPrefs::IsDownloadPathManaged() const { +@@ -430,7 +430,7 @@ bool DownloadPrefs::IsDownloadPathManaged() const { } bool DownloadPrefs::IsAutoOpenByUserUsed() const { --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ + defined(OS_MAC) if (ShouldOpenPdfInSystemReader()) return true; - #endif -@@ -405,7 +405,7 @@ bool DownloadPrefs::IsAutoOpenEnabled(const GURL& url, +@@ -445,7 +445,7 @@ bool DownloadPrefs::IsAutoOpenEnabled(const GURL& url, return false; DCHECK(extension[0] == base::FilePath::kExtensionSeparator); extension.erase(0, 1); --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ + defined(OS_MAC) if (base::FilePath::CompareEqualIgnoreCase(extension, FILE_PATH_LITERAL("pdf")) && - ShouldOpenPdfInSystemReader()) -@@ -455,7 +455,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens +@@ -496,7 +496,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens SaveAutoOpenState(); } --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ + defined(OS_MAC) void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) { if (should_open_pdf_in_system_reader_ == should_open) - return; -@@ -476,7 +476,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons +@@ -518,7 +518,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons #endif void DownloadPrefs::ResetAutoOpenByUser() { --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ + defined(OS_MAC) SetShouldOpenPdfInSystemReader(false); #endif - auto_open_by_user_.clear(); diff --git a/www/chromium/files/patch-chrome_browser_download_download__prefs.h b/www/chromium/files/patch-chrome_browser_download_download__prefs.h index d95f14067c16..dc591a61de75 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__prefs.h +++ b/www/chromium/files/patch-chrome_browser_download_download__prefs.h @@ -1,20 +1,20 @@ ---- chrome/browser/download/download_prefs.h.orig 2020-07-07 21:57:32 UTC +--- chrome/browser/download/download_prefs.h.orig 2020-11-13 06:36:36 UTC +++ chrome/browser/download/download_prefs.h -@@ -110,7 +110,7 @@ class DownloadPrefs { +@@ -117,7 +117,7 @@ class DownloadPrefs { // Disables auto-open based on file extension. void DisableAutoOpenByUserBasedOnExtension(const base::FilePath& file_name); --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ + defined(OS_MAC) // Store the user preference to disk. If |should_open| is true, also disable // the built-in PDF plugin. If |should_open| is false, enable the PDF plugin. - void SetShouldOpenPdfInSystemReader(bool should_open); -@@ -167,7 +167,7 @@ class DownloadPrefs { +@@ -176,7 +176,7 @@ class DownloadPrefs { - std::unique_ptr<policy::URLBlacklist> auto_open_allowed_by_urls_; + std::unique_ptr<policy::URLBlocklist> auto_open_allowed_by_urls_; --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ + defined(OS_MAC) bool should_open_pdf_in_system_reader_; #endif - diff --git a/www/chromium/files/patch-chrome_browser_download_download__query.cc b/www/chromium/files/patch-chrome_browser_download_download__query.cc index 5e2c66298677..a3d5b963a963 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__query.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__query.cc @@ -1,4 +1,4 @@ ---- chrome/browser/download/download_query.cc.orig 2020-07-07 21:57:32 UTC +--- chrome/browser/download/download_query.cc.orig 2020-11-13 06:36:36 UTC +++ chrome/browser/download/download_query.cc @@ -28,7 +28,11 @@ #include "components/download/public/common/download_item.h" diff --git a/www/chromium/files/patch-chrome_browser_download_download__shelf__context__menu.cc b/www/chromium/files/patch-chrome_browser_download_download__shelf__context__menu.cc index 0eed36ca0a25..684cafa34674 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__shelf__context__menu.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__shelf__context__menu.cc @@ -1,11 +1,11 @@ ---- chrome/browser/download/download_shelf_context_menu.cc.orig 2020-07-07 21:58:13 UTC +--- chrome/browser/download/download_shelf_context_menu.cc.orig 2020-11-13 06:36:36 UTC +++ chrome/browser/download/download_shelf_context_menu.cc -@@ -149,7 +149,7 @@ base::string16 DownloadShelfContextMenu::GetLabelForCo +@@ -146,7 +146,7 @@ base::string16 DownloadShelfContextMenu::GetLabelForCo : IDS_DOWNLOAD_MENU_PLATFORM_OPEN_ALWAYS; break; } --#elif defined(OS_MACOSX) || defined(OS_LINUX) -+#elif defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) +-#elif defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#elif defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) if (can_open_pdf_in_system_viewer) { id = IDS_DOWNLOAD_MENU_PLATFORM_OPEN_ALWAYS; break; diff --git a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn index ef846d58e94b..20751e79fc3b 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 2020-07-07 21:58:13 UTC +--- chrome/browser/extensions/BUILD.gn.orig 2020-11-13 06:36:36 UTC +++ chrome/browser/extensions/BUILD.gn -@@ -1186,6 +1186,12 @@ static_library("extensions") { +@@ -1219,6 +1219,12 @@ static_library("extensions") { deps += [ "//chrome/common:service_process_mojom" ] } diff --git a/www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc b/www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc index 9d31ad4054df..2ff400204851 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc @@ -1,4 +1,4 @@ ---- chrome/browser/extensions/activity_log/activity_log.cc.orig 2019-12-16 21:50:42 UTC +--- chrome/browser/extensions/activity_log/activity_log.cc.orig 2020-11-13 06:36:36 UTC +++ chrome/browser/extensions/activity_log/activity_log.cc @@ -47,7 +47,11 @@ #include "extensions/browser/extensions_browser_client.h" diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_device__info__fetcher.cc b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_device__info__fetcher.cc index 79b4d7d9c89a..032cb09214b2 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_device__info__fetcher.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_device__info__fetcher.cc @@ -1,20 +1,20 @@ ---- chrome/browser/extensions/api/enterprise_reporting_private/device_info_fetcher.cc.orig 2020-07-07 21:58:13 UTC +--- chrome/browser/extensions/api/enterprise_reporting_private/device_info_fetcher.cc.orig 2020-11-13 06:36:36 UTC +++ chrome/browser/extensions/api/enterprise_reporting_private/device_info_fetcher.cc @@ -10,7 +10,7 @@ #include "chrome/browser/extensions/api/enterprise_reporting_private/device_info_fetcher_mac.h" #elif defined(OS_WIN) #include "chrome/browser/extensions/api/enterprise_reporting_private/device_info_fetcher_win.h" --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) ++#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "chrome/browser/extensions/api/enterprise_reporting_private/device_info_fetcher_linux.h" #endif -@@ -57,7 +57,7 @@ std::unique_ptr<DeviceInfoFetcher> DeviceInfoFetcher:: +@@ -58,7 +58,7 @@ std::unique_ptr<DeviceInfoFetcher> DeviceInfoFetcher:: return std::make_unique<DeviceInfoFetcherMac>(); #elif defined(OS_WIN) return std::make_unique<DeviceInfoFetcherWin>(); --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) ++#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) return std::make_unique<DeviceInfoFetcherLinux>(); #else return std::make_unique<StubDeviceFetcher>(); diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_device__info__fetcher__linux.cc b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_device__info__fetcher__linux.cc index 8fb33a194cdc..0f027d5724f1 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_device__info__fetcher__linux.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_device__info__fetcher__linux.cc @@ -1,4 +1,4 @@ ---- chrome/browser/extensions/api/enterprise_reporting_private/device_info_fetcher_linux.cc.orig 2020-05-13 18:39:37 UTC +--- chrome/browser/extensions/api/enterprise_reporting_private/device_info_fetcher_linux.cc.orig 2020-11-13 06:36:36 UTC +++ chrome/browser/extensions/api/enterprise_reporting_private/device_info_fetcher_linux.cc @@ -8,7 +8,9 @@ #include <gio/gio.h> @@ -10,23 +10,50 @@ #include <string> -@@ -91,6 +93,7 @@ enterprise_reporting_private::SettingValue GetScreenlo +@@ -36,7 +38,11 @@ std::string GetDeviceModel() { + } + + std::string GetOsVersion() { ++#if defined(OS_BSD) ++ base::FilePath os_release_file("/usr/local/etc/os-release"); ++#else + base::FilePath os_release_file("/etc/os-release"); ++#endif + std::string release_info; + base::StringPairs values; + if (base::PathExists(os_release_file) && +@@ -107,6 +113,7 @@ enterprise_reporting_private::SettingValue GetScreenlo // Implements the logic from the native host installation script. First find the // root device identifier, then locate its parent and get its type. enterprise_reporting_private::SettingValue GetDiskEncrypted() { +#if !defined(OS_BSD) struct stat info; - // First figure out the device identifier. - stat("/", &info); -@@ -110,6 +113,7 @@ enterprise_reporting_private::SettingValue GetDiskEncr - return is_encrypted ? enterprise_reporting_private::SETTING_VALUE_ENABLED - : enterprise_reporting_private::SETTING_VALUE_DISABLED; + // First figure out the device identifier. Fail fast if this fails. + if (stat("/", &info) != 0) +@@ -131,10 +138,14 @@ enterprise_reporting_private::SettingValue GetDiskEncr + return enterprise_reporting_private::SETTING_VALUE_UNKNOWN; + } + return enterprise_reporting_private::SETTING_VALUE_DISABLED; ++#else ++ return enterprise_reporting_private::SETTING_VALUE_UNKNOWN; ++#endif + } + + std::vector<std::string> GetMacAddresses() { + std::vector<std::string> result; ++#if !defined(OS_BSD) + base::DirReaderPosix reader("/sys/class/net"); + if (!reader.IsValid()) + return result; +@@ -157,6 +168,7 @@ std::vector<std::string> GetMacAddresses() { + &address); + result.push_back(address); } +#endif - return enterprise_reporting_private::SETTING_VALUE_UNKNOWN; + return result; } -@@ -121,7 +125,11 @@ DeviceInfoFetcherLinux::~DeviceInfoFetcherLinux() = de +@@ -168,7 +180,11 @@ DeviceInfoFetcherLinux::~DeviceInfoFetcherLinux() = de DeviceInfo DeviceInfoFetcherLinux::Fetch() { DeviceInfo device_info; 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 d51374308ff4..27d41ae412f1 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,29 +1,29 @@ ---- chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc.orig 2020-07-07 21:58:13 UTC +--- chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc.orig 2020-11-13 06:36:36 UTC +++ chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc -@@ -40,7 +40,7 @@ +@@ -22,7 +22,7 @@ #include "base/win/registry.h" #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "base/environment.h" #include "base/nix/xdg_util.h" #endif -@@ -384,7 +384,7 @@ base::FilePath GetEndpointVerificationDir() { +@@ -226,7 +226,7 @@ base::FilePath GetEndpointVerificationDir() { return *GetEndpointVerificationDirOverride(); #if defined(OS_WIN) if (!base::PathService::Get(base::DIR_LOCAL_APP_DATA, &path)) --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#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); -@@ -395,7 +395,7 @@ base::FilePath GetEndpointVerificationDir() { +@@ -237,7 +237,7 @@ base::FilePath GetEndpointVerificationDir() { if (true) #endif return path; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) path = path.AppendASCII("google"); #else 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 6875245ca282..101f5825aa6c 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,11 +1,11 @@ ---- chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc.orig 2020-07-13 09:17:42 UTC +--- chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc.orig 2020-11-13 06:36:36 UTC +++ chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc -@@ -280,7 +280,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionInteractiveTest, T +@@ -277,7 +277,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. --#if !(defined(OS_LINUX) && !defined(USE_AURA)) -+#if !((defined(OS_LINUX) || defined(OS_BSD)) && !defined(USE_AURA)) +-#if !((defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(USE_AURA)) ++#if !((defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && !defined(USE_AURA)) // Starting window does not have a popup. EXPECT_FALSE(ExtensionActionTestHelper::Create(browser())->HasPopup()); #endif diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc b/www/chromium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc index ae3f09c5bb85..0db1b2f1cf37 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc @@ -1,4 +1,4 @@ ---- chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc.orig 2020-05-13 18:39:37 UTC +--- chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc.orig 2020-11-13 06:36:36 UTC +++ chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc @@ -22,6 +22,7 @@ static base::LazyInstance<scoped_refptr<StorageDeviceL diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_input__ime_input__ime__api.h b/www/chromium/files/patch-chrome_browser_extensions_api_input__ime_input__ime__api.h deleted file mode 100644 index 1cb62fbbfdce..000000000000 --- a/www/chromium/files/patch-chrome_browser_extensions_api_input__ime_input__ime__api.h +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/extensions/api/input_ime/input_ime_api.h.orig 2019-03-11 22:00:53 UTC -+++ chrome/browser/extensions/api/input_ime/input_ime_api.h -@@ -31,7 +31,7 @@ - - #if defined(OS_CHROMEOS) - #include "chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.h" --#elif defined(OS_LINUX) || defined(OS_WIN) -+#elif defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) - #include "chrome/browser/extensions/api/input_ime/input_ime_api_nonchromeos.h" - #endif // defined(OS_CHROMEOS) - diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc b/www/chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc index 060655cdaed2..5502b9a61bc3 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig 2020-07-07 21:57:32 UTC +--- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig 2020-11-13 06:36:36 UTC +++ chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc -@@ -292,6 +292,8 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor +@@ -284,6 +284,8 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor info->os = extensions::api::runtime::PLATFORM_OS_CROS; } else if (strcmp(os, "linux") == 0) { info->os = extensions::api::runtime::PLATFORM_OS_LINUX; diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc b/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc index 587dbc716c43..0a77345fbfb5 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc @@ -1,20 +1,20 @@ ---- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2020-05-13 18:40:22 UTC +--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2020-11-13 06:36:36 UTC +++ chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -161,7 +161,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist - (*s_whitelist)[bookmarks::prefs::kShowBookmarkBar] = +@@ -169,7 +169,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist + (*s_allowlist)[bookmarks::prefs::kShowBookmarkBar] = settings_api::PrefType::PREF_TYPE_BOOLEAN; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - (*s_whitelist)[::prefs::kUseCustomChromeFrame] = + (*s_allowlist)[::prefs::kUseCustomChromeFrame] = settings_api::PrefType::PREF_TYPE_BOOLEAN; #endif -@@ -171,7 +171,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist +@@ -179,7 +179,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist // Appearance settings. - (*s_whitelist)[::prefs::kCurrentThemeID] = + (*s_allowlist)[::prefs::kCurrentThemeID] = settings_api::PrefType::PREF_TYPE_STRING; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) - (*s_whitelist)[::prefs::kUsesSystemTheme] = ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + (*s_allowlist)[::prefs::kUsesSystemTheme] = settings_api::PrefType::PREF_TYPE_BOOLEAN; #endif diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc b/www/chromium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc index a1ca40c84375..0677c99de1fb 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc @@ -1,4 +1,4 @@ ---- chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc.orig 2020-07-07 21:57:32 UTC +--- chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc.orig 2020-11-13 06:36:36 UTC +++ chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc @@ -30,7 +30,7 @@ #include "extensions/browser/process_manager.h" @@ -18,7 +18,7 @@ if (extension) { enabled_by_permissions = extension->permissions_data()->active_permissions().HasAPIPermission( -@@ -570,7 +570,7 @@ void WebrtcLoggingPrivateStartEventLoggingFunction::Fi +@@ -571,7 +571,7 @@ void WebrtcLoggingPrivateStartEventLoggingFunction::Fi ExtensionFunction::ResponseAction WebrtcLoggingPrivateGetLogsDirectoryFunction::Run() { @@ -27,7 +27,7 @@ // Unlike other WebrtcLoggingPrivate functions that take a RequestInfo object, // this function shouldn't be called by a component extension on behalf of // some web code. It returns a DirectoryEntry for use directly in the calling -@@ -593,9 +593,9 @@ WebrtcLoggingPrivateGetLogsDirectoryFunction::Run() { +@@ -594,9 +594,9 @@ WebrtcLoggingPrivateGetLogsDirectoryFunction::Run() { &WebrtcLoggingPrivateGetLogsDirectoryFunction::FireErrorCallback, this)); return RespondLater(); diff --git a/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc b/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc index 70190902f4bb..52c2f5c66e64 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc @@ -1,4 +1,4 @@ ---- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2020-07-07 21:58:13 UTC +--- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2020-11-13 06:36:36 UTC +++ chrome/browser/extensions/browser_context_keyed_service_factories.cc @@ -53,7 +53,7 @@ #include "extensions/browser/api/networking_private/networking_private_delegate_factory.h" @@ -9,12 +9,3 @@ #include "chrome/browser/extensions/api/input_ime/input_ime_api.h" #endif -@@ -103,7 +103,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() - extensions::IdentityAPI::GetFactoryInstance(); - extensions::InstallTrackerFactory::GetInstance(); - extensions::InstallVerifierFactory::GetInstance(); --#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) -+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) - extensions::InputImeAPI::GetFactoryInstance(); - #endif - extensions::LanguageSettingsPrivateDelegateFactory::GetInstance(); diff --git a/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc b/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc index 8c813c1db5c8..834594ad882e 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 2020-03-16 18:39:44 UTC +--- chrome/browser/extensions/external_provider_impl.cc.orig 2020-11-13 06:36:37 UTC +++ chrome/browser/extensions/external_provider_impl.cc -@@ -760,7 +760,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -776,7 +776,7 @@ void ExternalProviderImpl::CreateExternalProviders( } #endif if (!profile->GetPrefs()->GetBoolean(pref_names::kBlockExternalExtensions)) { @@ -9,12 +9,12 @@ provider_list->push_back(std::make_unique<ExternalProviderImpl>( service, base::MakeRefCounted<ExternalPrefLoader>( -@@ -787,7 +787,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -803,7 +803,7 @@ void ExternalProviderImpl::CreateExternalProviders( bundled_extension_creation_flags)); // Define a per-user source of external extensions. --#if defined(OS_MACOSX) || (defined(OS_LINUX) && BUILDFLAG(CHROMIUM_BRANDING)) -+#if defined(OS_MACOSX) || ((defined(OS_LINUX) || defined(OS_BSD)) && BUILDFLAG(CHROMIUM_BRANDING)) +-#if defined(OS_MAC) || ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && \ ++#if defined(OS_MAC) || defined(OS_BSD) || ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && \ + BUILDFLAG(CHROMIUM_BRANDING)) provider_list->push_back(std::make_unique<ExternalProviderImpl>( service, - base::MakeRefCounted<ExternalPrefLoader>( diff --git a/www/chromium/files/patch-chrome_browser_first__run_first__run__dialog.h b/www/chromium/files/patch-chrome_browser_first__run_first__run__dialog.h index c079a7eac3e3..d35311ebd097 100644 --- a/www/chromium/files/patch-chrome_browser_first__run_first__run__dialog.h +++ b/www/chromium/files/patch-chrome_browser_first__run_first__run__dialog.h @@ -1,11 +1,11 @@ ---- chrome/browser/first_run/first_run_dialog.h.orig 2019-07-29 18:50:26 UTC +--- chrome/browser/first_run/first_run_dialog.h.orig 2020-11-13 06:36:37 UTC +++ chrome/browser/first_run/first_run_dialog.h @@ -9,7 +9,7 @@ #include "build/build_config.h" // Hide this function on platforms where the dialog does not exist. --#if defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+#if defined(OS_MACOSX) || (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) class Profile; diff --git a/www/chromium/files/patch-chrome_browser_first__run_first__run__internal.h b/www/chromium/files/patch-chrome_browser_first__run_first__run__internal.h index 5b60fc717be9..6ada7b6132d6 100644 --- a/www/chromium/files/patch-chrome_browser_first__run_first__run__internal.h +++ b/www/chromium/files/patch-chrome_browser_first__run_first__run__internal.h @@ -1,18 +1,18 @@ ---- chrome/browser/first_run/first_run_internal.h.orig 2019-07-29 18:50:45 UTC +--- chrome/browser/first_run/first_run_internal.h.orig 2020-11-13 06:36:37 UTC +++ chrome/browser/first_run/first_run_internal.h -@@ -64,13 +64,13 @@ FirstRunState DetermineFirstRunState(bool has_sentinel +@@ -56,13 +56,13 @@ FirstRunState DetermineFirstRunState(bool has_sentinel bool force_first_run, bool no_first_run); --#if defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+#if defined(OS_MACOSX) || (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) // For testing, forces the first run dialog to either be shown or not. If not // called, the decision to show the dialog or not will be made by Chrome based // on a number of factors (such as install type, whether it's a Chrome-branded // build, etc). void ForceFirstRunDialogShownForTesting(bool shown); --#endif // defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+#endif // defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) +-#endif // defined(OS_MAC) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++#endif // defined(OS_MAC) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) } // namespace internal } // namespace first_run 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 e180c95ab319..7413bfd572dd 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 2019-10-21 19:06:22 UTC +--- chrome/browser/first_run/first_run_internal_posix.cc.orig 2020-11-13 06:36:37 UTC +++ chrome/browser/first_run/first_run_internal_posix.cc @@ -45,7 +45,7 @@ enum class ForcedShowDialogState { ForcedShowDialogState g_forced_show_dialog_state = diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc index 8761ec1f68c9..a4ca410854a5 100644 --- a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc @@ -1,24 +1,6 @@ ---- chrome/browser/flag_descriptions.cc.orig 2020-08-18 18:40:05 UTC +--- chrome/browser/flag_descriptions.cc.orig 2020-11-13 06:36:37 UTC +++ chrome/browser/flag_descriptions.cc -@@ -3929,7 +3929,7 @@ const char kZeroCopyVideoCaptureDescription[] = - - #endif // defined(OS_CHROMEOS) - --#if defined(OS_CHROMEOS) || defined(OS_LINUX) -+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) - - #if BUILDFLAG(USE_TCMALLOC) - const char kDynamicTcmallocName[] = "Dynamic Tcmalloc Tuning"; -@@ -3938,7 +3938,7 @@ const char kDynamicTcmallocDescription[] = - "utilization."; - #endif // BUILDFLAG(USE_TCMALLOC) - --#endif // #if defined(OS_CHROMEOS) || defined(OS_LINUX) -+#endif // #if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) - - // All views-based platforms -------------------------------------------------- - -@@ -3968,13 +3968,13 @@ const char kReopenTabInProductHelpDescription[] = +@@ -4549,15 +4549,15 @@ const char kEnableNewBadgeOnMenuItemsDescription[] = // Random platform combinations ----------------------------------------------- @@ -32,34 +14,61 @@ -#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - #if BUILDFLAG(ENABLE_CLICK_TO_CALL) - -@@ -3986,7 +3986,7 @@ const char kClickToCallUIDescription[] = - - #endif // BUILDFLAG(ENABLE_CLICK_TO_CALL) - --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) const char kEnableMediaFeedsName[] = "Enables Media Feeds"; -@@ -4018,16 +4018,16 @@ const char kRemoteCopyProgressNotificationDescription[ +@@ -4601,17 +4601,17 @@ const char kRemoteCopyProgressNotificationDescription[ "Enables progress notifications to be shown for the remote copy feature " "when receiving a message."; --#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || -+#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || +-#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || // defined(OS_CHROMEOS) --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) 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_MACOSX) || defined(OS_LINUX) -+#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || + // defined(OS_CHROMEOS) + + #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_CHROMEOS) +@@ -4623,14 +4623,14 @@ const char kWebContentsOcclusionDescription[] = + + #endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_CHROMEOS) + +-#if defined(OS_CHROMEOS) || defined(OS_LINUX) ++#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) + #if BUILDFLAG(USE_TCMALLOC) + const char kDynamicTcmallocName[] = "Dynamic Tcmalloc Tuning"; + const char kDynamicTcmallocDescription[] = + "Allows tcmalloc to dynamically adjust tunables based on system resource " + "utilization."; + #endif // BUILDFLAG(USE_TCMALLOC) +-#endif // #if defined(OS_CHROMEOS) || defined(OS_LINUX) ++#endif // #if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) - #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS) + #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) + const char kUserDataSnapshotName[] = "Enable user data snapshots"; +@@ -4646,12 +4646,12 @@ const char kWebShareDescription[] = + "platforms."; + #endif // defined(OS_WIN) || defined(OS_CHROMEOS) + +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) || defined(OS_BSD) + const char kEnableEphemeralGuestProfilesOnDesktopName[] = + "Enable ephemeral Guest profiles on Desktop"; + const char kEnableEphemeralGuestProfilesOnDesktopDescription[] = + "Enables ephemeral Guest profiles on Windows, Linux, and Mac."; +-#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) ++#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) || defined(OS_BSD) + + // Feature flags -------------------------------------------------------------- diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.h b/www/chromium/files/patch-chrome_browser_flag__descriptions.h index f3856cddbf7e..64f7528768d8 100644 --- a/www/chromium/files/patch-chrome_browser_flag__descriptions.h +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.h @@ -1,35 +1,18 @@ ---- chrome/browser/flag_descriptions.h.orig 2020-08-18 18:40:05 UTC +--- chrome/browser/flag_descriptions.h.orig 2020-11-13 06:36:37 UTC +++ chrome/browser/flag_descriptions.h @@ -19,9 +19,9 @@ #include "ppapi/buildflags/buildflags.h" #include "printing/buildflags/buildflags.h" --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "base/allocator/buildflags.h" --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // This file declares strings used in chrome://flags. These messages are not // translated, because instead of end-users they target Chromium developers and -@@ -2306,14 +2306,14 @@ extern const char kZeroStateFilesDescription[]; - - #endif // #if defined(OS_CHROMEOS) - --#if defined(OS_CHROMEOS) || defined(OS_LINUX) -+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) - - #if BUILDFLAG(USE_TCMALLOC) - extern const char kDynamicTcmallocName[]; - extern const char kDynamicTcmallocDescription[]; - #endif // BUILDFLAG(USE_TCMALLOC) - --#endif // #if defined(OS_CHROMEOS) || defined(OS_LINUX) -+#endif // #if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) - - // All views-based platforms -------------------------------------------------- - -@@ -2335,12 +2335,12 @@ extern const char kReopenTabInProductHelpDescription[] +@@ -2646,14 +2646,14 @@ extern const char kEnableNewBadgeOnMenuItemsDescriptio // Random platform combinations ----------------------------------------------- @@ -42,33 +25,45 @@ -#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - #if BUILDFLAG(ENABLE_CLICK_TO_CALL) - -@@ -2349,7 +2349,7 @@ extern const char kClickToCallUIDescription[]; - - #endif // BUILDFLAG(ENABLE_CLICK_TO_CALL) - --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) extern const char kEnableMediaFeedsName[]; -@@ -2367,15 +2367,15 @@ extern const char kRemoteCopyPersistentNotificationDes - extern const char kRemoteCopyProgressNotificationName[]; - extern const char kRemoteCopyProgressNotificationDescription[]; +@@ -2680,7 +2680,7 @@ extern const char kRemoteCopyProgressNotificationDescr + extern const char kDirectManipulationStylusName[]; + extern const char kDirectManipulationStylusDescription[]; --#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || -+#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || // defined(OS_CHROMEOS) --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_CHROMEOS) +@@ -2690,12 +2690,12 @@ extern const char kWebContentsOcclusionDescription[]; - extern const char kDirectManipulationStylusName[]; - extern const char kDirectManipulationStylusDescription[]; + #endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_CHROMEOS) + +-#if defined(OS_CHROMEOS) || defined(OS_LINUX) ++#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) + #if BUILDFLAG(USE_TCMALLOC) + extern const char kDynamicTcmallocName[]; + extern const char kDynamicTcmallocDescription[]; + #endif // BUILDFLAG(USE_TCMALLOC) +-#endif // #if defined(OS_CHROMEOS) || defined(OS_LINUX) ++#endif // #if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) + + #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) + extern const char kUserDataSnapshotName[]; +@@ -2707,10 +2707,10 @@ extern const char kWebShareName[]; + extern const char kWebShareDescription[]; + #endif // defined(OS_WIN) || defined(OS_CHROMEOS) --#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) || defined(OS_BSD) + extern const char kEnableEphemeralGuestProfilesOnDesktopName[]; + extern const char kEnableEphemeralGuestProfilesOnDesktopDescription[]; +-#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) ++#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) || defined(OS_BSD) - #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS) + // Feature flags -------------------------------------------------------------- diff --git a/www/chromium/files/patch-chrome_browser_intranet__redirect__detector.h b/www/chromium/files/patch-chrome_browser_intranet__redirect__detector.h new file mode 100644 index 000000000000..5d71568395bd --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_intranet__redirect__detector.h @@ -0,0 +1,11 @@ +--- chrome/browser/intranet_redirect_detector.h.orig 2020-11-16 14:19:24 UTC ++++ chrome/browser/intranet_redirect_detector.h +@@ -27,7 +27,7 @@ class SimpleURLLoader; + + class PrefRegistrySimple; + +-#if !(defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || \ ++#if !(defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) ||\ + defined(OS_CHROMEOS)) + #error "IntranetRedirectDetector should only be built on Desktop platforms." + #endif diff --git a/www/chromium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc b/www/chromium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc index 93a3d5742fd1..b5eef183a63e 100644 --- a/www/chromium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc +++ b/www/chromium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc @@ -1,4 +1,4 @@ ---- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig 2019-04-30 22:22:34 UTC +--- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig 2020-11-13 06:36:37 UTC +++ chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc @@ -39,10 +39,12 @@ void MTPDeviceMapService::RegisterMTPFileSystem( // Note that this initializes the delegate asynchronously, but since diff --git a/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc b/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc index a390dbde142e..d46dbf815aec 100644 --- a/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc +++ b/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc @@ -1,6 +1,6 @@ ---- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2020-07-07 21:58:13 UTC +--- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2020-11-13 06:36:37 UTC +++ chrome/browser/media_galleries/media_file_system_registry.cc -@@ -736,7 +736,10 @@ class MediaFileSystemRegistry::MediaFileSystemContextI +@@ -735,7 +735,10 @@ class MediaFileSystemRegistry::MediaFileSystemContextI // Constructor in 'private' section because depends on private class definition. MediaFileSystemRegistry::MediaFileSystemRegistry() : file_system_context_(new MediaFileSystemContextImpl) { diff --git a/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__posix.cc b/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__posix.cc index c131ed5d1aa8..d2b2859bc266 100644 --- a/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__posix.cc +++ b/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__posix.cc @@ -1,4 +1,4 @@ ---- chrome/browser/media/router/discovery/discovery_network_list_posix.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/media/router/discovery/discovery_network_list_posix.cc.orig 2020-11-13 06:36:37 UTC +++ chrome/browser/media/router/discovery/discovery_network_list_posix.cc @@ -10,6 +10,7 @@ #include <netinet/in.h> @@ -8,21 +8,27 @@ #include <algorithm> -@@ -19,7 +20,7 @@ +@@ -18,7 +19,7 @@ #include "chrome/browser/media/router/discovery/discovery_network_list_wifi.h" #include "net/base/net_errors.h" --#if !defined(OS_MACOSX) -+#if !defined(OS_MACOSX) && !defined(OS_BSD) +-#if !defined(OS_MAC) ++#if !defined(OS_MAC) && !defined(OS_BSD) #include <netpacket/packet.h> #else #include <net/if_dl.h> -@@ -28,7 +29,7 @@ +@@ -27,12 +28,12 @@ namespace media_router { namespace { --#if !defined(OS_MACOSX) -+#if !defined(OS_MACOSX) && !defined(OS_BSD) +-#if !defined(OS_MAC) ++#if !defined(OS_MAC) && !defined(OS_BSD) using sll = struct sockaddr_ll; #define SOCKET_ARP_TYPE(s) ((s)->sll_hatype) #define SOCKET_ADDRESS_LEN(s) ((s)->sll_halen) + #define SOCKET_ADDRESS(s) ((s)->sll_addr) +-#else // defined(OS_MAC) ++#else // defined(OS_MAC) || defined(OS_BSD) + #define AF_PACKET AF_LINK + using sll = struct sockaddr_dl; + #define SOCKET_ARP_TYPE(s) ((s)->sdl_type) diff --git a/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__wifi__linux.cc b/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__wifi__linux.cc index 7a5b02c15f9d..bdac76446e89 100644 --- a/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__wifi__linux.cc +++ b/www/chromium/files/patch-chrome_browser_media_router_discovery_discovery__network__list__wifi__linux.cc @@ -1,4 +1,4 @@ ---- chrome/browser/media/router/discovery/discovery_network_list_wifi_linux.cc.orig 2020-07-07 21:57:32 UTC +--- chrome/browser/media/router/discovery/discovery_network_list_wifi_linux.cc.orig 2020-11-13 06:36:37 UTC +++ chrome/browser/media/router/discovery/discovery_network_list_wifi_linux.cc @@ -9,7 +9,11 @@ #include <sys/socket.h> 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 index 9b007ae67c87..068d8fd2862c 100644 --- 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 @@ -1,7 +1,7 @@ ---- chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.cc.orig 2019-09-09 21:55:09 UTC +--- chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.cc.orig 2020-11-13 06:36:37 UTC +++ chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.cc @@ -112,6 +112,12 @@ void WiredDisplayMediaRouteProvider::CreateRoute( - bool incognito, + bool off_the_record, CreateRouteCallback callback) { DCHECK(!base::Contains(presentations_, presentation_id)); +#if defined(OS_BSD) diff --git a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc index 76fb8bab73c0..f5946e14d1b5 100644 --- a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc +++ b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc @@ -1,11 +1,11 @@ ---- chrome/browser/media/webrtc/webrtc_event_log_uploader.cc.orig 2020-02-03 21:52:40 UTC +--- chrome/browser/media/webrtc/webrtc_event_log_uploader.cc.orig 2020-11-13 06:36:37 UTC +++ chrome/browser/media/webrtc/webrtc_event_log_uploader.cc -@@ -38,7 +38,7 @@ constexpr size_t kExpectedMimeOverheadBytes = 1000; / - const char kProduct[] = "Chrome"; - #elif defined(OS_MACOSX) - const char kProduct[] = "Chrome_Mac"; --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +@@ -40,6 +40,8 @@ const char kProduct[] = "Chrome_Mac"; + const char kProduct[] = "Chrome_ChromeOS"; + #elif defined(OS_LINUX) const char kProduct[] = "Chrome_Linux"; ++#elif defined(OS_FREEBSD) ++const char kProduct[] = "Chrome_FreeBSD"; #elif defined(OS_ANDROID) const char kProduct[] = "Chrome_Android"; + #else diff --git a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc index c1ca8fcabf4e..479fa6c52f70 100644 --- a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc +++ b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc @@ -1,6 +1,6 @@ ---- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2019-10-21 19:06:22 UTC +--- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2020-11-13 06:36:37 UTC +++ chrome/browser/media/webrtc/webrtc_log_uploader.cc -@@ -358,6 +358,8 @@ void WebRtcLogUploader::SetupMultipart( +@@ -357,6 +357,8 @@ void WebRtcLogUploader::SetupMultipart( const char product[] = "Chrome_Android"; #elif defined(OS_CHROMEOS) const char product[] = "Chrome_ChromeOS"; diff --git a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc index 942756201d7b..7d91b0ea5d5d 100644 --- a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc +++ b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc @@ -1,4 +1,4 @@ ---- chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig 2020-07-07 21:58:13 UTC +--- chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig 2020-11-13 06:36:37 UTC +++ chrome/browser/media/webrtc/webrtc_logging_controller.cc @@ -23,10 +23,10 @@ #include "content/public/browser/browser_context.h" @@ -13,18 +13,18 @@ using webrtc_event_logging::WebRtcEventLogManager; -@@ -269,7 +269,7 @@ void WebRtcLoggingController::StartEventLogging( +@@ -272,7 +272,7 @@ void WebRtcLoggingController::StartEventLogging( web_app_id, callback); } -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) void WebRtcLoggingController::GetLogsDirectory( - const LogsDirectoryCallback& callback, - const LogsDirectoryErrorCallback& error_callback) { -@@ -314,7 +314,7 @@ void WebRtcLoggingController::GrantLogsDirectoryAccess - base::SequencedTaskRunnerHandle::Get()->PostTask( - FROM_HERE, base::BindOnce(callback, file_system.id(), registered_name)); + LogsDirectoryCallback callback, + LogsDirectoryErrorCallback error_callback) { +@@ -318,7 +318,7 @@ void WebRtcLoggingController::GrantLogsDirectoryAccess + FROM_HERE, + base::BindOnce(std::move(callback), file_system.id(), registered_name)); } -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) diff --git a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.h b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.h index e3ef33fc829f..fe8b7922599f 100644 --- a/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.h +++ b/www/chromium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.h @@ -1,4 +1,4 @@ ---- chrome/browser/media/webrtc/webrtc_logging_controller.h.orig 2019-10-30 15:50:11 UTC +--- chrome/browser/media/webrtc/webrtc_logging_controller.h.orig 2020-11-13 06:36:37 UTC +++ chrome/browser/media/webrtc/webrtc_logging_controller.h @@ -129,13 +129,13 @@ class WebRtcLoggingController size_t web_app_id, @@ -9,8 +9,8 @@ // Ensures that the WebRTC Logs directory exists and then grants render // process access to the 'WebRTC Logs' directory, and invokes |callback| with // the ids necessary to create a DirectoryEntry object. - void GetLogsDirectory(const LogsDirectoryCallback& callback, - const LogsDirectoryErrorCallback& error_callback); + void GetLogsDirectory(LogsDirectoryCallback callback, + LogsDirectoryErrorCallback error_callback); -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) @@ -25,10 +25,10 @@ // Grants the render process access to the 'WebRTC Logs' directory, and // invokes |callback| with the ids necessary to create a DirectoryEntry // object. If the |logs_path| couldn't be created or found, |error_callback| -@@ -197,7 +197,7 @@ class WebRtcLoggingController - const LogsDirectoryCallback& callback, - const LogsDirectoryErrorCallback& error_callback, - const base::FilePath& logs_path); +@@ -196,7 +196,7 @@ class WebRtcLoggingController + void GrantLogsDirectoryAccess(LogsDirectoryCallback callback, + LogsDirectoryErrorCallback error_callback, + const base::FilePath& logs_path); -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) diff --git a/www/chromium/files/patch-chrome_browser_memory__details.cc b/www/chromium/files/patch-chrome_browser_memory__details.cc index d482b53d7d5e..c12c2928f020 100644 --- a/www/chromium/files/patch-chrome_browser_memory__details.cc +++ b/www/chromium/files/patch-chrome_browser_memory__details.cc @@ -1,20 +1,20 @@ ---- chrome/browser/memory_details.cc.orig 2020-07-07 21:58:13 UTC +--- chrome/browser/memory_details.cc.orig 2020-11-13 06:36:37 UTC +++ chrome/browser/memory_details.cc -@@ -39,7 +39,7 @@ +@@ -38,7 +38,7 @@ #include "services/resource_coordinator/public/cpp/memory_instrumentation/memory_instrumentation.h" #include "ui/base/l10n/l10n_util.h" --#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) - #include "services/service_manager/zygote/zygote_host_linux.h" +-#if defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_ANDROID) ++#if defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_ANDROID) && !defined(OS_BSD) + #include "content/public/browser/zygote_host/zygote_host_linux.h" #endif -@@ -340,7 +340,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() { +@@ -339,7 +339,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() { process.titles.push_back(title); } --#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) - if (service_manager::ZygoteHost::GetInstance()->IsZygotePid(process.pid)) { +-#if defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_ANDROID) ++#if defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_ANDROID) && !defined(OS_BSD) + if (content::ZygoteHost::GetInstance()->IsZygotePid(process.pid)) { process.process_type = content::PROCESS_TYPE_ZYGOTE; } diff --git a/www/chromium/files/patch-chrome_browser_memory__details__linux.cc b/www/chromium/files/patch-chrome_browser_memory__details__linux.cc index 1112bd81ffcc..8247a2268794 100644 --- a/www/chromium/files/patch-chrome_browser_memory__details__linux.cc +++ b/www/chromium/files/patch-chrome_browser_memory__details__linux.cc @@ -1,6 +1,6 @@ ---- chrome/browser/memory_details_linux.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/memory_details_linux.cc.orig 2020-11-13 06:36:37 UTC +++ chrome/browser/memory_details_linux.cc -@@ -72,8 +72,10 @@ ProcessData GetProcessDataMemoryInformation( +@@ -69,8 +69,10 @@ ProcessData GetProcessDataMemoryInformation( std::unique_ptr<base::ProcessMetrics> metrics( base::ProcessMetrics::CreateProcessMetrics(pid)); 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 8ea61636f679..74d70e1d8bc0 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 2020-07-07 21:58:13 UTC +--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2020-11-13 06:36:37 UTC +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc -@@ -51,7 +51,9 @@ +@@ -50,7 +50,9 @@ #if defined(OS_LINUX) && !defined(OS_CHROMEOS) #include <gnu/libc-version.h> @@ -11,7 +11,7 @@ #include "base/strings/string_split.h" #include "base/strings/string_util.h" @@ -59,7 +61,7 @@ - #if defined(USE_X11) + #include "ui/base/ui_base_features.h" #include "ui/base/x/x11_util.h" #endif -#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) 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 33a03a24cd15..665250477f3c 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,23 +1,23 @@ ---- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2020-07-07 21:58:13 UTC +--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2020-11-13 06:36:37 UTC +++ chrome/browser/metrics/chrome_metrics_service_client.cc -@@ -680,11 +680,11 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -685,11 +685,11 @@ void ChromeMetricsServiceClient::RegisterMetricsServic #endif // defined(OS_WIN) - #if defined(OS_WIN) || defined(OS_MACOSX) || \ + #if defined(OS_WIN) || defined(OS_MAC) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) metrics_service_->RegisterMetricsProvider( std::make_unique<DesktopPlatformFeaturesMetricsProvider>()); - #endif // defined(OS_WIN) || defined(OS_MACOSX) || \ + #endif // defined(OS_WIN) || defined(OS_MAC) || \ - // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) #if BUILDFLAG(ENABLE_PLUGINS) plugin_metrics_provider_ = new PluginMetricsProvider(local_state); -@@ -942,7 +942,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve +@@ -955,7 +955,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve } #endif - #if defined(OS_WIN) || defined(OS_MACOSX) || \ + #if defined(OS_WIN) || defined(OS_MAC) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) // This creates the DesktopProfileSessionDurationsServices if it didn't exist 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 263c484e7d66..712b6da45013 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,20 +1,20 @@ ---- chrome/browser/metrics/process_memory_metrics_emitter.cc.orig 2020-07-07 21:58:13 UTC +--- chrome/browser/metrics/process_memory_metrics_emitter.cc.orig 2020-11-13 06:36:37 UTC +++ chrome/browser/metrics/process_memory_metrics_emitter.cc -@@ -489,7 +489,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc +@@ -496,7 +496,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc builder->SetPrivateMemoryFootprint(pmd.os_dump().private_footprint_kb / kKiB); builder->SetSharedMemoryFootprint(pmd.os_dump().shared_footprint_kb / kKiB); --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) builder->SetPrivateSwapFootprint(pmd.os_dump().private_footprint_swap_kb / kKiB); #endif -@@ -512,7 +512,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc +@@ -519,7 +519,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc MEMORY_METRICS_HISTOGRAM_MB(std::string(kMemoryHistogramPrefix) + process_name + ".SharedMemoryFootprint", pmd.os_dump().shared_footprint_kb / kKiB); --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) MEMORY_METRICS_HISTOGRAM_MB(std::string(kMemoryHistogramPrefix) + process_name + ".PrivateSwapFootprint", pmd.os_dump().private_footprint_swap_kb / kKiB); diff --git a/www/chromium/files/patch-chrome_browser_native__file__system_chrome__native__file__system__permission__context.cc b/www/chromium/files/patch-chrome_browser_native__file__system_chrome__native__file__system__permission__context.cc index cea7509438b9..34eb6cc1c96c 100644 --- a/www/chromium/files/patch-chrome_browser_native__file__system_chrome__native__file__system__permission__context.cc +++ b/www/chromium/files/patch-chrome_browser_native__file__system_chrome__native__file__system__permission__context.cc @@ -1,11 +1,11 @@ ---- chrome/browser/native_file_system/chrome_native_file_system_permission_context.cc.orig 2020-05-13 18:39:37 UTC +--- chrome/browser/native_file_system/chrome_native_file_system_permission_context.cc.orig 2020-11-13 06:36:37 UTC +++ chrome/browser/native_file_system/chrome_native_file_system_permission_context.cc -@@ -150,7 +150,7 @@ const struct { - {base::DIR_APP_DATA, nullptr, true}, - {base::DIR_HOME, FILE_PATH_LITERAL("Library"), true}, +@@ -138,7 +138,7 @@ const struct { + {base::DIR_APP_DATA, nullptr, kBlockAllChildren}, + {base::DIR_HOME, FILE_PATH_LITERAL("Library"), kBlockAllChildren}, #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // On Linux also block access to devices via /dev, as well as security // sensitive data in /sys and /proc. - {kNoBasePathKey, FILE_PATH_LITERAL("/dev"), true}, + {kNoBasePathKey, FILE_PATH_LITERAL("/dev"), kBlockAllChildren}, diff --git a/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc index 36513267e9bc..9a40f6e5a6a2 100644 --- a/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc +++ b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/net/system_network_context_manager.cc.orig 2020-07-07 21:58:13 UTC +--- chrome/browser/net/system_network_context_manager.cc.orig 2020-11-13 06:36:37 UTC +++ chrome/browser/net/system_network_context_manager.cc -@@ -75,11 +75,11 @@ +@@ -77,11 +77,11 @@ #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" #endif // defined(OS_CHROMEOS) @@ -14,51 +14,51 @@ #if BUILDFLAG(ENABLE_EXTENSIONS) #include "extensions/common/constants.h" -@@ -138,10 +138,10 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -140,10 +140,10 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut auth_dynamic_params->enable_negotiate_port = local_state->GetBoolean(prefs::kEnableAuthNegotiatePort); --#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) || defined(OS_BSD) auth_dynamic_params->delegate_by_kdc_policy = local_state->GetBoolean(prefs::kAuthNegotiateDelegateByKdcPolicy); --#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) -+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) || defined(OS_BSD) #if defined(OS_POSIX) auth_dynamic_params->ntlm_v2_enabled = -@@ -352,10 +352,10 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -356,10 +356,10 @@ SystemNetworkContextManager::SystemNetworkContextManag pref_change_registrar_.Add(prefs::kEnableAuthNegotiatePort, auth_pref_callback); --#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) || defined(OS_BSD) pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy, auth_pref_callback); --#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) -+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) || defined(OS_BSD) #if defined(OS_POSIX) pref_change_registrar_.Add(prefs::kNtlmV2Enabled, auth_pref_callback); -@@ -402,10 +402,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe - registry->RegisterStringPref(prefs::kAuthServerWhitelist, std::string()); - registry->RegisterStringPref(prefs::kAuthNegotiateDelegateWhitelist, +@@ -406,10 +406,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe + registry->RegisterStringPref(prefs::kAuthServerAllowlist, std::string()); + registry->RegisterStringPref(prefs::kAuthNegotiateDelegateAllowlist, std::string()); --#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) || defined(OS_BSD) registry->RegisterBooleanPref(prefs::kAuthNegotiateDelegateByKdcPolicy, false); --#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) -+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) || defined(OS_BSD) #if defined(OS_POSIX) registry->RegisterBooleanPref( -@@ -490,7 +490,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea +@@ -492,7 +492,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea // NetworkContext is created, but before anything has the chance to use it. stub_resolver_config_reader_.UpdateNetworkService(true /* record_metrics */); -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) ++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) || defined(OS_BSD) const base::CommandLine& command_line = *base::CommandLine::ForCurrentProcess(); diff --git a/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc b/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc index 413ef580529e..bd2c3b45ccba 100644 --- a/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc +++ b/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc @@ -1,24 +1,15 @@ ---- chrome/browser/notifications/notification_display_service_impl.cc.orig 2020-05-13 18:40:22 UTC +--- chrome/browser/notifications/notification_display_service_impl.cc.orig 2020-11-13 06:36:37 UTC +++ chrome/browser/notifications/notification_display_service_impl.cc -@@ -36,7 +36,7 @@ - #include "chrome/browser/notifications/notification_platform_bridge_message_center.h" +@@ -29,7 +29,7 @@ + #include "chrome/browser/extensions/api/notifications/extension_notification_handler.h" #endif --#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) || \ + defined(OS_WIN) #include "chrome/browser/send_tab_to_self/desktop_notification_handler.h" - #endif - -@@ -49,7 +49,7 @@ namespace { - - #if !defined(OS_CHROMEOS) - bool NativeNotificationsEnabled(Profile* profile) { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - if (profile) { - PrefService* prefs = profile->GetPrefs(); - if (!prefs->GetBoolean(prefs::kAllowNativeNotifications)) -@@ -131,7 +131,7 @@ NotificationDisplayServiceImpl* NotificationDisplaySer + #include "chrome/browser/sharing/sharing_notification_handler.h" +@@ -57,7 +57,7 @@ NotificationDisplayServiceImpl* NotificationDisplaySer // static void NotificationDisplayServiceImpl::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { @@ -27,12 +18,12 @@ registry->RegisterBooleanPref(prefs::kAllowNativeNotifications, true); #endif } -@@ -148,7 +148,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer +@@ -72,7 +72,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer AddNotificationHandler(NotificationHandler::Type::WEB_PERSISTENT, std::make_unique<PersistentNotificationHandler>()); --#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) || \ + defined(OS_WIN) AddNotificationHandler( NotificationHandler::Type::SEND_TAB_TO_SELF, - std::make_unique<send_tab_to_self::DesktopNotificationHandler>( diff --git a/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc b/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc index 481088dd59a3..ff640ce7d221 100644 --- a/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc +++ b/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2020-07-07 21:58:13 UTC +--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2020-11-13 06:36:37 UTC +++ chrome/browser/password_manager/chrome_password_manager_client.cc -@@ -92,7 +92,11 @@ +@@ -98,7 +98,11 @@ #include "net/base/url_util.h" #include "net/cert/cert_status_flags.h" #include "services/metrics/public/cpp/ukm_recorder.h" 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 4489325c6ff8..1c56fbbb06f3 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,9 +1,9 @@ ---- chrome/browser/password_manager/password_store_factory.cc.orig 2020-07-07 21:58:13 UTC +--- chrome/browser/password_manager/password_store_factory.cc.orig 2020-11-13 06:36:37 UTC +++ chrome/browser/password_manager/password_store_factory.cc -@@ -189,7 +189,7 @@ PasswordStoreFactory::BuildServiceInstanceFor( - base::TimeDelta::FromSeconds(20)); +@@ -188,7 +188,7 @@ PasswordStoreFactory::BuildServiceInstanceFor( + network_context_getter); - #if defined(OS_WIN) || defined(OS_MACOSX) || \ + #if defined(OS_WIN) || defined(OS_MAC) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) std::unique_ptr<password_manager::PasswordStoreSigninNotifier> notifier = 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 ad1ebe848aa1..b34557dd2b0d 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,11 +1,11 @@ ---- chrome/browser/pdf/pdf_extension_test.cc.orig 2020-07-13 09:21:17 UTC +--- chrome/browser/pdf/pdf_extension_test.cc.orig 2020-11-13 06:36:37 UTC +++ chrome/browser/pdf/pdf_extension_test.cc -@@ -1796,7 +1796,7 @@ class PDFExtensionClipboardTest : public PDFExtensionT - - // Checks the Linux selection clipboard by polling. - void CheckSelectionClipboard(const std::string& expected) { +@@ -2159,7 +2159,7 @@ class PDFExtensionClipboardTest : public PDFExtensionT + // Runs `action` and checks the Linux selection clipboard contains `expected`. + void DoActionAndCheckSelectionClipboard(base::OnceClosure action, + const std::string& expected) { -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - CheckClipboard(ui::ClipboardBuffer::kSelection, expected); - #endif - } + DoActionAndCheckClipboard(std::move(action), + ui::ClipboardBuffer::kSelection, expected); + #else diff --git a/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__history.cc b/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__history.cc index ab6ee6caf224..e8223a8b41ea 100644 --- a/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__history.cc +++ b/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__history.cc @@ -1,38 +1,38 @@ ---- chrome/browser/performance_monitor/process_metrics_history.cc.orig 2020-07-07 21:57:32 UTC +--- chrome/browser/performance_monitor/process_metrics_history.cc.orig 2020-11-13 06:36:37 UTC +++ chrome/browser/performance_monitor/process_metrics_history.cc @@ -47,7 +47,7 @@ void ProcessMetricsHistory::SampleMetrics() { #if defined(OS_WIN) disk_usage_ = process_metrics_->GetDiskUsageBytesPerSecond(); #endif --#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) -+#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) || 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_AIX) idle_wakeups_ = process_metrics_->GetIdleWakeupsPerSecond(); #endif - #if defined(OS_MACOSX) -@@ -90,7 +90,7 @@ void ProcessMetricsHistory::UpdateHistograms() { +@@ -91,7 +91,7 @@ void ProcessMetricsHistory::UpdateHistograms() { kDiskUsageHistogramMin, kDiskUsageHistogramMax, kDiskUsageHistogramBucketCount); #endif --#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) -+#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) || 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_AIX) UMA_HISTOGRAM_COUNTS_10000( "PerformanceMonitor.IdleWakeups.BrowserProcess", idle_wakeups_); - #endif -@@ -111,7 +111,7 @@ void ProcessMetricsHistory::UpdateHistograms() { +@@ -113,7 +113,7 @@ void ProcessMetricsHistory::UpdateHistograms() { UMA_HISTOGRAM_BOOLEAN("PerformanceMonitor.HighCPU.RendererProcess", true); } --#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) -+#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) || 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_AIX) UMA_HISTOGRAM_COUNTS_10000( "PerformanceMonitor.IdleWakeups.RendererProcess", idle_wakeups_); - #endif -@@ -131,7 +131,7 @@ void ProcessMetricsHistory::UpdateHistograms() { +@@ -134,7 +134,7 @@ void ProcessMetricsHistory::UpdateHistograms() { kHistogramBucketCount); if (cpu_usage_ > kHighCPUUtilizationThreshold) UMA_HISTOGRAM_BOOLEAN("PerformanceMonitor.HighCPU.GPUProcess", true); --#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) -+#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) || 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_AIX) UMA_HISTOGRAM_COUNTS_10000("PerformanceMonitor.IdleWakeups.GPUProcess", idle_wakeups_); - #endif diff --git a/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__history.h b/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__history.h index c3cf5a42e12b..da3196ef2c61 100644 --- a/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__history.h +++ b/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__history.h @@ -1,11 +1,11 @@ ---- chrome/browser/performance_monitor/process_metrics_history.h.orig 2020-07-07 21:57:32 UTC +--- chrome/browser/performance_monitor/process_metrics_history.h.orig 2020-11-13 06:36:37 UTC +++ chrome/browser/performance_monitor/process_metrics_history.h @@ -71,7 +71,7 @@ class ProcessMetricsHistory { uint64_t disk_usage_ = 0; #endif --#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) -+#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) || 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_AIX) int idle_wakeups_ = 0; #endif - #if defined(OS_MACOSX) diff --git a/www/chromium/files/patch-chrome_browser_plugins_plugin__info__host__impl.cc b/www/chromium/files/patch-chrome_browser_plugins_plugin__info__host__impl.cc index c45a5b0d8d92..4665a7ee3008 100644 --- a/www/chromium/files/patch-chrome_browser_plugins_plugin__info__host__impl.cc +++ b/www/chromium/files/patch-chrome_browser_plugins_plugin__info__host__impl.cc @@ -1,11 +1,11 @@ ---- chrome/browser/plugins/plugin_info_host_impl.cc.orig 2020-02-03 21:52:40 UTC +--- chrome/browser/plugins/plugin_info_host_impl.cc.orig 2020-11-13 06:36:37 UTC +++ chrome/browser/plugins/plugin_info_host_impl.cc @@ -382,7 +382,7 @@ void PluginInfoHostImpl::ComponentPluginLookupDone( std::unique_ptr<component_updater::ComponentInfo> cus_plugin_info) { if (cus_plugin_info) { output->status = chrome::mojom::PluginStatus::kComponentUpdateRequired; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) if (cus_plugin_info->version != base::Version("0")) { output->status = chrome::mojom::PluginStatus::kRestartRequired; } diff --git a/www/chromium/files/patch-chrome_browser_plugins_plugins__resource__service.cc b/www/chromium/files/patch-chrome_browser_plugins_plugins__resource__service.cc index 35342997a152..f29fc42d052d 100644 --- a/www/chromium/files/patch-chrome_browser_plugins_plugins__resource__service.cc +++ b/www/chromium/files/patch-chrome_browser_plugins_plugins__resource__service.cc @@ -1,4 +1,4 @@ ---- chrome/browser/plugins/plugins_resource_service.cc.orig 2020-02-03 21:52:40 UTC +--- chrome/browser/plugins/plugins_resource_service.cc.orig 2020-11-13 06:36:37 UTC +++ chrome/browser/plugins/plugins_resource_service.cc @@ -62,7 +62,7 @@ GURL GetPluginsServerURL() { filename = "plugins_win.json"; @@ -7,5 +7,5 @@ -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) filename = "plugins_linux.json"; - #elif defined(OS_MACOSX) + #elif defined(OS_MAC) filename = "plugins_mac.json"; diff --git a/www/chromium/files/patch-chrome_browser_policy_browser__signin__policy__handler.cc b/www/chromium/files/patch-chrome_browser_policy_browser__signin__policy__handler.cc index 9f19ccc8e9f4..e45bc256af17 100644 --- a/www/chromium/files/patch-chrome_browser_policy_browser__signin__policy__handler.cc +++ b/www/chromium/files/patch-chrome_browser_policy_browser__signin__policy__handler.cc @@ -1,11 +1,11 @@ ---- chrome/browser/policy/browser_signin_policy_handler.cc.orig 2020-05-13 18:39:38 UTC +--- chrome/browser/policy/browser_signin_policy_handler.cc.orig 2020-11-13 06:36:37 UTC +++ chrome/browser/policy/browser_signin_policy_handler.cc @@ -52,7 +52,7 @@ void BrowserSigninPolicyHandler::ApplyPolicySettings(c } switch (static_cast<BrowserSigninMode>(int_value)) { case BrowserSigninMode::kForced: --#if !defined(OS_LINUX) -+#if !defined(OS_LINUX) && !defined(OS_BSD) +-#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_BSD) prefs->SetValue(prefs::kForceBrowserSignin, base::Value(true)); #endif FALLTHROUGH; diff --git a/www/chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc b/www/chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc new file mode 100644 index 000000000000..de246c17fb79 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc @@ -0,0 +1,23 @@ +--- chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc.orig 2020-11-16 14:21:44 UTC ++++ chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc +@@ -43,9 +43,9 @@ + #include "chrome/browser/policy/browser_dm_token_storage_mac.h" + #endif // defined(OS_MAC) + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + #include "chrome/browser/policy/browser_dm_token_storage_linux.h" +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + #if defined(OS_WIN) + #include "chrome/browser/policy/browser_dm_token_storage_win.h" +@@ -176,7 +176,7 @@ void ChromeBrowserCloudManagementControllerDesktop:: + + #if defined(OS_MAC) + storage_delegate = std::make_unique<BrowserDMTokenStorageMac>(); +-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) ++#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + storage_delegate = std::make_unique<BrowserDMTokenStorageLinux>(); + #elif defined(OS_WIN) + storage_delegate = std::make_unique<BrowserDMTokenStorageWin>(); 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 1a57e52ccde7..0715ada218cc 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,20 +1,20 @@ ---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2020-07-07 21:58:13 UTC +--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2020-11-13 06:36:37 UTC +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -1193,11 +1193,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1248,11 +1248,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, - #endif // !defined(OS_MACOSX) && !defined(OS_CHROMEOS) + #endif // !defined(OS_MAC) && !defined(OS_CHROMEOS) --#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) || defined(OS_BSD) { key::kAuthNegotiateDelegateByKdcPolicy, prefs::kAuthNegotiateDelegateByKdcPolicy, base::Value::Type::BOOLEAN }, --#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) -+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) || defined(OS_BSD) - #if !defined(OS_MACOSX) + #if !defined(OS_MAC) { key::kFullscreenAllowed, -@@ -1265,11 +1265,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1302,11 +1302,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // BUILDFLAG(ENABLE_SPELLCHECK) @@ -26,5 +26,5 @@ -#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) +#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - #if defined(OS_CHROMEOS) - { key::kRequiredClientCertificateForUser, + { key::kScrollToTextFragmentEnabled, + prefs::kScrollToTextFragmentEnabled, diff --git a/www/chromium/files/patch-chrome_browser_policy_device__management__service__configuration.cc b/www/chromium/files/patch-chrome_browser_policy_device__management__service__configuration.cc new file mode 100644 index 000000000000..39960e2ed591 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_policy_device__management__service__configuration.cc @@ -0,0 +1,20 @@ +--- chrome/browser/policy/device_management_service_configuration.cc.orig 2020-11-16 14:22:12 UTC ++++ chrome/browser/policy/device_management_service_configuration.cc +@@ -18,7 +18,7 @@ + #endif + + #if defined(OS_WIN) || defined(OS_MAC) || \ +- ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(OS_ANDROID)) ++ ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(OS_ANDROID)) || defined(OS_BSD) + #include "chrome/browser/enterprise/connectors/common.h" + #include "chrome/browser/enterprise/connectors/connectors_manager.h" + #endif +@@ -86,7 +86,7 @@ std::string DeviceManagementServiceConfiguration::GetR + std::string + DeviceManagementServiceConfiguration::GetReportingConnectorServerUrl() { + #if defined(OS_WIN) || defined(OS_MAC) || \ +- ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(OS_ANDROID)) ++ ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(OS_ANDROID)) || defined(OS_BSD) + auto settings = + enterprise_connectors::ConnectorsManager::GetInstance() + ->GetReportingSettings( 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 bef24c9e0321..a13aef2a4f6a 100644 --- a/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc +++ b/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc @@ -1,18 +1,18 @@ ---- chrome/browser/prefs/browser_prefs.cc.orig 2020-07-07 21:58:13 UTC +--- chrome/browser/prefs/browser_prefs.cc.orig 2020-11-13 06:36:37 UTC +++ chrome/browser/prefs/browser_prefs.cc -@@ -380,7 +380,7 @@ +@@ -379,7 +379,7 @@ #endif - #if defined(OS_WIN) || defined(OS_MACOSX) || \ + #if defined(OS_WIN) || defined(OS_MAC) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" #endif -@@ -1075,7 +1075,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync +@@ -976,7 +976,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync #endif - #if defined(OS_WIN) || defined(OS_MACOSX) || \ + #if defined(OS_WIN) || defined(OS_MAC) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) browser_switcher::BrowserSwitcherPrefs::RegisterProfilePrefs(registry); diff --git a/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__whitelist.cc b/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc index e394a24d2267..313bbc7a2f2d 100644 --- a/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__whitelist.cc +++ b/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc @@ -1,11 +1,11 @@ ---- chrome/browser/prefs/pref_service_incognito_whitelist.cc.orig 2020-05-13 18:39:38 UTC -+++ chrome/browser/prefs/pref_service_incognito_whitelist.cc -@@ -133,7 +133,7 @@ const char* const kPersistentPrefNames[] = { +--- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2020-11-13 06:36:37 UTC ++++ chrome/browser/prefs/pref_service_incognito_allowlist.cc +@@ -135,7 +135,7 @@ const char* const kPersistentPrefNames[] = { prefs::kShowFullscreenToolbar, #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) ++#if defined(OS_BSD) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) // Toggleing custom frames affects all open windows in the profile, hence // should be written to the regular profile when changed in incognito mode. prefs::kUseCustomChromeFrame, diff --git a/www/chromium/files/patch-chrome_browser_printing_print__job__worker.cc b/www/chromium/files/patch-chrome_browser_printing_print__job__worker.cc new file mode 100644 index 000000000000..2c60efb1bd28 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_printing_print__job__worker.cc @@ -0,0 +1,20 @@ +--- chrome/browser/printing/print_job_worker.cc.orig 2020-11-16 14:22:42 UTC ++++ chrome/browser/printing/print_job_worker.cc +@@ -223,7 +223,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) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_CUPS) && !defined(OS_CHROMEOS) + PrinterBasicInfo basic_info; + if (print_backend->GetPrinterBasicInfo(printer_name, &basic_info)) { + base::Value advanced_settings(base::Value::Type::DICTIONARY); +@@ -233,7 +233,7 @@ void PrintJobWorker::UpdatePrintSettings(base::Value n + new_settings.SetKey(kSettingAdvancedSettings, + std::move(advanced_settings)); + } +-#endif // defined(OS_LINUX) && defined(USE_CUPS) && !defined(OS_CHROMEOS) ++#endif // (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_CUPS) && !defined(OS_CHROMEOS) + } + + PrintingContext::Result result; diff --git a/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc b/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc index f8a7db8e85a3..685ecb00646f 100644 --- a/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc +++ b/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc @@ -1,11 +1,11 @@ ---- chrome/browser/process_singleton_posix.cc.orig 2019-10-21 19:06:22 UTC +--- chrome/browser/process_singleton_posix.cc.orig 2020-11-13 06:36:37 UTC +++ chrome/browser/process_singleton_posix.cc -@@ -95,11 +95,11 @@ +@@ -94,11 +94,11 @@ #include "net/base/network_interfaces.h" #include "ui/base/l10n/l10n_util.h" --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "chrome/browser/ui/process_singleton_dialog_linux.h" #endif @@ -14,16 +14,16 @@ #include "ui/views/linux_ui/linux_ui.h" #endif -@@ -296,7 +296,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo +@@ -295,7 +295,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo if (g_disable_prompt) return g_user_opted_unlock_in_use_profile; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) base::string16 relaunch_button_text = l10n_util::GetStringUTF16( IDS_PROFILE_IN_USE_LINUX_RELAUNCH); return ShowProcessSingletonDialog(error, relaunch_button_text); -@@ -872,7 +872,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::Notif +@@ -871,7 +871,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::Notif SendRemoteProcessInteractionResultHistogram(REMOTE_PROCESS_SHUTTING_DOWN); return PROCESS_NONE; } else if (strncmp(buf, kACKToken, base::size(kACKToken) - 1) == 0) { 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 ecef81b85a8f..2ceb167d42ff 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,9 +1,9 @@ ---- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2020-07-07 21:58:13 UTC +--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2020-11-13 06:36:37 UTC +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -301,7 +301,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -304,7 +304,7 @@ void ChromeBrowserMainExtraPartsProfiles:: media_router::MediaRouterUIServiceFactory::GetInstance(); #endif - #if defined(OS_WIN) || defined(OS_MACOSX) || \ + #if defined(OS_WIN) || defined(OS_MAC) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance(); 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 081583a855ac..7da8fb14299f 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,11 +1,11 @@ ---- chrome/browser/profiles/profile_attributes_entry.cc.orig 2020-07-07 21:58:13 UTC +--- chrome/browser/profiles/profile_attributes_entry.cc.orig 2020-11-13 06:36:37 UTC +++ chrome/browser/profiles/profile_attributes_entry.cc -@@ -136,7 +136,7 @@ void ProfileAttributesEntry::Initialize(ProfileInfoCac +@@ -166,7 +166,7 @@ void ProfileAttributesEntry::Initialize(ProfileInfoCac if (is_force_signin_enabled_) { if (!IsAuthenticated()) is_force_signin_profile_locked_ = true; --#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_WIN) -+#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_WIN) || 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) } else if (IsSigninRequired()) { // Profiles that require signin in the absence of an enterprise policy are - // left-overs from legacy supervised users. Just unlock them, so users can 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 418a29f77142..682cd5b87417 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,29 +1,11 @@ ---- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig 2020-07-07 21:58:13 UTC +--- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig 2020-11-13 06:36:37 UTC +++ chrome/browser/renderer_context_menu/render_view_context_menu.cc -@@ -1700,7 +1700,7 @@ void RenderViewContextMenu::AppendEditableItems() { - // 'Undo' and 'Redo' for text input with no suggestions and no text selected. - // We make an exception for OS X as context clicking will select the closest - // word. In this case both items are always shown. --#if defined(OS_MACOSX) -+#if defined(OS_MACOSX) || defined(OS_BSD) - menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_UNDO, - IDS_CONTENT_CONTEXT_UNDO); - menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_REDO, -@@ -1742,7 +1742,7 @@ void RenderViewContextMenu::AppendLanguageSettings() { - if (!use_spelling) - return; - --#if defined(OS_MACOSX) -+#if defined(OS_MACOSX) || defined(OS_BSD) - menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_LANGUAGE_SETTINGS, - IDS_CONTENT_CONTEXT_LANGUAGE_SETTINGS); - #else -@@ -2083,7 +2083,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) +@@ -2077,7 +2077,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) case IDC_CHECK_SPELLING_WHILE_TYPING: return prefs->GetBoolean(spellcheck::prefs::kSpellCheckEnable); --#if !defined(OS_MACOSX) && defined(OS_POSIX) -+#if !defined(OS_MACOSX) && !defined(OS_BSD) && defined(OS_POSIX) +-#if !defined(OS_MAC) && defined(OS_POSIX) ++#if !defined(OS_MAC) && !defined(OS_BSD) && defined(OS_POSIX) // TODO(suzhe): this should not be enabled for password fields. case IDC_INPUT_METHODS_MENU: return true; 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 db4c5e81a31d..cff0cfde0031 100644 --- a/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc +++ b/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc @@ -1,6 +1,6 @@ ---- chrome/browser/renderer_preferences_util.cc.orig 2020-03-16 18:40:29 UTC +--- chrome/browser/renderer_preferences_util.cc.orig 2020-11-13 06:36:37 UTC +++ chrome/browser/renderer_preferences_util.cc -@@ -31,7 +31,7 @@ +@@ -34,7 +34,7 @@ #include "ui/base/cocoa/defaults_utils.h" #endif @@ -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" -@@ -146,7 +146,7 @@ void UpdateFromSystemSettings(blink::mojom::RendererPr +@@ -164,7 +164,7 @@ void UpdateFromSystemSettings(blink::mojom::RendererPr prefs->caret_blink_interval = interval; #endif @@ -18,12 +18,12 @@ views::LinuxUI* linux_ui = views::LinuxUI::instance(); if (linux_ui) { if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) { -@@ -165,7 +165,7 @@ void UpdateFromSystemSettings(blink::mojom::RendererPr +@@ -183,7 +183,7 @@ void UpdateFromSystemSettings(blink::mojom::RendererPr } #endif --#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_WIN) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) || \ + defined(OS_WIN) content::UpdateFontRendererPreferencesFromSystemSettings(prefs); #endif - diff --git a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.js b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.js index 41996df80f99..3ef9b11912dd 100644 --- a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.js +++ b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.js @@ -1,4 +1,4 @@ ---- chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.js.orig 2020-07-07 21:57:32 UTC +--- chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.js.orig 2020-11-13 06:36:37 UTC +++ chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.js @@ -23,7 +23,7 @@ export class AppearanceBrowserProxy { diff --git a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html index cef48947ef2d..a7551ed59495 100644 --- a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html +++ b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html @@ -1,4 +1,4 @@ ---- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2020-07-07 21:57:32 UTC +--- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2020-11-13 06:36:37 UTC +++ chrome/browser/resources/settings/appearance_page/appearance_page.html @@ -27,7 +27,7 @@ <cr-link-row class="first" hidden="[[!pageVisibility.setTheme]]" diff --git a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.js b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.js index dca6178e5ca8..3949958c61bb 100644 --- a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.js +++ b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.js @@ -1,4 +1,4 @@ ---- chrome/browser/resources/settings/appearance_page/appearance_page.js.orig 2020-07-07 21:58:14 UTC +--- chrome/browser/resources/settings/appearance_page/appearance_page.js.orig 2020-11-13 06:36:37 UTC +++ chrome/browser/resources/settings/appearance_page/appearance_page.js @@ -137,7 +137,7 @@ Polymer({ 'defaultFontSizeChanged_(prefs.webkit.webprefs.default_font_size.value)', diff --git a/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__handler__util.cc b/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__handler__util.cc index a9c4ec62beb9..15819a569eaa 100644 --- a/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__handler__util.cc +++ b/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__handler__util.cc @@ -1,4 +1,4 @@ ---- chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc.orig 2020-07-07 21:57:32 UTC +--- chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc.orig 2020-11-13 06:36:37 UTC +++ chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc @@ -8,7 +8,11 @@ diff --git a/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc b/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc index 65cf38661bf6..e6c143f662d7 100644 --- a/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc +++ b/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc @@ -1,11 +1,11 @@ ---- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig 2020-05-13 18:39:38 UTC +--- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig 2020-11-13 06:36:37 UTC +++ chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc -@@ -672,7 +672,7 @@ void IncidentReportingService::OnEnvironmentDataCollec +@@ -676,7 +676,7 @@ void IncidentReportingService::OnEnvironmentDataCollec environment_collection_pending_ = false; // Process::Current().CreationTime() is missing on some platforms. --#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) -+#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) +-#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) base::TimeDelta uptime = first_incident_time_ - base::Process::Current().CreationTime(); - environment_data->mutable_process()->set_uptime_msec(uptime.InMilliseconds()); diff --git a/www/chromium/files/patch-chrome_browser_search_search__suggest_search__suggest__service.cc b/www/chromium/files/patch-chrome_browser_search_search__suggest_search__suggest__service.cc index 82bd8f1ca4f3..56b63ca0ccf2 100644 --- a/www/chromium/files/patch-chrome_browser_search_search__suggest_search__suggest__service.cc +++ b/www/chromium/files/patch-chrome_browser_search_search__suggest_search__suggest__service.cc @@ -1,4 +1,4 @@ ---- chrome/browser/search/search_suggest/search_suggest_service.cc.orig 2020-05-13 18:39:38 UTC +--- chrome/browser/search/search_suggest/search_suggest_service.cc.orig 2020-11-13 06:36:37 UTC +++ chrome/browser/search/search_suggest/search_suggest_service.cc @@ -21,7 +21,11 @@ #include "components/prefs/scoped_user_pref_update.h" 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 f8a2b34d89f3..8f9ac3f8aa36 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,20 @@ ---- chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc.orig 2019-06-07 20:47:39 UTC +--- chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc.orig 2020-11-13 06:36:37 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" --#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) || \ + defined(OS_WIN) #include "chrome/browser/send_tab_to_self/desktop_notification_handler.h" #endif - -@@ -32,7 +32,7 @@ ReceivingUiHandlerRegistry* ReceivingUiHandlerRegistry +@@ -33,7 +33,7 @@ ReceivingUiHandlerRegistry* ReceivingUiHandlerRegistry // Instantiates all the handlers relevant to this platform. void ReceivingUiHandlerRegistry::InstantiatePlatformSpecificHandlers( Profile* profile) { --#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) || \ + defined(OS_WIN) applicable_handlers_.push_back( std::make_unique<send_tab_to_self::DesktopNotificationHandler>(profile)); - #elif defined(OS_ANDROID) 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 f2392a735ce1..1a04e8053ad5 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,11 +1,11 @@ ---- chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc.orig 2020-07-07 21:57:32 UTC +--- chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc.orig 2020-11-13 06:36:37 UTC +++ chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc @@ -40,7 +40,7 @@ void SendTabToSelfClientService::SendTabToSelfModelLoa void SendTabToSelfClientService::EntriesAddedRemotely( const std::vector<const SendTabToSelfEntry*>& new_entries) { for (const std::unique_ptr<ReceivingUiHandler>& handler : GetHandlers()) { --#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) || \ + defined(OS_WIN) // Only respond to notifications corresponding to this service's profile // for these OSes; mobile does not have a Profile. - // Cast note: on desktop, handlers are guaranteed to be the derived class diff --git a/www/chromium/files/patch-chrome_browser_sharing_shared__clipboard_feature__flags.cc b/www/chromium/files/patch-chrome_browser_sharing_shared__clipboard_feature__flags.cc index 59ab4588c52b..9db0cf762235 100644 --- 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 @@ -1,11 +1,11 @@ ---- chrome/browser/sharing/shared_clipboard/feature_flags.cc.orig 2020-07-07 21:57:32 UTC +--- chrome/browser/sharing/shared_clipboard/feature_flags.cc.orig 2020-11-13 06:36:37 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_MACOSX) || defined(OS_LINUX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) const base::Feature kRemoteCopyReceiver{"RemoteCopyReceiver", base::FEATURE_ENABLED_BY_DEFAULT}; @@ -13,6 +13,6 @@ const base::Feature kRemoteCopyProgressNotification{ "RemoteCopyProgressNotification", base::FEATURE_DISABLED_BY_DEFAULT}; --#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || +-#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 index 0a6e7dccfdeb..2be79ddd69ee 100644 --- 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 @@ -1,11 +1,11 @@ ---- chrome/browser/sharing/shared_clipboard/feature_flags.h.orig 2020-07-07 21:57:32 UTC +--- chrome/browser/sharing/shared_clipboard/feature_flags.h.orig 2020-11-13 06:36:37 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_MACOSX) || defined(OS_LINUX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) // Feature to enable handling remote copy messages. extern const base::Feature kRemoteCopyReceiver; @@ -13,8 +13,8 @@ // Feature to enable progress notifications for remote copy messages. extern const base::Feature kRemoteCopyProgressNotification; --#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || -+#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || +-#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || // defined(OS_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 dbd781ba75ac..4e65f78dc6fe 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,20 +1,11 @@ ---- chrome/browser/sharing/sharing_device_registration.cc.orig 2020-05-13 18:39:38 UTC +--- chrome/browser/sharing/sharing_device_registration.cc.orig 2020-11-13 06:36:37 UTC +++ chrome/browser/sharing/sharing_device_registration.cc -@@ -328,7 +328,7 @@ bool SharingDeviceRegistration::IsSmsFetcherSupported( +@@ -325,7 +325,7 @@ bool SharingDeviceRegistration::IsSmsFetcherSupported( } bool SharingDeviceRegistration::IsRemoteCopySupported() const { --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) return base::FeatureList::IsEnabled(kRemoteCopyReceiver); #else -@@ -337,7 +337,7 @@ bool SharingDeviceRegistration::IsRemoteCopySupported( - } - - bool SharingDeviceRegistration::IsPeerConnectionSupported() const { --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ - defined(OS_CHROMEOS) - return base::FeatureList::IsEnabled(kSharingPeerConnectionReceiver); - #else diff --git a/www/chromium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc b/www/chromium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc index a9744c4a6a8d..d0eedc032628 100644 --- a/www/chromium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc +++ b/www/chromium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc @@ -1,32 +1,32 @@ ---- chrome/browser/sharing/sharing_handler_registry_impl.cc.orig 2020-03-16 18:39:44 UTC +--- chrome/browser/sharing/sharing_handler_registry_impl.cc.orig 2020-11-13 06:36:37 UTC +++ chrome/browser/sharing/sharing_handler_registry_impl.cc -@@ -24,10 +24,10 @@ - #include "chrome/browser/sharing/webrtc/webrtc_message_handler.h" +@@ -22,10 +22,10 @@ + #include "chrome/browser/sharing/shared_clipboard/shared_clipboard_message_handler_desktop.h" #endif // defined(OS_ANDROID) --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) #include "chrome/browser/sharing/shared_clipboard/remote_copy_message_handler.h" --#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || +-#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) ++#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || // defined(OS_CHROMEOS) SharingHandlerRegistryImpl::SharingHandlerRegistryImpl( -@@ -73,14 +73,14 @@ SharingHandlerRegistryImpl::SharingHandlerRegistryImpl +@@ -70,14 +70,14 @@ SharingHandlerRegistryImpl::SharingHandlerRegistryImpl {chrome_browser_sharing::SharingMessage::kSharedClipboardMessage}); } --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) if (sharing_device_registration->IsRemoteCopySupported()) { AddSharingHandler( std::make_unique<RemoteCopyMessageHandler>(profile), {chrome_browser_sharing::SharingMessage::kRemoteCopyMessage}); } --#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || -+#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || +-#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || // defined(OS_CHROMEOS) + } - #if !defined(OS_ANDROID) diff --git a/www/chromium/files/patch-chrome_browser_sharing_sharing__service.cc b/www/chromium/files/patch-chrome_browser_sharing_sharing__service.cc deleted file mode 100644 index 4eda832bcd52..000000000000 --- a/www/chromium/files/patch-chrome_browser_sharing_sharing__service.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- chrome/browser/sharing/sharing_service.cc.orig 2020-05-13 18:40:22 UTC -+++ chrome/browser/sharing/sharing_service.cc -@@ -30,7 +30,7 @@ namespace { - SharingMessageSender::DelegateType GetSendDelegateType( - const syncer::DeviceInfo& device, - const chrome_browser_sharing::SharingMessage& message) { --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ - defined(OS_CHROMEOS) - // Messages other than SharedClipboard are always sent via FCM. - if (message.payload_case() != -@@ -59,7 +59,7 @@ SharingMessageSender::DelegateType GetSendDelegateType - #else - // Only FCM is supported for non desktop OS. - return SharingMessageSender::DelegateType::kFCM; --#endif // defined(OS_WIN) || defined(OS_MACOSX) || 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_webrtc_webrtc__flags.cc b/www/chromium/files/patch-chrome_browser_sharing_webrtc_webrtc__flags.cc deleted file mode 100644 index cfac06c08d3d..000000000000 --- a/www/chromium/files/patch-chrome_browser_sharing_webrtc_webrtc__flags.cc +++ /dev/null @@ -1,17 +0,0 @@ ---- chrome/browser/sharing/webrtc/webrtc_flags.cc.orig 2020-03-30 09:35:30 UTC -+++ chrome/browser/sharing/webrtc/webrtc_flags.cc -@@ -4,12 +4,12 @@ - - #include "chrome/browser/sharing/webrtc/webrtc_flags.h" - --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ - defined(OS_CHROMEOS) - const base::Feature kSharingPeerConnectionReceiver{ - "SharingPeerConnectionReceiver", base::FEATURE_DISABLED_BY_DEFAULT}; - - const base::Feature kSharingPeerConnectionSender{ - "SharingPeerConnectionSender", base::FEATURE_ENABLED_BY_DEFAULT}; --#endif // defined(OS_WIN) || defined(OS_MACOSX) || 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_webrtc_webrtc__flags.h b/www/chromium/files/patch-chrome_browser_sharing_webrtc_webrtc__flags.h deleted file mode 100644 index fdec699052e2..000000000000 --- a/www/chromium/files/patch-chrome_browser_sharing_webrtc_webrtc__flags.h +++ /dev/null @@ -1,19 +0,0 @@ ---- chrome/browser/sharing/webrtc/webrtc_flags.h.orig 2020-03-30 09:35:47 UTC -+++ chrome/browser/sharing/webrtc/webrtc_flags.h -@@ -8,14 +8,14 @@ - #include "base/feature_list.h" - #include "build/build_config.h" - --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ - defined(OS_CHROMEOS) - // Feature flag to enable receiving PeerConnection requests. - extern const base::Feature kSharingPeerConnectionReceiver; - - // Feature flag to enable sending SharingMessage using PeerConnection. - extern const base::Feature kSharingPeerConnectionSender; --#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || -+#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || - // defined(OS_CHROMEOS) - - #endif // CHROME_BROWSER_SHARING_WEBRTC_WEBRTC_FLAGS_H_ diff --git a/www/chromium/files/patch-chrome_browser_signin_signin__util.cc b/www/chromium/files/patch-chrome_browser_signin_signin__util.cc index 4c230f4f53f2..91f46393f627 100644 --- a/www/chromium/files/patch-chrome_browser_signin_signin__util.cc +++ b/www/chromium/files/patch-chrome_browser_signin_signin__util.cc @@ -1,11 +1,11 @@ ---- chrome/browser/signin/signin_util.cc.orig 2019-12-16 21:50:43 UTC +--- chrome/browser/signin/signin_util.cc.orig 2020-11-13 06:36:37 UTC +++ chrome/browser/signin/signin_util.cc @@ -34,7 +34,7 @@ #include "google_apis/gaia/gaia_auth_util.h" #include "ui/base/l10n/l10n_util.h" --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ + defined(OS_MAC) #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_list.h" - #include "chrome/browser/ui/browser_list_observer.h" diff --git a/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc b/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc index d7938b671069..25b558a9f5ac 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,20 +1,20 @@ ---- chrome/browser/sync/chrome_sync_client.cc.orig 2020-07-07 21:58:14 UTC +--- chrome/browser/sync/chrome_sync_client.cc.orig 2020-11-13 06:36:37 UTC +++ chrome/browser/sync/chrome_sync_client.cc -@@ -450,7 +450,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy +@@ -458,7 +458,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy // Chrome prefers OS provided spell checkers where they exist. So only sync the // custom dictionary on platforms that typically don't provide one. --#if defined(OS_LINUX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_BSD) // Dictionary sync is enabled by default. - if (!disabled_types.Has(syncer::DICTIONARY)) { - controllers.push_back( -@@ -458,7 +458,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy + if (!disabled_types.Has(syncer::DICTIONARY) && + GetPrefService()->GetBoolean(spellcheck::prefs::kSpellCheckEnable)) { +@@ -467,7 +467,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy syncer::DICTIONARY, model_type_store_factory, GetSyncableServiceForType(syncer::DICTIONARY), dump_stack)); } --#endif // defined(OS_LINUX) || defined(OS_WIN) -+#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_BSD) #if defined(OS_CHROMEOS) if (arc::IsArcAllowedForProfile(profile_) && diff --git a/www/chromium/files/patch-chrome_browser_sync_test_integration_single__client__wallet__sync__test.cc b/www/chromium/files/patch-chrome_browser_sync_test_integration_single__client__wallet__sync__test.cc deleted file mode 100644 index 834f4d92f514..000000000000 --- a/www/chromium/files/patch-chrome_browser_sync_test_integration_single__client__wallet__sync__test.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/sync/test/integration/single_client_wallet_sync_test.cc.orig 2020-07-13 09:22:37 UTC -+++ chrome/browser/sync/test/integration/single_client_wallet_sync_test.cc -@@ -814,7 +814,7 @@ IN_PROC_BROWSER_TEST_F(SingleClientWalletSyncTest, Cha - IN_PROC_BROWSER_TEST_F(SingleClientWalletSyncTest, - SameUpdatesAreIgnoredWhenLocalCardsUnmasked) { - // We need to allow storing full server cards for this test to work properly. --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - base::CommandLine::ForCurrentProcess()->AppendSwitch( - autofill::switches::kEnableOfferStoreUnmaskedWalletCards); - #endif 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 1e077a7ff46c..7be6220182e7 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,56 +1,56 @@ ---- chrome/browser/task_manager/sampling/task_group.cc.orig 2019-09-09 21:55:10 UTC +--- chrome/browser/task_manager/sampling/task_group.cc.orig 2020-11-13 06:36:37 UTC +++ chrome/browser/task_manager/sampling/task_group.cc -@@ -33,9 +33,9 @@ const int kBackgroundRefreshTypesMask = +@@ -32,9 +32,9 @@ const int kBackgroundRefreshTypesMask = #if defined(OS_WIN) REFRESH_TYPE_START_TIME | REFRESH_TYPE_CPU_TIME | #endif // defined(OS_WIN) --#if defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) REFRESH_TYPE_FD_COUNT | --#endif // defined(OS_LINUX) || defined(OS_MACOSX) -+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) #if BUILDFLAG(ENABLE_NACL) REFRESH_TYPE_NACL | #endif // BUILDFLAG(ENABLE_NACL) -@@ -114,9 +114,9 @@ TaskGroup::TaskGroup( +@@ -113,9 +113,9 @@ TaskGroup::TaskGroup( #if BUILDFLAG(ENABLE_NACL) nacl_debug_stub_port_(nacl::kGdbDebugStubPortUnknown), #endif // BUILDFLAG(ENABLE_NACL) --#if defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) open_fd_count_(-1), --#endif // defined(OS_LINUX) || defined(OS_MACOSX) -+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) idle_wakeups_per_second_(-1), gpu_memory_has_duplicates_(false), is_backgrounded_(false) { -@@ -129,10 +129,10 @@ TaskGroup::TaskGroup( - weak_ptr_factory_.GetWeakPtr()), - base::Bind(&TaskGroup::OnIdleWakeupsRefreshDone, - weak_ptr_factory_.GetWeakPtr()), --#if defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) - base::Bind(&TaskGroup::OnOpenFdCountRefreshDone, - weak_ptr_factory_.GetWeakPtr()), --#endif // defined(OS_LINUX) || defined(OS_MACOSX) -+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) - base::Bind(&TaskGroup::OnProcessPriorityDone, - weak_ptr_factory_.GetWeakPtr())); +@@ -128,10 +128,10 @@ TaskGroup::TaskGroup( + weak_ptr_factory_.GetWeakPtr()), + base::BindRepeating(&TaskGroup::OnIdleWakeupsRefreshDone, + weak_ptr_factory_.GetWeakPtr()), +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) + base::BindRepeating(&TaskGroup::OnOpenFdCountRefreshDone, + weak_ptr_factory_.GetWeakPtr()), +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) + base::BindRepeating(&TaskGroup::OnProcessPriorityDone, + weak_ptr_factory_.GetWeakPtr())); -@@ -300,14 +300,14 @@ void TaskGroup::OnRefreshNaClDebugStubPortDone(int nac +@@ -299,14 +299,14 @@ void TaskGroup::OnRefreshNaClDebugStubPortDone(int nac } #endif // BUILDFLAG(ENABLE_NACL) --#if defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) void TaskGroup::OnOpenFdCountRefreshDone(int open_fd_count) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); open_fd_count_ = open_fd_count; OnBackgroundRefreshTypeFinished(REFRESH_TYPE_FD_COUNT); } --#endif // defined(OS_LINUX) || defined(OS_MACOSX) -+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) void TaskGroup::OnCpuRefreshDone(double cpu_usage) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h index 3b055c6018f5..4a6df838317f 100644 --- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h +++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h @@ -1,11 +1,11 @@ ---- chrome/browser/task_manager/sampling/task_group.h.orig 2019-10-21 19:06:23 UTC +--- chrome/browser/task_manager/sampling/task_group.h.orig 2020-11-13 06:36:37 UTC +++ chrome/browser/task_manager/sampling/task_group.h @@ -39,7 +39,7 @@ constexpr int kUnsupportedVMRefreshFlags = REFRESH_TYPE_WEBCACHE_STATS | REFRESH_TYPE_NETWORK_USAGE | REFRESH_TYPE_NACL | REFRESH_TYPE_IDLE_WAKEUPS | REFRESH_TYPE_HANDLES | REFRESH_TYPE_START_TIME | REFRESH_TYPE_CPU_TIME | REFRESH_TYPE_PRIORITY | --#if defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) REFRESH_TYPE_FD_COUNT | #endif REFRESH_TYPE_HARD_FAULTS; @@ -13,11 +13,11 @@ int nacl_debug_stub_port() const { return nacl_debug_stub_port_; } #endif // BUILDFLAG(ENABLE_NACL) --#if defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) int open_fd_count() const { return open_fd_count_; } --#endif // defined(OS_LINUX) || defined(OS_MACOSX) -+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#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_; } @@ -25,11 +25,11 @@ void RefreshNaClDebugStubPort(int child_process_unique_id); void OnRefreshNaClDebugStubPortDone(int port); #endif --#if defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) void OnOpenFdCountRefreshDone(int open_fd_count); --#endif // defined(OS_LINUX) || defined(OS_MACOSX) -+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) void OnCpuRefreshDone(double cpu_usage); void OnSwappedMemRefreshDone(int64_t swapped_mem_bytes); @@ -37,12 +37,12 @@ #if BUILDFLAG(ENABLE_NACL) int nacl_debug_stub_port_; #endif // BUILDFLAG(ENABLE_NACL) --#if defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) // The number of file descriptors currently open by the process. int open_fd_count_; --#endif // defined(OS_LINUX) || defined(OS_MACOSX) -+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#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_; bool gpu_memory_has_duplicates_; bool is_backgrounded_; diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc index 0727f82f22b9..144111528150 100644 --- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc +++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc @@ -1,14 +1,14 @@ ---- chrome/browser/task_manager/sampling/task_group_sampler.cc.orig 2020-03-16 18:39:45 UTC +--- chrome/browser/task_manager/sampling/task_group_sampler.cc.orig 2020-11-13 06:36:37 UTC +++ chrome/browser/task_manager/sampling/task_group_sampler.cc @@ -43,9 +43,9 @@ TaskGroupSampler::TaskGroupSampler( const OnCpuRefreshCallback& on_cpu_refresh, const OnSwappedMemRefreshCallback& on_swapped_mem_refresh, const OnIdleWakeupsCallback& on_idle_wakeups, --#if defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) const OnOpenFdCountCallback& on_open_fd_count, --#endif // defined(OS_LINUX) || defined(OS_MACOSX) -+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) const OnProcessPriorityCallback& on_process_priority) : process_(std::move(process)), process_metrics_(CreateProcessMetrics(process_.Handle())), @@ -16,11 +16,11 @@ on_cpu_refresh_callback_(on_cpu_refresh), on_swapped_mem_refresh_callback_(on_swapped_mem_refresh), on_idle_wakeups_callback_(on_idle_wakeups), --#if defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) on_open_fd_count_callback_(on_open_fd_count), --#endif // defined(OS_LINUX) || defined(OS_MACOSX) -+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) on_process_priority_callback_(on_process_priority) { DCHECK(blocking_pool_runner.get()); @@ -28,8 +28,8 @@ base::BindOnce(on_swapped_mem_refresh_callback_)); } --#if defined(OS_MACOSX) || defined(OS_LINUX) -+#if defined(OS_MACOSX) || defined(OS_LINUX) || 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) if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_IDLE_WAKEUPS, refresh_flags)) { base::PostTaskAndReplyWithResult( @@ -37,11 +37,11 @@ base::BindOnce(&TaskGroupSampler::RefreshIdleWakeupsPerSecond, this), base::BindOnce(on_idle_wakeups_callback_)); } --#endif // defined(OS_MACOSX) || defined(OS_LINUX) -+#endif // defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) --#if defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_FD_COUNT, refresh_flags)) { base::PostTaskAndReplyWithResult( @@ -49,8 +49,8 @@ base::BindOnce(&TaskGroupSampler::RefreshOpenFdCount, this), base::BindOnce(on_open_fd_count_callback_)); } --#endif // defined(OS_LINUX) || defined(OS_MACOSX) -+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_PRIORITY, refresh_flags)) { @@ -58,15 +58,15 @@ return process_metrics_->GetIdleWakeupsPerSecond(); } --#if defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) int TaskGroupSampler::RefreshOpenFdCount() { DCHECK(worker_pool_sequenced_checker_.CalledOnValidSequence()); return process_metrics_->GetOpenFdCount(); } --#endif // defined(OS_LINUX) || defined(OS_MACOSX) -+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) bool TaskGroupSampler::RefreshProcessPriority() { DCHECK(worker_pool_sequenced_checker_.CalledOnValidSequence()); diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h index ee309764291e..65c55ccfc48c 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,26 +1,26 @@ ---- chrome/browser/task_manager/sampling/task_group_sampler.h.orig 2019-06-04 18:55:18 UTC +--- chrome/browser/task_manager/sampling/task_group_sampler.h.orig 2020-11-13 06:36:37 UTC +++ chrome/browser/task_manager/sampling/task_group_sampler.h @@ -32,9 +32,9 @@ class TaskGroupSampler : public base::RefCountedThread - using OnCpuRefreshCallback = base::Callback<void(double)>; - using OnSwappedMemRefreshCallback = base::Callback<void(int64_t)>; - using OnIdleWakeupsCallback = base::Callback<void(int)>; --#if defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) - using OnOpenFdCountCallback = base::Callback<void(int)>; --#endif // defined(OS_LINUX) || defined(OS_MACOSX) -+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) - using OnProcessPriorityCallback = base::Callback<void(bool)>; + using OnCpuRefreshCallback = base::RepeatingCallback<void(double)>; + using OnSwappedMemRefreshCallback = base::RepeatingCallback<void(int64_t)>; + using OnIdleWakeupsCallback = base::RepeatingCallback<void(int)>; +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) + using OnOpenFdCountCallback = base::RepeatingCallback<void(int)>; +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) + using OnProcessPriorityCallback = base::RepeatingCallback<void(bool)>; TaskGroupSampler( @@ -43,9 +43,9 @@ class TaskGroupSampler : public base::RefCountedThread const OnCpuRefreshCallback& on_cpu_refresh, const OnSwappedMemRefreshCallback& on_memory_refresh, const OnIdleWakeupsCallback& on_idle_wakeups, --#if defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) const OnOpenFdCountCallback& on_open_fd_count, --#endif // defined(OS_LINUX) || defined(OS_MACOSX) -+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) ++#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 @@ -28,11 +28,11 @@ double RefreshCpuUsage(); int64_t RefreshSwappedMem(); int RefreshIdleWakeupsPerSecond(); --#if defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) int RefreshOpenFdCount(); --#endif // defined(OS_LINUX) || defined(OS_MACOSX) -+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) bool RefreshProcessPriority(); // The process that holds the handle that we own so that we can use it for @@ -40,11 +40,11 @@ const OnCpuRefreshCallback on_cpu_refresh_callback_; const OnSwappedMemRefreshCallback on_swapped_mem_refresh_callback_; const OnIdleWakeupsCallback on_idle_wakeups_callback_; --#if defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) const OnOpenFdCountCallback on_open_fd_count_callback_; --#endif // defined(OS_LINUX) || defined(OS_MACOSX) -+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) const OnProcessPriorityCallback on_process_priority_callback_; // To assert we're running on the correct thread. 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 cb287277caa7..7721b4b0c510 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,16 +1,16 @@ ---- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2019-10-21 19:06:23 UTC +--- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2020-11-13 06:36:37 UTC +++ chrome/browser/task_manager/sampling/task_manager_impl.cc -@@ -219,11 +219,11 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id, +@@ -220,11 +220,11 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id, } int TaskManagerImpl::GetOpenFdCount(TaskId task_id) const { --#if defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) return GetTaskGroupByTaskId(task_id)->open_fd_count(); #else return -1; --#endif // defined(OS_LINUX) || defined(OS_MACOSX) -+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) } bool TaskManagerImpl::IsTaskOnBackgroundedProcess(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 ee059c93979b..2c5fac1b70f5 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,16 +1,16 @@ ---- chrome/browser/task_manager/task_manager_observer.h.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/task_manager/task_manager_observer.h.orig 2020-11-13 06:36:37 UTC +++ chrome/browser/task_manager/task_manager_observer.h @@ -43,11 +43,11 @@ enum RefreshType { // or backgrounded. REFRESH_TYPE_PRIORITY = 1 << 13, --#if defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) // For observers interested in getting the number of open file descriptors of // processes. REFRESH_TYPE_FD_COUNT = 1 << 14, --#endif // defined(OS_LINUX) || defined(OS_MACOSX) -+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) REFRESH_TYPE_KEEPALIVE_COUNT = 1 << 15, REFRESH_TYPE_MEMORY_FOOTPRINT = 1 << 16, diff --git a/www/chromium/files/patch-chrome_browser_themes_theme__service__factory.cc b/www/chromium/files/patch-chrome_browser_themes_theme__service__factory.cc index 705fc0190969..3513040b5e1f 100644 --- a/www/chromium/files/patch-chrome_browser_themes_theme__service__factory.cc +++ b/www/chromium/files/patch-chrome_browser_themes_theme__service__factory.cc @@ -1,4 +1,4 @@ ---- chrome/browser/themes/theme_service_factory.cc.orig 2020-07-07 21:57:33 UTC +--- chrome/browser/themes/theme_service_factory.cc.orig 2020-11-13 06:36:37 UTC +++ chrome/browser/themes/theme_service_factory.cc @@ -22,7 +22,7 @@ #include "chrome/browser/themes/theme_helper_win.h" diff --git a/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc b/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc index f0b784e8df46..ebf3e8cb8521 100644 --- a/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc +++ b/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc @@ -1,6 +1,6 @@ ---- chrome/browser/tracing/crash_service_uploader.cc.orig 2020-05-13 18:39:38 UTC +--- chrome/browser/tracing/crash_service_uploader.cc.orig 2020-11-13 06:36:37 UTC +++ chrome/browser/tracing/crash_service_uploader.cc -@@ -161,6 +161,8 @@ void TraceCrashServiceUploader::DoCompressOnBackground +@@ -160,6 +160,8 @@ void TraceCrashServiceUploader::DoCompressOnBackground const char product[] = "Chrome_Linux"; #elif defined(OS_ANDROID) const char product[] = "Chrome_Android"; diff --git a/www/chromium/files/patch-chrome_browser_ui_BUILD.gn b/www/chromium/files/patch-chrome_browser_ui_BUILD.gn index 017c12ccf8cc..0b814894d31e 100644 --- a/www/chromium/files/patch-chrome_browser_ui_BUILD.gn +++ b/www/chromium/files/patch-chrome_browser_ui_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/browser/ui/BUILD.gn.orig 2020-07-07 21:58:14 UTC +--- chrome/browser/ui/BUILD.gn.orig 2020-11-13 06:36:37 UTC +++ chrome/browser/ui/BUILD.gn -@@ -641,12 +641,15 @@ static_library("ui") { +@@ -615,12 +615,15 @@ static_library("ui") { deps += [ "//components/autofill/content/browser/webauthn" ] } @@ -16,4 +16,4 @@ + deps += [ "//components/crash/core/browser" ] } - if (is_win || is_android || is_linux) { + if (is_win || is_android || is_linux || is_chromeos) { 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 54cc03271d7d..87622229ba37 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,15 +1,15 @@ ---- chrome/browser/ui/browser_command_controller.cc.orig 2020-07-07 21:58:14 UTC +--- chrome/browser/ui/browser_command_controller.cc.orig 2020-11-17 18:39:17 UTC +++ chrome/browser/ui/browser_command_controller.cc -@@ -83,7 +83,7 @@ +@@ -82,7 +82,7 @@ #include "components/session_manager/core/session_manager.h" #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" #endif -@@ -253,7 +253,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( +@@ -246,7 +246,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( #endif } @@ -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 = -@@ -479,7 +479,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -473,7 +473,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo break; #endif @@ -27,7 +27,7 @@ case IDC_MINIMIZE_WINDOW: browser_->window()->Minimize(); break; -@@ -981,7 +981,7 @@ void BrowserCommandController::InitCommandState() { +@@ -940,7 +940,7 @@ void BrowserCommandController::InitCommandState() { command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_4, true); command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_5, true); #endif diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc b/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc index c393ceb5d02d..aaa30d1ce8ac 100644 --- a/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc +++ b/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc @@ -1,20 +1,24 @@ ---- chrome/browser/ui/browser_view_prefs.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/ui/browser_view_prefs.cc.orig 2020-11-13 06:36:38 UTC +++ chrome/browser/ui/browser_view_prefs.cc -@@ -34,7 +34,7 @@ void RegisterBrowserViewLocalPrefs(PrefRegistrySimple* +@@ -26,7 +26,7 @@ namespace { + // Old values: 0 = SHRINK (default), 1 = STACKED. + const char kTabStripLayoutType[] = "tab_strip_layout_type"; + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + bool GetCustomFramePrefDefault() { + #if defined(USE_OZONE) + if (features::IsUsingOzonePlatform()) { +@@ -51,10 +51,10 @@ void RegisterBrowserViewLocalPrefs(PrefRegistrySimple* void RegisterBrowserViewProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - bool custom_frame_pref_default = false; - #if defined(USE_X11) - custom_frame_pref_default = ui::GetCustomFramePrefDefault(); -@@ -45,7 +45,7 @@ void RegisterBrowserViewProfilePrefs( - #endif ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) registry->RegisterBooleanPref(prefs::kUseCustomChromeFrame, - custom_frame_pref_default); --#endif // OS_LINUX && !OS_CHROMEOS -+#endif // (OS_LINUX && !OS_CHROMEOS) || defined(OS_BSD) + GetCustomFramePrefDefault()); +-#endif // defined(OS_LINUX) && defined(!OS_CHROMEOS) ++#endif // (defined(OS_LINUX) || defined(OS_BSD)) && defined(!OS_CHROMEOS) } void MigrateBrowserTabStripPrefs(PrefService* prefs) { diff --git a/www/chromium/files/patch-chrome_browser_ui_exclusive__access_exclusive__access__bubble.cc b/www/chromium/files/patch-chrome_browser_ui_exclusive__access_exclusive__access__bubble.cc index c3704c9ebe7d..d4f53e99e416 100644 --- a/www/chromium/files/patch-chrome_browser_ui_exclusive__access_exclusive__access__bubble.cc +++ b/www/chromium/files/patch-chrome_browser_ui_exclusive__access_exclusive__access__bubble.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc.orig 2020-11-13 06:36:38 UTC +++ chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc @@ -16,7 +16,7 @@ // NOTE(koz): Linux doesn't use the thick shadowed border, so we add padding // here. --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) const int ExclusiveAccessBubble::kPaddingPx = 8; #else const int ExclusiveAccessBubble::kPaddingPx = 15; diff --git a/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine__base.cc b/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine__base.cc deleted file mode 100644 index fd379c49386c..000000000000 --- a/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine__base.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/ui/input_method/input_method_engine_base.cc.orig 2020-02-03 21:53:29 UTC -+++ chrome/browser/ui/input_method/input_method_engine_base.cc -@@ -31,7 +31,7 @@ - #include "ui/base/ime/chromeos/ime_keymap.h" - #elif defined(OS_WIN) - #include "ui/events/keycodes/keyboard_codes_win.h" --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) - #include "ui/events/keycodes/keyboard_codes_posix.h" - #endif - diff --git a/www/chromium/files/patch-chrome_browser_ui_sad__tab.cc b/www/chromium/files/patch-chrome_browser_ui_sad__tab.cc index d03e6c550af9..98d6e66c7427 100644 --- a/www/chromium/files/patch-chrome_browser_ui_sad__tab.cc +++ b/www/chromium/files/patch-chrome_browser_ui_sad__tab.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/sad_tab.cc.orig 2020-03-16 18:39:45 UTC +--- chrome/browser/ui/sad_tab.cc.orig 2020-11-13 06:36:38 UTC +++ chrome/browser/ui/sad_tab.cc -@@ -188,7 +188,7 @@ std::vector<int> SadTab::GetSubMessages() { +@@ -189,7 +189,7 @@ std::vector<int> SadTab::GetSubMessages() { // Only show Incognito suggestion if not already in Incognito mode. if (!web_contents_->GetBrowserContext()->IsOffTheRecord()) message_ids.insert(message_ids.begin(), IDS_SAD_TAB_RELOAD_INCOGNITO); --#if defined(OS_MACOSX) || defined(OS_LINUX) -+#if defined(OS_MACOSX) || defined(OS_LINUX) || 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) // Note: on macOS, Linux and ChromeOS, the first bullet is either one of // IDS_SAD_TAB_RELOAD_CLOSE_TABS or IDS_SAD_TAB_RELOAD_CLOSE_NOTABS // followed by one of the above suggestions. diff --git a/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc b/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc index ade0df4b4404..d1fbf6b0263c 100644 --- a/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc +++ b/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2020-05-13 18:39:38 UTC +--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2020-11-13 06:36:38 UTC +++ chrome/browser/ui/startup/bad_flags_prompt.cc @@ -88,7 +88,7 @@ static const char* kBadFlags[] = { extensions::switches::kExtensionsOnChromeURLs, 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 d9af1ba13eb7..6f5dea3b1228 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,31 +1,11 @@ ---- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2020-07-07 21:58:14 UTC +--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2020-11-13 06:36:38 UTC +++ chrome/browser/ui/startup/startup_browser_creator.cc -@@ -85,7 +85,7 @@ - #include "chrome/browser/ui/user_manager.h" - #endif - --#if defined(TOOLKIT_VIEWS) && defined(OS_LINUX) -+#if defined(TOOLKIT_VIEWS) && (defined(OS_LINUX) || defined(OS_BSD)) - #include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck - #endif - -@@ -300,7 +300,7 @@ bool IsSilentLaunchEnabled(const base::CommandLine& co +@@ -274,7 +274,7 @@ bool CanOpenProfileOnStartup(Profile* profile) { // true, send a warning if guest mode is requested but not allowed by policy. bool IsGuestModeEnforced(const base::CommandLine& command_line, bool show_warning) { --#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX) -+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || \ ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_BSD) || \ + defined(OS_MAC) PrefService* service = g_browser_process->local_state(); DCHECK(service); - -@@ -684,8 +684,10 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( - } - #endif // OS_CHROMEOS - -+#if 0 /* XXX */ - #if defined(TOOLKIT_VIEWS) && defined(USE_X11) - ui::TouchFactory::SetTouchDeviceListFromCommandLine(); -+#endif - #endif - - #if defined(OS_MACOSX) 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 a301a76dea6c..adef229813ab 100644 --- a/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc +++ b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc @@ -1,25 +1,25 @@ ---- chrome/browser/ui/tab_helpers.cc.orig 2020-07-07 21:58:14 UTC +--- chrome/browser/ui/tab_helpers.cc.orig 2020-11-13 06:36:38 UTC +++ chrome/browser/ui/tab_helpers.cc -@@ -143,7 +143,7 @@ +@@ -146,7 +146,7 @@ #include "chrome/browser/ui/app_list/search/cros_action_history/cros_action_recorder_tab_tracker.h" #endif --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) #include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h" #include "chrome/browser/ui/hats/hats_helper.h" - #endif -@@ -392,11 +392,11 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con +@@ -398,11 +398,11 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con #endif - #if defined(OS_WIN) || defined(OS_MACOSX) || \ + #if defined(OS_WIN) || defined(OS_MAC) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) metrics::DesktopSessionDurationObserver::CreateForWebContents(web_contents); #endif --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) if (base::FeatureList::IsEnabled( features::kHappinessTrackingSurveysForDesktop) || - base::FeatureList::IsEnabled( diff --git a/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.cc b/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.cc index a5abcc83206d..32245f7e2452 100644 --- a/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.cc +++ b/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.cc @@ -1,15 +1,15 @@ ---- chrome/browser/ui/task_manager/task_manager_columns.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/ui/task_manager/task_manager_columns.cc.orig 2020-11-13 06:36:38 UTC +++ chrome/browser/ui/task_manager/task_manager_columns.cc @@ -93,10 +93,10 @@ const TableColumnData kColumns[] = { base::size("100000") * kCharWidth, -1, true, false, false}, #endif --#if defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) {IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN, ui::TableColumn::RIGHT, -1, 0, base::size("999") * kCharWidth, -1, true, false, false}, --#endif // defined(OS_LINUX) || defined(OS_MACOSX) -+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) {IDS_TASK_MANAGER_PROCESS_PRIORITY_COLUMN, ui::TableColumn::LEFT, -1, 0, base::size("background") * kCharWidth, -1, true, true, false}, {IDS_TASK_MANAGER_KEEPALIVE_COUNT_COLUMN, ui::TableColumn::RIGHT, -1, 0, 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 0f8d7e671406..1f128b51098d 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,18 +1,18 @@ ---- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2019-12-16 21:50:43 UTC +--- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2020-11-13 06:36:38 UTC +++ chrome/browser/ui/task_manager/task_manager_table_model.cc @@ -450,13 +450,13 @@ base::string16 TaskManagerTableModel::GetText(int row, ? stringifier_->backgrounded_string() : stringifier_->foregrounded_string(); --#if defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: { const int fd_count = observed_task_manager()->GetOpenFdCount(tasks_[row]); return fd_count >= 0 ? base::FormatNumber(fd_count) : stringifier_->n_a_string(); } --#endif // defined(OS_LINUX) || defined(OS_MACOSX) -+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) case IDS_TASK_MANAGER_KEEPALIVE_COUNT_COLUMN: { return stringifier_->GetKeepaliveCountText( @@ -20,8 +20,8 @@ return BooleanCompare(is_proc1_bg, is_proc2_bg); } --#if defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: { const int proc1_fd_count = observed_task_manager()->GetOpenFdCount(tasks_[row1]); @@ -29,8 +29,8 @@ observed_task_manager()->GetOpenFdCount(tasks_[row2]); return ValueCompare(proc1_fd_count, proc2_fd_count); } --#endif // defined(OS_LINUX) || defined(OS_MACOSX) -+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) default: NOTREACHED(); @@ -38,13 +38,13 @@ type = REFRESH_TYPE_KEEPALIVE_COUNT; break; --#if defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: type = REFRESH_TYPE_FD_COUNT; break; --#endif // defined(OS_LINUX) || defined(OS_MACOSX) -+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) default: NOTREACHED(); diff --git a/www/chromium/files/patch-chrome_browser_ui_test_test__browser__dialog.cc b/www/chromium/files/patch-chrome_browser_ui_test_test__browser__dialog.cc index 16ef7ae396c8..ff7e474524bb 100644 --- a/www/chromium/files/patch-chrome_browser_ui_test_test__browser__dialog.cc +++ b/www/chromium/files/patch-chrome_browser_ui_test_test__browser__dialog.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/test/test_browser_dialog.cc.orig 2020-07-13 09:23:32 UTC +--- chrome/browser/ui/test/test_browser_dialog.cc.orig 2020-11-13 06:36:38 UTC +++ chrome/browser/ui/test/test_browser_dialog.cc @@ -114,7 +114,7 @@ bool TestBrowserDialog::VerifyUi() { diff --git a/www/chromium/files/patch-chrome_browser_ui_test_test__browser__ui.cc b/www/chromium/files/patch-chrome_browser_ui_test_test__browser__ui.cc index ff9d6ec0005d..5b0c8bd02a79 100644 --- a/www/chromium/files/patch-chrome_browser_ui_test_test__browser__ui.cc +++ b/www/chromium/files/patch-chrome_browser_ui_test_test__browser__ui.cc @@ -1,20 +1,29 @@ ---- chrome/browser/ui/test/test_browser_ui.cc.orig 2020-07-13 09:23:57 UTC +--- chrome/browser/ui/test/test_browser_ui.cc.orig 2020-11-13 06:36:38 UTC +++ chrome/browser/ui/test/test_browser_ui.cc @@ -10,7 +10,7 @@ #include "build/build_config.h" - #if defined(OS_WIN) || defined(OS_MACOSX) || \ + #if defined(OS_WIN) || defined(OS_MAC) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) #include "chrome/test/pixel/browser_skia_gold_pixel_diff.h" + #include "ui/base/test/skia_gold_matching_algorithm.h" #include "ui/compositor/test/draw_waiter_for_test.h" - #include "ui/views/widget/widget.h" -@@ -37,7 +37,7 @@ bool TestBrowserUi::VerifyPixelUi(views::Widget* widge - const std::string& screenshot_prefix, - const std::string& screenshot_name) { +@@ -32,7 +32,7 @@ std::string NameFromTestCase() { + } // namespace + + TestBrowserUi::TestBrowserUi() { +-#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // Default to fuzzy diff. The magic number is chosen based on + // past experiments. + SetPixelMatchAlgorithm( +@@ -43,7 +43,7 @@ TestBrowserUi::TestBrowserUi() { + TestBrowserUi::~TestBrowserUi() = default; + // TODO(https://crbug.com/958242) support Mac for pixel tests. -#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) +#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - if (!base::CommandLine::ForCurrentProcess()->HasSwitch( - "browser-ui-tests-verify-pixels")) - return true; + bool TestBrowserUi::VerifyPixelUi(views::Widget* widget, + const std::string& screenshot_prefix, + const std::string& screenshot_name) { 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 5b89c27e8d36..50e489e0bfe8 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,6 +1,6 @@ ---- chrome/browser/ui/views/accelerator_table.cc.orig 2019-09-09 21:55:11 UTC +--- chrome/browser/ui/views/accelerator_table.cc.orig 2020-11-13 06:36:38 UTC +++ chrome/browser/ui/views/accelerator_table.cc -@@ -51,7 +51,7 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -58,7 +58,7 @@ const AcceleratorMapping kAcceleratorMap[] = { {ui::VKEY_S, ui::EF_PLATFORM_ACCELERATOR, IDC_SAVE_PAGE}, {ui::VKEY_9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB}, {ui::VKEY_NUMPAD9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB}, @@ -9,7 +9,7 @@ {ui::VKEY_9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB}, {ui::VKEY_NUMPAD9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB}, {ui::VKEY_NEXT, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, IDC_MOVE_TAB_NEXT}, -@@ -81,7 +81,7 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -88,7 +88,7 @@ const AcceleratorMapping kAcceleratorMap[] = { {ui::VKEY_NUMPAD7, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_6}, {ui::VKEY_8, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_7}, {ui::VKEY_NUMPAD8, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_7}, @@ -18,7 +18,7 @@ {ui::VKEY_1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0}, {ui::VKEY_NUMPAD1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0}, {ui::VKEY_2, ui::EF_ALT_DOWN, IDC_SELECT_TAB_1}, -@@ -99,7 +99,7 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -106,7 +106,7 @@ const AcceleratorMapping kAcceleratorMap[] = { {ui::VKEY_8, ui::EF_ALT_DOWN, IDC_SELECT_TAB_7}, {ui::VKEY_NUMPAD8, ui::EF_ALT_DOWN, IDC_SELECT_TAB_7}, {ui::VKEY_BROWSER_FAVORITES, ui::EF_NONE, IDC_SHOW_BOOKMARK_BAR}, @@ -27,20 +27,20 @@ {ui::VKEY_B, ui::EF_SHIFT_DOWN | ui::EF_PLATFORM_ACCELERATOR, IDC_SHOW_BOOKMARK_BAR}, {ui::VKEY_OEM_MINUS, ui::EF_PLATFORM_ACCELERATOR, IDC_ZOOM_MINUS}, -@@ -125,14 +125,14 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -132,14 +132,14 @@ const AcceleratorMapping kAcceleratorMap[] = { IDC_SHOW_AVATAR_MENU}, // Platform-specific key maps. --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) {ui::VKEY_BROWSER_BACK, ui::EF_NONE, IDC_BACK}, {ui::VKEY_BROWSER_FORWARD, ui::EF_NONE, IDC_FORWARD}, {ui::VKEY_BROWSER_HOME, ui::EF_NONE, IDC_HOME}, {ui::VKEY_BROWSER_REFRESH, ui::EF_NONE, IDC_RELOAD}, {ui::VKEY_BROWSER_REFRESH, ui::EF_CONTROL_DOWN, IDC_RELOAD_BYPASSING_CACHE}, {ui::VKEY_BROWSER_REFRESH, ui::EF_SHIFT_DOWN, IDC_RELOAD_BYPASSING_CACHE}, --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #if defined(OS_CHROMEOS) // On Chrome OS, VKEY_BROWSER_SEARCH is handled in Ash. diff --git a/www/chromium/files/patch-chrome_browser_ui_views_bookmarks_bookmark__bar__view__test.cc b/www/chromium/files/patch-chrome_browser_ui_views_bookmarks_bookmark__bar__view__test.cc index eb2aa8604f95..aff4f9a2dcf0 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_bookmarks_bookmark__bar__view__test.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_bookmarks_bookmark__bar__view__test.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc.orig 2020-07-13 09:24:43 UTC +--- chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc.orig 2020-11-13 06:36:38 UTC +++ chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc -@@ -1833,7 +1833,7 @@ class BookmarkBarViewTest20 : public BookmarkBarViewEv +@@ -1848,7 +1848,7 @@ class BookmarkBarViewTest20 : public BookmarkBarViewEv } void Step3() { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) EXPECT_EQ(1, test_view_->press_count()); #else EXPECT_EQ(2, test_view_->press_count()); 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 efd5afea53a3..91e548894e4e 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 2020-05-13 18:39:38 UTC +--- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig 2020-11-13 06:36:38 UTC +++ chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc -@@ -32,7 +32,7 @@ +@@ -34,7 +34,7 @@ #include "ui/wm/core/wm_state.h" #endif // defined(USE_AURA) @@ -9,7 +9,7 @@ #include <sys/stat.h> #include <sys/types.h> #include <unistd.h> -@@ -42,7 +42,7 @@ +@@ -44,7 +44,7 @@ #include "chrome/grit/generated_resources.h" #include "content/public/common/content_switches.h" #include "ui/base/l10n/l10n_util.h" @@ -18,16 +18,16 @@ // This connector is used in ui_devtools's TracingAgent to hook up with the // tracing service. -@@ -99,7 +99,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( - devtools_server_->tracing_agent()); - } +@@ -114,7 +114,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( + return controller; + })); -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) // 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. -@@ -130,7 +130,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( +@@ -145,7 +145,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( base::RunLoop().RunUntilIdle(); exit(EXIT_FAILURE); diff --git a/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h b/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h index 59453a839cab..65f553f23ea0 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h +++ b/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/chrome_views_delegate.h.orig 2019-06-04 18:55:18 UTC +--- chrome/browser/ui/views/chrome_views_delegate.h.orig 2020-11-13 06:36:38 UTC +++ chrome/browser/ui/views/chrome_views_delegate.h @@ -44,7 +44,7 @@ class ChromeViewsDelegate : public views::ViewsDelegat HICON GetSmallWindowIcon() const override; 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 d9b14d21e1f2..419307499020 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,20 +1,11 @@ ---- chrome/browser/ui/views/download/download_item_view.cc.orig 2020-07-07 21:58:14 UTC +--- chrome/browser/ui/views/download/download_item_view.cc.orig 2020-11-13 06:36:38 UTC +++ chrome/browser/ui/views/download/download_item_view.cc -@@ -235,7 +235,7 @@ DownloadItemView::DownloadItemView(DownloadUIModel::Do - open_button_ = AddChildView(std::move(open_button)); +@@ -190,7 +190,7 @@ bool UseNewWarnings() { + } - int file_name_style = views::style::STYLE_PRIMARY; --#if !defined(OS_LINUX) -+#if !defined(OS_LINUX) && !defined(OS_BSD) - if (base::FeatureList::IsEnabled(safe_browsing::kUseNewDownloadWarnings)) - file_name_style = STYLE_EMPHASIZED; + int GetFilenameStyle(const views::StyledLabel& label) { +-#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_BSD) + if (UseNewWarnings()) + return STYLE_EMPHASIZED; #endif -@@ -1636,7 +1636,7 @@ void DownloadItemView::StyleFilenameInLabel(views::Sty - if (!base::FeatureList::IsEnabled(safe_browsing::kUseNewDownloadWarnings)) - return; - --#if !defined(OS_LINUX) -+#if !defined(OS_LINUX) && !defined(OS_BSD) - base::string16 filename = ElidedFilename(); - size_t file_name_position = label->GetText().find(filename); - if (file_name_position != std::string::npos) { diff --git a/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc b/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc index d2029ff732a8..4b89d981f10d 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc @@ -1,12 +1,13 @@ ---- chrome/browser/ui/views/first_run_dialog.cc.orig 2020-03-16 18:40:30 UTC +--- chrome/browser/ui/views/first_run_dialog.cc.orig 2020-11-13 06:36:38 UTC +++ chrome/browser/ui/views/first_run_dialog.cc -@@ -114,8 +114,10 @@ void FirstRunDialog::Done() { +@@ -114,9 +114,11 @@ void FirstRunDialog::Done() { bool FirstRunDialog::Accept() { GetWidget()->Hide(); +#if !defined(OS_BSD) - ChangeMetricsReportingStateWithReply(report_crashes_->GetChecked(), - base::Bind(&InitCrashReporterIfEnabled)); + ChangeMetricsReportingStateWithReply( + report_crashes_->GetChecked(), + base::BindRepeating(&InitCrashReporterIfEnabled)); +#endif if (make_default_->GetChecked()) 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 51a23ba87bf4..14e55ae7320c 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/browser_frame.cc.orig 2020-07-07 21:58:14 UTC +--- chrome/browser/ui/views/frame/browser_frame.cc.orig 2020-11-13 06:36:38 UTC +++ chrome/browser/ui/views/frame/browser_frame.cc @@ -38,14 +38,14 @@ #include "components/user_manager/user_manager.h" @@ -17,7 +17,7 @@ return ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme(); #else return false; -@@ -218,7 +218,7 @@ const ui::NativeTheme* BrowserFrame::GetNativeTheme() +@@ -204,7 +204,7 @@ const ui::NativeTheme* BrowserFrame::GetNativeTheme() void BrowserFrame::OnNativeWidgetWorkspaceChanged() { chrome::SaveWindowWorkspace(browser_view_->browser(), GetWorkspace()); diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc index c61a46cde03b..573898150041 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc.orig 2020-05-13 18:39:38 UTC +--- chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc.orig 2020-11-13 06:36:38 UTC +++ chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc @@ -13,7 +13,7 @@ #include "chrome/browser/ui/views/frame/glass_browser_frame_view.h" @@ -10,7 +10,7 @@ #include "chrome/browser/ui/views/frame/desktop_linux_browser_frame_view_layout.h" #include "ui/views/linux_ui/linux_ui.h" @@ -27,7 +27,7 @@ namespace { - OpaqueBrowserFrameView* CreateOpaqueBrowserFrameView( + std::unique_ptr<OpaqueBrowserFrameView> CreateOpaqueBrowserFrameView( BrowserFrame* frame, BrowserView* browser_view) { -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) 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 492f58d424af..85c8bb8ae076 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,15 @@ ---- chrome/browser/ui/views/frame/browser_view.cc.orig 2020-07-07 21:58:14 UTC +--- chrome/browser/ui/views/frame/browser_view.cc.orig 2020-11-13 06:36:38 UTC +++ chrome/browser/ui/views/frame/browser_view.cc -@@ -1729,7 +1729,7 @@ void BrowserView::UserChangedTheme(BrowserThemeChangeT +@@ -1474,7 +1474,7 @@ void BrowserView::ToolbarSizeChanged(bool is_animating + void BrowserView::TabDraggingStatusChanged(bool is_dragging) { + // TODO(crbug.com/1110266): Remove explicit OS_CHROMEOS check once OS_LINUX + // CrOS cleanup is done. +-#if !defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if !defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + contents_web_view_->SetFastResize(is_dragging); + if (!is_dragging) { + // When tab dragging is ended, we need to make sure the web contents get +@@ -1854,7 +1854,7 @@ void BrowserView::UserChangedTheme(BrowserThemeChangeT const bool should_use_native_frame = frame_->ShouldUseNativeFrame(); bool must_regenerate_frame; 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 9429876dcf27..554e68d84e0d 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,24 +1,15 @@ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2020-03-16 18:39:45 UTC +--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2020-11-13 06:36:38 UTC +++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc -@@ -48,7 +48,7 @@ +@@ -49,7 +49,7 @@ #include "ui/views/window/vector_icons/vector_icons.h" #include "ui/views/window/window_shape.h" --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "ui/views/controls/menu/menu_runner.h" #endif -@@ -349,7 +349,7 @@ void OpaqueBrowserFrameView::ButtonPressed(views::Butt - } else if (sender == close_button_) { - frame()->CloseWithReason(views::Widget::ClosedReason::kCloseButtonClicked); - } else if (sender == window_icon_) { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - // TODO(pbos): Figure out / document why this is Linux only. This needs a - // comment. - views::MenuRunner menu_runner(frame()->GetSystemMenuModel(), -@@ -478,7 +478,7 @@ bool OpaqueBrowserFrameView::EverHasVisibleBackgroundT +@@ -464,7 +464,7 @@ bool OpaqueBrowserFrameView::EverHasVisibleBackgroundT OpaqueBrowserFrameView::FrameButtonStyle OpaqueBrowserFrameView::GetFrameButtonStyle() const { @@ -27,3 +18,12 @@ return FrameButtonStyle::kMdButton; #else return FrameButtonStyle::kImageButton; +@@ -657,7 +657,7 @@ gfx::Rect OpaqueBrowserFrameView::IconBounds() const { + } + + void OpaqueBrowserFrameView::WindowIconPressed() { +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + // TODO(pbos): Figure out / document why this is Linux only. This needs a + // comment. + views::MenuRunner menu_runner(frame()->GetSystemMenuModel(), diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__platform__specific.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__platform__specific.cc index 0586d8bb467d..3a877d45f6e1 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__platform__specific.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__platform__specific.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc.orig 2019-04-30 22:22:36 UTC +--- chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc.orig 2020-11-13 06:36:38 UTC +++ chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc @@ -6,7 +6,7 @@ #include "build/build_config.h" --#if !defined(OS_LINUX) -+#if !defined(OS_LINUX) && !defined(OS_FREEBSD) +-#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_BSD) // static std::unique_ptr<OpaqueBrowserFrameViewPlatformSpecific> diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc index dc06c4f10c39..8bf5135711bf 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 2020-02-03 21:52:41 UTC +--- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2020-11-13 06:36:38 UTC +++ chrome/browser/ui/views/frame/system_menu_model_builder.cc -@@ -62,7 +62,7 @@ void SystemMenuModelBuilder::BuildMenu(ui::SimpleMenuM +@@ -63,7 +63,7 @@ void SystemMenuModelBuilder::BuildMenu(ui::SimpleMenuM void SystemMenuModelBuilder::BuildSystemMenuForBrowserWindow( ui::SimpleMenuModel* model) { @@ -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); -@@ -75,7 +75,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser +@@ -78,7 +78,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser model->AddSeparator(ui::NORMAL_SEPARATOR); model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); } @@ -18,7 +18,7 @@ model->AddSeparator(ui::NORMAL_SEPARATOR); model->AddCheckItemWithStringId(IDC_USE_SYSTEM_TITLE_BAR, IDS_SHOW_WINDOW_DECORATIONS_MENU); -@@ -113,7 +113,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo +@@ -116,7 +116,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo model->AddSeparator(ui::NORMAL_SEPARATOR); model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); } 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 0e2672a7af5f..237f3a9372ac 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,4 +1,4 @@ ---- chrome/browser/ui/views/frame/system_menu_model_delegate.cc.orig 2019-06-04 18:55:18 UTC +--- chrome/browser/ui/views/frame/system_menu_model_delegate.cc.orig 2020-11-13 06:36:38 UTC +++ chrome/browser/ui/views/frame/system_menu_model_delegate.cc @@ -15,7 +15,7 @@ #include "components/sessions/core/tab_restore_service.h" diff --git a/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc index 07dc0d13cd21..ee1036f6e65d 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/views/hung_renderer_view.cc.orig 2020-05-13 18:40:25 UTC +--- chrome/browser/ui/views/hung_renderer_view.cc.orig 2020-11-13 06:36:38 UTC +++ chrome/browser/ui/views/hung_renderer_view.cc -@@ -425,7 +425,7 @@ void HungRendererDialogView::ForceCrashHungRenderer() +@@ -421,7 +421,7 @@ void HungRendererDialogView::ForceCrashHungRenderer() content::RenderProcessHost* rph = hung_pages_table_model_->GetRenderWidgetHost()->GetProcess(); if (rph) { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // A generic |CrashDumpHungChildProcess()| is not implemented for Linux. // Instead we send an explicit IPC to crash on the renderer's IO thread. rph->ForceCrash(); diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc index 98e130553ec0..f20448e2e461 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/views/tabs/new_tab_button.cc.orig 2019-12-16 21:51:24 UTC +--- chrome/browser/ui/views/tabs/new_tab_button.cc.orig 2020-11-13 06:36:38 UTC +++ chrome/browser/ui/views/tabs/new_tab_button.cc -@@ -84,7 +84,7 @@ class NewTabButton::HighlightPathGenerator - NewTabButton::NewTabButton(TabStrip* tab_strip, views::ButtonListener* listener) - : views::ImageButton(listener), tab_strip_(tab_strip) { - set_animate_on_state_change(true); +@@ -57,7 +57,7 @@ class NewTabButton::HighlightPathGenerator + NewTabButton::NewTabButton(TabStrip* tab_strip, PressedCallback callback) + : views::ImageButton(std::move(callback)), tab_strip_(tab_strip) { + SetAnimateOnStateChange(true); -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) - set_triggerable_event_flags(triggerable_event_flags() | - ui::EF_MIDDLE_MOUSE_BUTTON); ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + SetTriggerableEventFlags(GetTriggerableEventFlags() | + ui::EF_MIDDLE_MOUSE_BUTTON); #endif diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc index 0eb06acbe1e7..f2f4d79efeac 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/views/tabs/tab.cc.orig 2020-05-13 18:40:25 UTC +--- chrome/browser/ui/views/tabs/tab.cc.orig 2020-11-13 06:36:38 UTC +++ chrome/browser/ui/views/tabs/tab.cc -@@ -596,7 +596,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& +@@ -571,7 +571,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& if (mouse_hovered_ || !GetWidget()->IsMouseEventsEnabled()) return; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Move the hit test area for hovering up so that it is not overlapped by tab // hover cards when they are shown. // TODO(crbug/978134): Once Linux/CrOS widget transparency is solved, remove 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 753ace3963ed..d7fa4004d710 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,15 +1,15 @@ ---- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2020-07-07 21:58:14 UTC +--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2020-11-13 06:36:38 UTC +++ chrome/browser/ui/views/tabs/tab_drag_controller.cc -@@ -444,7 +444,7 @@ void TabDragController::Init(TabDragContext* source_co +@@ -445,7 +445,7 @@ void TabDragController::Init(TabDragContext* source_co // synchronous on desktop Linux, so use that. // - Chrome OS // Releasing capture on Ash cancels gestures so avoid it. --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) can_release_capture_ = false; #endif start_point_in_screen_ = gfx::Point(source_view_offset, mouse_offset.y()); -@@ -889,7 +889,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon +@@ -895,7 +895,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon else SetCapture(target_context); @@ -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. -@@ -2076,7 +2076,7 @@ TabDragController::Liveness TabDragController::GetLoca +@@ -2081,7 +2081,7 @@ TabDragController::Liveness TabDragController::GetLoca if (dragged_window) exclude.insert(dragged_window); } diff --git a/www/chromium/files/patch-chrome_browser_ui_views_web__apps_pwa__confirmation__bubble__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_web__apps_pwa__confirmation__bubble__view.cc new file mode 100644 index 000000000000..7bdf932fe9ad --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_views_web__apps_pwa__confirmation__bubble__view.cc @@ -0,0 +1,11 @@ +--- chrome/browser/ui/views/web_apps/pwa_confirmation_bubble_view.cc.orig 2020-11-16 14:24:34 UTC ++++ chrome/browser/ui/views/web_apps/pwa_confirmation_bubble_view.cc +@@ -34,7 +34,7 @@ + + namespace { + +-#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) + constexpr char kDeviceTypeForCheckbox[] = "computer"; + #else 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 4db7812d21a2..88b5db98e181 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,20 +1,20 @@ ---- chrome/browser/ui/webui/about_ui.cc.orig 2020-07-07 21:58:14 UTC +--- chrome/browser/ui/webui/about_ui.cc.orig 2020-11-13 06:36:38 UTC +++ chrome/browser/ui/webui/about_ui.cc -@@ -563,7 +563,7 @@ std::string ChromeURLs() { +@@ -579,7 +579,7 @@ std::string ChromeURLs() { return html; } --#if defined(OS_LINUX) || defined(OS_OPENBSD) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_OPENBSD) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) std::string AboutLinuxProxyConfig() { std::string data; AppendHeader(&data, 0, -@@ -619,7 +619,7 @@ void AboutUIHTMLSource::StartDataRequest( +@@ -635,7 +635,7 @@ void AboutUIHTMLSource::StartDataRequest( response = ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(idr); } --#if defined(OS_LINUX) || defined(OS_OPENBSD) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_OPENBSD) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) } else if (source_name_ == chrome::kChromeUILinuxProxyConfigHost) { response = AboutLinuxProxyConfig(); #endif diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc b/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc index aa12ea3fe72c..c8f191f9c109 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,53 +1,56 @@ ---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2020-07-07 21:58:14 UTC +--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2020-11-13 06:36:38 UTC +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -228,11 +228,11 @@ +@@ -246,12 +246,12 @@ #include "chrome/browser/ui/webui/conflicts/conflicts_ui.h" #endif --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) #include "chrome/browser/ui/webui/discards/discards_ui.h" #endif --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ + defined(OS_ANDROID) #include "chrome/browser/ui/webui/sandbox/sandbox_internals_ui.h" #endif - -@@ -376,7 +376,7 @@ bool IsAboutUI(const GURL& url) { +@@ -425,7 +425,7 @@ bool IsAboutUI(const GURL& url) { #if !defined(OS_ANDROID) || url.host_piece() == chrome::kChromeUITermsHost #endif --#if defined(OS_LINUX) || defined(OS_OPENBSD) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_OPENBSD) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || url.host_piece() == chrome::kChromeUILinuxProxyConfigHost #endif #if defined(OS_CHROMEOS) -@@ -725,7 +725,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -816,7 +816,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we if (url.host_piece() == chrome::kChromeUINaClHost) return &NewWebUI<NaClUI>; #endif --#if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA) -+#if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA) || defined(OS_BSD) +-#if ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(TOOLKIT_VIEWS)) || \ ++#if ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(TOOLKIT_VIEWS)) || defined(OS_BSD) || \ + defined(USE_AURA) if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost) return &NewWebUI<ConstrainedWebDialogUI>; - #endif -@@ -773,17 +773,17 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -865,19 +865,19 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we return &NewWebUI<media_router::MediaRouterInternalsUI>; } #endif --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ + defined(OS_ANDROID) if (url.host_piece() == chrome::kChromeUISandboxHost) { return &NewWebUI<SandboxInternalsUI>; } #endif --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) if (url.host_piece() == chrome::kChromeUIDiscardsHost) return &NewWebUI<DiscardsUI>; #endif - #if defined(OS_WIN) || defined(OS_MACOSX) || \ + #if defined(OS_WIN) || defined(OS_MAC) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) if (url.host_piece() == chrome::kChromeUIBrowserSwitchHost) diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc index bf333383f3f1..b90cefd7caf5 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/webui/settings/appearance_handler.cc.orig 2019-10-21 19:06:24 UTC +--- chrome/browser/ui/webui/settings/appearance_handler.cc.orig 2020-11-13 06:36:38 UTC +++ chrome/browser/ui/webui/settings/appearance_handler.cc @@ -27,7 +27,7 @@ void AppearanceHandler::RegisterMessages() { "useDefaultTheme", diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.h b/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.h index 79f7e3050fff..c6ba905a8526 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.h +++ b/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.h @@ -1,4 +1,4 @@ ---- chrome/browser/ui/webui/settings/appearance_handler.h.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/ui/webui/settings/appearance_handler.h.orig 2020-11-13 06:36:38 UTC +++ chrome/browser/ui/webui/settings/appearance_handler.h @@ -36,7 +36,7 @@ class AppearanceHandler : public SettingsPageUIHandler // Changes the UI theme of the browser to the default theme. 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 a7c79e5ce249..4faf02b48592 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 2020-07-07 21:58:14 UTC +--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2020-11-13 06:36:38 UTC +++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -319,7 +319,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -335,7 +335,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht {"minimumFont", IDS_SETTINGS_MINIMUM_FONT_SIZE_LABEL}, {"tiny", IDS_SETTINGS_TINY_FONT_SIZE}, {"huge", IDS_SETTINGS_HUGE_FONT_SIZE}, 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 7ad4185e39b5..5eb9bb9e3bdb 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__file__handler__registration.h +++ b/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__file__handler__registration.h @@ -1,11 +1,11 @@ ---- chrome/browser/web_applications/components/web_app_file_handler_registration.h.orig 2020-05-15 14:57:06 UTC +--- chrome/browser/web_applications/components/web_app_file_handler_registration.h.orig 2020-11-13 06:36:38 UTC +++ chrome/browser/web_applications/components/web_app_file_handler_registration.h @@ -38,7 +38,7 @@ void RegisterFileHandlersWithOs(const AppId& app_id, // If a shim app was required, also removes the shim app. void UnregisterFileHandlersWithOs(const AppId& app_id, Profile* profile); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) using RegisterMimeTypesOnLinuxCallback = base::OnceCallback<bool(base::FilePath profile_path, std::string file_contents)>; diff --git a/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__shortcut.cc b/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__shortcut.cc index 5ea618dc394f..c3155f6ef9b4 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__shortcut.cc +++ b/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__shortcut.cc @@ -1,11 +1,11 @@ ---- chrome/browser/web_applications/components/web_app_shortcut.cc.orig 2020-05-13 18:39:39 UTC +--- chrome/browser/web_applications/components/web_app_shortcut.cc.orig 2020-11-13 06:36:38 UTC +++ chrome/browser/web_applications/components/web_app_shortcut.cc @@ -34,7 +34,7 @@ namespace { - #if defined(OS_MACOSX) + #if defined(OS_MAC) const int kDesiredIconSizesForShortcut[] = {16, 32, 128, 256, 512}; --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) ++#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Linux supports icons of any size. FreeDesktop Icon Theme Specification states // that "Minimally you should install a 48x48 icon in the hicolor theme." const int kDesiredIconSizesForShortcut[] = {16, 32, 48, 128, 256, 512}; diff --git a/www/chromium/files/patch-chrome_browser_web__applications_extensions_bookmark__app__finalizer__utils.cc b/www/chromium/files/patch-chrome_browser_web__applications_extensions_bookmark__app__finalizer__utils.cc index 9b0d271a91c7..778bb3c228ba 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_extensions_bookmark__app__finalizer__utils.cc +++ b/www/chromium/files/patch-chrome_browser_web__applications_extensions_bookmark__app__finalizer__utils.cc @@ -1,4 +1,4 @@ ---- chrome/browser/web_applications/extensions/bookmark_app_finalizer_utils.cc.orig 2019-10-30 15:54:13 UTC +--- chrome/browser/web_applications/extensions/bookmark_app_finalizer_utils.cc.orig 2020-11-13 06:36:38 UTC +++ chrome/browser/web_applications/extensions/bookmark_app_finalizer_utils.cc @@ -15,7 +15,7 @@ namespace { diff --git a/www/chromium/files/patch-chrome_common_BUILD.gn b/www/chromium/files/patch-chrome_common_BUILD.gn index 8942c1e2054c..5019b7a909c9 100644 --- a/www/chromium/files/patch-chrome_common_BUILD.gn +++ b/www/chromium/files/patch-chrome_common_BUILD.gn @@ -1,14 +1,37 @@ ---- chrome/common/BUILD.gn.orig 2020-07-07 21:58:14 UTC +--- chrome/common/BUILD.gn.orig 2020-11-13 06:36:38 UTC +++ chrome/common/BUILD.gn -@@ -273,6 +273,11 @@ static_library("common") { +@@ -250,6 +250,10 @@ public_deps += [ "//ppapi/shared_impl" ] } + if (is_bsd) { -+ sources -= [ "component_flash_hint_file_linux.cc" ] + deps -= [ "//components/crash/core/app" ] + } + if (enable_extensions) { sources += [ "cast_messages.cc", +@@ -487,7 +491,7 @@ + public_deps += [ "//chrome/common/safe_browsing" ] + } + +- if (is_linux || is_chromeos) { ++ if ((is_linux || is_chromeos) && !is_bsd) { + sources += [ + "auto_start_linux.cc", + "auto_start_linux.h", +@@ -496,6 +500,14 @@ + "multi_process_lock_linux.cc", + ] + deps += [ "//sandbox/linux:sandbox_services" ] ++ } ++ ++ if (is_bsd) { ++ sources += [ ++ "auto_start_linux.cc", ++ "auto_start_linux.h", ++ "multi_process_lock_linux.cc", ++ ] + } + + if (enable_cdm_host_verification) { diff --git a/www/chromium/files/patch-chrome_common_channel__info.h b/www/chromium/files/patch-chrome_common_channel__info.h index c2b389d1ea34..172daf17329d 100644 --- a/www/chromium/files/patch-chrome_common_channel__info.h +++ b/www/chromium/files/patch-chrome_common_channel__info.h @@ -1,4 +1,4 @@ ---- chrome/common/channel_info.h.orig 2020-05-13 18:39:39 UTC +--- chrome/common/channel_info.h.orig 2020-11-13 06:36:38 UTC +++ chrome/common/channel_info.h @@ -61,7 +61,7 @@ bool IsSideBySideCapable(); std::string GetChannelSuffixForDataDir(); 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 9f189f9fc869..b71431a64f77 100644 --- a/www/chromium/files/patch-chrome_common_channel__info__posix.cc +++ b/www/chromium/files/patch-chrome_common_channel__info__posix.cc @@ -1,4 +1,4 @@ ---- chrome/common/channel_info_posix.cc.orig 2020-07-07 21:57:33 UTC +--- chrome/common/channel_info_posix.cc.orig 2020-11-13 06:36:38 UTC +++ chrome/common/channel_info_posix.cc @@ -67,7 +67,7 @@ std::string GetChannelSuffixForDataDir() { } diff --git a/www/chromium/files/patch-chrome_common_chrome__features.cc b/www/chromium/files/patch-chrome_common_chrome__features.cc index 72c78872e51f..5e39098d9c4f 100644 --- a/www/chromium/files/patch-chrome_common_chrome__features.cc +++ b/www/chromium/files/patch-chrome_common_chrome__features.cc @@ -1,18 +1,33 @@ ---- chrome/common/chrome_features.cc.orig 2020-07-07 21:58:14 UTC +--- chrome/common/chrome_features.cc.orig 2020-11-13 06:36:38 UTC +++ chrome/common/chrome_features.cc -@@ -68,13 +68,13 @@ const base::Feature kAsyncDns { +@@ -96,13 +96,13 @@ const base::Feature kAsyncDns { #endif }; --#if defined(OS_WIN) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Enables the Restart background mode optimization. When all Chrome UI is // closed and it goes in the background, allows to restart the browser to // discard memory. const base::Feature kBackgroundModeAllowRestart{ "BackgroundModeAllowRestart", base::FEATURE_DISABLED_BY_DEFAULT}; --#endif // defined(OS_WIN) || defined(OS_LINUX) -+#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - #if !defined(OS_ANDROID) - // Enables logging UKMs for background tab activity by TabActivityWatcher. + #if defined(OS_CHROMEOS) + // Enable Borealis on Chrome OS. +@@ -337,12 +337,12 @@ const base::Feature kEnableAmbientAuthenticationInInco + "EnableAmbientAuthenticationInIncognito", + base::FEATURE_DISABLED_BY_DEFAULT}; + +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) || defined(OS_BSD) + COMPONENT_EXPORT(CHROME_FEATURES) + // Enables ephemeral Guest profiles on desktop. + extern const base::Feature kEnableEphemeralGuestProfilesOnDesktop{ + "EnableEphemeralGuestProfilesOnDesktop", base::FEATURE_DISABLED_BY_DEFAULT}; +-#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) ++#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) || defined(OS_BSD) + + #if defined(OS_WIN) + // Enables users to create a desktop shortcut for incognito mode. diff --git a/www/chromium/files/patch-chrome_common_chrome__features.h b/www/chromium/files/patch-chrome_common_chrome__features.h index 2ca11194fafc..5d4404baffc3 100644 --- a/www/chromium/files/patch-chrome_common_chrome__features.h +++ b/www/chromium/files/patch-chrome_common_chrome__features.h @@ -1,15 +1,28 @@ ---- chrome/common/chrome_features.h.orig 2020-07-07 21:58:14 UTC +--- chrome/common/chrome_features.h.orig 2020-11-13 06:36:38 UTC +++ chrome/common/chrome_features.h -@@ -61,10 +61,10 @@ extern const base::Feature kAppServiceIntentHandling; +@@ -82,10 +82,10 @@ extern const base::Feature kAppShimNewCloseBehavior; COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kAsyncDns; --#if defined(OS_WIN) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kBackgroundModeAllowRestart; --#endif // defined(OS_WIN) || defined(OS_LINUX) -+#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - #if BUILDFLAG(TRIAL_COMPARISON_CERT_VERIFIER_SUPPORTED) + #if defined(OS_CHROMEOS) + COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kBorealis; +@@ -214,10 +214,10 @@ extern const base::Feature kEnableAmbientAuthenticatio + COMPONENT_EXPORT(CHROME_FEATURES) + extern const base::Feature kEnableAmbientAuthenticationInIncognito; + +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) || defined(OS_BSD) + COMPONENT_EXPORT(CHROME_FEATURES) + extern const base::Feature kEnableEphemeralGuestProfilesOnDesktop; +-#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) ++#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MAC) || defined(OS_BSD) + + #if defined(OS_WIN) COMPONENT_EXPORT(CHROME_FEATURES) diff --git a/www/chromium/files/patch-chrome_common_chrome__paths.cc b/www/chromium/files/patch-chrome_common_chrome__paths.cc index 8f8695168ae5..adac9acf140f 100644 --- a/www/chromium/files/patch-chrome_common_chrome__paths.cc +++ b/www/chromium/files/patch-chrome_common_chrome__paths.cc @@ -1,41 +1,47 @@ ---- chrome/common/chrome_paths.cc.orig 2020-02-03 21:52:41 UTC +--- chrome/common/chrome_paths.cc.orig 2020-11-13 06:36:38 UTC +++ chrome/common/chrome_paths.cc -@@ -51,21 +51,21 @@ const base::FilePath::CharType kPepperFlashSystemBaseD +@@ -52,21 +52,29 @@ const base::FilePath::CharType kPepperFlashSystemBaseD FILE_PATH_LITERAL("Internet Plug-Ins/PepperFlashPlayer"); #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // The path to the external extension <id>.json files. // /usr/share seems like a good choice, see: http://www.pathname.com/fhs/ const base::FilePath::CharType kFilepathSinglePrefExtensions[] = #if BUILDFLAG(GOOGLE_CHROME_BRANDING) -- FILE_PATH_LITERAL("/usr/share/google-chrome/extensions"); ++#if defined(OS_BSD) + FILE_PATH_LITERAL("/usr/local/share/google-chrome/extensions"); ++#else + FILE_PATH_LITERAL("/usr/share/google-chrome/extensions"); ++#endif #else -- FILE_PATH_LITERAL("/usr/share/chromium/extensions"); ++#if defined(OS_BSD) + FILE_PATH_LITERAL("/usr/local/share/chromium/extensions"); ++#else + FILE_PATH_LITERAL("/usr/share/chromium/extensions"); ++#endif #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) // The path to the hint file that tells the pepper plugin loader // where it can find the latest component updated flash. const base::FilePath::CharType kComponentUpdatedFlashHint[] = FILE_PATH_LITERAL("latest-component-updated-flash"); --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - #if defined(OS_LINUX) && BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) - // The name of the hint file that tells the latest component updated Widevine -@@ -204,7 +204,7 @@ bool PathProvider(int key, base::FilePath* result) { + #if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && \ + BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) +@@ -207,7 +215,7 @@ bool PathProvider(int key, base::FilePath* result) { return false; break; case chrome::DIR_DEFAULT_DOWNLOADS_SAFE: --#if defined(OS_WIN) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) if (!GetUserDownloadsDirectorySafe(&cur)) return false; break; -@@ -495,6 +495,9 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -494,6 +502,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")); @@ -45,34 +51,34 @@ #else cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies")); #endif -@@ -502,7 +505,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -501,7 +512,7 @@ bool PathProvider(int key, base::FilePath* result) { } #endif #if defined(OS_CHROMEOS) || \ -- (defined(OS_LINUX) && BUILDFLAG(CHROMIUM_BRANDING)) || defined(OS_MACOSX) -+ ((defined(OS_LINUX) || defined(OS_BSD)) && BUILDFLAG(CHROMIUM_BRANDING)) || defined(OS_MACOSX) +- (defined(OS_LINUX) && BUILDFLAG(CHROMIUM_BRANDING)) || defined(OS_MAC) ++ (defined(OS_LINUX) && BUILDFLAG(CHROMIUM_BRANDING)) || defined(OS_MAC) || defined(OS_BSD) case chrome::DIR_USER_EXTERNAL_EXTENSIONS: { if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) return false; -@@ -510,7 +513,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -509,7 +520,7 @@ bool PathProvider(int key, base::FilePath* result) { break; } #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: { cur = base::FilePath(kFilepathSinglePrefExtensions); break; -@@ -545,7 +548,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -544,7 +555,7 @@ bool PathProvider(int key, base::FilePath* result) { #endif break; --#if defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) case chrome::DIR_NATIVE_MESSAGING: - #if defined(OS_MACOSX) + #if defined(OS_MAC) #if BUILDFLAG(GOOGLE_CHROME_BRANDING) -@@ -559,6 +562,9 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -558,6 +569,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")); @@ -82,30 +88,12 @@ #else cur = base::FilePath(FILE_PATH_LITERAL( "/etc/chromium/native-messaging-hosts")); -@@ -571,7 +577,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -570,7 +584,7 @@ bool PathProvider(int key, base::FilePath* result) { return false; cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts")); break; --#endif // defined(OS_LINUX) || defined(OS_MACOSX) -+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) #if !defined(OS_ANDROID) case chrome::DIR_GLOBAL_GCM_STORE: if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) -@@ -579,7 +585,7 @@ bool PathProvider(int key, base::FilePath* result) { - cur = cur.Append(kGCMStoreDirname); - break; - #endif // !defined(OS_ANDROID) --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - case chrome::FILE_COMPONENT_FLASH_HINT: - if (!base::PathService::Get( - chrome::DIR_COMPONENT_UPDATED_PEPPER_FLASH_PLUGIN, &cur)) { -@@ -587,7 +593,7 @@ bool PathProvider(int key, base::FilePath* result) { - } - cur = cur.Append(kComponentUpdatedFlashHint); - break; --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) - #if defined(OS_CHROMEOS) - case chrome::FILE_CHROME_OS_COMPONENT_FLASH: - cur = base::FilePath(kChromeOSComponentFlash); diff --git a/www/chromium/files/patch-chrome_common_chrome__paths.h b/www/chromium/files/patch-chrome_common_chrome__paths.h index 703fb6677e76..40581d9ba666 100644 --- a/www/chromium/files/patch-chrome_common_chrome__paths.h +++ b/www/chromium/files/patch-chrome_common_chrome__paths.h @@ -1,42 +1,29 @@ ---- chrome/common/chrome_paths.h.orig 2019-12-16 21:50:44 UTC +--- chrome/common/chrome_paths.h.orig 2020-11-13 06:36:38 UTC +++ chrome/common/chrome_paths.h -@@ -53,7 +53,7 @@ enum { +@@ -51,7 +51,7 @@ enum { // contains subdirectories. #endif #if defined(OS_CHROMEOS) || \ -- (defined(OS_LINUX) && BUILDFLAG(CHROMIUM_BRANDING)) || defined(OS_MACOSX) -+ ((defined(OS_LINUX) || defined(OS_BSD)) && BUILDFLAG(CHROMIUM_BRANDING)) || defined(OS_MACOSX) +- (defined(OS_LINUX) && BUILDFLAG(CHROMIUM_BRANDING)) || defined(OS_MAC) ++ (defined(OS_LINUX) && BUILDFLAG(CHROMIUM_BRANDING)) || defined(OS_MAC) || defined(OS_BSD) DIR_USER_EXTERNAL_EXTENSIONS, // Directory for per-user external extensions // on Chrome Mac and Chromium Linux. // On Chrome OS, this path is used for OEM -@@ -61,7 +61,7 @@ enum { +@@ -59,7 +59,7 @@ enum { // create it. #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) DIR_STANDALONE_EXTERNAL_EXTENSIONS, // Directory for 'per-extension' // definition manifest files that // describe extensions which are to be -@@ -122,7 +122,7 @@ enum { +@@ -120,7 +120,7 @@ enum { DIR_SUPERVISED_USER_INSTALLED_WHITELISTS, // Directory where sanitized // supervised user whitelists are // installed. --#if defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) DIR_NATIVE_MESSAGING, // System directory where native messaging host // manifest files are stored. DIR_USER_NATIVE_MESSAGING, // Directory with Native Messaging Hosts -@@ -137,10 +137,10 @@ enum { - DIR_GEN_TEST_DATA, // Directory where generated test data resides. - DIR_TEST_DATA, // Directory where unit test data resides. - DIR_TEST_TOOLS, // Directory where unit test tools reside. --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - FILE_COMPONENT_FLASH_HINT, // A file in a known location that points to - // the component updated flash plugin. --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) - #if defined(OS_CHROMEOS) - FILE_CHROME_OS_COMPONENT_FLASH, // The location of component updated Flash on - // Chrome OS. diff --git a/www/chromium/files/patch-chrome_common_chrome__paths__internal.h b/www/chromium/files/patch-chrome_common_chrome__paths__internal.h index 9bf429302cd3..5a4c75c4944b 100644 --- a/www/chromium/files/patch-chrome_common_chrome__paths__internal.h +++ b/www/chromium/files/patch-chrome_common_chrome__paths__internal.h @@ -1,11 +1,11 @@ ---- chrome/common/chrome_paths_internal.h.orig 2019-07-24 18:58:13 UTC +--- chrome/common/chrome_paths_internal.h.orig 2020-11-13 06:36:38 UTC +++ chrome/common/chrome_paths_internal.h @@ -45,7 +45,7 @@ void GetUserCacheDirectory(const base::FilePath& profi // Get the path to the user's documents directory. bool GetUserDocumentsDirectory(base::FilePath* result); --#if defined(OS_WIN) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Gets the path to a safe default download directory for a user. bool GetUserDownloadsDirectorySafe(base::FilePath* result); #endif diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.cc b/www/chromium/files/patch-chrome_common_chrome__switches.cc index de52fa804ea8..34d872d21a68 100644 --- a/www/chromium/files/patch-chrome_common_chrome__switches.cc +++ b/www/chromium/files/patch-chrome_common_chrome__switches.cc @@ -1,11 +1,11 @@ ---- chrome/common/chrome_switches.cc.orig 2020-07-07 21:58:14 UTC +--- chrome/common/chrome_switches.cc.orig 2020-11-13 06:36:38 UTC +++ chrome/common/chrome_switches.cc -@@ -833,7 +833,7 @@ const char kAllowNaClFileHandleAPI[] = "allow-n +@@ -808,7 +808,7 @@ const char kAllowNaClFileHandleAPI[] = "allow-n const char kAllowNaClSocketAPI[] = "allow-nacl-socket-api"; #endif --#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) || \ + defined(OS_WIN) const char kEnableNewAppMenuIcon[] = "enable-new-app-menu-icon"; - // Causes the browser to launch directly in guest mode. diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.h b/www/chromium/files/patch-chrome_common_chrome__switches.h index 66b4a3837121..951b9dd1ab2e 100644 --- a/www/chromium/files/patch-chrome_common_chrome__switches.h +++ b/www/chromium/files/patch-chrome_common_chrome__switches.h @@ -1,11 +1,11 @@ ---- chrome/common/chrome_switches.h.orig 2020-07-07 21:58:14 UTC +--- chrome/common/chrome_switches.h.orig 2020-11-13 06:36:38 UTC +++ chrome/common/chrome_switches.h -@@ -255,7 +255,7 @@ extern const char kAllowNaClFileHandleAPI[]; +@@ -253,7 +253,7 @@ extern const char kAllowNaClFileHandleAPI[]; extern const char kAllowNaClSocketAPI[]; #endif --#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) || \ + defined(OS_WIN) extern const char kEnableNewAppMenuIcon[]; extern const char kGuest[]; - #endif diff --git a/www/chromium/files/patch-chrome_common_extensions_api_api__sources.gni b/www/chromium/files/patch-chrome_common_extensions_api_api__sources.gni deleted file mode 100644 index 52d07bac4945..000000000000 --- a/www/chromium/files/patch-chrome_common_extensions_api_api__sources.gni +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/common/extensions/api/api_sources.gni.orig 2020-02-03 21:52:41 UTC -+++ chrome/common/extensions/api/api_sources.gni -@@ -113,7 +113,7 @@ if (is_chromeos) { - if (use_cups) { - schema_sources_ += [ "printing.idl" ] - } --} else if (is_linux || is_win) { -+} else if (is_linux || is_bsd || is_win) { - schema_sources_ += [ "input_ime.json" ] - } - diff --git a/www/chromium/files/patch-chrome_common_extensions_command.cc b/www/chromium/files/patch-chrome_common_extensions_command.cc index 653e9b714b41..9b1db0fe35cf 100644 --- a/www/chromium/files/patch-chrome_common_extensions_command.cc +++ b/www/chromium/files/patch-chrome_common_extensions_command.cc @@ -1,4 +1,4 @@ ---- chrome/common/extensions/command.cc.orig 2020-07-07 21:57:33 UTC +--- chrome/common/extensions/command.cc.orig 2020-11-13 06:36:38 UTC +++ chrome/common/extensions/command.cc @@ -293,7 +293,7 @@ std::string Command::CommandPlatform() { return values::kKeybindingPlatformMac; diff --git a/www/chromium/files/patch-chrome_common_features.gni b/www/chromium/files/patch-chrome_common_features.gni index b93907d17968..b20e33aa9aa6 100644 --- a/www/chromium/files/patch-chrome_common_features.gni +++ b/www/chromium/files/patch-chrome_common_features.gni @@ -1,8 +1,8 @@ ---- chrome/common/features.gni.orig 2020-07-07 21:58:14 UTC +--- chrome/common/features.gni.orig 2020-11-13 06:36:38 UTC +++ chrome/common/features.gni -@@ -54,7 +54,7 @@ declare_args() { - # Enables password change in leaked password dialog, disabled by default. - enable_password_change_in_leaked_dialog = false +@@ -51,7 +51,7 @@ declare_args() { + enable_one_click_signin = + is_win || is_mac || (is_linux && !is_chromeos && !is_chromecast) - enable_service_discovery = (enable_mdns && !is_android) || is_mac + enable_service_discovery = (enable_mdns && !is_android) || is_mac || is_bsd diff --git a/www/chromium/files/patch-chrome_common_media_cdm__host__file__path.cc b/www/chromium/files/patch-chrome_common_media_cdm__host__file__path.cc deleted file mode 100644 index dc060950d123..000000000000 --- a/www/chromium/files/patch-chrome_common_media_cdm__host__file__path.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/common/media/cdm_host_file_path.cc.orig 2020-07-07 21:58:14 UTC -+++ chrome/common/media/cdm_host_file_path.cc -@@ -93,7 +93,7 @@ void AddCdmHostFilePaths( - cdm_host_file_paths->emplace_back(chrome_framework_path, - chrome_framework_sig_path); - --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) - - base::FilePath chrome_exe_dir; - if (!base::PathService::Get(base::DIR_EXE, &chrome_exe_dir)) diff --git a/www/chromium/files/patch-chrome_common_pref__names.cc b/www/chromium/files/patch-chrome_common_pref__names.cc index 26f2e59870e8..66315fb8d269 100644 --- a/www/chromium/files/patch-chrome_common_pref__names.cc +++ b/www/chromium/files/patch-chrome_common_pref__names.cc @@ -1,4 +1,4 @@ ---- chrome/common/pref_names.cc.orig 2020-07-07 21:58:14 UTC +--- chrome/common/pref_names.cc.orig 2020-11-13 06:36:38 UTC +++ chrome/common/pref_names.cc @@ -1076,7 +1076,7 @@ const char kForceYouTubeRestrict[] = "settings.force_y // only using an account that belongs to one of the domains from this pref. @@ -9,7 +9,7 @@ // Linux specific preference on whether we should match the system theme. const char kUsesSystemTheme[] = "extensions.theme.use_system"; #endif -@@ -1213,7 +1213,7 @@ const char kShowUpdatePromotionInfoBar[] = +@@ -1238,7 +1238,7 @@ const char kShowUpdatePromotionInfoBar[] = "browser.show_update_promotion_info_bar"; #endif @@ -18,31 +18,31 @@ // 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"; -@@ -1651,7 +1651,7 @@ const char kDownloadDefaultDirectory[] = "download.def +@@ -1685,7 +1685,7 @@ const char kDownloadDefaultDirectory[] = "download.def // upgrade a unsafe location to a safe location. const char kDownloadDirUpgraded[] = "download.directory_upgrade"; --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ + defined(OS_MAC) const char kOpenPdfDownloadInSystemReader[] = "download.open_pdf_in_system_reader"; - #endif -@@ -1962,12 +1962,12 @@ const char kGloballyScopeHTTPAuthCacheEnabled[] = +@@ -2027,12 +2027,12 @@ const char kGloballyScopeHTTPAuthCacheEnabled[] = const char kAmbientAuthenticationInPrivateModesEnabled[] = "auth.ambient_auth_in_private_modes"; --#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) || defined(OS_BSD) // Boolean that specifies whether OK-AS-DELEGATE flag from KDC is respected - // along with kAuthNegotiateDelegateWhitelist. + // along with kAuthNegotiateDelegateAllowlist. const char kAuthNegotiateDelegateByKdcPolicy[] = "auth.negotiate_delegate_by_kdc_policy"; --#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) -+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) || defined(OS_BSD) #if defined(OS_POSIX) // Boolean that specifies whether NTLMv2 is enabled. -@@ -2874,7 +2874,7 @@ const char kAutoplayWhitelist[] = "media.autoplay_whit +@@ -2931,7 +2931,7 @@ const char kAutoplayWhitelist[] = "media.autoplay_whit const char kBlockAutoplayEnabled[] = "media.block_autoplay"; #endif // !defined(OS_ANDROID) diff --git a/www/chromium/files/patch-chrome_common_pref__names.h b/www/chromium/files/patch-chrome_common_pref__names.h index 36585ecd88ca..b7cd0378d468 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 2020-07-07 21:58:14 UTC +--- chrome/common/pref_names.h.orig 2020-11-13 06:36:38 UTC +++ chrome/common/pref_names.h -@@ -345,7 +345,7 @@ extern const char kHistoryMenuPromoShown[]; +@@ -355,7 +355,7 @@ extern const char kHistoryMenuPromoShown[]; extern const char kForceGoogleSafeSearch[]; extern const char kForceYouTubeRestrict[]; extern const char kAllowedDomainsForApps[]; @@ -9,8 +9,8 @@ extern const char kUsesSystemTheme[]; #endif extern const char kCurrentThemePackFilename[]; -@@ -376,7 +376,7 @@ extern const char kDefaultBrowserSettingEnabled[]; - #if defined(OS_MACOSX) +@@ -385,7 +385,7 @@ extern const char kDefaultBrowserSettingEnabled[]; + #if defined(OS_MAC) extern const char kShowUpdatePromotionInfoBar[]; #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) @@ -18,28 +18,28 @@ extern const char kUseCustomChromeFrame[]; #endif #if BUILDFLAG(ENABLE_PLUGINS) -@@ -550,7 +550,7 @@ extern const char kDownloadExtensionsToOpen[]; +@@ -554,7 +554,7 @@ extern const char kDownloadExtensionsToOpen[]; extern const char kDownloadExtensionsToOpenByPolicy[]; extern const char kDownloadAllowedURLsForOpenByPolicy[]; extern const char kDownloadDirUpgraded[]; --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ + defined(OS_MAC) extern const char kOpenPdfDownloadInSystemReader[]; #endif - #if defined(OS_ANDROID) -@@ -764,9 +764,9 @@ extern const char kAllowCrossOriginAuthPrompt[]; +@@ -777,9 +777,9 @@ extern const char kAllowCrossOriginAuthPrompt[]; extern const char kGloballyScopeHTTPAuthCacheEnabled[]; extern const char kAmbientAuthenticationInPrivateModesEnabled[]; --#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) || defined(OS_BSD) extern const char kAuthNegotiateDelegateByKdcPolicy[]; --#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) -+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) || defined(OS_BSD) #if defined(OS_POSIX) extern const char kNtlmV2Enabled[]; -@@ -999,7 +999,7 @@ extern const char kAutoplayWhitelist[]; +@@ -1006,7 +1006,7 @@ extern const char kAutoplayWhitelist[]; extern const char kBlockAutoplayEnabled[]; #endif diff --git a/www/chromium/files/patch-chrome_common_webui__url__constants.cc b/www/chromium/files/patch-chrome_common_webui__url__constants.cc index 629d91c9e0ff..c611494c9cdd 100644 --- a/www/chromium/files/patch-chrome_common_webui__url__constants.cc +++ b/www/chromium/files/patch-chrome_common_webui__url__constants.cc @@ -1,48 +1,50 @@ ---- chrome/common/webui_url_constants.cc.orig 2020-07-07 21:58:14 UTC +--- chrome/common/webui_url_constants.cc.orig 2020-11-13 06:36:38 UTC +++ chrome/common/webui_url_constants.cc -@@ -318,7 +318,7 @@ bool IsSystemWebUIHost(base::StringPiece host) { +@@ -338,7 +338,7 @@ bool IsSystemWebUIHost(base::StringPiece host) { } #endif // defined(OS_CHROMEOS) --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) const char kChromeUIDiscardsHost[] = "discards"; const char kChromeUIDiscardsURL[] = "chrome://discards/"; - const char kChromeUIHatsHost[] = "hats"; -@@ -330,17 +330,17 @@ const char kChromeUIProfilePickerHost[] = "profile-pic +@@ -360,18 +360,18 @@ const char kChromeUINearbyShareURL[] = "chrome://nearb const char kChromeUILinuxProxyConfigHost[] = "linux-proxy-config"; #endif --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ + defined(OS_ANDROID) const char kChromeUISandboxHost[] = "sandbox"; #endif - #if defined(OS_WIN) || defined(OS_MACOSX) || \ + #if defined(OS_WIN) || defined(OS_MAC) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) const char kChromeUIBrowserSwitchHost[] = "browser-switch"; const char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/"; #endif --#if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA) -+#if ((defined(OS_LINUX) || defined(OS_BSD)) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA) +-#if ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(TOOLKIT_VIEWS)) || \ ++#if ((defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(TOOLKIT_VIEWS)) || \ + defined(USE_AURA) const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog"; #endif - -@@ -500,13 +500,13 @@ const char* const kChromeHostURLs[] = { +@@ -542,14 +542,14 @@ const char* const kChromeHostURLs[] = { kChromeUIInternetDetailDialogHost, kChromeUIAssistantOptInHost, #endif --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) kChromeUIDiscardsHost, #endif - #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) + #if defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_ANDROID) kChromeUILinuxProxyConfigHost, #endif --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ + defined(OS_ANDROID) kChromeUISandboxHost, #endif - #if defined(OS_WIN) 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 c8f720a222c5..34971b669e6b 100644 --- a/www/chromium/files/patch-chrome_common_webui__url__constants.h +++ b/www/chromium/files/patch-chrome_common_webui__url__constants.h @@ -1,32 +1,33 @@ ---- chrome/common/webui_url_constants.h.orig 2020-07-07 21:58:14 UTC +--- chrome/common/webui_url_constants.h.orig 2020-11-13 06:36:38 UTC +++ chrome/common/webui_url_constants.h -@@ -282,7 +282,7 @@ bool IsSystemWebUIHost(base::StringPiece host); +@@ -291,7 +291,7 @@ bool IsSystemWebUIHost(base::StringPiece host); #endif // defined(OS_CHROMEOS) --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) extern const char kChromeUIDiscardsHost[]; extern const char kChromeUIDiscardsURL[]; - extern const char kChromeUIHatsHost[]; -@@ -295,17 +295,17 @@ extern const char kChromeUIProfilePickerHost[]; +@@ -311,18 +311,18 @@ extern const char kChromeUINearbyShareURL[]; extern const char kChromeUILinuxProxyConfigHost[]; #endif --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ + defined(OS_ANDROID) extern const char kChromeUISandboxHost[]; #endif - #if defined(OS_WIN) || defined(OS_MACOSX) || \ + #if defined(OS_WIN) || defined(OS_MAC) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) extern const char kChromeUIBrowserSwitchHost[]; extern const char kChromeUIBrowserSwitchURL[]; #endif --#if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA) -+#if ((defined(OS_LINUX) || defined(OS_BSD)) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA) +-#if ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(TOOLKIT_VIEWS)) || \ ++#if ((defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(TOOLKIT_VIEWS)) || \ + defined(USE_AURA) extern const char kChromeUITabModalConfirmDialogHost[]; #endif - diff --git a/www/chromium/files/patch-chrome_renderer_chrome__content__renderer__client.cc b/www/chromium/files/patch-chrome_renderer_chrome__content__renderer__client.cc index cc91d54a387b..b9b4af9491ed 100644 --- a/www/chromium/files/patch-chrome_renderer_chrome__content__renderer__client.cc +++ b/www/chromium/files/patch-chrome_renderer_chrome__content__renderer__client.cc @@ -1,11 +1,11 @@ ---- chrome/renderer/chrome_content_renderer_client.cc.orig 2020-07-07 21:58:14 UTC +--- chrome/renderer/chrome_content_renderer_client.cc.orig 2020-11-13 06:36:38 UTC +++ chrome/renderer/chrome_content_renderer_client.cc -@@ -1078,7 +1078,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( +@@ -1072,7 +1072,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( } case chrome::mojom::PluginStatus::kRestartRequired: { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) placeholder = create_blocked_plugin(IDR_BLOCKED_PLUGIN_HTML, l10n_util::GetStringFUTF16( diff --git a/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.cc b/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.cc index d77103710996..4448e259fa8d 100644 --- a/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.cc +++ b/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.cc @@ -1,11 +1,11 @@ ---- chrome/renderer/pepper/pepper_flash_font_file_host.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/renderer/pepper/pepper_flash_font_file_host.cc.orig 2020-11-13 06:36:38 UTC +++ chrome/renderer/pepper/pepper_flash_font_file_host.cc @@ -15,7 +15,7 @@ #include "ppapi/proxy/ppapi_messages.h" #include "ppapi/proxy/serialized_structs.h" --#if defined(OS_LINUX) || defined(OS_OPENBSD) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_OPENBSD) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "components/services/font/public/cpp/font_loader.h" #include "content/public/common/common_sandbox_support_linux.h" #elif defined(OS_WIN) @@ -13,8 +13,8 @@ const ppapi::proxy::SerializedFontDescription& description, PP_PrivateFontCharset charset) : ResourceHost(host->GetPpapiHost(), instance, resource) { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // The global SkFontConfigInterface is configured and initialized with a // SkFontconfigInterface compatible font_service::FontLoader in // RendererBlinkPlatformImpl (called from RenderThreadImpl::Init) at startup @@ -22,8 +22,8 @@ void* buffer, size_t* length) { bool result = false; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) if (font_file_.IsValid()) { result = content::GetFontTable(font_file_.GetPlatformFile(), table, 0 /* offset */, diff --git a/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.h b/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.h index 6acbcf8fc2d9..f1a6ef3e585b 100644 --- a/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.h +++ b/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.h @@ -1,11 +1,11 @@ ---- chrome/renderer/pepper/pepper_flash_font_file_host.h.orig 2019-03-11 22:00:54 UTC +--- chrome/renderer/pepper/pepper_flash_font_file_host.h.orig 2020-11-13 06:36:38 UTC +++ chrome/renderer/pepper/pepper_flash_font_file_host.h @@ -14,7 +14,7 @@ #include "ppapi/c/private/pp_private_font_charset.h" #include "ppapi/host/resource_host.h" --#if defined(OS_LINUX) || defined(OS_OPENBSD) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_OPENBSD) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "base/files/file.h" #elif defined(OS_WIN) #include "third_party/skia/include/core/SkRefCnt.h" @@ -13,8 +13,8 @@ uint32_t table); bool GetFontData(uint32_t table, void* buffer, size_t* length); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) base::File font_file_; #elif defined(OS_WIN) sk_sp<SkTypeface> typeface_; diff --git a/www/chromium/files/patch-chrome_service_cloud__print_print__system.cc b/www/chromium/files/patch-chrome_service_cloud__print_print__system.cc index 8624cc6a5068..716e461b4f5c 100644 --- a/www/chromium/files/patch-chrome_service_cloud__print_print__system.cc +++ b/www/chromium/files/patch-chrome_service_cloud__print_print__system.cc @@ -1,11 +1,11 @@ ---- chrome/service/cloud_print/print_system.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/service/cloud_print/print_system.cc.orig 2020-11-13 06:36:38 UTC +++ chrome/service/cloud_print/print_system.cc @@ -36,7 +36,7 @@ std::string PrintSystem::GenerateProxyId() { return base::GenerateGUID(); } --#if defined(OS_LINUX) && !defined(USE_CUPS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(USE_CUPS) +-#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(USE_CUPS) ++#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && !defined(USE_CUPS) scoped_refptr<PrintSystem> PrintSystem::CreateInstance( const base::DictionaryValue*) { return nullptr; diff --git a/www/chromium/files/patch-chrome_test_BUILD.gn b/www/chromium/files/patch-chrome_test_BUILD.gn index 5a45c5e3f160..ffb6d9547174 100644 --- a/www/chromium/files/patch-chrome_test_BUILD.gn +++ b/www/chromium/files/patch-chrome_test_BUILD.gn @@ -1,8 +1,8 @@ ---- chrome/test/BUILD.gn.orig 2020-07-07 21:58:14 UTC +--- chrome/test/BUILD.gn.orig 2020-11-13 06:36:38 UTC +++ chrome/test/BUILD.gn -@@ -6191,7 +6191,7 @@ test("chrome_app_unittests") { - "//components/heap_profiling/in_process", +@@ -6572,7 +6572,7 @@ test("chrome_app_unittests") { "//components/safe_browsing:buildflags", + "//pdf:pdf_ppapi", ] - if (!is_fuchsia) { + if (!is_fuchsia && !is_bsd) { diff --git a/www/chromium/files/patch-chrome_test_base_chrome__test__launcher.cc b/www/chromium/files/patch-chrome_test_base_chrome__test__launcher.cc index b1edf8f80ebd..7f936ee83cae 100644 --- a/www/chromium/files/patch-chrome_test_base_chrome__test__launcher.cc +++ b/www/chromium/files/patch-chrome_test_base_chrome__test__launcher.cc @@ -1,27 +1,36 @@ ---- chrome/test/base/chrome_test_launcher.cc.orig 2020-07-07 21:58:14 UTC +--- chrome/test/base/chrome_test_launcher.cc.orig 2020-11-13 06:36:38 UTC +++ chrome/test/base/chrome_test_launcher.cc @@ -61,7 +61,7 @@ #endif - #if defined(OS_WIN) || defined(OS_MACOSX) || \ + #if defined(OS_WIN) || defined(OS_MAC) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) #include "chrome/browser/first_run/scoped_relaunch_chrome_browser_override.h" #include "chrome/browser/upgrade_detector/installed_version_poller.h" #include "testing/gtest/include/gtest/gtest.h" -@@ -81,7 +81,7 @@ int ChromeTestSuiteRunner::RunTestSuite(int argc, char +@@ -79,7 +79,7 @@ int ChromeTestSuiteRunner::RunTestSuite(int argc, char content::ContentTestSuiteBase::RegisterInProcessThreads(); #endif - #if defined(OS_WIN) || defined(OS_MACOSX) || \ + #if defined(OS_WIN) || defined(OS_MAC) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) InstalledVersionPoller::ScopedDisableForTesting disable_polling( InstalledVersionPoller::MakeScopedDisableForTesting()); #endif -@@ -231,7 +231,7 @@ int LaunchChromeTests(size_t parallel_jobs, +@@ -201,7 +201,7 @@ int LaunchChromeTests(size_t parallel_jobs, + if (command_line.HasSwitch(switches::kLaunchAsBrowser)) + sampling_profiler = std::make_unique<MainThreadStackSamplingProfiler>(); + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) + ChromeCrashReporterClient::Create(); + #elif defined(OS_WIN) + // We leak this pointer intentionally. The crash client needs to outlive +@@ -229,7 +229,7 @@ int LaunchChromeTests(size_t parallel_jobs, } - #if defined(OS_WIN) || defined(OS_MACOSX) || \ + #if defined(OS_WIN) || defined(OS_MAC) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) // Cause a test failure for any test that triggers an unexpected relaunch. 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 15d46dc40629..2f7f24189243 100644 --- a/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc +++ b/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc @@ -1,6 +1,6 @@ ---- chrome/test/base/in_process_browser_test.cc.orig 2020-07-07 21:58:14 UTC +--- chrome/test/base/in_process_browser_test.cc.orig 2020-11-13 06:36:38 UTC +++ chrome/test/base/in_process_browser_test.cc -@@ -77,6 +77,10 @@ +@@ -78,6 +78,10 @@ #include "chrome/test/base/scoped_bundle_swizzler_mac.h" #endif @@ -11,30 +11,21 @@ #if defined(OS_WIN) #include "base/win/scoped_com_initializer.h" #include "base/win/windows_version.h" -@@ -105,7 +109,7 @@ - #include "ui/events/test/event_generator.h" - #endif // defined(OS_CHROMEOS) - --#if !defined(OS_CHROMEOS) && defined(OS_LINUX) -+#if !defined(OS_CHROMEOS) && (defined(OS_LINUX) || defined(OS_BSD)) - #include "ui/views/test/test_desktop_screen_x11.h" - #endif - -@@ -282,7 +286,7 @@ void InProcessBrowserTest::SetUp() { +@@ -288,7 +292,7 @@ void InProcessBrowserTest::SetUp() { // Cookies). Without this on Mac and Linux, many tests will hang waiting for a // user to approve KeyChain/kwallet access. On Windows this is not needed as // OS APIs never block. --#if defined(OS_MACOSX) || defined(OS_LINUX) -+#if defined(OS_MACOSX) || defined(OS_LINUX) || 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) OSCryptMocker::SetUp(); #endif -@@ -344,7 +348,7 @@ void InProcessBrowserTest::TearDown() { +@@ -348,7 +352,7 @@ void InProcessBrowserTest::TearDown() { com_initializer_.reset(); #endif BrowserTestBase::TearDown(); --#if defined(OS_MACOSX) || defined(OS_LINUX) -+#if defined(OS_MACOSX) || defined(OS_LINUX) || 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) OSCryptMocker::TearDown(); #endif 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 f80c31dcc8d4..fe02e60c4d33 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,4 +1,4 @@ ---- chrome/test/base/interactive_ui_tests_main.cc.orig 2020-04-06 07:47:38 UTC +--- chrome/test/base/interactive_ui_tests_main.cc.orig 2020-11-13 06:36:38 UTC +++ chrome/test/base/interactive_ui_tests_main.cc @@ -16,7 +16,7 @@ #if defined(USE_AURA) @@ -6,20 +6,15 @@ #include "ui/base/test/ui_controls_aura.h" -#if defined(USE_OZONE) && defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if defined(USE_OZONE) && ((defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)) + #include "ui/base/ui_base_features.h" #include "ui/ozone/public/ozone_platform.h" #endif - #if defined(USE_X11) -@@ -54,11 +54,11 @@ class InteractiveUITestSuite : public ChromeTestSuite +@@ -53,7 +53,7 @@ class InteractiveUITestSuite : public ChromeTestSuite com_initializer_.reset(new base::win::ScopedCOMInitializer()); ui_controls::InstallUIControlsAura( aura::test::CreateUIControlsAura(nullptr)); --#elif defined(USE_OZONE) && defined(OS_LINUX) -+#elif defined(USE_OZONE) && (defined(OS_LINUX) || defined(OS_BSD)) - ui::OzonePlatform::InitParams params; - params.single_process = true; - ui::OzonePlatform::InitializeForUI(params); -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) - ui_controls::InstallUIControlsAura( - views::test::CreateUIControlsDesktopAura()); - #else + #if defined(USE_OZONE) + if (features::IsUsingOzonePlatform()) { + ui::OzonePlatform::InitParams params; 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 842f9dd09dd2..2e871fc158fd 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,9 +1,9 @@ ---- chrome/test/base/test_browser_window.h.orig 2020-04-06 07:48:42 UTC +--- chrome/test/base/test_browser_window.h.orig 2020-11-13 06:36:38 UTC +++ chrome/test/base/test_browser_window.h -@@ -178,7 +178,7 @@ class TestBrowserWindow : public BrowserWindow { +@@ -179,7 +179,7 @@ class TestBrowserWindow : public BrowserWindow { bool is_source_keyboard) override {} - #if defined(OS_CHROMEOS) || defined(OS_MACOSX) || defined(OS_WIN) || \ + #if defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_WIN) || \ - defined(OS_LINUX) + defined(OS_LINUX) || defined(OS_BSD) void ShowHatsBubble(const std::string& site_id) override {} diff --git a/www/chromium/files/patch-chrome_test_base_testing__browser__process.h b/www/chromium/files/patch-chrome_test_base_testing__browser__process.h index 6a67fa4771e1..5f92ad3ddac7 100644 --- a/www/chromium/files/patch-chrome_test_base_testing__browser__process.h +++ b/www/chromium/files/patch-chrome_test_base_testing__browser__process.h @@ -1,6 +1,6 @@ ---- chrome/test/base/testing_browser_process.h.orig 2020-07-07 21:58:14 UTC +--- chrome/test/base/testing_browser_process.h.orig 2020-11-13 06:36:38 UTC +++ chrome/test/base/testing_browser_process.h -@@ -118,8 +118,8 @@ class TestingBrowserProcess : public BrowserProcess { +@@ -124,8 +124,8 @@ class TestingBrowserProcess : public BrowserProcess { DownloadRequestLimiter* download_request_limiter() override; StartupData* startup_data() override; diff --git a/www/chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc b/www/chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc index bf350970aa84..6cf1aa4a2eee 100644 --- a/www/chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc +++ b/www/chromium/files/patch-chrome_test_chromedriver_chrome__launcher.cc @@ -1,6 +1,6 @@ ---- chrome/test/chromedriver/chrome_launcher.cc.orig 2020-05-13 18:40:25 UTC +--- chrome/test/chromedriver/chrome_launcher.cc.orig 2020-11-13 06:36:38 UTC +++ chrome/test/chromedriver/chrome_launcher.cc -@@ -70,6 +70,10 @@ +@@ -71,6 +71,10 @@ #include "chrome/test/chromedriver/keycode_text_conversion.h" #endif diff --git a/www/chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc b/www/chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc index 1aa645203816..ca21e1ab2383 100644 --- a/www/chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc +++ b/www/chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc @@ -1,20 +1,20 @@ ---- chrome/test/chromedriver/chrome/chrome_finder.cc.orig 2020-02-24 18:39:10 UTC +--- chrome/test/chromedriver/chrome/chrome_finder.cc.orig 2020-11-13 06:36:38 UTC +++ chrome/test/chromedriver/chrome/chrome_finder.cc -@@ -50,7 +50,7 @@ void GetApplicationDirs(std::vector<base::FilePath>* l +@@ -53,7 +53,7 @@ void GetApplicationDirs(std::vector<base::FilePath>* l installation_locations[i].Append(L"Chromium\\Application")); } } --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) ++#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) void GetApplicationDirs(std::vector<base::FilePath>* locations) { // TODO: Respect users' PATH variables. // Until then, we use an approximation of the most common defaults. -@@ -136,7 +136,7 @@ bool FindChrome(base::FilePath* browser_exe) { - #if defined(OS_WIN) || defined(OS_MACOSX) +@@ -139,7 +139,7 @@ bool FindChrome(base::FilePath* browser_exe) { + #if defined(OS_WIN) || defined(OS_MAC) base::FilePath(chrome::kBrowserProcessExecutablePath), base::FilePath(chrome::kBrowserProcessExecutablePathChromium) --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) ++#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) base::FilePath("google-chrome"), base::FilePath(chrome::kBrowserProcessExecutablePath), base::FilePath(chrome::kBrowserProcessExecutablePathChromium), diff --git a/www/chromium/files/patch-chrome_test_chromedriver_key__converter__unittest.cc b/www/chromium/files/patch-chrome_test_chromedriver_key__converter__unittest.cc index 55dac4d42cad..6fd346344563 100644 --- a/www/chromium/files/patch-chrome_test_chromedriver_key__converter__unittest.cc +++ b/www/chromium/files/patch-chrome_test_chromedriver_key__converter__unittest.cc @@ -1,11 +1,11 @@ ---- chrome/test/chromedriver/key_converter_unittest.cc.orig 2020-07-07 21:57:34 UTC +--- chrome/test/chromedriver/key_converter_unittest.cc.orig 2020-11-13 06:36:38 UTC +++ chrome/test/chromedriver/key_converter_unittest.cc @@ -277,7 +277,7 @@ TEST(KeyConverter, AllShorthandKeys) { ->Generate(&key_events); builder.Generate(&key_events); builder.SetKeyCode(ui::VKEY_TAB); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) builder.SetText("\t", "\t")->Generate(&key_events); #else builder.SetText(std::string(), std::string()); @@ -13,8 +13,8 @@ key_events.push_back(builder.SetType(kKeyUpEventType)->Build()); #endif builder.SetKeyCode(ui::VKEY_BACK); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) builder.SetText("\b", "\b")->Generate(&key_events); #else builder.SetText(std::string(), std::string()); @@ -22,8 +22,8 @@ CheckEventsReleaseModifiers("\n\r\n\t\b ", key_events); } --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Fails on bots: crbug.com/174962 #define MAYBE_AllEnglishKeyboardSymbols DISABLED_AllEnglishKeyboardSymbols #else @@ -31,8 +31,8 @@ TEST(KeyConverter, AllSpecialWebDriverKeysOnEnglishKeyboard) { ui::ScopedKeyboardLayout keyboard_layout(ui::KEYBOARD_LAYOUT_ENGLISH_US); const char kTextForKeys[] = { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) 0, 0, 0, 0, '\t', 0, '\r', '\r', 0, 0, 0, 0, 0, #else 0, 0, 0, 0, 0, 0, '\r', '\r', 0, 0, 0, 0, 0, diff --git a/www/chromium/files/patch-chrome_test_chromedriver_server_chromedriver__server.cc b/www/chromium/files/patch-chrome_test_chromedriver_server_chromedriver__server.cc index ac458e0d2904..b9ad3fcd47fb 100644 --- a/www/chromium/files/patch-chrome_test_chromedriver_server_chromedriver__server.cc +++ b/www/chromium/files/patch-chrome_test_chromedriver_server_chromedriver__server.cc @@ -1,11 +1,11 @@ ---- chrome/test/chromedriver/server/chromedriver_server.cc.orig 2020-07-13 09:28:06 UTC +--- chrome/test/chromedriver/server/chromedriver_server.cc.orig 2020-11-13 06:36:39 UTC +++ chrome/test/chromedriver/server/chromedriver_server.cc -@@ -492,7 +492,7 @@ int main(int argc, char *argv[]) { +@@ -283,7 +283,7 @@ int main(int argc, char *argv[]) { base::AtExitManager at_exit; base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Select the locale from the environment by passing an empty string instead // of the default "C" locale. This is particularly needed for the keycode // conversion code to work. 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 af10c34c339f..704780f0ba1c 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,56 +1,83 @@ ---- chromecast/browser/cast_browser_main_parts.cc.orig 2020-07-07 21:58:14 UTC +--- chromecast/browser/cast_browser_main_parts.cc.orig 2020-11-13 06:36:40 UTC +++ chromecast/browser/cast_browser_main_parts.cc -@@ -75,7 +75,7 @@ +@@ -73,7 +73,7 @@ #include "ui/base/ui_base_switches.h" #include "ui/gl/gl_switches.h" --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include <fontconfig/fontconfig.h> #include <signal.h> #include <sys/prctl.h> -@@ -272,7 +272,7 @@ class CastViewsDelegate : public views::ViewsDelegate +@@ -129,7 +129,7 @@ + #include "extensions/browser/extension_prefs.h" // nogncheck + #endif + +-#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(USE_OZONE) ++#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(USE_OZONE) + #include "chromecast/browser/exo/wayland_server_controller.h" + #endif + +@@ -271,7 +271,7 @@ class CastViewsDelegate : public views::ViewsDelegate #endif // defined(USE_AURA) --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) base::FilePath GetApplicationFontsDir() { std::unique_ptr<base::Environment> env(base::Environment::Create()); -@@ -288,7 +288,7 @@ base::FilePath GetApplicationFontsDir() { +@@ -287,7 +287,7 @@ base::FilePath GetApplicationFontsDir() { } } --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) } // namespace -@@ -317,7 +317,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { +@@ -316,7 +316,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { {cc::switches::kDisableThreadedAnimation, ""}, #endif // defined(OS_ANDROID) #endif // BUILDFLAG(IS_CAST_AUDIO_ONLY) --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #if defined(ARCH_CPU_X86_FAMILY) // This is needed for now to enable the x11 Ozone platform to work with // current Linux/NVidia OpenGL drivers. -@@ -327,7 +327,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { +@@ -326,7 +326,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { {switches::kEnableHardwareOverlays, "cast"}, #endif #endif --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // It's better to start GPU process on demand. For example, for TV platforms // cast starts in background and can't render until TV switches to cast // input. -@@ -479,7 +479,7 @@ void CastBrowserMainParts::ToolkitInitialized() { +@@ -476,7 +476,7 @@ void CastBrowserMainParts::ToolkitInitialized() { views_delegate_ = std::make_unique<CastViewsDelegate>(); #endif // defined(USE_AURA) --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) 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)) { +@@ -657,7 +657,7 @@ void CastBrowserMainParts::PreMainMessageLoopRun() { + cast_browser_process_->browser_context()); + #endif + +-#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(USE_OZONE) ++#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(USE_OZONE) + wayland_server_controller_ = + std::make_unique<WaylandServerController>(window_manager_.get()); + #endif +@@ -739,7 +739,7 @@ bool CastBrowserMainParts::MainMessageLoopRun(int* res + } + + void CastBrowserMainParts::PostMainMessageLoopRun() { +-#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(USE_OZONE) ++#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(USE_OZONE) + wayland_server_controller_.reset(); + #endif + #if BUILDFLAG(ENABLE_CHROMECAST_EXTENSIONS) diff --git a/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc b/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc index b24788bca45a..98d3d306f0e0 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,11 +1,38 @@ ---- chromecast/browser/cast_content_browser_client.cc.orig 2020-07-07 21:58:14 UTC +--- chromecast/browser/cast_content_browser_client.cc.orig 2020-11-13 06:36:40 UTC +++ chromecast/browser/cast_content_browser_client.cc -@@ -457,7 +457,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS +@@ -130,9 +130,9 @@ + #include "chromecast/external_mojo/broker_service/broker_service.h" + #endif + +-#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(USE_OZONE) ++#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(USE_OZONE) + #include "chromecast/browser/webview/webview_controller.h" +-#endif // (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(USE_OZONE) ++#endif // (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(USE_OZONE) + + #if BUILDFLAG(ENABLE_CAST_RENDERER) + #include "base/sequenced_task_runner.h" +@@ -472,7 +472,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS switches::kAudioOutputChannels)); } } else if (process_type == switches::kGpuProcess) { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // 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. +@@ -854,12 +854,12 @@ CastContentBrowserClient::CreateThrottlesForNavigation + handle, general_audience_browsing_service_.get())); + } + +-#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(USE_OZONE) ++#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(USE_OZONE) + auto webview_throttle = WebviewController::MaybeGetNavigationThrottle(handle); + if (webview_throttle) { + throttles.push_back(std::move(webview_throttle)); + } +-#endif // (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(USE_OZONE) ++#endif // (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(USE_OZONE) + + return throttles; + } diff --git a/www/chromium/files/patch-chromecast_browser_metrics_BUILD.gn b/www/chromium/files/patch-chromecast_browser_metrics_BUILD.gn deleted file mode 100644 index e3c84406e9bf..000000000000 --- a/www/chromium/files/patch-chromecast_browser_metrics_BUILD.gn +++ /dev/null @@ -1,11 +0,0 @@ ---- chromecast/browser/metrics/BUILD.gn.orig 2019-07-24 18:58:17 UTC -+++ chromecast/browser/metrics/BUILD.gn -@@ -32,7 +32,7 @@ cast_source_set("metrics") { - "//third_party/metrics_proto", - ] - -- if (is_linux) { -+ if (is_linux || is_bsd) { - sources += [ - "external_metrics.cc", - "external_metrics.h", diff --git a/www/chromium/files/patch-chromecast_browser_tts_tts__controller__impl.cc b/www/chromium/files/patch-chromecast_browser_tts_tts__controller__impl.cc deleted file mode 100644 index 2c4456163b65..000000000000 --- a/www/chromium/files/patch-chromecast_browser_tts_tts__controller__impl.cc +++ /dev/null @@ -1,14 +0,0 @@ ---- chromecast/browser/tts/tts_controller_impl.cc.orig 2019-03-11 22:00:56 UTC -+++ chromecast/browser/tts/tts_controller_impl.cc -@@ -390,7 +390,11 @@ int TtsControllerImpl::QueueSize() { - } - - TtsPlatformImpl* TtsControllerImpl::GetPlatformImpl() { -+#if defined(OS_BSD) -+ return NULL; -+#else - return platform_impl_.get(); -+#endif // defined(OS_BSD) - } - - std::string TtsControllerImpl::GetApplicationLocale() const { diff --git a/www/chromium/files/patch-chromecast_external__mojo_public_cpp_external__mojo__broker.cc b/www/chromium/files/patch-chromecast_external__mojo_public_cpp_external__mojo__broker.cc index 381734887dcb..c203de3d90bd 100644 --- a/www/chromium/files/patch-chromecast_external__mojo_public_cpp_external__mojo__broker.cc +++ b/www/chromium/files/patch-chromecast_external__mojo_public_cpp_external__mojo__broker.cc @@ -1,20 +1,20 @@ ---- chromecast/external_mojo/public/cpp/external_mojo_broker.cc.orig 2020-02-03 21:52:43 UTC +--- chromecast/external_mojo/public/cpp/external_mojo_broker.cc.orig 2020-11-13 06:36:40 UTC +++ chromecast/external_mojo/public/cpp/external_mojo_broker.cc @@ -7,7 +7,7 @@ #include <map> #include <utility> --#if OS_LINUX -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include <sys/stat.h> #endif -@@ -393,7 +393,7 @@ ExternalMojoBroker::ExternalMojoBroker(const std::stri +@@ -412,7 +412,7 @@ ExternalMojoBroker::ExternalMojoBroker(const std::stri named_channel.TakeServerEndpoint(); DCHECK(server_endpoint.is_valid()); --#if OS_LINUX -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) chmod(broker_path.c_str(), 0770); #endif diff --git a/www/chromium/files/patch-chromecast_media_base_default__monotonic__clock.cc b/www/chromium/files/patch-chromecast_media_base_default__monotonic__clock.cc index 8a91130ad3fb..41e243abd765 100644 --- a/www/chromium/files/patch-chromecast_media_base_default__monotonic__clock.cc +++ b/www/chromium/files/patch-chromecast_media_base_default__monotonic__clock.cc @@ -1,14 +1,14 @@ ---- chromecast/media/base/default_monotonic_clock.cc.orig 2020-07-13 09:31:00 UTC +--- chromecast/media/base/default_monotonic_clock.cc.orig 2020-11-13 06:36:40 UTC +++ chromecast/media/base/default_monotonic_clock.cc @@ -9,9 +9,9 @@ #include "base/time/time.h" #include "build/build_config.h" --#if defined(OS_ANDROID) || defined(OS_LINUX) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "chromecast/media/base/buildflags.h" --#endif // defined(OS_ANDROID) || defined(OS_LINUX) -+#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #if defined(OS_FUCHSIA) #include <zircon/syscalls.h> @@ -16,8 +16,8 @@ namespace chromecast { namespace media { --#if defined(OS_ANDROID) || defined(OS_LINUX) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) int64_t MonotonicClockNow() { timespec now = {0, 0}; #if BUILDFLAG(MEDIA_CLOCK_MONOTONIC_RAW) diff --git a/www/chromium/files/patch-chromecast_renderer_cast__content__renderer__client.cc b/www/chromium/files/patch-chromecast_renderer_cast__content__renderer__client.cc index 5bfd53bc2903..976c4c189adf 100644 --- a/www/chromium/files/patch-chromecast_renderer_cast__content__renderer__client.cc +++ b/www/chromium/files/patch-chromecast_renderer_cast__content__renderer__client.cc @@ -1,11 +1,11 @@ ---- chromecast/renderer/cast_content_renderer_client.cc.orig 2020-05-13 18:40:25 UTC +--- chromecast/renderer/cast_content_renderer_client.cc.orig 2020-11-13 06:36:40 UTC +++ chromecast/renderer/cast_content_renderer_client.cc -@@ -204,7 +204,7 @@ void CastContentRendererClient::RenderFrameCreated( +@@ -202,7 +202,7 @@ void CastContentRendererClient::RenderFrameCreated( dispatcher->OnRenderFrameCreated(render_frame); #endif --#if defined(OS_LINUX) && defined(USE_OZONE) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_OZONE) +-#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(USE_OZONE) ++#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(USE_OZONE) // JsChannelBindings destroys itself when the RenderFrame is destroyed. JsChannelBindings::Create(render_frame); #endif diff --git a/www/chromium/files/patch-components_BUILD.gn b/www/chromium/files/patch-components_BUILD.gn index cd067e4c8780..796c8f04c306 100644 --- a/www/chromium/files/patch-components_BUILD.gn +++ b/www/chromium/files/patch-components_BUILD.gn @@ -1,18 +1,20 @@ ---- components/BUILD.gn.orig 2020-07-07 21:58:14 UTC +--- components/BUILD.gn.orig 2020-11-13 06:36:40 UTC +++ components/BUILD.gn -@@ -290,9 +290,14 @@ test("components_unittests") { +@@ -308,10 +308,15 @@ test("components_unittests") { ] - if (!is_fuchsia) { + if (!is_fuchsia) { # !iOS and !Fuchsia + if (!is_bsd) { + deps += [ + "//components/crash/content/browser:unit_tests", ++ "//components/crash/content/browser/error_reporting:unit_tests", + "//components/crash/core/app:unit_tests", + ] -+ } -+ ++ } ++ deps += [ - "//components/crash/content/browser:unit_tests", +- "//components/crash/content/browser/error_reporting:unit_tests", - "//components/crash/core/app:unit_tests", "//components/data_reduction_proxy/core/browser:unit_tests", "//components/data_reduction_proxy/core/common:unit_tests", 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 9d4aed4e9def..fbf77d73e828 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 2020-07-07 21:58:14 UTC +--- components/autofill/content/renderer/password_form_conversion_utils.cc.orig 2020-11-13 06:36:40 UTC +++ components/autofill/content/renderer/password_form_conversion_utils.cc -@@ -20,7 +20,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__experiments.cc b/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.cc deleted file mode 100644 index 097d0570f2e7..000000000000 --- a/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- components/autofill/core/browser/autofill_experiments.cc.orig 2020-07-07 21:58:14 UTC -+++ components/autofill/core/browser/autofill_experiments.cc -@@ -226,7 +226,7 @@ bool IsInAutofillSuggestionsDisabledExperiment() { - } - - bool OfferStoreUnmaskedCards(bool is_off_the_record) { --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - // The checkbox can be forced on with a flag, but by default we don't store - // on Linux due to lack of system keychain integration. See crbug.com/162735 - return base::CommandLine::ForCurrentProcess()->HasSwitch( 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 f1910897dfd2..ca8c7caff973 100644 --- a/www/chromium/files/patch-components_autofill_core_browser_autofill__external__delegate.cc +++ b/www/chromium/files/patch-components_autofill_core_browser_autofill__external__delegate.cc @@ -1,11 +1,11 @@ ---- components/autofill/core/browser/autofill_external_delegate.cc.orig 2020-07-07 21:58:14 UTC +--- components/autofill/core/browser/autofill_external_delegate.cc.orig 2020-11-13 06:36:40 UTC +++ components/autofill/core/browser/autofill_external_delegate.cc -@@ -118,7 +118,7 @@ void AutofillExternalDelegate::OnSuggestionsReturned( +@@ -127,7 +127,7 @@ void AutofillExternalDelegate::OnSuggestionsReturned( // Append the "Hide Suggestions" menu item for only Autofill Address and // Autocomplete popups. --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || \ -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) || \ +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_APPLE) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_APPLE) || defined(OS_BSD) || \ defined(OS_CHROMEOS) if (base::FeatureList::IsEnabled( features::kAutofillEnableHideSuggestionsUI)) { 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 7a7e321027de..cc01912f968b 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,20 +1,20 @@ ---- components/autofill/core/browser/personal_data_manager.cc.orig 2020-07-07 21:58:14 UTC +--- components/autofill/core/browser/personal_data_manager.cc.orig 2020-11-13 06:36:40 UTC +++ components/autofill/core/browser/personal_data_manager.cc -@@ -1921,7 +1921,7 @@ bool PersonalDataManager::IsServerCard(const CreditCar +@@ -1960,7 +1960,7 @@ bool PersonalDataManager::IsServerCard(const CreditCar bool PersonalDataManager::ShouldShowCardsFromAccountOption() const { // The feature is only for Linux, Windows and Mac. --#if (!defined(OS_LINUX) && !defined(OS_WIN) && !defined(OS_MACOSX)) || \ -+#if (!defined(OS_LINUX) && !defined(OS_WIN) && !defined(OS_MACOSX) && !defined(OS_BSD)) || \ - defined(OS_CHROMEOS) - return false; - #else -@@ -1945,7 +1945,7 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp - - // The option should only be shown if the user has not already opted-in. +-#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_WIN) || \ ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_WIN) || defined(OS_BSD) || \ + defined(OS_APPLE) + // This option should only be shown for users that have not enabled the Sync + // Feature and that have server credit cards available. +@@ -1984,7 +1984,7 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp return !is_opted_in; --#endif // (!defined(OS_LINUX) && !defined(OS_WIN) && !defined(OS_MACOSX)) || -+#endif // (!defined(OS_LINUX) && !defined(OS_WIN) && !defined(OS_MACOSX) && !defined(OS_BSD)) || - // defined(OS_CHROMEOS) + #else + return false; +-#endif // #if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_WIN) || \ ++#endif // #if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_WIN) || defined(OS_BSD) || \ + // defined(OS_APPLE) } 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 92bdc3d3b18c..83f8745adb76 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,9 +1,9 @@ ---- components/autofill/core/common/autofill_payments_features.cc.orig 2020-07-07 21:58:14 UTC +--- components/autofill/core/common/autofill_payments_features.cc.orig 2020-11-13 06:36:40 UTC +++ components/autofill/core/common/autofill_payments_features.cc -@@ -115,7 +115,7 @@ const base::Feature kAutofillUpstreamEditableExpiratio +@@ -123,7 +123,7 @@ const base::Feature kAutofillUpstreamAllowAllEmailDoma bool ShouldShowImprovedUserConsentForCreditCardSave() { - #if defined(OS_WIN) || defined(OS_MACOSX) || \ + #if defined(OS_WIN) || defined(OS_APPLE) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) // The new user consent UI is fully launched on MacOS, Windows and Linux. 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 f4cdea27b407..3912a40dc665 100644 --- a/www/chromium/files/patch-components_autofill_core_common_autofill__util.cc +++ b/www/chromium/files/patch-components_autofill_core_common_autofill__util.cc @@ -1,11 +1,11 @@ ---- components/autofill/core/common/autofill_util.cc.orig 2019-09-09 21:55:14 UTC +--- components/autofill/core/common/autofill_util.cc.orig 2020-11-13 06:36:40 UTC +++ components/autofill/core/common/autofill_util.cc -@@ -213,7 +213,7 @@ bool SanitizedFieldIsEmpty(const base::string16& value +@@ -174,7 +174,7 @@ bool SanitizedFieldIsEmpty(const base::string16& value } bool ShouldAutoselectFirstSuggestionOnArrowDown() { --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) +-#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) return true; #else - return false; diff --git a/www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.cc b/www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.cc index 3c85edbf2e08..4ed86453593b 100644 --- a/www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.cc +++ b/www/chromium/files/patch-components_content__settings_core_browser_website__settings__registry.cc @@ -1,4 +1,4 @@ ---- components/content_settings/core/browser/website_settings_registry.cc.orig 2019-03-11 22:00:56 UTC +--- components/content_settings/core/browser/website_settings_registry.cc.orig 2020-11-13 06:36:40 UTC +++ components/content_settings/core/browser/website_settings_registry.cc @@ -66,7 +66,7 @@ const WebsiteSettingsInfo* WebsiteSettingsRegistry::Re #if defined(OS_WIN) @@ -8,4 +8,4 @@ +#elif (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) if (!(platform & PLATFORM_LINUX)) return nullptr; - #elif defined(OS_MACOSX) && !defined(OS_IOS) + #elif defined(OS_MAC) diff --git a/www/chromium/files/patch-components_cookie__config_cookie__store__util.cc b/www/chromium/files/patch-components_cookie__config_cookie__store__util.cc index 871d1f936cc4..9f0298e83ed3 100644 --- a/www/chromium/files/patch-components_cookie__config_cookie__store__util.cc +++ b/www/chromium/files/patch-components_cookie__config_cookie__store__util.cc @@ -1,24 +1,26 @@ ---- components/cookie_config/cookie_store_util.cc.orig 2019-03-11 22:00:56 UTC +--- components/cookie_config/cookie_store_util.cc.orig 2020-11-13 06:36:40 UTC +++ components/cookie_config/cookie_store_util.cc @@ -11,7 +11,7 @@ namespace cookie_config { --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) +-#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) namespace { - // Use the operating system's mechanisms to encrypt cookies before writing -@@ -63,10 +63,10 @@ base::LazyInstance<CookieOSCryptoDelegate>::Destructor +@@ -64,12 +64,12 @@ base::LazyInstance<CookieOSCryptoDelegate>::Destructor net::CookieCryptoDelegate* GetCookieCryptoDelegate() { return g_cookie_crypto_delegate.Pointer(); } --#else // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#else // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) +-#else // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || ++#else // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || + // defined(OS_CHROMEOS) net::CookieCryptoDelegate* GetCookieCryptoDelegate() { return NULL; } --#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) +-#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 cookie_config diff --git a/www/chromium/files/patch-components_crash_content_browser_BUILD.gn b/www/chromium/files/patch-components_crash_content_browser_BUILD.gn index 6c5e78455e0f..1d4730753f4a 100644 --- a/www/chromium/files/patch-components_crash_content_browser_BUILD.gn +++ b/www/chromium/files/patch-components_crash_content_browser_BUILD.gn @@ -1,15 +1,15 @@ ---- components/crash/content/browser/BUILD.gn.orig 2019-03-11 22:00:56 UTC +--- components/crash/content/browser/BUILD.gn.orig 2020-11-13 06:36:40 UTC +++ components/crash/content/browser/BUILD.gn -@@ -28,7 +28,7 @@ source_set("browser") { +@@ -35,7 +35,7 @@ source_set("browser") { "//content/public/common", ] -- if (is_linux || is_android) { -+ if ((is_linux && !is_bsd) || is_android) { +- if (is_linux || is_chromeos || is_android) { ++ if ((is_linux || is_chromeos || is_android) && !is_bsd) { set_sources_assignment_filter([]) # Want this file on both Linux and Android. -@@ -42,13 +42,13 @@ source_set("browser") { +@@ -49,13 +49,13 @@ source_set("browser") { deps += [ "//third_party/crashpad/crashpad/client" ] } diff --git a/www/chromium/files/patch-components_crash_core_app_BUILD.gn b/www/chromium/files/patch-components_crash_core_app_BUILD.gn new file mode 100644 index 000000000000..844f434fcf6d --- /dev/null +++ b/www/chromium/files/patch-components_crash_core_app_BUILD.gn @@ -0,0 +1,11 @@ +--- components/crash/core/app/BUILD.gn.orig 2020-11-16 15:59:38 UTC ++++ components/crash/core/app/BUILD.gn +@@ -3,7 +3,7 @@ + # found in the LICENSE file. + + # TODO(crbug.com/753619): Enable crash reporting on Fuchsia. +-assert(!is_ios && !is_fuchsia) ++assert(!is_ios && !is_fuchsia && !is_bsd) + + import("//components/gwp_asan/buildflags/buildflags.gni") + diff --git a/www/chromium/files/patch-components_crash_core_common_BUILD.gn b/www/chromium/files/patch-components_crash_core_common_BUILD.gn index b7177c832a48..5b41932bac30 100644 --- a/www/chromium/files/patch-components_crash_core_common_BUILD.gn +++ b/www/chromium/files/patch-components_crash_core_common_BUILD.gn @@ -1,4 +1,4 @@ ---- components/crash/core/common/BUILD.gn.orig 2020-07-07 21:58:15 UTC +--- components/crash/core/common/BUILD.gn.orig 2020-11-13 06:36:40 UTC +++ components/crash/core/common/BUILD.gn @@ -7,7 +7,7 @@ import("//components/gwp_asan/buildflags/buildflags.gn @@ -9,17 +9,26 @@ } group("common") { -@@ -108,7 +108,9 @@ target(crash_key_target_type, "crash_key_lib") { - ] - } +@@ -32,7 +32,7 @@ use_crashpad_annotation = + # implementations will be instantiated and set, doubling the storage + # used for keys. This is intended to be used temporarily to test Crashpad + # integrations without disabling Breakpad. +-use_combined_annotations = is_linux || is_chromeos ++use_combined_annotations = (is_linux || is_chromeos) && !is_bsd -- deps += [ "//third_party/breakpad:client" ] + buildflag_header("crash_buildflags") { + header = "crash_buildflags.h" +@@ -93,7 +93,9 @@ target(crash_key_target_type, "crash_key_lib") { + sources += [ "crash_key_stubs.cc" ] + } else if (use_crashpad_annotation) { + sources += [ "crash_key_crashpad.cc" ] +- deps += [ "//third_party/crashpad/crashpad/client" ] + if (!is_bsd) { -+ deps += [ "//third_party/breakpad:client" ] ++ deps += [ "//third_party/crashpad/crashpad/client" ] + } - if (use_combined_annotations) { - public_deps += [ "//third_party/crashpad/crashpad/client" ] - } + } else { + include_dirs = [ "//third_party/breakpad/breakpad/src" ] + @@ -184,7 +186,7 @@ source_set("unit_tests") { sources += [ "crash_key_breakpad_ios_unittest.cc" ] deps += [ "//third_party/breakpad:client" ] diff --git a/www/chromium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc b/www/chromium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc index f174c6f26bc3..69a1d9be3a1a 100644 --- a/www/chromium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc +++ b/www/chromium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc @@ -1,11 +1,11 @@ ---- components/discardable_memory/service/discardable_shared_memory_manager.cc.orig 2020-05-13 18:39:41 UTC +--- components/discardable_memory/service/discardable_shared_memory_manager.cc.orig 2020-11-13 06:36:40 UTC +++ components/discardable_memory/service/discardable_shared_memory_manager.cc @@ -33,7 +33,7 @@ #include "components/discardable_memory/common/discardable_shared_memory_heap.h" #include "mojo/public/cpp/bindings/self_owned_receiver.h" --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/metrics/histogram_macros.h" @@ -13,8 +13,8 @@ max_default_memory_limit /= 8; #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) base::FilePath shmem_dir; if (base::GetShmemTempDir(false, &shmem_dir)) { int64_t shmem_dir_amount_of_free_space = diff --git a/www/chromium/files/patch-components_download_internal_common_base__file.cc b/www/chromium/files/patch-components_download_internal_common_base__file.cc index c9e1747454b6..9de8c461bc08 100644 --- a/www/chromium/files/patch-components_download_internal_common_base__file.cc +++ b/www/chromium/files/patch-components_download_internal_common_base__file.cc @@ -1,20 +1,20 @@ ---- components/download/internal/common/base_file.cc.orig 2020-05-13 18:39:41 UTC +--- components/download/internal/common/base_file.cc.orig 2020-11-13 06:36:40 UTC +++ components/download/internal/common/base_file.cc @@ -604,7 +604,7 @@ GURL GetEffectiveAuthorityURL(const GURL& source_url, } // namespace --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) +-#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) DownloadInterruptReason BaseFile::AnnotateWithSourceInformationSync( - const std::string& client_guid, -@@ -622,7 +622,7 @@ DownloadInterruptReason BaseFile::AnnotateWithSourceIn +@@ -623,7 +623,7 @@ DownloadInterruptReason BaseFile::AnnotateWithSourceIn return QuarantineFileResultToReason(result); } --#else // !OS_WIN && !OS_MACOSX && !OS_LINUX -+#else // !OS_WIN && !OS_MACOSX && !OS_LINUX && !OS_BSD +-#else // !OS_WIN && !OS_APPLE && !OS_LINUX && !OS_CHROMEOS ++#else // !OS_WIN && !OS_APPLE && !OS_LINUX && !OS_CHROMEOS && !OS_BSD DownloadInterruptReason BaseFile::AnnotateWithSourceInformationSync( const std::string& client_guid, const GURL& source_url, 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 ea4af4e91c50..e6e1dad77f19 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,27 +1,28 @@ ---- components/feature_engagement/public/event_constants.cc.orig 2020-02-03 21:52:44 UTC +--- components/feature_engagement/public/event_constants.cc.orig 2020-11-13 06:36:40 UTC +++ components/feature_engagement/public/event_constants.cc -@@ -12,12 +12,12 @@ namespace feature_engagement { +@@ -10,13 +10,13 @@ namespace feature_engagement { + namespace events { - #if defined(OS_IOS) || defined(OS_WIN) || defined(OS_MACOSX) || \ -- defined(OS_LINUX) || defined(OS_CHROMEOS) -+ defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) const char kNewTabOpened[] = "new_tab_opened"; - #endif // defined(OS_IOS) || defined(OS_WIN) || defined(OS_MACOSX) || + #endif // defined(OS_WIN) || defined(OS_APPLE) || - // defined(OS_LINUX) || defined(OS_CHROMEOS) + // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ +-#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) - const char kReopenTabConditionsMet[] = "reopen_tab_conditions_met"; - const char kTabReopened[] = "tab_reopened"; -@@ -42,7 +42,7 @@ const char kIncognitoWindowOpened[] = "incognito_windo - const char kIncognitoWindowSessionTimeMet[] = - "incognito_window_session_time_met"; - #endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP) --#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || -+#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || + const char kSixthTabOpened[] = "sixth_tab_opened"; + const char kTabGroupCreated[] = "tab_group_created"; +@@ -32,7 +32,7 @@ const char kFocusModeConditionsMet[] = "focus_mode_con + + const char kWebUITabStripClosed[] = "webui_tab_strip_closed"; + const char kWebUITabStripOpened[] = "webui_tab_strip_opened"; +-#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || // defined(OS_CHROMEOS) #if defined(OS_IOS) diff --git a/www/chromium/files/patch-components_feature__engagement_public_event__constants.h b/www/chromium/files/patch-components_feature__engagement_public_event__constants.h index 96b274df41fb..8550f9c063fc 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,30 +1,31 @@ ---- components/feature_engagement/public/event_constants.h.orig 2020-02-03 21:52:44 UTC +--- components/feature_engagement/public/event_constants.h.orig 2020-11-13 06:36:40 UTC +++ components/feature_engagement/public/event_constants.h -@@ -14,15 +14,15 @@ namespace events { +@@ -12,16 +12,16 @@ namespace feature_engagement { + namespace events { // Desktop and IOS. - #if defined(OS_IOS) || defined(OS_WIN) || defined(OS_MACOSX) || \ -- defined(OS_LINUX) || defined(OS_CHROMEOS) -+ defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#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) // The user has explicitly opened a new tab via an entry point from inside of // Chrome. extern const char kNewTabOpened[]; - #endif // defined(OS_IOS) || defined(OS_WIN) || defined(OS_MACOSX) || + #endif // defined(OS_WIN) || defined(OS_APPLE) || - // defined(OS_LINUX) || defined(OS_CHROMEOS) + // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Desktop --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ +-#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) - // All conditions for reopen closed tab IPH were met. Since this IPH needs to - // track user events (opening/closing tabs, focusing the omnibox, etc) on the -@@ -80,7 +80,7 @@ extern const char kIncognitoWindowOpened[]; - extern const char kIncognitoWindowSessionTimeMet[]; - #endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP) + // A new tab was opened when 5 (or more) tabs were already open. + extern const char kSixthTabOpened[]; +@@ -54,7 +54,7 @@ extern const char kWebUITabStripClosed[]; + // The WebUI tab strip was opened by the user. + extern const char kWebUITabStripOpened[]; --#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || -+#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || +-#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || // defined(OS_CHROMEOS) #if defined(OS_IOS) 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 new file mode 100644 index 000000000000..4e9006fb4290 --- /dev/null +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc @@ -0,0 +1,20 @@ +--- components/feature_engagement/public/feature_configurations.cc.orig 2020-11-16 14:27:02 UTC ++++ components/feature_engagement/public/feature_configurations.cc +@@ -12,7 +12,7 @@ namespace feature_engagement { + + base::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(); +@@ -28,7 +28,7 @@ base::Optional<FeatureConfig> GetClientSideFeatureConf + Comparator(EQUAL, 0), 180, 180)); + return config; + } +-#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || + // defined(OS_CHROMEOS) + + #if defined(OS_ANDROID) 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 699be09ed7b4..edfc2d3a4eda 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc @@ -1,20 +1,20 @@ ---- components/feature_engagement/public/feature_constants.cc.orig 2020-02-03 21:53:30 UTC +--- components/feature_engagement/public/feature_constants.cc.orig 2020-11-13 06:36:40 UTC +++ components/feature_engagement/public/feature_constants.cc -@@ -14,7 +14,7 @@ const base::Feature kIPHDemoMode{"IPH_DemoMode", +@@ -12,7 +12,7 @@ const base::Feature kIPHDemoMode{"IPH_DemoMode", const base::Feature kIPHDummyFeature{"IPH_Dummy", base::FEATURE_DISABLED_BY_DEFAULT}; --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ +-#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) - const base::Feature kIPHFocusModeFeature{"IPH_FocusMode", - base::FEATURE_DISABLED_BY_DEFAULT}; -@@ -33,7 +33,7 @@ const base::Feature kIPHIncognitoWindowFeature{ - const base::Feature kIPHNewTabFeature{"IPH_NewTab", - base::FEATURE_DISABLED_BY_DEFAULT}; - #endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP) --#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || -+#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || + const base::Feature kIPHDesktopTabGroupsNewGroupFeature{ + "IPH_DesktopTabGroupsNewGroup", base::FEATURE_DISABLED_BY_DEFAULT}; +@@ -30,7 +30,7 @@ const base::Feature kIPHWebUITabStripFeature{"IPH_WebU + base::FEATURE_DISABLED_BY_DEFAULT}; + const base::Feature kIPHDesktopSnoozeFeature{"IPH_DesktopSnoozeFeature", + 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) #if defined(OS_ANDROID) 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 415b6f1d8c71..29479fe45148 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h @@ -1,20 +1,20 @@ ---- components/feature_engagement/public/feature_constants.h.orig 2020-02-03 21:53:30 UTC +--- components/feature_engagement/public/feature_constants.h.orig 2020-11-13 06:36:40 UTC +++ components/feature_engagement/public/feature_constants.h -@@ -17,7 +17,7 @@ extern const base::Feature kIPHDemoMode; +@@ -16,7 +16,7 @@ extern const base::Feature kIPHDemoMode; // A feature to ensure all arrays can contain at least one feature. extern const base::Feature kIPHDummyFeature; --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ +-#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) + extern const base::Feature kIPHDesktopTabGroupsNewGroupFeature; extern const base::Feature kIPHFocusModeFeature; - extern const base::Feature kIPHGlobalMediaControlsFeature; -@@ -29,7 +29,7 @@ extern const base::Feature kIPHBookmarkFeature; - extern const base::Feature kIPHIncognitoWindowFeature; - extern const base::Feature kIPHNewTabFeature; - #endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IPH) --#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || -+#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || +@@ -26,7 +26,7 @@ extern const base::Feature kIPHPasswordsAccountStorage + extern const base::Feature kIPHReopenTabFeature; + extern const base::Feature kIPHWebUITabStripFeature; + extern const base::Feature kIPHDesktopSnoozeFeature; +-#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) // All the features declared for Android below that are also used in Java, 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 135ee2a3937a..b1ddb3e1c682 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc @@ -1,20 +1,20 @@ ---- components/feature_engagement/public/feature_list.cc.orig 2020-08-18 18:40:09 UTC +--- components/feature_engagement/public/feature_list.cc.orig 2020-11-13 06:36:40 UTC +++ components/feature_engagement/public/feature_list.cc -@@ -63,7 +63,7 @@ const base::Feature* const kAllFeatures[] = { - &kIPHBadgedReadingListFeature, +@@ -66,7 +66,7 @@ const base::Feature* const kAllFeatures[] = { &kIPHBadgedTranslateManualTriggerFeature, + &kIPHDiscoverFeedHeaderFeature, #endif // defined(OS_IOS) --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ +-#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) + &kIPHDesktopTabGroupsNewGroupFeature, &kIPHFocusModeFeature, - &kIPHGlobalMediaControlsFeature, -@@ -74,7 +74,7 @@ const base::Feature* const kAllFeatures[] = { - &kIPHIncognitoWindowFeature, - &kIPHNewTabFeature, - #endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP) --#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || -+#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || +@@ -75,7 +75,7 @@ const base::Feature* const kAllFeatures[] = { + &kIPHPasswordsAccountStorageFeature, + &kIPHReopenTabFeature, + &kIPHWebUITabStripFeature, +-#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 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 f6d474bded01..90087005d86f 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__list.h +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__list.h @@ -1,38 +1,38 @@ ---- components/feature_engagement/public/feature_list.h.orig 2020-08-18 18:40:09 UTC +--- components/feature_engagement/public/feature_list.h.orig 2020-11-13 06:36:40 UTC +++ components/feature_engagement/public/feature_list.h -@@ -119,7 +119,7 @@ DEFINE_VARIATION_PARAM(kIPHBadgedTranslateManualTrigge - "IPH_BadgedTranslateManualTrigger"); +@@ -126,7 +126,7 @@ DEFINE_VARIATION_PARAM(kIPHDiscoverFeedHeaderFeature, + "IPH_DiscoverFeedHeaderMenu"); #endif // defined(OS_IOS) --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ +-#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) - DEFINE_VARIATION_PARAM(kIPHFocusModeFeature, "IPH_FocusMode"); - DEFINE_VARIATION_PARAM(kIPHGlobalMediaControls, "IPH_GlobalMediaControls"); -@@ -130,7 +130,7 @@ DEFINE_VARIATION_PARAM(kIPHBookmarkFeature, "IPH_Bookm - DEFINE_VARIATION_PARAM(kIPHIncognitoWindowFeature, "IPH_IncognitoWindow"); - DEFINE_VARIATION_PARAM(kIPHNewTabFeature, "IPH_NewTab"); - #endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP) --#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || -+#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || + DEFINE_VARIATION_PARAM(kIPHDesktopTabGroupsNewGroupFeature, + "IPH_DesktopTabGroupsNewGroup"); +@@ -137,7 +137,7 @@ DEFINE_VARIATION_PARAM(kIPHPasswordsAccountStorageFeat + "IPH_PasswordsAccountStorage"); + DEFINE_VARIATION_PARAM(kIPHReopenTabFeature, "IPH_ReopenTab"); + DEFINE_VARIATION_PARAM(kIPHWebUITabStripFeature, "IPH_WebUITabStrip"); +-#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 -@@ -185,7 +185,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation - VARIATION_ENTRY(kIPHNewIncognitoTabTipFeature), +@@ -196,7 +196,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation VARIATION_ENTRY(kIPHBadgedReadingListFeature), VARIATION_ENTRY(kIPHBadgedTranslateManualTriggerFeature), --#elif defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ -+#elif defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ + 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) || \ defined(OS_CHROMEOS) + VARIATION_ENTRY(kIPHDesktopTabGroupsNewGroupFeature), VARIATION_ENTRY(kIPHFocusModeFeature), - VARIATION_ENTRY(kIPHGlobalMediaControls), -@@ -196,7 +196,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation - VARIATION_ENTRY(kIPHIncognitoWindowFeature), - VARIATION_ENTRY(kIPHNewTabFeature), - #endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP) --#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || -+#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || +@@ -205,7 +205,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation + VARIATION_ENTRY(kIPHPasswordsAccountStorageFeature), + VARIATION_ENTRY(kIPHReopenTabFeature), + VARIATION_ENTRY(kIPHWebUITabStripFeature), +-#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_feed_core_proto_v2_wire_version.proto b/www/chromium/files/patch-components_feed_core_proto_v2_wire_version.proto new file mode 100644 index 000000000000..c7e3ddc01941 --- /dev/null +++ b/www/chromium/files/patch-components_feed_core_proto_v2_wire_version.proto @@ -0,0 +1,13 @@ +--- components/feed/core/proto/v2/wire/version.proto.orig 2020-11-26 17:29:25 UTC ++++ components/feed/core/proto/v2/wire/version.proto +@@ -11,8 +11,8 @@ option optimize_for = LITE_RUNTIME; + // Specification of an application or OS version. + // A version string typically looks like: 'major.minor.build.revision' + message Version { +- optional int32 major = 1; +- optional int32 minor = 2; ++ optional int32 gmajor = 1; ++ optional int32 gminor = 2; + optional int32 build = 3; + optional int32 revision = 4; + diff --git a/www/chromium/files/patch-components_feed_core_proto_wire_version.proto b/www/chromium/files/patch-components_feed_core_proto_wire_version.proto new file mode 100644 index 000000000000..b3f2537d971d --- /dev/null +++ b/www/chromium/files/patch-components_feed_core_proto_wire_version.proto @@ -0,0 +1,13 @@ +--- components/feed/core/proto/wire/version.proto.orig 2020-11-26 17:11:18 UTC ++++ components/feed/core/proto/wire/version.proto +@@ -14,8 +14,8 @@ option java_outer_classname = "VersionProto"; + // Specification of an application or OS version. + // A version string typically looks like: 'major.minor.build.revision' + message Version { +- optional int32 major = 1; +- optional int32 minor = 2; ++ optional int32 gmajor = 1; ++ optional int32 gminor = 2; + optional int32 build = 3; + optional int32 revision = 4; + 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 new file mode 100644 index 000000000000..178e30dc695d --- /dev/null +++ b/www/chromium/files/patch-components_feed_core_v2_proto__util.cc @@ -0,0 +1,24 @@ +--- components/feed/core/v2/proto_util.cc.orig 2020-11-26 17:50:17 UTC ++++ components/feed/core/v2/proto_util.cc +@@ -79,8 +79,8 @@ feedwire::Version GetPlatformVersionMessage() { + + int32_t major, minor, revision; + base::SysInfo::OperatingSystemVersionNumbers(&major, &minor, &revision); +- result.set_major(major); +- result.set_minor(minor); ++ result.set_gmajor(major); ++ result.set_gminor(minor); + result.set_revision(revision); + #if defined(OS_ANDROID) + result.set_api_version(base::android::BuildInfo::GetInstance()->sdk_int()); +@@ -95,8 +95,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) { +- result.set_major(static_cast<int32_t>(numbers[0])); +- result.set_minor(static_cast<int32_t>(numbers[1])); ++ result.set_gmajor(static_cast<int32_t>(numbers[0])); ++ result.set_gminor(static_cast<int32_t>(numbers[1])); + result.set_build(static_cast<int32_t>(numbers[2])); + result.set_revision(static_cast<int32_t>(numbers[3])); + } diff --git a/www/chromium/files/patch-components_feedback_anonymizer__tool.cc b/www/chromium/files/patch-components_feedback_anonymizer__tool.cc deleted file mode 100644 index ec853d75bd26..000000000000 --- a/www/chromium/files/patch-components_feedback_anonymizer__tool.cc +++ /dev/null @@ -1,14 +0,0 @@ ---- components/feedback/anonymizer_tool.cc.orig 2020-03-16 18:40:30 UTC -+++ components/feedback/anonymizer_tool.cc -@@ -15,7 +15,11 @@ - #include "base/threading/thread_restrictions.h" - #include "content/public/browser/browser_thread.h" - #include "net/base/ip_address.h" -+#if defined(OS_BSD) -+#include <re2/re2.h> -+#else - #include "third_party/re2/src/re2/re2.h" -+#endif - - using re2::RE2; - 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 fdaa3f2f453c..a6a5449f1b7d 100644 --- a/www/chromium/files/patch-components_flags__ui_flags__state.cc +++ b/www/chromium/files/patch-components_flags__ui_flags__state.cc @@ -1,8 +1,8 @@ ---- components/flags_ui/flags_state.cc.orig 2020-02-03 21:53:30 UTC +--- components/flags_ui/flags_state.cc.orig 2020-11-13 06:36:40 UTC +++ components/flags_ui/flags_state.cc -@@ -693,7 +693,7 @@ int FlagsState::GetCurrentPlatform() { +@@ -687,7 +687,7 @@ int FlagsState::GetCurrentPlatform() { return kOsWin; - #elif defined(OS_CHROMEOS) // Needs to be before the OS_LINUX check. + #elif defined(OS_CHROMEOS) return kOsCrOS; -#elif defined(OS_LINUX) || defined(OS_OPENBSD) +#elif defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_FREEBSD) diff --git a/www/chromium/files/patch-components_gcm__driver_gcm__client.h b/www/chromium/files/patch-components_gcm__driver_gcm__client.h index d40f905a889e..6b9d3e0c6436 100644 --- a/www/chromium/files/patch-components_gcm__driver_gcm__client.h +++ b/www/chromium/files/patch-components_gcm__driver_gcm__client.h @@ -1,4 +1,4 @@ ---- components/gcm_driver/gcm_client.h.orig 2020-02-03 21:53:30 UTC +--- components/gcm_driver/gcm_client.h.orig 2020-11-13 06:36:40 UTC +++ components/gcm_driver/gcm_client.h @@ -87,6 +87,7 @@ class GCMClient { PLATFORM_CROS, 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 52e43837a5bd..b1ed1bdb07ab 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,4 +1,4 @@ ---- components/gcm_driver/gcm_client_impl.cc.orig 2020-02-03 21:53:30 UTC +--- components/gcm_driver/gcm_client_impl.cc.orig 2020-11-13 06:36:40 UTC +++ components/gcm_driver/gcm_client_impl.cc @@ -135,6 +135,9 @@ void ToCheckinProtoVersion( case GCMClient::PLATFORM_CROS: diff --git a/www/chromium/files/patch-components_gwp__asan_BUILD.gn b/www/chromium/files/patch-components_gwp__asan_BUILD.gn new file mode 100644 index 000000000000..ee9be0f977fe --- /dev/null +++ b/www/chromium/files/patch-components_gwp__asan_BUILD.gn @@ -0,0 +1,10 @@ +--- components/gwp_asan/BUILD.gn.orig 2020-11-17 12:04:32 UTC ++++ components/gwp_asan/BUILD.gn +@@ -20,4 +20,7 @@ test("gwp_asan_unittests") { + "//components/gwp_asan/crash_handler:unit_tests", + ] + } ++ if (is_bsd) { ++ deps -= [ "//components/gwp_asan/crash_handler:unit_tests" ] ++ } + } diff --git a/www/chromium/files/patch-components_keyed__service_core_dependency__graph__unittest.cc b/www/chromium/files/patch-components_keyed__service_core_dependency__graph__unittest.cc index bbf7cb18c4a1..d88a8acf9d44 100644 --- a/www/chromium/files/patch-components_keyed__service_core_dependency__graph__unittest.cc +++ b/www/chromium/files/patch-components_keyed__service_core_dependency__graph__unittest.cc @@ -1,4 +1,4 @@ ---- components/keyed_service/core/dependency_graph_unittest.cc.orig 2019-03-11 22:00:56 UTC +--- components/keyed_service/core/dependency_graph_unittest.cc.orig 2020-11-13 06:36:41 UTC +++ components/keyed_service/core/dependency_graph_unittest.cc @@ -9,7 +9,11 @@ #include "components/keyed_service/core/dependency_graph.h" diff --git a/www/chromium/files/patch-components_metrics_BUILD.gn b/www/chromium/files/patch-components_metrics_BUILD.gn index adf2e64f115b..4fee4f1fc144 100644 --- a/www/chromium/files/patch-components_metrics_BUILD.gn +++ b/www/chromium/files/patch-components_metrics_BUILD.gn @@ -1,6 +1,6 @@ ---- components/metrics/BUILD.gn.orig 2020-07-07 21:58:15 UTC +--- components/metrics/BUILD.gn.orig 2020-11-13 06:36:41 UTC +++ components/metrics/BUILD.gn -@@ -177,6 +177,11 @@ jumbo_static_library("metrics") { +@@ -189,6 +189,11 @@ static_library("metrics") { if (is_fuchsia) { sources += [ "drive_metrics_provider_fuchsia.cc" ] } diff --git a/www/chromium/files/patch-components_metrics_drive__metrics__provider__linux.cc b/www/chromium/files/patch-components_metrics_drive__metrics__provider__linux.cc index 7e51eab82bdb..4f25f410bfe1 100644 --- a/www/chromium/files/patch-components_metrics_drive__metrics__provider__linux.cc +++ b/www/chromium/files/patch-components_metrics_drive__metrics__provider__linux.cc @@ -1,4 +1,4 @@ ---- components/metrics/drive_metrics_provider_linux.cc.orig 2019-03-11 22:00:56 UTC +--- components/metrics/drive_metrics_provider_linux.cc.orig 2020-11-13 06:36:41 UTC +++ components/metrics/drive_metrics_provider_linux.cc @@ -4,7 +4,13 @@ diff --git a/www/chromium/files/patch-components_metrics_metrics__log.cc b/www/chromium/files/patch-components_metrics_metrics__log.cc index 579e92430da3..63cfb92beb13 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 2020-07-07 21:58:15 UTC +--- components/metrics/metrics_log.cc.orig 2020-11-13 06:36:41 UTC +++ components/metrics/metrics_log.cc -@@ -214,7 +214,7 @@ void MetricsLog::RecordCoreSystemProfile( +@@ -224,7 +224,7 @@ void MetricsLog::RecordCoreSystemProfile( // OperatingSystemVersion refers to the ChromeOS release version. #if defined(OS_CHROMEOS) os->set_kernel_version(base::SysInfo::KernelVersion()); diff --git a/www/chromium/files/patch-components_metrics_system__memory__stats__recorder__linux.cc b/www/chromium/files/patch-components_metrics_system__memory__stats__recorder__linux.cc deleted file mode 100644 index 1cb338f7464b..000000000000 --- a/www/chromium/files/patch-components_metrics_system__memory__stats__recorder__linux.cc +++ /dev/null @@ -1,18 +0,0 @@ ---- components/metrics/system_memory_stats_recorder_linux.cc.orig 2019-09-09 21:55:14 UTC -+++ components/metrics/system_memory_stats_recorder_linux.cc -@@ -30,6 +30,7 @@ namespace metrics { - UMA_HISTOGRAM_LINEAR(name, sample, 2500, 50) - - void RecordMemoryStats(RecordMemoryStatsType type) { -+#if !defined(OS_FREEBSD) - base::SystemMemoryInfoKB memory; - if (!base::GetSystemMemoryInfo(&memory)) - return; -@@ -81,6 +82,7 @@ void RecordMemoryStats(RecordMemoryStatsType type) { - break; - } - } -+#endif // !defined(OS_FREEBSD) - } - - } // namespace metrics diff --git a/www/chromium/files/patch-components_neterror_resources_neterror.js b/www/chromium/files/patch-components_neterror_resources_neterror.js index 0aec56a3e621..a61693d6fc70 100644 --- a/www/chromium/files/patch-components_neterror_resources_neterror.js +++ b/www/chromium/files/patch-components_neterror_resources_neterror.js @@ -1,6 +1,6 @@ ---- components/neterror/resources/neterror.js.orig 2020-07-07 21:58:15 UTC +--- components/neterror/resources/neterror.js.orig 2020-11-13 06:36:41 UTC +++ components/neterror/resources/neterror.js -@@ -202,7 +202,7 @@ function setUpCachedButton(buttonStrings) { +@@ -153,7 +153,7 @@ function detailsButtonClick() { } let primaryControlOnLeft = true; diff --git a/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc b/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc index 7bea87ef5488..90cf9695a7d4 100644 --- a/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc +++ b/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc @@ -1,6 +1,6 @@ ---- components/network_session_configurator/browser/network_session_configurator.cc.orig 2020-07-07 21:58:15 UTC +--- components/network_session_configurator/browser/network_session_configurator.cc.orig 2020-11-13 06:36:41 UTC +++ components/network_session_configurator/browser/network_session_configurator.cc -@@ -703,7 +703,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C +@@ -749,7 +749,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C } #endif // #if !defined(OS_ANDROID) diff --git a/www/chromium/files/patch-components_new__or__sad__tab__strings.grdp b/www/chromium/files/patch-components_new__or__sad__tab__strings.grdp index 015ca5836d21..c8a2ad64a154 100644 --- a/www/chromium/files/patch-components_new__or__sad__tab__strings.grdp +++ b/www/chromium/files/patch-components_new__or__sad__tab__strings.grdp @@ -1,4 +1,4 @@ ---- components/new_or_sad_tab_strings.grdp.orig 2020-03-16 18:40:30 UTC +--- components/new_or_sad_tab_strings.grdp.orig 2020-11-13 06:36:41 UTC +++ components/new_or_sad_tab_strings.grdp @@ -51,7 +51,7 @@ Open page in a new Incognito window (⇧⌘N) diff --git a/www/chromium/files/patch-components_os__crypt_os__crypt.h b/www/chromium/files/patch-components_os__crypt_os__crypt.h index f9e601a9a454..2c319ae38e46 100644 --- a/www/chromium/files/patch-components_os__crypt_os__crypt.h +++ b/www/chromium/files/patch-components_os__crypt_os__crypt.h @@ -1,4 +1,4 @@ ---- components/os_crypt/os_crypt.h.orig 2020-02-03 21:53:30 UTC +--- components/os_crypt/os_crypt.h.orig 2020-11-13 06:36:41 UTC +++ components/os_crypt/os_crypt.h @@ -15,9 +15,9 @@ #include "base/strings/string16.h" @@ -10,7 +10,7 @@ -#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) +#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - #if defined(OS_WIN) || (defined(OS_MACOSX) && !defined(OS_IOS)) + #if defined(OS_WIN) || defined(OS_MAC) class PrefRegistrySimple; @@ -34,13 +34,13 @@ struct Config; // true for Linux, if a password management tool is available. @@ -24,8 +24,8 @@ -#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) +#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) --#if defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+#if defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) +-#if defined(OS_APPLE) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++#if defined(OS_APPLE) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) // On Linux returns true iff the real secret key (not hardcoded one) is // available. On MacOS returns true if Keychain is available (for mock // Keychain it returns true if not using locked Keychain, false if using diff --git a/www/chromium/files/patch-components_os__crypt_os__crypt__unittest.cc b/www/chromium/files/patch-components_os__crypt_os__crypt__unittest.cc index d8cbdaad386c..2de800a4cc96 100644 --- a/www/chromium/files/patch-components_os__crypt_os__crypt__unittest.cc +++ b/www/chromium/files/patch-components_os__crypt_os__crypt__unittest.cc @@ -1,4 +1,4 @@ ---- components/os_crypt/os_crypt_unittest.cc.orig 2019-03-11 22:00:56 UTC +--- components/os_crypt/os_crypt_unittest.cc.orig 2020-11-13 06:36:41 UTC +++ components/os_crypt/os_crypt_unittest.cc @@ -18,7 +18,7 @@ #include "components/os_crypt/os_crypt_mocker.h" diff --git a/www/chromium/files/patch-components_plugins_renderer_plugin__placeholder.cc b/www/chromium/files/patch-components_plugins_renderer_plugin__placeholder.cc index 0f704d529edf..2f56253b9a9a 100644 --- a/www/chromium/files/patch-components_plugins_renderer_plugin__placeholder.cc +++ b/www/chromium/files/patch-components_plugins_renderer_plugin__placeholder.cc @@ -1,4 +1,4 @@ ---- components/plugins/renderer/plugin_placeholder.cc.orig 2019-03-11 22:00:56 UTC +--- components/plugins/renderer/plugin_placeholder.cc.orig 2020-11-13 06:36:41 UTC +++ components/plugins/renderer/plugin_placeholder.cc @@ -17,7 +17,11 @@ #include "third_party/blink/public/web/web_plugin_container.h" diff --git a/www/chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc b/www/chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc index 13dc978bbc38..79e7e3b31786 100644 --- a/www/chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc +++ b/www/chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc @@ -1,4 +1,4 @@ ---- components/policy/core/browser/policy_pref_mapping_test.cc.orig 2020-07-13 09:35:12 UTC +--- components/policy/core/browser/policy_pref_mapping_test.cc.orig 2020-11-13 06:36:41 UTC +++ components/policy/core/browser/policy_pref_mapping_test.cc @@ -270,6 +270,8 @@ class PolicyTestCase { const std::string os("chromeos"); 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 13d0c5eb1a3a..92b510244ce1 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,15 +1,6 @@ ---- components/policy/core/common/cloud/cloud_policy_util.cc.orig 2020-07-07 21:58:15 UTC +--- components/policy/core/common/cloud/cloud_policy_util.cc.orig 2020-11-13 06:36:41 UTC +++ components/policy/core/common/cloud/cloud_policy_util.cc -@@ -16,7 +16,7 @@ - #include <wincred.h> - #endif - --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_MACOSX) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) || defined(OS_BSD) - #include <pwd.h> - #include <sys/types.h> - #include <unistd.h> -@@ -31,7 +31,7 @@ +@@ -32,7 +32,7 @@ #import <SystemConfiguration/SCDynamicStoreCopySpecific.h> #endif @@ -18,7 +9,7 @@ #include <limits.h> // For HOST_NAME_MAX #endif -@@ -61,7 +61,7 @@ +@@ -66,7 +66,7 @@ #include "base/system/sys_info.h" #endif @@ -27,47 +18,3 @@ #include "base/system/sys_info.h" #endif -@@ -70,11 +70,24 @@ namespace policy { - namespace em = enterprise_management; - - std::string GetMachineName() { --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) - char hostname[HOST_NAME_MAX]; - if (gethostname(hostname, HOST_NAME_MAX) == 0) // Success. - return hostname; - return std::string(); -+#elif defined(OS_BSD) -+ long host_name_max = sysconf(_SC_HOST_NAME_MAX); -+ if (host_name_max != -1) { -+ char *hostname = new char[host_name_max + 1](); -+ std::string hostname_r; -+ -+ if (gethostname(hostname, host_name_max) == 0) -+ hostname_r = hostname; -+ -+ delete[] hostname; -+ return hostname_r; -+ } -+ return std::string(); - #elif defined(OS_MACOSX) - // TODO(crbug.com/1024115): Find a different replacement for -[NSHost - // currentHost] on iOS. -@@ -124,7 +137,7 @@ std::string GetMachineName() { - } - - std::string GetOSVersion() { --#if defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) - return base::SysInfo::OperatingSystemVersion(); - #elif defined(OS_WIN) - base::win::OSInfo::VersionNumber version_number = -@@ -147,7 +160,7 @@ std::string GetOSArchitecture() { - } - - std::string GetOSUsername() { --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_MACOSX) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) || defined(OS_BSD) - struct passwd* creds = getpwuid(getuid()); - if (!creds || !creds->pw_name) - return std::string(); diff --git a/www/chromium/files/patch-components_policy_core_common_schema.cc b/www/chromium/files/patch-components_policy_core_common_schema.cc index 886e2b810d99..079d10571c28 100644 --- a/www/chromium/files/patch-components_policy_core_common_schema.cc +++ b/www/chromium/files/patch-components_policy_core_common_schema.cc @@ -1,4 +1,4 @@ ---- components/policy/core/common/schema.cc.orig 2020-07-07 21:57:36 UTC +--- components/policy/core/common/schema.cc.orig 2020-11-13 06:36:41 UTC +++ components/policy/core/common/schema.cc @@ -24,7 +24,11 @@ #include "base/strings/stringprintf.h" diff --git a/www/chromium/files/patch-components_policy_resources_policy__templates.json b/www/chromium/files/patch-components_policy_resources_policy__templates.json index a0d8ee1b04c9..013236168a8b 100644 --- a/www/chromium/files/patch-components_policy_resources_policy__templates.json +++ b/www/chromium/files/patch-components_policy_resources_policy__templates.json @@ -1,6 +1,6 @@ ---- components/policy/resources/policy_templates.json.orig 2020-07-07 21:58:15 UTC +--- components/policy/resources/policy_templates.json.orig 2020-11-13 06:36:41 UTC +++ components/policy/resources/policy_templates.json -@@ -1127,7 +1127,7 @@ +@@ -1198,7 +1198,7 @@ 'owners': ['file://components/policy/resources/OWNERS'], 'type': 'string', 'schema': { 'type': 'string' }, @@ -9,7 +9,7 @@ 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -1157,7 +1157,7 @@ +@@ -1224,7 +1224,7 @@ 'owners': ['file://components/policy/resources/OWNERS'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -18,7 +18,7 @@ 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -1184,7 +1184,7 @@ +@@ -1245,7 +1245,7 @@ 'owners': ['file://components/policy/resources/OWNERS'], 'type': 'string', 'schema': { 'type': 'string' }, @@ -27,16 +27,7 @@ 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -2013,7 +2013,7 @@ - 'owners': ['jamiewalch@chromium.org', 'rkjnsn@chromium.org'], - 'type': 'main', - 'schema': { 'type': 'boolean' }, -- 'supported_on': ['chrome.linux:25-', 'chrome.mac:25-', 'chrome_os:42-'], -+ 'supported_on': ['chrome.linux:25-', 'chrome.mac:25-', 'chrome_os:42-', 'chrome.freebsd:25-'], - 'features': { - 'dynamic_refresh': True, - 'per_profile': False, -@@ -4151,7 +4151,7 @@ +@@ -4285,7 +4285,7 @@ 'owners': ['file://components/policy/resources/OWNERS'], 'type': 'string', 'schema': { 'type': 'string' }, @@ -45,7 +36,7 @@ 'features': { 'dynamic_refresh': False, 'per_profile': False, -@@ -4205,7 +4205,7 @@ +@@ -4341,7 +4341,7 @@ 'owners': ['file://components/policy/resources/OWNERS'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -54,7 +45,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -7781,7 +7781,7 @@ +@@ -8423,7 +8423,7 @@ 'owners': ['file://src/net/cert/OWNERS'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -63,7 +54,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -9179,7 +9179,7 @@ +@@ -9998,7 +9998,7 @@ 'owners': ['file://components/policy/resources/OWNERS'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -72,7 +63,7 @@ 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -9928,7 +9928,7 @@ +@@ -10733,7 +10733,7 @@ 'owners': ['file://components/policy/resources/OWNERS'], 'type': 'main', 'schema': { 'type': 'boolean' }, diff --git a/www/chromium/files/patch-components_policy_tools_generate__policy__source.py b/www/chromium/files/patch-components_policy_tools_generate__policy__source.py index 59015ce58ae6..4c7a1836eeea 100644 --- a/www/chromium/files/patch-components_policy_tools_generate__policy__source.py +++ b/www/chromium/files/patch-components_policy_tools_generate__policy__source.py @@ -1,4 +1,4 @@ ---- components/policy/tools/generate_policy_source.py.orig 2020-07-07 21:58:15 UTC +--- components/policy/tools/generate_policy_source.py.orig 2020-11-13 06:36:41 UTC +++ components/policy/tools/generate_policy_source.py @@ -37,8 +37,9 @@ PLATFORM_STRINGS = { 'ios': ['ios'], diff --git a/www/chromium/files/patch-components_previews_core_previews__features.cc b/www/chromium/files/patch-components_previews_core_previews__features.cc index fabf0b3025ea..dd4f17ff34af 100644 --- a/www/chromium/files/patch-components_previews_core_previews__features.cc +++ b/www/chromium/files/patch-components_previews_core_previews__features.cc @@ -1,18 +1,18 @@ ---- components/previews/core/previews_features.cc.orig 2019-03-11 22:00:57 UTC +--- components/previews/core/previews_features.cc.orig 2020-11-13 06:36:41 UTC +++ components/previews/core/previews_features.cc @@ -14,12 +14,12 @@ namespace features { // are enabled are controlled by other features. const base::Feature kPreviews { "Previews", --#if defined(OS_ANDROID) || defined(OS_LINUX) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Previews allowed for Android (but also allow on Linux for dev/debug). base::FEATURE_ENABLED_BY_DEFAULT --#else // !defined(OS_ANDROID) || defined(OS_LINUX) -+#else // !defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) +-#else // !defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#else // !defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) base::FEATURE_DISABLED_BY_DEFAULT --#endif // defined(OS_ANDROID) || defined(OS_LINUX) -+#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) }; // Enables the Offline previews on android slow connections. 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 c7fbd8abeebb..70a88f157270 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,4 +1,4 @@ ---- components/safe_browsing/core/resources/gen_file_type_proto.py.orig 2019-03-11 22:00:54 UTC +--- components/safe_browsing/core/resources/gen_file_type_proto.py.orig 2020-11-13 06:36:41 UTC +++ components/safe_browsing/core/resources/gen_file_type_proto.py @@ -31,6 +31,7 @@ def PlatformTypes(): "android": download_file_types_pb2.DownloadFileType.PLATFORM_ANDROID, diff --git a/www/chromium/files/patch-components_security__interstitials_content_captive__portal__blocking__page.cc b/www/chromium/files/patch-components_security__interstitials_content_captive__portal__blocking__page.cc index b9eaf2aa1e95..6d4a8a1ebe8d 100644 --- a/www/chromium/files/patch-components_security__interstitials_content_captive__portal__blocking__page.cc +++ b/www/chromium/files/patch-components_security__interstitials_content_captive__portal__blocking__page.cc @@ -1,11 +1,11 @@ ---- components/security_interstitials/content/captive_portal_blocking_page.cc.orig 2020-03-16 18:39:49 UTC +--- components/security_interstitials/content/captive_portal_blocking_page.cc.orig 2020-11-13 06:36:41 UTC +++ components/security_interstitials/content/captive_portal_blocking_page.cc @@ -106,7 +106,7 @@ std::string CaptivePortalBlockingPage::GetWiFiSSID() c wifi_service->GetConnectedNetworkSSID(&ssid, &error); if (!error.empty()) return std::string(); --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) ++#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) ssid = net::GetWifiSSID(); #elif defined(OS_ANDROID) ssid = net::android::GetWifiSSID(); diff --git a/www/chromium/files/patch-components_security__interstitials_content_utils.cc b/www/chromium/files/patch-components_security__interstitials_content_utils.cc index 01dbabc11844..d6411a65d266 100644 --- a/www/chromium/files/patch-components_security__interstitials_content_utils.cc +++ b/www/chromium/files/patch-components_security__interstitials_content_utils.cc @@ -1,30 +1,11 @@ ---- components/security_interstitials/content/utils.cc.orig 2020-05-15 15:04:01 UTC +--- components/security_interstitials/content/utils.cc.orig 2020-11-13 06:36:41 UTC +++ components/security_interstitials/content/utils.cc -@@ -31,12 +31,18 @@ void LaunchDateAndTimeSettings() { +@@ -31,7 +31,7 @@ void LaunchDateAndTimeSettings() { #if defined(OS_ANDROID) JNIEnv* env = base::android::AttachCurrentThread(); Java_DateAndTimeSettingsHelper_openDateAndTimeSettings(env); --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) ++#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) struct ClockCommand { const char* const pathname; const char* const argument; - }; - static const ClockCommand kClockCommands[] = { -+#if defined(OS_BSD) -+ // GNOME -+ {"/usr/local/bin/gnome-control-center", "datetime"}, -+ // KDE -+ {"/usr/local/bin/kcmshell4", "clock"}, -+#else - // Unity - {"/usr/bin/unity-control-center", "datetime"}, - // GNOME -@@ -50,6 +56,7 @@ void LaunchDateAndTimeSettings() { - {"/usr/bin/kcmshell4", "clock"}, - {"/usr/local/bin/kcmshell4", "clock"}, - {"/opt/bin/kcmshell4", "clock"}, -+#endif - }; - - base::CommandLine command(base::FilePath("")); 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 f6e9116c28d0..31144453f53a 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,11 +1,11 @@ ---- components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.cc.orig 2020-02-24 18:39:14 UTC +--- components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.cc.orig 2020-11-13 06:36:41 UTC +++ components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.cc @@ -15,7 +15,7 @@ #if defined(OS_WIN) #include "content/public/child/dwrite_font_proxy_init_win.h" --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) ++#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "components/services/font/public/cpp/font_loader.h" #endif @@ -13,8 +13,8 @@ // Initialize font access for Skia. #if defined(OS_WIN) content::InitializeDWriteFontProxy(); --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) ++#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) mojo::PendingRemote<font_service::mojom::FontService> font_service; content::UtilityThread::Get()->BindHostReceiver( font_service.InitWithNewPipeAndPassReceiver()); @@ -22,8 +22,8 @@ // encoding to PNG or we could provide our own codec implementations. // Sanity check that fonts are working. --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // No WebSandbox is provided on Linux so the local fonts aren't accessible. // This is fine since since the subsetted fonts are provided in the SkPicture. // However, we still need to check that the SkFontMgr starts as it is used by diff --git a/www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.h b/www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.h index cef84cb98706..7c96529f2692 100644 --- a/www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.h +++ b/www/chromium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.h @@ -1,11 +1,11 @@ ---- components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.h.orig 2020-05-13 18:39:42 UTC +--- components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.h.orig 2020-11-13 06:36:41 UTC +++ components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.h @@ -20,7 +20,7 @@ #include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/receiver.h" --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "components/services/font/public/cpp/font_loader.h" #include "third_party/skia/include/core/SkRefCnt.h" #endif @@ -13,8 +13,8 @@ std::unique_ptr<PaintPreviewCompositorImpl>> compositors_; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) sk_sp<font_service::FontLoader> font_loader_; #endif diff --git a/www/chromium/files/patch-components_storage__monitor_BUILD.gn b/www/chromium/files/patch-components_storage__monitor_BUILD.gn index 3d90d22d647b..914773d67ed7 100644 --- a/www/chromium/files/patch-components_storage__monitor_BUILD.gn +++ b/www/chromium/files/patch-components_storage__monitor_BUILD.gn @@ -1,6 +1,6 @@ ---- components/storage_monitor/BUILD.gn.orig 2019-10-21 19:06:30 UTC +--- components/storage_monitor/BUILD.gn.orig 2020-11-13 06:36:41 UTC +++ components/storage_monitor/BUILD.gn -@@ -81,6 +81,13 @@ static_library("storage_monitor") { +@@ -88,6 +88,13 @@ static_library("storage_monitor") { } } diff --git a/www/chromium/files/patch-components_storage__monitor_removable__device__constants.cc b/www/chromium/files/patch-components_storage__monitor_removable__device__constants.cc index 055ef8ce5281..1e87811d0841 100644 --- a/www/chromium/files/patch-components_storage__monitor_removable__device__constants.cc +++ b/www/chromium/files/patch-components_storage__monitor_removable__device__constants.cc @@ -1,11 +1,11 @@ ---- components/storage_monitor/removable_device_constants.cc.orig 2019-03-11 22:00:57 UTC +--- components/storage_monitor/removable_device_constants.cc.orig 2020-11-13 06:36:41 UTC +++ components/storage_monitor/removable_device_constants.cc @@ -10,7 +10,7 @@ namespace storage_monitor { const char kFSUniqueIdPrefix[] = "UUID:"; const char kVendorModelSerialPrefix[] = "VendorModelSerial:"; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) const char kVendorModelVolumeStoragePrefix[] = "VendorModelVolumeStorage:"; #endif diff --git a/www/chromium/files/patch-components_storage__monitor_removable__device__constants.h b/www/chromium/files/patch-components_storage__monitor_removable__device__constants.h index 6417016c4b7e..9402828cd75e 100644 --- a/www/chromium/files/patch-components_storage__monitor_removable__device__constants.h +++ b/www/chromium/files/patch-components_storage__monitor_removable__device__constants.h @@ -1,11 +1,11 @@ ---- components/storage_monitor/removable_device_constants.h.orig 2019-03-11 22:00:57 UTC +--- components/storage_monitor/removable_device_constants.h.orig 2020-11-13 06:36:41 UTC +++ components/storage_monitor/removable_device_constants.h @@ -15,7 +15,7 @@ namespace storage_monitor { extern const char kFSUniqueIdPrefix[]; extern const char kVendorModelSerialPrefix[]; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) extern const char kVendorModelVolumeStoragePrefix[]; #endif diff --git a/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.cc b/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.cc index 5565618b98b3..a3c497dfaba0 100644 --- a/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.cc +++ b/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.cc @@ -1,4 +1,4 @@ ---- components/storage_monitor/storage_monitor_freebsd.cc.orig 2019-03-17 01:47:13 UTC +--- components/storage_monitor/storage_monitor_freebsd.cc.orig 2020-11-16 10:08:44 UTC +++ components/storage_monitor/storage_monitor_freebsd.cc @@ -0,0 +1,54 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. diff --git a/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.h b/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.h index 258c90fede4d..22290afed372 100644 --- a/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.h +++ b/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.h @@ -1,4 +1,4 @@ ---- components/storage_monitor/storage_monitor_freebsd.h.orig 2019-03-17 01:47:13 UTC +--- components/storage_monitor/storage_monitor_freebsd.h.orig 2020-11-16 10:08:44 UTC +++ components/storage_monitor/storage_monitor_freebsd.h @@ -0,0 +1,45 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. diff --git a/www/chromium/files/patch-components_sync__device__info_local__device__info__util.cc b/www/chromium/files/patch-components_sync__device__info_local__device__info__util.cc index 19d4b54c7495..db960aad0f75 100644 --- a/www/chromium/files/patch-components_sync__device__info_local__device__info__util.cc +++ b/www/chromium/files/patch-components_sync__device__info_local__device__info__util.cc @@ -1,6 +1,6 @@ ---- components/sync_device_info/local_device_info_util.cc.orig 2019-12-31 14:40:27 UTC +--- components/sync_device_info/local_device_info_util.cc.orig 2020-11-13 06:36:42 UTC +++ components/sync_device_info/local_device_info_util.cc -@@ -19,7 +19,7 @@ std::string GetPersonalizableDeviceNameInternal(); +@@ -52,7 +52,7 @@ std::string GetPersonalizableDeviceNameInternal(); sync_pb::SyncEnums::DeviceType GetLocalDeviceType() { #if defined(OS_CHROMEOS) return sync_pb::SyncEnums_DeviceType_TYPE_CROS; diff --git a/www/chromium/files/patch-components_sync__device__info_local__device__info__util__linux.cc b/www/chromium/files/patch-components_sync__device__info_local__device__info__util__linux.cc index 5c9398a7ea7c..76eec415a44e 100644 --- a/www/chromium/files/patch-components_sync__device__info_local__device__info__util__linux.cc +++ b/www/chromium/files/patch-components_sync__device__info_local__device__info__util__linux.cc @@ -1,4 +1,4 @@ ---- components/sync_device_info/local_device_info_util_linux.cc.orig 2020-02-24 18:39:14 UTC +--- components/sync_device_info/local_device_info_util_linux.cc.orig 2020-11-13 06:36:42 UTC +++ components/sync_device_info/local_device_info_util_linux.cc @@ -37,8 +37,9 @@ std::string GetPersonalizableDeviceNameInternal() { #if defined(OS_CHROMEOS) diff --git a/www/chromium/files/patch-components_update__client_update__query__params.cc b/www/chromium/files/patch-components_update__client_update__query__params.cc index 7da3a9299fb1..a9e8901f4c1e 100644 --- a/www/chromium/files/patch-components_update__client_update__query__params.cc +++ b/www/chromium/files/patch-components_update__client_update__query__params.cc @@ -1,4 +1,4 @@ ---- components/update_client/update_query_params.cc.orig 2019-10-21 19:06:31 UTC +--- components/update_client/update_query_params.cc.orig 2020-11-13 06:36:42 UTC +++ components/update_client/update_query_params.cc @@ -39,6 +39,8 @@ const char kOs[] = "fuchsia"; diff --git a/www/chromium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc b/www/chromium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc index d1eedad301dd..72c1783fe6eb 100644 --- a/www/chromium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc +++ b/www/chromium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc @@ -1,11 +1,11 @@ ---- components/url_formatter/spoof_checks/idn_spoof_checker.cc.orig 2020-07-07 21:58:15 UTC +--- components/url_formatter/spoof_checks/idn_spoof_checker.cc.orig 2020-11-13 06:36:42 UTC +++ components/url_formatter/spoof_checks/idn_spoof_checker.cc -@@ -272,7 +272,7 @@ IDNSpoofChecker::IDNSpoofChecker() { +@@ -291,7 +291,7 @@ IDNSpoofChecker::IDNSpoofChecker() { // The ideal fix would be to change the omnibox font used for Thai. In // that case, the Linux-only list should be revisited and potentially // removed. --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) "[ทนบพรหเแ๐ดลปฟม]", #else "[บพเแ๐]", diff --git a/www/chromium/files/patch-components_url__matcher_regex__set__matcher.cc b/www/chromium/files/patch-components_url__matcher_regex__set__matcher.cc index 9728dca829de..ebec8d7b2942 100644 --- a/www/chromium/files/patch-components_url__matcher_regex__set__matcher.cc +++ b/www/chromium/files/patch-components_url__matcher_regex__set__matcher.cc @@ -1,4 +1,4 @@ ---- components/url_matcher/regex_set_matcher.cc.orig 2020-05-13 18:39:42 UTC +--- components/url_matcher/regex_set_matcher.cc.orig 2020-11-13 06:36:42 UTC +++ components/url_matcher/regex_set_matcher.cc @@ -12,8 +12,13 @@ #include "base/logging.h" diff --git a/www/chromium/files/patch-components_url__matcher_url__matcher__factory.cc b/www/chromium/files/patch-components_url__matcher_url__matcher__factory.cc index 533e9439604e..08daf72025a0 100644 --- a/www/chromium/files/patch-components_url__matcher_url__matcher__factory.cc +++ b/www/chromium/files/patch-components_url__matcher_url__matcher__factory.cc @@ -1,4 +1,4 @@ ---- components/url_matcher/url_matcher_factory.cc.orig 2019-03-11 22:00:57 UTC +--- components/url_matcher/url_matcher_factory.cc.orig 2020-11-13 06:36:42 UTC +++ components/url_matcher/url_matcher_factory.cc @@ -16,7 +16,11 @@ #include "base/values.h" diff --git a/www/chromium/files/patch-components_viz_common_features.cc b/www/chromium/files/patch-components_viz_common_features.cc index b3b8c74652fa..d24435ee8443 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 2020-05-13 18:39:42 UTC +--- components/viz/common/features.cc.orig 2020-11-13 06:36:42 UTC +++ components/viz/common/features.cc -@@ -20,7 +20,7 @@ const base::Feature kUseSkiaForGLReadback{"UseSkiaForG - base::FEATURE_ENABLED_BY_DEFAULT}; +@@ -22,7 +22,7 @@ const base::Feature kForcePreferredIntervalForVideo{ // Use the SkiaRenderer. --#if defined(OS_LINUX) && !(defined(OS_CHROMEOS) || BUILDFLAG(IS_CHROMECAST)) -+#if (defined(OS_LINUX) && !(defined(OS_CHROMEOS) || BUILDFLAG(IS_CHROMECAST))) || defined(OS_BSD) + #if defined(OS_WIN) || \ +- (defined(OS_LINUX) && !(defined(OS_CHROMEOS) || BUILDFLAG(IS_CHROMECAST))) ++ (defined(OS_LINUX) && !(defined(OS_CHROMEOS) || BUILDFLAG(IS_CHROMECAST))) || defined(OS_BSD) const base::Feature kUseSkiaRenderer{"UseSkiaRenderer", base::FEATURE_ENABLED_BY_DEFAULT}; #else diff --git a/www/chromium/files/patch-components_viz_common_gpu_dawn__context__provider.cc b/www/chromium/files/patch-components_viz_common_gpu_dawn__context__provider.cc index ea33615fe7e0..6f55d50bc9e4 100644 --- a/www/chromium/files/patch-components_viz_common_gpu_dawn__context__provider.cc +++ b/www/chromium/files/patch-components_viz_common_gpu_dawn__context__provider.cc @@ -1,11 +1,11 @@ ---- components/viz/common/gpu/dawn_context_provider.cc.orig 2020-02-26 13:14:08 UTC +--- components/viz/common/gpu/dawn_context_provider.cc.orig 2020-11-13 06:36:42 UTC +++ components/viz/common/gpu/dawn_context_provider.cc -@@ -17,7 +17,7 @@ namespace { +@@ -20,7 +20,7 @@ namespace { dawn_native::BackendType GetDefaultBackendType() { #if defined(OS_WIN) return dawn_native::BackendType::D3D12; --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) ++#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) return dawn_native::BackendType::Vulkan; #else NOTREACHED(); diff --git a/www/chromium/files/patch-components_viz_host_host__display__client.cc b/www/chromium/files/patch-components_viz_host_host__display__client.cc index bdfec86f1ddf..cf73a89ac62a 100644 --- a/www/chromium/files/patch-components_viz_host_host__display__client.cc +++ b/www/chromium/files/patch-components_viz_host_host__display__client.cc @@ -1,4 +1,4 @@ ---- components/viz/host/host_display_client.cc.orig 2020-02-03 21:52:45 UTC +--- components/viz/host/host_display_client.cc.orig 2020-11-13 06:36:42 UTC +++ components/viz/host/host_display_client.cc @@ -56,7 +56,7 @@ void HostDisplayClient::CreateLayeredWindowUpdater( } diff --git a/www/chromium/files/patch-components_viz_host_host__display__client.h b/www/chromium/files/patch-components_viz_host_host__display__client.h index 4b57c1bf5f23..e7006b32cd4c 100644 --- a/www/chromium/files/patch-components_viz_host_host__display__client.h +++ b/www/chromium/files/patch-components_viz_host_host__display__client.h @@ -1,4 +1,4 @@ ---- components/viz/host/host_display_client.h.orig 2020-02-03 21:52:45 UTC +--- components/viz/host/host_display_client.h.orig 2020-11-13 06:36:42 UTC +++ components/viz/host/host_display_client.h @@ -43,7 +43,7 @@ class VIZ_HOST_EXPORT HostDisplayClient : public mojom mojo::PendingReceiver<mojom::LayeredWindowUpdater> receiver) override; diff --git a/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__device__dawn.cc b/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__device__dawn.cc deleted file mode 100644 index c04afee015a3..000000000000 --- a/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__device__dawn.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- components/viz/service/display_embedder/skia_output_device_dawn.cc.orig 2020-07-13 09:36:15 UTC -+++ components/viz/service/display_embedder/skia_output_device_dawn.cc -@@ -14,7 +14,7 @@ - #if defined(OS_WIN) - #include "third_party/dawn/src/include/dawn_native/D3D12Backend.h" - #include "ui/gl/vsync_provider_win.h" --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) - #include "third_party/dawn/src/include/dawn_native/VulkanBackend.h" - #endif - 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 fb803c369cbe..00ba16bd1373 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 2020-05-13 18:39:42 UTC +--- components/viz/service/display_embedder/software_output_surface.cc.orig 2020-11-13 06:36:42 UTC +++ components/viz/service/display_embedder/software_output_surface.cc -@@ -114,7 +114,7 @@ void SoftwareOutputSurface::SwapBuffersCallback(base:: +@@ -112,7 +112,7 @@ void SoftwareOutputSurface::SwapBuffersCallback(base:: base::TimeTicks now = base::TimeTicks::Now(); base::TimeDelta interval_to_next_refresh = now.SnappedToNextTick(refresh_timebase_, refresh_interval_) - now; @@ -9,7 +9,7 @@ if (needs_swap_size_notifications_) client_->DidSwapWithSize(pixel_size); #endif -@@ -143,7 +143,7 @@ gfx::OverlayTransform SoftwareOutputSurface::GetDispla +@@ -141,7 +141,7 @@ gfx::OverlayTransform SoftwareOutputSurface::GetDispla return gfx::OVERLAY_TRANSFORM_NONE; } diff --git a/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h b/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h index 1e19845eca9c..3182be564557 100644 --- a/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h +++ b/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h @@ -1,6 +1,6 @@ ---- components/viz/service/display_embedder/software_output_surface.h.orig 2020-05-13 18:39:42 UTC +--- components/viz/service/display_embedder/software_output_surface.h.orig 2020-11-13 06:36:42 UTC +++ components/viz/service/display_embedder/software_output_surface.h -@@ -49,7 +49,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi +@@ -48,7 +48,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi UpdateVSyncParametersCallback callback) override; void SetDisplayTransformHint(gfx::OverlayTransform transform) override {} gfx::OverlayTransform GetDisplayTransform() override; @@ -9,7 +9,7 @@ void SetNeedsSwapSizeNotifications( bool needs_swap_size_notifications) override; #endif -@@ -72,7 +72,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi +@@ -71,7 +71,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi std::queue<std::vector<ui::LatencyInfo>> stored_latency_info_; ui::LatencyTracker latency_tracker_; 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 2b362538954e..fe02b2b577bd 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,6 +1,6 @@ ---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2020-07-07 21:58:15 UTC +--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2020-11-13 06:36:42 UTC +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc -@@ -50,7 +50,7 @@ RootCompositorFrameSinkImpl::Create( +@@ -54,7 +54,7 @@ RootCompositorFrameSinkImpl::Create( output_surface->SetNeedsSwapSizeNotifications( params->send_swap_size_notifications); @@ -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); -@@ -448,7 +448,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw +@@ -456,7 +456,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw #if defined(OS_ANDROID) if (display_client_) display_client_->DidCompleteSwapWithSize(pixel_size); diff --git a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h index 02bacec4bf44..1fe65c9b7a15 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 2020-07-07 21:57:37 UTC +--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2020-11-13 06:36:42 UTC +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h -@@ -157,7 +157,7 @@ class RootCompositorFrameSinkImpl : public mojom::Comp +@@ -163,7 +163,7 @@ class RootCompositorFrameSinkImpl : public mojom::Comp base::TimeDelta preferred_frame_interval_ = FrameRateDecider::UnspecifiedFrameInterval(); 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 cf5ae3fedb21..dd972aa5ef5d 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 2020-05-13 18:39:42 UTC +--- components/viz/test/fake_output_surface.cc.orig 2020-11-13 06:36:42 UTC +++ components/viz/test/fake_output_surface.cc -@@ -111,7 +111,7 @@ gfx::OverlayTransform FakeOutputSurface::GetDisplayTra +@@ -115,7 +115,7 @@ gfx::OverlayTransform FakeOutputSurface::GetDisplayTra : gfx::OVERLAY_TRANSFORM_NONE; } 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 d4118ff7d302..680e71a78843 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 2020-05-13 18:39:42 UTC +--- components/viz/test/fake_output_surface.h.orig 2020-11-13 06:36:42 UTC +++ components/viz/test/fake_output_surface.h -@@ -83,7 +83,7 @@ class FakeOutputSurface : public OutputSurface { +@@ -86,7 +86,7 @@ class FakeOutputSurface : public OutputSurface { UpdateVSyncParametersCallback callback) override; void SetDisplayTransformHint(gfx::OverlayTransform transform) override; gfx::OverlayTransform GetDisplayTransform() override; 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 d1e2dc5db3e4..8d46659c8c1a 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,4 +1,4 @@ ---- components/viz/test/mock_display_client.h.orig 2020-07-07 21:57:37 UTC +--- components/viz/test/mock_display_client.h.orig 2020-11-13 06:36:42 UTC +++ components/viz/test/mock_display_client.h @@ -36,7 +36,7 @@ class MockDisplayClient : public mojom::DisplayClient MOCK_METHOD1(SetWideColorEnabled, void(bool enabled)); diff --git a/www/chromium/files/patch-components_webcrypto_algorithms_test__helpers.cc b/www/chromium/files/patch-components_webcrypto_algorithms_test__helpers.cc index cc741c7d273f..fe1b6dce7587 100644 --- a/www/chromium/files/patch-components_webcrypto_algorithms_test__helpers.cc +++ b/www/chromium/files/patch-components_webcrypto_algorithms_test__helpers.cc @@ -1,4 +1,4 @@ ---- components/webcrypto/algorithms/test_helpers.cc.orig 2019-03-11 22:00:57 UTC +--- components/webcrypto/algorithms/test_helpers.cc.orig 2020-11-13 06:36:42 UTC +++ components/webcrypto/algorithms/test_helpers.cc @@ -25,7 +25,11 @@ #include "components/webcrypto/status.h" diff --git a/www/chromium/files/patch-services_service__manager_embedder_main.cc b/www/chromium/files/patch-content_app_content__main.cc index c57bcf0c5be2..a250cd6d6e76 100644 --- a/www/chromium/files/patch-services_service__manager_embedder_main.cc +++ b/www/chromium/files/patch-content_app_content__main.cc @@ -1,11 +1,11 @@ ---- services/service_manager/embedder/main.cc.orig 2020-05-13 18:39:47 UTC -+++ services/service_manager/embedder/main.cc -@@ -275,7 +275,7 @@ int Main(const MainParams& params) { +--- content/app/content_main.cc.orig 2020-11-16 14:31:07 UTC ++++ content/app/content_main.cc +@@ -230,7 +230,7 @@ int RunContentProcess(const ContentMainParams& params, #endif base::EnableTerminationOnOutOfMemory(); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // The various desktop environments set this environment variable that // allows the dbus client library to connect directly to the bus. When this // variable is not set (test environments like xvfb-run), the dbus client diff --git a/www/chromium/files/patch-content_app_content__main__runner__impl.cc b/www/chromium/files/patch-content_app_content__main__runner__impl.cc index 5d872cbc0665..4871cb59aa5b 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,73 +1,65 @@ ---- content/app/content_main_runner_impl.cc.orig 2020-07-07 21:58:15 UTC +--- content/app/content_main_runner_impl.cc.orig 2020-11-13 06:36:42 UTC +++ content/app/content_main_runner_impl.cc -@@ -114,17 +114,17 @@ - #include "base/posix/global_descriptors.h" - #include "content/public/common/content_descriptors.h" - --#if !defined(OS_MACOSX) -+#if !defined(OS_MACOSX) && !defined(OS_BSD) - #include "services/service_manager/zygote/common/zygote_fork_delegate_linux.h" - #endif --#if !defined(OS_MACOSX) && !defined(OS_ANDROID) -+#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) - #include "sandbox/linux/services/libc_interceptor.h" - #include "services/service_manager/zygote/zygote_main.h" - #endif +@@ -131,7 +131,7 @@ #endif // OS_POSIX || OS_FUCHSIA --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "base/native_library.h" #include "base/rand_util.h" - #include "services/service_manager/zygote/common/common_sandbox_support_linux.h" -@@ -145,7 +145,7 @@ + #include "content/public/common/zygote/sandbox_support_linux.h" +@@ -151,7 +151,7 @@ #include "content/public/common/content_client.h" #endif --#endif // OS_LINUX -+#endif // OS_LINUX || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #if BUILDFLAG(USE_ZYGOTE_HANDLE) #include "content/browser/sandbox_host_linux.h" -@@ -289,7 +289,7 @@ void InitializeZygoteSandboxForBrowserProcess( +@@ -301,7 +301,7 @@ void InitializeZygoteSandboxForBrowserProcess( } #endif // BUILDFLAG(USE_ZYGOTE_HANDLE) --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #if BUILDFLAG(ENABLE_PLUGINS) // Loads the (native) libraries but does not initialize them (i.e., does not -@@ -386,7 +386,7 @@ void PreSandboxInit() { +@@ -392,7 +392,7 @@ void PreSandboxInit() { } #endif // BUILDFLAG(USE_ZYGOTE_HANDLE) --#endif // OS_LINUX -+#endif // OS_LINUX || OS_BSD +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) } // namespace -@@ -450,7 +450,7 @@ int RunZygote(ContentMainDelegate* delegate) { +@@ -455,7 +455,7 @@ int RunZygote(ContentMainDelegate* delegate) { delegate->ZygoteStarting(&zygote_fork_delegates); media::InitializeMediaLibrary(); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) PreSandboxInit(); #endif -@@ -594,11 +594,11 @@ int ContentMainRunnerImpl::Initialize(const ContentMai - base::GlobalDescriptors::kBaseDescriptor); - #endif // !OS_ANDROID - --#if defined(OS_LINUX) || defined(OS_OPENBSD) -+#if defined(OS_LINUX) - g_fds->Set(service_manager::kCrashDumpSignal, - service_manager::kCrashDumpSignal + - base::GlobalDescriptors::kBaseDescriptor); --#endif // OS_LINUX || OS_OPENBSD -+#endif // OS_LINUX +@@ -830,7 +830,7 @@ int ContentMainRunnerImpl::Run(bool start_service_mana + delegate_->PostFieldTrialInitialization(); + } - #endif // !OS_WIN +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + // If dynamic Mojo Core is being used, ensure that it's loaded very early in + // the child/zygote process, before any sandbox is initialized. The library + // is not fully initialized with IPC support until a ChildProcess is later +@@ -840,7 +840,7 @@ int ContentMainRunnerImpl::Run(bool start_service_mana + CHECK_EQ(mojo::LoadCoreLibrary(GetMojoCoreSharedLibraryPath()), + MOJO_RESULT_OK); + } +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + } + MainFunctionParams main_params(command_line); diff --git a/www/chromium/files/patch-content_browser_BUILD.gn b/www/chromium/files/patch-content_browser_BUILD.gn index 29faa4677fd0..0eb1e2627b47 100644 --- a/www/chromium/files/patch-content_browser_BUILD.gn +++ b/www/chromium/files/patch-content_browser_BUILD.gn @@ -1,12 +1,18 @@ ---- content/browser/BUILD.gn.orig 2020-07-07 21:58:15 UTC +--- content/browser/BUILD.gn.orig 2020-11-13 06:36:42 UTC +++ content/browser/BUILD.gn -@@ -2044,6 +2044,9 @@ jumbo_source_set("browser") { - "//third_party/blink/public/mojom:memory_usage_monitor_linux_mojo_bindings", - ] +@@ -2113,6 +2113,15 @@ source_set("browser") { + deps += [ "//third_party/speech-dispatcher" ] } + + if (is_bsd) { -+ deps -= [ "//services/service_manager/zygote" ] ++ sources -= [ ++ "sandbox_host_linux.cc", ++ "sandbox_host_linux.h", ++ "sandbox_ipc_linux.cc", ++ "sandbox_ipc_linux.h", ++ ] + } - - if (is_desktop_linux) { - sources += [ "speech/tts_linux.cc" ] ++ + # ChromeOS also defines linux but their memory-monitors conflict. + if (is_chromeos) { + sources += [ 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 28bf251f55ca..7ae7a0c506e8 100644 --- a/www/chromium/files/patch-content_browser_browser__main__loop.cc +++ b/www/chromium/files/patch-content_browser_browser__main__loop.cc @@ -1,34 +1,38 @@ ---- content/browser/browser_main_loop.cc.orig 2020-07-07 21:58:15 UTC +--- content/browser/browser_main_loop.cc.orig 2020-11-13 06:36:42 UTC +++ content/browser/browser_main_loop.cc -@@ -241,6 +241,13 @@ - #include "mojo/public/cpp/bindings/lib/test_random_mojo_delays.h" +@@ -367,7 +367,7 @@ std::unique_ptr<base::MemoryPressureMonitor> CreateMem + if (chromeos::switches::MemoryPressureHandlingEnabled()) + monitor = std::make_unique<util::MultiSourceMemoryPressureMonitor>(); + #elif defined(OS_MAC) || defined(OS_WIN) || defined(OS_FUCHSIA) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_CHROMECAST)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_CHROMECAST)) || defined(OS_BSD) + monitor = std::make_unique<util::MultiSourceMemoryPressureMonitor>(); #endif + // No memory monitor on other platforms... +@@ -611,7 +611,7 @@ int BrowserMainLoop::EarlyInitialization() { -+#if defined(OS_BSD) -+#include "content/browser/sandbox_host_linux.h" -+#include "services/service_manager/zygote/common/common_sandbox_support_linux.h" -+#include "content/public/common/common_sandbox_support_linux.h" -+#include "services/service_manager/sandbox/sandbox.h" -+#endif -+ - // One of the linux specific headers defines this as a macro. - #ifdef DestroyAll - #undef DestroyAll -@@ -654,7 +661,7 @@ int BrowserMainLoop::EarlyInitialization() { + // Up the priority of the UI thread unless it was already high (since Mac + // and recent versions of Android (O+) do this automatically). +-#if !defined(OS_MAC) ++#if !defined(OS_MAC) && !defined(OS_BSD) + if (base::FeatureList::IsEnabled( + features::kBrowserUseDisplayThreadPriority) && + base::PlatformThread::GetCurrentThreadPriority() < +@@ -621,7 +621,7 @@ int BrowserMainLoop::EarlyInitialization() { } - #endif // !defined(OS_MACOSX) + #endif // !defined(OS_MAC) --#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -+#if defined(OS_MACOSX) || 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_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. -@@ -664,7 +671,7 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -631,7 +631,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); --#endif // defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_CHROMEOS) || -+#endif // defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || +-#endif // defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || ++#endif // defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || // defined(OS_ANDROID) #if defined(OS_WIN) diff --git a/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc b/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc index 5ef3bf43c843..b45e7a8ca6cc 100644 --- a/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc +++ b/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc @@ -1,53 +1,40 @@ ---- content/browser/child_process_launcher_helper_linux.cc.orig 2020-05-13 18:39:42 UTC +--- content/browser/child_process_launcher_helper_linux.cc.orig 2020-11-13 06:36:42 UTC +++ content/browser/child_process_launcher_helper_linux.cc -@@ -18,7 +18,9 @@ +@@ -18,9 +18,12 @@ + #include "content/public/common/content_switches.h" + #include "content/public/common/result_codes.h" #include "content/public/common/sandboxed_process_launcher_delegate.h" - #include "services/service_manager/sandbox/linux/sandbox_linux.h" - #include "services/service_manager/zygote/common/common_sandbox_support_linux.h" ++ +#if !defined(OS_BSD) - #include "services/service_manager/zygote/common/zygote_handle.h" + #include "content/public/common/zygote/sandbox_support_linux.h" + #include "content/public/common/zygote/zygote_handle.h" + #include "sandbox/policy/linux/sandbox_linux.h" +#endif - #include "services/service_manager/zygote/host/zygote_communication_linux.h" - #include "services/service_manager/zygote/host/zygote_host_impl_linux.h" -@@ -50,11 +52,13 @@ bool ChildProcessLauncherHelper::BeforeLaunchOnLaunche + namespace content { + namespace internal { +@@ -50,10 +53,12 @@ bool ChildProcessLauncherHelper::BeforeLaunchOnLaunche options->fds_to_remap = files_to_register.GetMappingWithIDAdjustment( base::GlobalDescriptors::kBaseDescriptor); +#if !defined(OS_BSD) if (GetProcessType() == switches::kRendererProcess) { const int sandbox_fd = SandboxHostLinux::GetInstance()->GetChildSocket(); - options->fds_to_remap.push_back( - std::make_pair(sandbox_fd, service_manager::GetSandboxFD())); + options->fds_to_remap.push_back(std::make_pair(sandbox_fd, GetSandboxFD())); } +#endif options->environment = delegate_->GetEnvironment(); -@@ -69,6 +73,7 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr +@@ -68,6 +73,7 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr int* launch_result) { *is_synchronous_launch = true; +#if !defined(OS_BSD) - service_manager::ZygoteHandle zygote_handle = + ZygoteHandle zygote_handle = base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoZygote) ? nullptr -@@ -82,7 +87,6 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr - GetProcessType()); - *launch_result = LAUNCH_RESULT_SUCCESS; - --#if !defined(OS_OPENBSD) - if (handle) { - // It could be a renderer process or an utility process. - int oom_score = content::kMiscOomScore; -@@ -92,13 +96,13 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr - service_manager::ZygoteHostImpl::GetInstance()->AdjustRendererOOMScore( - handle, oom_score); - } --#endif - - Process process; - process.process = base::Process(handle); +@@ -97,6 +103,7 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr process.zygote = zygote_handle; return process; } @@ -55,7 +42,7 @@ Process process; process.process = base::LaunchProcess(*command_line(), options); -@@ -116,10 +120,14 @@ ChildProcessTerminationInfo ChildProcessLauncherHelper +@@ -114,10 +121,14 @@ ChildProcessTerminationInfo ChildProcessLauncherHelper const ChildProcessLauncherHelper::Process& process, bool known_dead) { ChildProcessTerminationInfo info; @@ -70,9 +57,9 @@ info.status = base::GetKnownDeadTerminationStatus(process.process.Handle(), &info.exit_code); } else { -@@ -143,13 +151,17 @@ void ChildProcessLauncherHelper::ForceNormalProcessTer +@@ -141,13 +152,17 @@ void ChildProcessLauncherHelper::ForceNormalProcessTer DCHECK(CurrentlyOnProcessLauncherTaskRunner()); - process.process.Terminate(service_manager::RESULT_CODE_NORMAL_EXIT, false); + process.process.Terminate(RESULT_CODE_NORMAL_EXIT, false); // On POSIX, we must additionally reap the child. +#if !defined(OS_BSD) if (process.zygote) { diff --git a/www/chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc b/www/chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc index 645022d83e96..005f4103e4d2 100644 --- a/www/chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc +++ b/www/chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc @@ -1,6 +1,6 @@ ---- content/browser/compositor/viz_process_transport_factory.cc.orig 2020-05-15 15:06:49 UTC +--- content/browser/compositor/viz_process_transport_factory.cc.orig 2020-11-13 06:36:42 UTC +++ content/browser/compositor/viz_process_transport_factory.cc -@@ -109,7 +109,7 @@ class HostDisplayClient : public viz::HostDisplayClien +@@ -108,7 +108,7 @@ class HostDisplayClient : public viz::HostDisplayClien HostDisplayClient& operator=(const HostDisplayClient&) = delete; // viz::HostDisplayClient: 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 07b3d2a70f08..f08535e77efe 100644 --- a/www/chromium/files/patch-content_browser_devtools_protocol_system__info__handler.cc +++ b/www/chromium/files/patch-content_browser_devtools_protocol_system__info__handler.cc @@ -1,11 +1,11 @@ ---- content/browser/devtools/protocol/system_info_handler.cc.orig 2020-07-07 21:58:15 UTC +--- content/browser/devtools/protocol/system_info_handler.cc.orig 2020-11-13 06:36:42 UTC +++ content/browser/devtools/protocol/system_info_handler.cc -@@ -48,7 +48,7 @@ std::unique_ptr<SystemInfo::Size> GfxSizeToSystemInfoS +@@ -47,7 +47,7 @@ std::unique_ptr<SystemInfo::Size> GfxSizeToSystemInfoS // Give the GPU process a few seconds to provide GPU info. // Linux Debug builds need more time -- see Issue 796437 and 1046598. // Windows builds need more time -- see Issue 873112 and 1004472. --#if (defined(OS_LINUX) && !defined(NDEBUG)) || defined(OS_WIN) -+#if ((defined(OS_LINUX) || defined(OS_BSD)) && !defined(NDEBUG)) || defined(OS_WIN) +-#if ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(NDEBUG)) || \ ++#if ((defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && !defined(NDEBUG)) || \ + defined(OS_WIN) const int kGPUInfoWatchdogTimeoutMs = 30000; #else - const int kGPUInfoWatchdogTimeoutMs = 5000; 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 new file mode 100644 index 000000000000..08594c6635ba --- /dev/null +++ b/www/chromium/files/patch-content_browser_font__access_font__enumeration__cache.h @@ -0,0 +1,11 @@ +--- content/browser/font_access/font_enumeration_cache.h.orig 2020-11-16 14:31:38 UTC ++++ content/browser/font_access/font_enumeration_cache.h +@@ -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" + +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ + defined(OS_MAC) + #define PLATFORM_HAS_LOCAL_FONT_ENUMERATION_IMPL 1 + #endif diff --git a/www/chromium/files/patch-content_browser_gpu_compositor__util.cc b/www/chromium/files/patch-content_browser_gpu_compositor__util.cc new file mode 100644 index 000000000000..e4d3a0c12ed0 --- /dev/null +++ b/www/chromium/files/patch-content_browser_gpu_compositor__util.cc @@ -0,0 +1,16 @@ +--- content/browser/gpu/compositor_util.cc.orig 2020-11-16 14:31:58 UTC ++++ content/browser/gpu/compositor_util.cc +@@ -131,11 +131,11 @@ const GpuFeatureData GetGpuFeatureData( + {"video_decode", + SafeGetFeatureStatus(gpu_feature_info, + gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE), +-#if defined(OS_LINUX) && !defined(OS_ANDROID) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_ANDROID) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + !command_line.HasSwitch(switches::kEnableAcceleratedVideoDecode), + #else + command_line.HasSwitch(switches::kDisableAcceleratedVideoDecode), +-#endif // defined(OS_LINUX) && !defined(OS_ANDROID) && !defined(OS_CHROMEOS) ++#endif // (defined(OS_LINUX) && !defined(OS_ANDROID) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + DisableInfo::Problem( + "Accelerated video decode has been disabled, either via blocklist, " + "about:flags or the command line."), 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 76e451bc26d3..9f89b4fa5583 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,20 +1,11 @@ ---- content/browser/gpu/gpu_process_host.cc.orig 2020-07-07 21:58:15 UTC +--- content/browser/gpu/gpu_process_host.cc.orig 2020-11-13 06:36:42 UTC +++ content/browser/gpu/gpu_process_host.cc -@@ -215,7 +215,7 @@ static const char* const kSwitchNames[] = { - service_manager::switches::kGpuSandboxFailuresFatal, - service_manager::switches::kDisableGpuSandbox, - service_manager::switches::kNoSandbox, --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - switches::kDisableDevShmUsage, - #endif - #if defined(OS_WIN) -@@ -1094,7 +1094,7 @@ bool GpuProcessHost::LaunchGpuProcess() { +@@ -1127,7 +1127,7 @@ bool GpuProcessHost::LaunchGpuProcess() { std::unique_ptr<base::CommandLine> cmd_line = std::make_unique<base::CommandLine>(base::CommandLine::NO_PROGRAM); #else --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) int child_flags = gpu_launcher.empty() ? ChildProcessHost::CHILD_ALLOW_SELF : ChildProcessHost::CHILD_NORMAL; - #elif defined(OS_MACOSX) + #elif defined(OS_MAC) diff --git a/www/chromium/files/patch-content_browser_memory_swap__metrics__driver__impl__linux.cc b/www/chromium/files/patch-content_browser_memory_swap__metrics__driver__impl__linux.cc index ff345048baf2..e6ed81eb0b5c 100644 --- a/www/chromium/files/patch-content_browser_memory_swap__metrics__driver__impl__linux.cc +++ b/www/chromium/files/patch-content_browser_memory_swap__metrics__driver__impl__linux.cc @@ -1,4 +1,4 @@ ---- content/browser/memory/swap_metrics_driver_impl_linux.cc.orig 2019-03-11 22:00:57 UTC +--- content/browser/memory/swap_metrics_driver_impl_linux.cc.orig 2020-11-13 06:36:42 UTC +++ content/browser/memory/swap_metrics_driver_impl_linux.cc @@ -43,6 +43,7 @@ SwapMetricsDriverImplLinux::~SwapMetricsDriverImplLinu diff --git a/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc b/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc index dd7271ca2db7..8c5ab9697cad 100644 --- a/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc +++ b/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc @@ -1,11 +1,11 @@ ---- content/browser/ppapi_plugin_process_host.cc.orig 2020-02-03 21:53:31 UTC +--- content/browser/ppapi_plugin_process_host.cc.orig 2020-11-13 06:36:42 UTC +++ content/browser/ppapi_plugin_process_host.cc -@@ -365,7 +365,7 @@ bool PpapiPluginProcessHost::Init(const PepperPluginIn +@@ -364,7 +364,7 @@ bool PpapiPluginProcessHost::Init(const PepperPluginIn base::CommandLine::StringType plugin_launcher = browser_command_line.GetSwitchValueNative(switches::kPpapiPluginLauncher); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) int flags = plugin_launcher.empty() ? ChildProcessHost::CHILD_ALLOW_SELF : ChildProcessHost::CHILD_NORMAL; - #elif defined(OS_MACOSX) + #elif defined(OS_MAC) diff --git a/www/chromium/files/patch-content_browser_ppapi__plugin__process__host__receiver__bindings.cc b/www/chromium/files/patch-content_browser_ppapi__plugin__process__host__receiver__bindings.cc index 41c5edc15175..a874131a70bb 100644 --- a/www/chromium/files/patch-content_browser_ppapi__plugin__process__host__receiver__bindings.cc +++ b/www/chromium/files/patch-content_browser_ppapi__plugin__process__host__receiver__bindings.cc @@ -1,11 +1,11 @@ ---- content/browser/ppapi_plugin_process_host_receiver_bindings.cc.orig 2019-12-17 19:34:30 UTC +--- content/browser/ppapi_plugin_process_host_receiver_bindings.cc.orig 2020-11-13 06:36:42 UTC +++ content/browser/ppapi_plugin_process_host_receiver_bindings.cc @@ -8,7 +8,7 @@ #include "build/build_config.h" --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck #include "content/browser/font_service.h" // nogncheck #endif @@ -13,8 +13,8 @@ void PpapiPluginProcessHost::BindHostReceiver( mojo::GenericPendingReceiver receiver) { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) ConnectToFontService(std::move(font_receiver)); #endif diff --git a/www/chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc b/www/chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc new file mode 100644 index 000000000000..28c58204cc70 --- /dev/null +++ b/www/chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc @@ -0,0 +1,11 @@ +--- content/browser/renderer_host/delegated_frame_host.cc.orig 2020-11-16 14:32:47 UTC ++++ content/browser/renderer_host/delegated_frame_host.cc +@@ -243,7 +243,7 @@ void DelegatedFrameHost::EmbedSurface( + + if (!primary_surface_id || + primary_surface_id->local_surface_id() != local_surface_id_) { +-#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // On Windows and Linux, we would like to produce new content as soon as + // possible or the OS will create an additional black gutter. Until we can + // block resize on surface synchronization on these platforms, we will not diff --git a/www/chromium/files/patch-content_browser_renderer__host_input_input__device__change__observer.cc b/www/chromium/files/patch-content_browser_renderer__host_input_input__device__change__observer.cc index 3d6112bc698b..abca0094ca18 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_input_input__device__change__observer.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_input_input__device__change__observer.cc @@ -1,29 +1,29 @@ ---- content/browser/renderer_host/input/input_device_change_observer.cc.orig 2019-09-09 21:55:16 UTC +--- content/browser/renderer_host/input/input_device_change_observer.cc.orig 2020-11-13 06:36:42 UTC +++ content/browser/renderer_host/input/input_device_change_observer.cc -@@ -10,7 +10,7 @@ +@@ -9,7 +9,7 @@ #if defined(OS_WIN) #include "ui/events/devices/input_device_observer_win.h" --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) ++#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "ui/events/devices/device_data_manager.h" #elif defined(OS_ANDROID) #include "ui/events/devices/input_device_observer_android.h" -@@ -22,7 +22,7 @@ InputDeviceChangeObserver::InputDeviceChangeObserver(R +@@ -21,7 +21,7 @@ InputDeviceChangeObserver::InputDeviceChangeObserver(R render_view_host_impl_ = rvhi; #if defined(OS_WIN) ui::InputDeviceObserverWin::GetInstance()->AddObserver(this); --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) ++#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) ui::DeviceDataManager::GetInstance()->AddObserver(this); #elif defined(OS_ANDROID) ui::InputDeviceObserverAndroid::GetInstance()->AddObserver(this); -@@ -32,7 +32,7 @@ InputDeviceChangeObserver::InputDeviceChangeObserver(R +@@ -31,7 +31,7 @@ InputDeviceChangeObserver::InputDeviceChangeObserver(R InputDeviceChangeObserver::~InputDeviceChangeObserver() { #if defined(OS_WIN) ui::InputDeviceObserverWin::GetInstance()->RemoveObserver(this); --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) ++#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) ui::DeviceDataManager::GetInstance()->RemoveObserver(this); #elif defined(OS_ANDROID) ui::InputDeviceObserverAndroid::GetInstance()->RemoveObserver(this); diff --git a/www/chromium/files/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc b/www/chromium/files/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc index 7e10ee7c69a9..c469e1919709 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,20 +1,20 @@ ---- content/browser/renderer_host/pepper/pepper_file_io_host.cc.orig 2020-03-16 18:40:31 UTC +--- content/browser/renderer_host/pepper/pepper_file_io_host.cc.orig 2020-11-13 06:36:42 UTC +++ content/browser/renderer_host/pepper/pepper_file_io_host.cc -@@ -433,7 +433,7 @@ void PepperFileIOHost::OnLocalFileOpened( +@@ -438,7 +438,7 @@ void PepperFileIOHost::OnLocalFileOpened( ppapi::host::ReplyMessageContext reply_context, const base::FilePath& path, base::File::Error error_code) { --#if defined(OS_WIN) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Quarantining a file before its contents are available is only supported on // Windows and Linux. if (!FileOpenForWrite(open_flags_) || error_code != base::File::FILE_OK) { -@@ -454,7 +454,7 @@ void PepperFileIOHost::OnLocalFileOpened( +@@ -459,7 +459,7 @@ void PepperFileIOHost::OnLocalFileOpened( #endif } --#if defined(OS_WIN) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) void PepperFileIOHost::OnLocalFileQuarantined( ppapi::host::ReplyMessageContext reply_context, const base::FilePath& path, diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc b/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc index 2b17bdaa451a..c6b2f77b8105 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc @@ -1,11 +1,11 @@ ---- content/browser/renderer_host/render_message_filter.cc.orig 2020-05-13 18:39:43 UTC +--- content/browser/renderer_host/render_message_filter.cc.orig 2020-11-13 06:36:42 UTC +++ content/browser/renderer_host/render_message_filter.cc @@ -70,7 +70,7 @@ - #if defined(OS_MACOSX) + #if defined(OS_MAC) #include "ui/accelerated_widget_mac/window_resize_helper_mac.h" #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "base/linux_util.h" #include "base/threading/platform_thread.h" #endif @@ -13,8 +13,8 @@ std::move(callback).Run(render_widget_helper_->GetNextRoutingID()); } --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) void RenderMessageFilter::SetThreadPriorityOnFileThread( base::PlatformThreadId ns_tid, base::ThreadPriority priority) { @@ -22,8 +22,8 @@ } #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) void RenderMessageFilter::SetThreadPriority(int32_t ns_tid, base::ThreadPriority priority) { constexpr base::TaskTraits kTraits = { diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h b/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h index f7211a9cd845..97cc245059ec 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h +++ b/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h @@ -1,19 +1,19 @@ ---- content/browser/renderer_host/render_message_filter.h.orig 2020-05-13 18:39:43 UTC +--- content/browser/renderer_host/render_message_filter.h.orig 2020-11-13 06:36:42 UTC +++ content/browser/renderer_host/render_message_filter.h @@ -79,14 +79,14 @@ class CONTENT_EXPORT RenderMessageFilter // mojom::RenderMessageFilter: void GenerateRoutingID(GenerateRoutingIDCallback routing_id) override; void HasGpuProcess(HasGpuProcessCallback callback) override; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) void SetThreadPriority(int32_t ns_tid, base::ThreadPriority priority) override; #endif void OnResolveProxy(const GURL& url, IPC::Message* reply_msg); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) void SetThreadPriorityOnFileThread(base::PlatformThreadId ns_tid, base::ThreadPriority priority); #endif diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc index b18e2476eb81..5e4309d365cd 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,56 +1,56 @@ ---- content/browser/renderer_host/render_process_host_impl.cc.orig 2020-07-07 21:58:15 UTC +--- content/browser/renderer_host/render_process_host_impl.cc.orig 2020-11-13 06:36:42 UTC +++ content/browser/renderer_host/render_process_host_impl.cc -@@ -243,7 +243,7 @@ - #include "content/browser/gpu/gpu_data_manager_impl.h" +@@ -237,7 +237,7 @@ + #include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h" #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include <sys/resource.h> #include <sys/time.h> -@@ -1200,7 +1200,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = +@@ -1228,7 +1228,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = // to indicate failure and std::numeric_limits<size_t>::max() to indicate // unlimited. size_t GetPlatformProcessLimit() { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) struct rlimit limit; if (getrlimit(RLIMIT_NPROC, &limit) != 0) return kUnknownPlatformProcessLimit; -@@ -1211,7 +1211,7 @@ size_t GetPlatformProcessLimit() { +@@ -1239,7 +1239,7 @@ size_t GetPlatformProcessLimit() { #else // TODO(https://crbug.com/104689): Implement on other platforms. return kUnknownPlatformProcessLimit; --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) } #endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS) -@@ -1305,7 +1305,7 @@ class RenderProcessHostImpl::IOThreadHostImpl +@@ -1324,7 +1324,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public return; } --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) { ConnectToFontService(std::move(font_receiver)); return; -@@ -1739,7 +1739,7 @@ bool RenderProcessHostImpl::Init() { +@@ -1757,7 +1757,7 @@ bool RenderProcessHostImpl::Init() { renderer_prefix = browser_command_line.GetSwitchValueNative(switches::kRendererCmdPrefix); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) int flags = renderer_prefix.empty() ? ChildProcessHost::CHILD_ALLOW_SELF : ChildProcessHost::CHILD_NORMAL; - #elif defined(OS_MACOSX) -@@ -3232,7 +3232,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin - service_manager::switches::kDisableInProcessStackTraces, - service_manager::switches::kDisableSeccompFilterSandbox, - service_manager::switches::kNoSandbox, --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + #elif defined(OS_MAC) +@@ -3302,7 +3302,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin + #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_LACROS) switches::kDisableDevShmUsage, #endif - #if defined(OS_MACOSX) +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)) || defined(OS_BSD) + switches::kEnableAcceleratedVideoDecode, + #endif + #if defined(OS_MAC) diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h deleted file mode 100644 index c9e5ead64625..000000000000 --- a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h +++ /dev/null @@ -1,15 +0,0 @@ ---- content/browser/renderer_host/render_process_host_impl.h.orig 2020-07-07 21:58:15 UTC -+++ content/browser/renderer_host/render_process_host_impl.h -@@ -478,10 +478,10 @@ class CONTENT_EXPORT RenderProcessHostImpl - is_for_guests_only_ = is_for_guests_only; - } - --#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) -+#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) - // Launch the zygote early in the browser startup. - static void EarlyZygoteLaunch(); --#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) -+#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) - - // Called when a video capture stream or an audio stream is added or removed - // and used to determine if the process should be backgrounded or not. 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 d2a8a1c2bcab..9d4810a47c60 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc @@ -1,11 +1,11 @@ ---- content/browser/renderer_host/render_view_host_impl.cc.orig 2020-07-07 21:58:15 UTC +--- content/browser/renderer_host/render_view_host_impl.cc.orig 2020-11-13 06:36:42 UTC +++ content/browser/renderer_host/render_view_host_impl.cc -@@ -227,7 +227,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs( +@@ -278,7 +278,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs( display::win::ScreenWin::GetSystemMetricsInDIP(SM_CYVSCROLL); prefs->arrow_bitmap_width_horizontal_scroll_bar_in_dips = display::win::ScreenWin::GetSystemMetricsInDIP(SM_CXHSCROLL); --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) ++#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) prefs->system_font_family_name = gfx::Font().GetFontName(); #elif defined(OS_FUCHSIA) // Make Blink's "focus ring" invisible. The focus ring is a hairline border diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc index d9956498f67e..3b5eb2c8798a 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,4 +1,4 @@ ---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2020-07-07 21:58:15 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2020-11-13 06:36:42 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.cc @@ -111,11 +111,11 @@ #include "ui/gfx/gdi_util.h" @@ -14,7 +14,7 @@ #include "ui/base/ime/linux/text_edit_command_auralinux.h" #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" #endif -@@ -557,7 +557,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge +@@ -492,7 +492,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge if (manager) return ToBrowserAccessibilityWin(manager->GetRoot())->GetCOM(); @@ -23,7 +23,7 @@ BrowserAccessibilityManager* manager = host()->GetOrCreateRootBrowserAccessibilityManager(); if (manager && manager->GetRoot()) -@@ -2187,7 +2187,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { +@@ -2224,7 +2224,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { } bool RenderWidgetHostViewAura::NeedsMouseCapture() { @@ -32,7 +32,7 @@ return NeedsInputGrab(); #else return false; -@@ -2357,7 +2357,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit +@@ -2388,7 +2388,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 459ab2bcbe82..080b2c52b0a4 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc @@ -1,11 +1,11 @@ ---- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig 2020-05-13 18:40:31 UTC +--- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig 2020-11-13 06:36:42 UTC +++ content/browser/renderer_host/render_widget_host_view_event_handler.cc -@@ -641,7 +641,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand +@@ -716,7 +716,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand if (event->type() == ui::ET_MOUSE_EXITED) { if (mouse_locked || selection_popup) return false; --#if defined(OS_WIN) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Don't forward the mouse leave message which is received when the context // menu is displayed by the page. This confuses the page and causes state // changes. diff --git a/www/chromium/files/patch-content_browser_scheduler_responsiveness_jank__monitor.cc b/www/chromium/files/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc index c20c0bafc0a9..02a17be99797 100644 --- a/www/chromium/files/patch-content_browser_scheduler_responsiveness_jank__monitor.cc +++ b/www/chromium/files/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/scheduler/responsiveness/jank_monitor.cc.orig 2020-05-13 18:39:43 UTC -+++ content/browser/scheduler/responsiveness/jank_monitor.cc -@@ -322,7 +322,7 @@ void JankMonitor::ThreadExecutionState::DidRunTaskOrEv +--- content/browser/scheduler/responsiveness/jank_monitor_impl.cc.orig 2020-11-16 14:34:07 UTC ++++ content/browser/scheduler/responsiveness/jank_monitor_impl.cc +@@ -332,7 +332,7 @@ void JankMonitorImpl::ThreadExecutionState::DidRunTask // in context menus, among others). Simply ignore the mismatches for now. // See https://crbug.com/929813 for the details of why the mismatch // happens. diff --git a/www/chromium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.cc b/www/chromium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.cc index 906761601b4b..c36d7ff3f5ee 100644 --- a/www/chromium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.cc +++ b/www/chromium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.cc @@ -1,11 +1,11 @@ ---- content/browser/scheduler/responsiveness/native_event_observer.cc.orig 2019-03-11 22:00:58 UTC +--- content/browser/scheduler/responsiveness/native_event_observer.cc.orig 2020-11-13 06:36:42 UTC +++ content/browser/scheduler/responsiveness/native_event_observer.cc @@ -15,7 +15,7 @@ #include "ui/events/platform/platform_event_source.h" --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "ui/aura/env.h" #include "ui/events/event.h" #endif @@ -13,8 +13,8 @@ DeregisterObserver(); } --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) void NativeEventObserver::RegisterObserver() { aura::Env::GetInstance()->AddWindowEventDispatcherObserver(this); } @@ -22,8 +22,8 @@ did_run_event_callback_.Run(info.unique_id); events_being_processed_.pop_back(); } --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #if defined(OS_WIN) void NativeEventObserver::RegisterObserver() { diff --git a/www/chromium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.h b/www/chromium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.h index 03b31b8d904e..d0149b73e657 100644 --- a/www/chromium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.h +++ b/www/chromium/files/patch-content_browser_scheduler_responsiveness_native__event__observer.h @@ -1,20 +1,20 @@ ---- content/browser/scheduler/responsiveness/native_event_observer.h.orig 2019-03-11 22:00:58 UTC +--- content/browser/scheduler/responsiveness/native_event_observer.h.orig 2020-11-13 06:36:42 UTC +++ content/browser/scheduler/responsiveness/native_event_observer.h @@ -14,7 +14,7 @@ #include "content/public/browser/native_event_processor_observer_mac.h" #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "ui/aura/window_event_dispatcher_observer.h" #endif @@ -39,7 +39,7 @@ namespace responsiveness { class CONTENT_EXPORT NativeEventObserver - #if defined(OS_MACOSX) + #if defined(OS_MAC) : public NativeEventProcessorObserver --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) ++#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) : public aura::WindowEventDispatcherObserver #elif defined(OS_WIN) : public base::MessagePumpForUI::Observer @@ -22,8 +22,8 @@ NativeEventObserver(WillRunEventCallback will_run_event_callback, DidRunEventCallback did_run_event_callback); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) ~NativeEventObserver() override; #else virtual ~NativeEventObserver(); @@ -31,8 +31,8 @@ // Exposed for tests. void WillRunNativeEvent(const void* opaque_identifier) override; void DidRunNativeEvent(const void* opaque_identifier) override; --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) ++#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // aura::WindowEventDispatcherObserver overrides: void OnWindowEventDispatcherStartedProcessing( aura::WindowEventDispatcher* dispatcher, @@ -40,8 +40,8 @@ void RegisterObserver(); void DeregisterObserver(); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) struct EventInfo { const void* unique_id; }; diff --git a/www/chromium/files/patch-content_browser_scheduler_responsiveness_watcher.cc b/www/chromium/files/patch-content_browser_scheduler_responsiveness_watcher.cc deleted file mode 100644 index 397c2691e0c0..000000000000 --- a/www/chromium/files/patch-content_browser_scheduler_responsiveness_watcher.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- content/browser/scheduler/responsiveness/watcher.cc.orig 2020-07-07 21:58:15 UTC -+++ content/browser/scheduler/responsiveness/watcher.cc -@@ -102,7 +102,7 @@ void Watcher::DidRunTask(const base::PendingTask* task - // in context menus, among others). Simply ignore the mismatches for now. - // See https://crbug.com/929813 for the details of why the mismatch - // happens. --#if !defined(OS_CHROMEOS) && defined(OS_LINUX) && defined(USE_OZONE) -+#if !defined(OS_CHROMEOS) && (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_OZONE) - return currently_running_metadata_ui_.clear(); - #endif - DCHECK_LE(*mismatched_task_identifiers, 1); -@@ -171,7 +171,7 @@ void Watcher::DidRunEventOnUIThread(const void* opaque - mismatched_event_identifiers_ui_ += 1; - // See comment in DidRunTask() for why |currently_running_metadata_ui_| may - // be reset. --#if !defined(OS_CHROMEOS) && defined(OS_LINUX) && defined(USE_OZONE) -+#if !defined(OS_CHROMEOS) && (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_OZONE) - return currently_running_metadata_ui_.clear(); - #endif - DCHECK_LE(mismatched_event_identifiers_ui_, 1); diff --git a/www/chromium/files/patch-content_browser_utility__process__host.cc b/www/chromium/files/patch-content_browser_utility__process__host.cc index 9e2464bcc5d5..b584df93de0b 100644 --- a/www/chromium/files/patch-content_browser_utility__process__host.cc +++ b/www/chromium/files/patch-content_browser_utility__process__host.cc @@ -1,20 +1,11 @@ ---- content/browser/utility_process_host.cc.orig 2020-07-07 21:58:15 UTC +--- content/browser/utility_process_host.cc.orig 2020-11-13 06:36:42 UTC +++ content/browser/utility_process_host.cc -@@ -248,7 +248,7 @@ UtilityProcessHost::UtilityProcessHost() +@@ -58,7 +58,7 @@ UtilityProcessHost::UtilityProcessHost() UtilityProcessHost::UtilityProcessHost(std::unique_ptr<Client> client) - : sandbox_type_(service_manager::SandboxType::kUtility), --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) + : sandbox_type_(sandbox::policy::SandboxType::kUtility), +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) child_flags_(ChildProcessHost::CHILD_ALLOW_SELF), #else child_flags_(ChildProcessHost::CHILD_NORMAL), -@@ -420,7 +420,7 @@ bool UtilityProcessHost::StartProcess() { - network::switches::kNetLogCaptureMode, - network::switches::kExplicitlyAllowedPorts, - service_manager::switches::kNoSandbox, --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - switches::kDisableDevShmUsage, - #endif - service_manager::switches::kEnableAudioServiceSandbox, diff --git a/www/chromium/files/patch-content_browser_utility__process__host__receiver__bindings.cc b/www/chromium/files/patch-content_browser_utility__process__host__receiver__bindings.cc index a69a1ccfe8b3..53239a7094ac 100644 --- a/www/chromium/files/patch-content_browser_utility__process__host__receiver__bindings.cc +++ b/www/chromium/files/patch-content_browser_utility__process__host__receiver__bindings.cc @@ -1,20 +1,20 @@ ---- content/browser/utility_process_host_receiver_bindings.cc.orig 2020-02-26 13:18:37 UTC +--- content/browser/utility_process_host_receiver_bindings.cc.orig 2020-11-13 06:36:42 UTC +++ content/browser/utility_process_host_receiver_bindings.cc -@@ -8,7 +8,7 @@ +@@ -10,7 +10,7 @@ + #include "content/public/browser/content_browser_client.h" + #include "content/public/common/content_client.h" - #include "build/build_config.h" - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck #include "content/browser/font_service.h" // nogncheck #endif -@@ -17,7 +17,7 @@ namespace content { +@@ -19,7 +19,7 @@ namespace content { void UtilityProcessHost::BindHostReceiver( mojo::GenericPendingReceiver receiver) { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) { ConnectToFontService(std::move(font_receiver)); return; diff --git a/www/chromium/files/patch-content_browser_v8__snapshot__files.cc b/www/chromium/files/patch-content_browser_v8__snapshot__files.cc index 957c743c222c..ed0f01353c69 100644 --- a/www/chromium/files/patch-content_browser_v8__snapshot__files.cc +++ b/www/chromium/files/patch-content_browser_v8__snapshot__files.cc @@ -1,11 +1,11 @@ ---- content/browser/v8_snapshot_files.cc.orig 2020-02-24 18:39:15 UTC +--- content/browser/v8_snapshot_files.cc.orig 2020-11-13 06:36:42 UTC +++ content/browser/v8_snapshot_files.cc @@ -10,7 +10,7 @@ namespace content { std::map<std::string, base::FilePath> GetV8SnapshotFilesToPreload() { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #if defined(USE_V8_CONTEXT_SNAPSHOT) return {{kV8ContextSnapshotDataDescriptor, - base::FilePath(FILE_PATH_LITERAL("v8_context_snapshot.bin"))}}; + base::FilePath(FILE_PATH_LITERAL(V8_CONTEXT_SNAPSHOT_FILENAME))}}; diff --git a/www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc b/www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc new file mode 100644 index 000000000000..3a7cce8a4cdd --- /dev/null +++ b/www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc @@ -0,0 +1,11 @@ +--- content/browser/web_contents/web_contents_view_aura.cc.orig 2020-11-16 14:34:56 UTC ++++ content/browser/web_contents/web_contents_view_aura.cc +@@ -1211,7 +1211,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent* + // Linux window managers like to handle raise-on-click themselves. If we + // raise-on-click manually, this may override user settings that prevent + // focus-stealing. +-#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_BSD) + // It is possible for the web-contents to be destroyed while it is being + // activated. Use a weak-ptr to track whether that happened or not. + // More in https://crbug.com/1040725 diff --git a/www/chromium/files/patch-content_browser_webui_shared__resources__data__source.cc b/www/chromium/files/patch-content_browser_webui_shared__resources__data__source.cc index 28bd0af475ef..5ab8e698b5fe 100644 --- a/www/chromium/files/patch-content_browser_webui_shared__resources__data__source.cc +++ b/www/chromium/files/patch-content_browser_webui_shared__resources__data__source.cc @@ -1,18 +1,18 @@ ---- content/browser/webui/shared_resources_data_source.cc.orig 2020-07-07 21:58:15 UTC +--- content/browser/webui/shared_resources_data_source.cc.orig 2020-11-13 06:36:42 UTC +++ content/browser/webui/shared_resources_data_source.cc -@@ -130,13 +130,13 @@ const std::map<int, std::string> CreateMojoResourceIdT +@@ -120,13 +120,13 @@ const std::map<int, std::string> CreateMojoResourceIdT "mojo/mojo/public/mojom/base/text_direction.mojom.html"}, {IDR_MOJO_TEXT_DIRECTION_MOJOM_LITE_JS, "mojo/mojo/public/mojom/base/text_direction.mojom-lite.js"}, --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ - defined(OS_ANDROID) +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) || defined(OS_ANDROID) {IDR_MOJO_TIME_MOJOM_HTML, "mojo/mojo/public/mojom/base/time.mojom.html"}, {IDR_MOJO_TIME_MOJOM_LITE_JS, "mojo/mojo/public/mojom/base/time.mojom-lite.js"}, --#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || -+#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || - // defined(OS_ANDROID) +-#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || + // defined(OS_CHROMEOS) || defined(OS_ANDROID) }; } diff --git a/www/chromium/files/patch-services_service__manager_zygote_host_zygote__host__impl__linux.cc b/www/chromium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.cc index 84d77a3074f4..bc6602d9bcc1 100644 --- a/www/chromium/files/patch-services_service__manager_zygote_host_zygote__host__impl__linux.cc +++ b/www/chromium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.cc @@ -1,35 +1,35 @@ ---- services/service_manager/zygote/host/zygote_host_impl_linux.cc.orig 2020-05-13 18:39:47 UTC -+++ services/service_manager/zygote/host/zygote_host_impl_linux.cc -@@ -72,6 +72,7 @@ ZygoteHostImpl* ZygoteHostImpl::GetInstance() { +--- content/browser/zygote_host/zygote_host_impl_linux.cc.orig 2020-11-18 15:42:24 UTC ++++ content/browser/zygote_host/zygote_host_impl_linux.cc +@@ -73,6 +73,7 @@ ZygoteHostImpl* ZygoteHostImpl::GetInstance() { } void ZygoteHostImpl::Init(const base::CommandLine& command_line) { +#if !defined(OS_BSD) - if (command_line.HasSwitch(service_manager::switches::kNoSandbox)) { + if (command_line.HasSwitch(sandbox::policy::switches::kNoSandbox)) { return; } -@@ -122,6 +123,7 @@ void ZygoteHostImpl::Init(const base::CommandLine& com +@@ -123,6 +124,7 @@ void ZygoteHostImpl::Init(const base::CommandLine& com "you can try using --" - << service_manager::switches::kNoSandbox << "."; + << sandbox::policy::switches::kNoSandbox << "."; } +#endif } void ZygoteHostImpl::AddZygotePid(pid_t pid) { -@@ -146,6 +148,7 @@ pid_t ZygoteHostImpl::LaunchZygote( +@@ -147,6 +149,9 @@ pid_t ZygoteHostImpl::LaunchZygote( base::CommandLine* cmd_line, base::ScopedFD* control_fd, base::FileHandleMappingVector additional_remapped_fds) { -+#if !defined(OS_BSD) ++#if defined(OS_BSD) ++ NOTIMPLEMENTED(); ++#else int fds[2]; CHECK_EQ(0, socketpair(AF_UNIX, SOCK_SEQPACKET, 0, fds)); CHECK(base::UnixDomainSocket::EnableReceiveProcessId(fds[0])); -@@ -213,9 +216,12 @@ pid_t ZygoteHostImpl::LaunchZygote( +@@ -214,9 +219,10 @@ pid_t ZygoteHostImpl::LaunchZygote( AddZygotePid(pid); return pid; -+#else -+ return 0; +#endif } diff --git a/www/chromium/files/patch-services_service__manager_zygote_host_zygote__host__impl__linux.h b/www/chromium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.h index 2d846ba1732e..a848b32dd067 100644 --- a/www/chromium/files/patch-services_service__manager_zygote_host_zygote__host__impl__linux.h +++ b/www/chromium/files/patch-content_browser_zygote__host_zygote__host__impl__linux.h @@ -1,6 +1,6 @@ ---- services/service_manager/zygote/host/zygote_host_impl_linux.h.orig 2019-03-11 22:01:02 UTC -+++ services/service_manager/zygote/host/zygote_host_impl_linux.h -@@ -44,8 +44,10 @@ class COMPONENT_EXPORT(SERVICE_MANAGER_ZYGOTE) ZygoteH +--- content/browser/zygote_host/zygote_host_impl_linux.h.orig 2020-11-13 06:36:42 UTC ++++ content/browser/zygote_host/zygote_host_impl_linux.h +@@ -42,8 +42,10 @@ class CONTENT_EXPORT ZygoteHostImpl : public ZygoteHos base::ScopedFD* control_fd, base::FileHandleMappingVector additional_remapped_fds); diff --git a/www/chromium/files/patch-content_child_BUILD.gn b/www/chromium/files/patch-content_child_BUILD.gn deleted file mode 100644 index 88966886db74..000000000000 --- a/www/chromium/files/patch-content_child_BUILD.gn +++ /dev/null @@ -1,16 +0,0 @@ ---- content/child/BUILD.gn.orig 2020-05-19 08:30:28 UTC -+++ content/child/BUILD.gn -@@ -147,8 +147,12 @@ target(link_target_type, "child") { - deps += [ - "//components/services/font/public/cpp", - "//components/services/font/public/mojom", -- "//services/service_manager/zygote", - ] -+ if (!is_bsd) { -+ deps += [ -+ "//services/service_manager/zygote", -+ ] -+ } - } - - if (is_win) { diff --git a/www/chromium/files/patch-content_child_child__process.cc b/www/chromium/files/patch-content_child_child__process.cc new file mode 100644 index 000000000000..e26e41f62838 --- /dev/null +++ b/www/chromium/files/patch-content_child_child__process.cc @@ -0,0 +1,11 @@ +--- content/child/child_process.cc.orig 2020-11-16 14:35:28 UTC ++++ content/child/child_process.cc +@@ -50,7 +50,7 @@ ChildProcess::ChildProcess(base::ThreadPriority io_thr + DCHECK(!g_lazy_child_process_tls.Pointer()->Get()); + g_lazy_child_process_tls.Pointer()->Set(this); + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + const base::CommandLine& command_line = + *base::CommandLine::ForCurrentProcess(); + if (IsMojoCoreSharedLibraryEnabled()) { diff --git a/www/chromium/files/patch-content_common_BUILD.gn b/www/chromium/files/patch-content_common_BUILD.gn index f9cf481ecfa9..ef88eb01f56a 100644 --- a/www/chromium/files/patch-content_common_BUILD.gn +++ b/www/chromium/files/patch-content_common_BUILD.gn @@ -1,6 +1,6 @@ ---- content/common/BUILD.gn.orig 2020-07-07 21:58:15 UTC +--- content/common/BUILD.gn.orig 2020-11-13 06:36:42 UTC +++ content/common/BUILD.gn -@@ -340,6 +340,12 @@ source_set("common") { +@@ -328,6 +328,15 @@ source_set("common") { libs += [ "android" ] } @@ -8,8 +8,20 @@ + sources -= [ + "sandbox_init_linux.cc", + ] ++ deps += [ ++ "//third_party/fontconfig", ++ ] + } + if (is_debug && !is_component_build && enable_plugins) { # Content depends on the PPAPI message logging stuff; if this isn't here, # some unit test binaries won't compile. This only worked in release mode +@@ -345,7 +354,7 @@ source_set("common") { + sources -= [ "cursors/webcursor_aura.cc" ] + } + +- if (is_linux || is_chromeos) { ++ if ((is_linux || is_chromeos) && !is_bsd) { + sources += [ + "zygote/sandbox_support_linux.cc", + "zygote/send_zygote_child_ping_linux.cc", diff --git a/www/chromium/files/patch-content_common_common__sandbox__support__linux.cc b/www/chromium/files/patch-content_common_common__sandbox__support__linux.cc index 95e576060511..512ca6a3293a 100644 --- a/www/chromium/files/patch-content_common_common__sandbox__support__linux.cc +++ b/www/chromium/files/patch-content_common_common__sandbox__support__linux.cc @@ -1,4 +1,4 @@ ---- content/common/common_sandbox_support_linux.cc.orig 2019-03-11 22:00:58 UTC +--- content/common/common_sandbox_support_linux.cc.orig 2020-11-13 06:36:42 UTC +++ content/common/common_sandbox_support_linux.cc @@ -5,6 +5,7 @@ #include "content/public/common/common_sandbox_support_linux.h" 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 new file mode 100644 index 000000000000..abdbd42a5600 --- /dev/null +++ b/www/chromium/files/patch-content_common_mojo__core__library__support.cc @@ -0,0 +1,11 @@ +--- content/common/mojo_core_library_support.cc.orig 2020-11-16 14:35:51 UTC ++++ content/common/mojo_core_library_support.cc +@@ -15,7 +15,7 @@ bool IsMojoCoreSharedLibraryEnabled() { + } + + base::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 = + *base::CommandLine::ForCurrentProcess(); + if (!command_line.HasSwitch(switches::kMojoCoreLibraryPath)) diff --git a/www/chromium/files/patch-content_common_user__agent.cc b/www/chromium/files/patch-content_common_user__agent.cc index 838e2dee302f..2cea97121ae9 100644 --- a/www/chromium/files/patch-content_common_user__agent.cc +++ b/www/chromium/files/patch-content_common_user__agent.cc @@ -1,6 +1,6 @@ ---- content/common/user_agent.cc.orig 2020-07-07 21:57:37 UTC +--- content/common/user_agent.cc.orig 2020-11-13 06:36:43 UTC +++ content/common/user_agent.cc -@@ -198,6 +198,14 @@ std::string BuildOSCpuInfoFromOSVersionAndCpuType(cons +@@ -214,6 +214,14 @@ std::string BuildOSCpuInfoFromOSVersionAndCpuType(cons ); #endif diff --git a/www/chromium/files/patch-content_gpu_BUILD.gn b/www/chromium/files/patch-content_gpu_BUILD.gn index f51961d30857..717b4a20699b 100644 --- a/www/chromium/files/patch-content_gpu_BUILD.gn +++ b/www/chromium/files/patch-content_gpu_BUILD.gn @@ -1,14 +1,5 @@ ---- content/gpu/BUILD.gn.orig 2020-05-13 18:39:43 UTC +--- content/gpu/BUILD.gn.orig 2020-11-13 06:36:43 UTC +++ content/gpu/BUILD.gn -@@ -96,7 +96,7 @@ target(link_target_type, "gpu_sources") { - ] - } - -- if (is_linux) { -+ if (is_linux && !is_bsd) { - deps += [ "//services/service_manager/zygote" ] - } - @@ -130,7 +130,7 @@ target(link_target_type, "gpu_sources") { # Use DRI on desktop Linux builds. diff --git a/www/chromium/files/patch-content_gpu_gpu__main.cc b/www/chromium/files/patch-content_gpu_gpu__main.cc index ff722f4a3504..1987886fbd17 100644 --- a/www/chromium/files/patch-content_gpu_gpu__main.cc +++ b/www/chromium/files/patch-content_gpu_gpu__main.cc @@ -1,56 +1,20 @@ ---- content/gpu/gpu_main.cc.orig 2020-07-07 21:58:15 UTC +--- content/gpu/gpu_main.cc.orig 2020-11-13 06:36:43 UTC +++ content/gpu/gpu_main.cc -@@ -83,7 +83,7 @@ +@@ -86,7 +86,7 @@ #include "ui/gfx/x/x11_types.h" // nogncheck #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "content/gpu/gpu_sandbox_hook_linux.h" #include "content/public/common/sandbox_init.h" - #include "services/service_manager/sandbox/linux/sandbox_linux.h" -@@ -108,7 +108,7 @@ namespace content { - - namespace { - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) && !defined(OS_BSD) - bool StartSandboxLinux(gpu::GpuWatchdogThread*, - const gpu::GPUInfo*, - const gpu::GpuPreferences&); -@@ -161,7 +161,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel - bool EnsureSandboxInitialized(gpu::GpuWatchdogThread* watchdog_thread, - const gpu::GPUInfo* gpu_info, - const gpu::GpuPreferences& gpu_prefs) override { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) && !defined(OS_BSD) - return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs); - #elif defined(OS_WIN) - return StartSandboxWindows(sandbox_info_); -@@ -282,7 +282,7 @@ int GpuMain(const MainFunctionParams& parameters) { - main_thread_task_executor = - std::make_unique<base::SingleThreadTaskExecutor>( - gpu_preferences.message_pump_type); --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) + #include "sandbox/policy/linux/sandbox_linux.h" +@@ -302,7 +302,7 @@ int GpuMain(const MainFunctionParams& parameters) { + gpu_preferences.message_pump_type); + } + #endif +-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) ++#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #error "Unsupported Linux platform." - #elif defined(OS_MACOSX) + #elif defined(OS_MAC) // Cross-process CoreAnimation requires a CFRunLoop to function at all, and -@@ -424,7 +424,7 @@ int GpuMain(const MainFunctionParams& parameters) { - - namespace { - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) && !defined(OS_BSD) - bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread, - const gpu::GPUInfo* gpu_info, - const gpu::GpuPreferences& gpu_prefs) { -@@ -461,7 +461,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo - - return res; - } --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) && !defined(OS_BSD) - - #if defined(OS_WIN) - bool StartSandboxWindows(const sandbox::SandboxInterfaceInfo* sandbox_info) { diff --git a/www/chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc b/www/chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc index 52a6fced51be..6030ca9c20ca 100644 --- a/www/chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc +++ b/www/chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc @@ -1,28 +1,14 @@ ---- content/gpu/gpu_sandbox_hook_linux.cc.orig 2020-07-07 21:58:15 UTC +--- content/gpu/gpu_sandbox_hook_linux.cc.orig 2020-11-19 08:18:33 UTC +++ content/gpu/gpu_sandbox_hook_linux.cc -@@ -97,8 +97,9 @@ static const char kLibV4lEncPluginPath[] = - "/usr/lib/libv4l/plugins/libv4l-encplugin.so"; - #endif - --constexpr int dlopen_flag = RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE; -+constexpr int dlopen_flag = RTLD_NOW | RTLD_GLOBAL; - -+#if !defined(OS_BSD) - void AddV4L2GpuWhitelist( - std::vector<BrokerFilePermission>* permissions, - const service_manager::SandboxSeccompBPF::Options& options) { -@@ -339,8 +340,10 @@ std::vector<BrokerFilePermission> FilePermissionsForGp - AddStandardGpuWhiteList(&permissions); - return permissions; +@@ -361,6 +361,7 @@ std::vector<BrokerFilePermission> FilePermissionsForGp } -+#endif void LoadArmGpuLibraries() { +#if !defined(OS_BSD) // Preload the Mali library. - if (UseChromecastSandboxWhitelist()) { - for (const char* path : kWhitelistedChromecastPaths) { -@@ -355,6 +358,7 @@ void LoadArmGpuLibraries() { + if (UseChromecastSandboxAllowlist()) { + for (const char* path : kAllowedChromecastPaths) { +@@ -375,6 +376,7 @@ void LoadArmGpuLibraries() { // Preload the Tegra V4L2 (video decode acceleration) library. dlopen(kLibTegraPath, dlopen_flag); } @@ -30,44 +16,3 @@ } bool LoadAmdGpuLibraries() { -@@ -394,12 +398,14 @@ void LoadV4L2Libraries( - } - - void LoadChromecastV4L2Libraries() { -+#if !defined(OS_BSD) - for (const char* path : kWhitelistedChromecastPaths) { - const std::string library_path(std::string(path) + - std::string("libvpcodec.so")); - if (dlopen(library_path.c_str(), dlopen_flag)) - break; - } -+#endif - } - - bool LoadLibrariesForGpu( -@@ -421,6 +427,7 @@ bool LoadLibrariesForGpu( - return true; - } - -+#if !defined(OS_BSD) - sandbox::syscall_broker::BrokerCommandSet CommandSetForGPU( - const service_manager::SandboxLinux::Options& options) { - sandbox::syscall_broker::BrokerCommandSet command_set; -@@ -442,13 +449,17 @@ bool BrokerProcessPreSandboxHook( - service_manager::SetProcessTitleFromCommandLine(nullptr); - return true; - } -+#endif - - } // namespace - - bool GpuProcessPreSandboxHook(service_manager::SandboxLinux::Options options) { -+ NOTIMPLEMENTED(); -+#if !defined(OS_BSD) - service_manager::SandboxLinux::GetInstance()->StartBrokerProcess( - CommandSetForGPU(options), FilePermissionsForGpu(options), - base::BindOnce(BrokerProcessPreSandboxHook), options); -+#endif - - if (!LoadLibrariesForGpu(options)) - return false; 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 8708f1d34421..97540244bc91 100644 --- a/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc +++ b/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc @@ -1,11 +1,11 @@ ---- content/ppapi_plugin/ppapi_blink_platform_impl.cc.orig 2020-02-03 21:52:46 UTC +--- content/ppapi_plugin/ppapi_blink_platform_impl.cc.orig 2020-11-13 06:36:43 UTC +++ content/ppapi_plugin/ppapi_blink_platform_impl.cc @@ -19,7 +19,7 @@ - #if defined(OS_MACOSX) + #if defined(OS_MAC) #include "content/child/child_process_sandbox_support_impl_mac.h" --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) ++#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "content/child/child_process_sandbox_support_impl_linux.h" #include "mojo/public/cpp/bindings/pending_remote.h" #endif @@ -13,8 +13,8 @@ namespace content { PpapiBlinkPlatformImpl::PpapiBlinkPlatformImpl() { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) mojo::PendingRemote<font_service::mojom::FontService> font_service; ChildThread::Get()->BindHostReceiver( font_service.InitWithNewPipeAndPassReceiver()); @@ -22,8 +22,8 @@ void PpapiBlinkPlatformImpl::Shutdown() {} blink::WebSandboxSupport* PpapiBlinkPlatformImpl::GetSandboxSupport() { --#if defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) return sandbox_support_.get(); #else return nullptr; diff --git a/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h b/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h index d246feb0e6c4..d85f9dfffc3d 100644 --- a/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h +++ b/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h @@ -1,11 +1,11 @@ ---- content/ppapi_plugin/ppapi_blink_platform_impl.h.orig 2019-10-21 19:06:32 UTC +--- content/ppapi_plugin/ppapi_blink_platform_impl.h.orig 2020-11-13 06:36:43 UTC +++ content/ppapi_plugin/ppapi_blink_platform_impl.h @@ -13,7 +13,7 @@ #include "build/build_config.h" #include "content/child/blink_platform_impl.h" --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "components/services/font/public/cpp/font_loader.h" #include "third_party/skia/include/core/SkRefCnt.h" #endif @@ -13,13 +13,13 @@ blink::WebThemeEngine* ThemeEngine() override; private: --#if defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) std::unique_ptr<blink::WebSandboxSupport> sandbox_support_; #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) sk_sp<font_service::FontLoader> font_loader_; #endif diff --git a/www/chromium/files/patch-content_public_app_content__main__delegate.cc b/www/chromium/files/patch-content_public_app_content__main__delegate.cc index c0daa3c2f628..15ee833b31aa 100644 --- a/www/chromium/files/patch-content_public_app_content__main__delegate.cc +++ b/www/chromium/files/patch-content_public_app_content__main__delegate.cc @@ -1,18 +1,17 @@ ---- content/public/app/content_main_delegate.cc.orig 2020-07-07 21:58:15 UTC +--- content/public/app/content_main_delegate.cc.orig 2020-11-13 06:36:43 UTC +++ content/public/app/content_main_delegate.cc -@@ -24,13 +24,13 @@ int ContentMainDelegate::RunProcess( +@@ -24,12 +24,12 @@ int ContentMainDelegate::RunProcess( return -1; } --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) void ContentMainDelegate::ZygoteStarting( - std::vector<std::unique_ptr<service_manager::ZygoteForkDelegate>>* - delegates) {} + std::vector<std::unique_ptr<ZygoteForkDelegate>>* delegates) {} --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) int ContentMainDelegate::TerminateForFatalInitializationError() { CHECK(false); diff --git a/www/chromium/files/patch-content_public_app_content__main__delegate.h b/www/chromium/files/patch-content_public_app_content__main__delegate.h index 7fdad01e5ccf..89c7b802bde4 100644 --- a/www/chromium/files/patch-content_public_app_content__main__delegate.h +++ b/www/chromium/files/patch-content_public_app_content__main__delegate.h @@ -1,20 +1,20 @@ ---- content/public/app/content_main_delegate.h.orig 2020-05-13 18:40:32 UTC +--- content/public/app/content_main_delegate.h.orig 2020-11-13 06:36:43 UTC +++ content/public/app/content_main_delegate.h -@@ -60,7 +60,7 @@ class CONTENT_EXPORT ContentMainDelegate { +@@ -49,7 +49,7 @@ class CONTENT_EXPORT ContentMainDelegate { // Called right before the process exits. virtual void ProcessExiting(const std::string& process_type) {} --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Tells the embedder that the zygote process is starting, and allows it to // specify one or more zygote delegates if it wishes by storing them in // |*delegates|. -@@ -70,7 +70,7 @@ class CONTENT_EXPORT ContentMainDelegate { +@@ -58,7 +58,7 @@ class CONTENT_EXPORT ContentMainDelegate { // Called every time the zygote process forks. virtual void ZygoteForked() {} --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Fatal errors during initialization are reported by this function, so that // the embedder can implement graceful exit by displaying some message and diff --git a/www/chromium/files/patch-services_service__manager_zygote_zygote__host__linux.h b/www/chromium/files/patch-content_public_browser_zygote__host_zygote__host__linux.h index bdf4e5ff2926..4cf5a0186e2d 100644 --- a/www/chromium/files/patch-services_service__manager_zygote_zygote__host__linux.h +++ b/www/chromium/files/patch-content_public_browser_zygote__host_zygote__host__linux.h @@ -1,8 +1,8 @@ ---- services/service_manager/zygote/zygote_host_linux.h.orig 2019-03-11 22:01:02 UTC -+++ services/service_manager/zygote/zygote_host_linux.h +--- content/public/browser/zygote_host/zygote_host_linux.h.orig 2020-11-13 06:36:43 UTC ++++ content/public/browser/zygote_host/zygote_host_linux.h @@ -30,11 +30,13 @@ class ZygoteHost { // after the first render has been forked. - virtual int GetRendererSandboxStatus() const = 0; + virtual int GetRendererSandboxStatus() = 0; +#if !defined(OS_BSD) // Adjust the OOM score of the given renderer's PID. The allowed @@ -13,4 +13,4 @@ +#endif }; - } // namespace service_manager + } // namespace content diff --git a/www/chromium/files/patch-content_public_common_BUILD.gn b/www/chromium/files/patch-content_public_common_BUILD.gn deleted file mode 100644 index 5ec304a9b7d1..000000000000 --- a/www/chromium/files/patch-content_public_common_BUILD.gn +++ /dev/null @@ -1,11 +0,0 @@ ---- content/public/common/BUILD.gn.orig 2020-07-07 21:58:15 UTC -+++ content/public/common/BUILD.gn -@@ -255,7 +255,7 @@ jumbo_source_set("common_sources") { - deps += [ "//content/public/android:jni" ] - } - -- if (is_linux) { -+ if (is_linux && !is_bsd) { - deps += [ "//services/service_manager/zygote" ] - } - diff --git a/www/chromium/files/patch-content_public_common_child__process__host.h b/www/chromium/files/patch-content_public_common_child__process__host.h index bf91f4c4d0d2..be7ccfdbe458 100644 --- a/www/chromium/files/patch-content_public_common_child__process__host.h +++ b/www/chromium/files/patch-content_public_common_child__process__host.h @@ -1,11 +1,11 @@ ---- content/public/common/child_process_host.h.orig 2020-02-03 21:52:46 UTC +--- content/public/common/child_process_host.h.orig 2020-11-13 06:36:43 UTC +++ content/public/common/child_process_host.h -@@ -80,7 +80,7 @@ class CONTENT_EXPORT ChildProcessHost : public IPC::Se +@@ -81,7 +81,7 @@ class CONTENT_EXPORT ChildProcessHost : public IPC::Se // No special behavior requested. CHILD_NORMAL = 0, --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Indicates that the child execed after forking may be execced from // /proc/self/exe rather than using the "real" app path. This prevents // autoupdate from confusing us if it changes the file out from under us. diff --git a/www/chromium/files/patch-content_public_common_common__param__traits__macros.h b/www/chromium/files/patch-content_public_common_common__param__traits__macros.h index bd87d06db5b6..f617a67285e1 100644 --- a/www/chromium/files/patch-content_public_common_common__param__traits__macros.h +++ b/www/chromium/files/patch-content_public_common_common__param__traits__macros.h @@ -1,11 +1,11 @@ ---- content/public/common/common_param_traits_macros.h.orig 2020-07-07 21:58:15 UTC +--- content/public/common/common_param_traits_macros.h.orig 2020-11-13 06:36:43 UTC +++ content/public/common/common_param_traits_macros.h -@@ -318,7 +318,7 @@ IPC_STRUCT_TRAITS_BEGIN(blink::mojom::RendererPreferen +@@ -138,7 +138,7 @@ IPC_STRUCT_TRAITS_BEGIN(blink::mojom::RendererPreferen IPC_STRUCT_TRAITS_MEMBER(accept_languages) - IPC_STRUCT_TRAITS_MEMBER(disable_client_blocked_error_page) IPC_STRUCT_TRAITS_MEMBER(plugin_fullscreen_allowed) --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) + IPC_STRUCT_TRAITS_MEMBER(caret_browsing_enabled) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) IPC_STRUCT_TRAITS_MEMBER(system_font_family_name) + IPC_STRUCT_TRAITS_MEMBER(selection_clipboard_buffer_available) #endif - #if defined(OS_WIN) diff --git a/www/chromium/files/patch-content_public_common_content__constants.cc b/www/chromium/files/patch-content_public_common_content__constants.cc index fcf1b26ac67d..0ebd9b159a2c 100644 --- a/www/chromium/files/patch-content_public_common_content__constants.cc +++ b/www/chromium/files/patch-content_public_common_content__constants.cc @@ -1,11 +1,11 @@ ---- content/public/common/content_constants.cc.orig 2020-05-15 15:08:32 UTC +--- content/public/common/content_constants.cc.orig 2020-11-13 06:36:43 UTC +++ content/public/common/content_constants.cc -@@ -46,7 +46,7 @@ const int kDefaultDetachableCancelDelayMs = 30000; - const char kCorsExemptPurposeHeaderName[] = "Purpose"; - const char kCorsExemptRequestedWithHeaderName[] = "X-Requested-With"; +@@ -56,7 +56,7 @@ std::string GetCorsExemptRequestedWithHeaderName() { + return base::JoinString(pieces, "-"); + } --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) const int kLowestRendererOomScore = 300; const int kHighestRendererOomScore = 1000; diff --git a/www/chromium/files/patch-content_public_common_content__constants.h b/www/chromium/files/patch-content_public_common_content__constants.h index d26794df95f9..9975a358859f 100644 --- a/www/chromium/files/patch-content_public_common_content__constants.h +++ b/www/chromium/files/patch-content_public_common_content__constants.h @@ -1,11 +1,11 @@ ---- content/public/common/content_constants.h.orig 2020-05-15 15:08:45 UTC +--- content/public/common/content_constants.h.orig 2020-11-13 06:36:43 UTC +++ content/public/common/content_constants.h -@@ -65,7 +65,7 @@ CONTENT_EXPORT extern const int kDefaultDetachableCanc - CONTENT_EXPORT extern const char kCorsExemptPurposeHeaderName[]; - CONTENT_EXPORT extern const char kCorsExemptRequestedWithHeaderName[]; +@@ -70,7 +70,7 @@ CONTENT_EXPORT extern const char kCorsExemptPurposeHea + // it at run time. + CONTENT_EXPORT std::string GetCorsExemptRequestedWithHeaderName(); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // The OOM score adj constants // The highest and lowest assigned OOM score adjustment (oom_score_adj) for // renderers and extensions used by the OomPriority Manager. 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 d0a541e86aeb..863f2389701e 100644 --- a/www/chromium/files/patch-content_public_common_content__features.cc +++ b/www/chromium/files/patch-content_public_common_content__features.cc @@ -1,24 +1,26 @@ ---- content/public/common/content_features.cc.orig 2020-07-07 21:58:15 UTC +--- content/public/common/content_features.cc.orig 2020-11-13 06:36:43 UTC +++ content/public/common/content_features.cc -@@ -48,7 +48,7 @@ const base::Feature kAudioServiceLaunchOnStartup{ +@@ -54,7 +54,7 @@ const base::Feature kAudioServiceLaunchOnStartup{ const base::Feature kAudioServiceOutOfProcess { "AudioServiceOutOfProcess", - #if defined(OS_WIN) || defined(OS_MACOSX) || \ + #if defined(OS_WIN) || defined(OS_MAC) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -730,7 +730,7 @@ const base::Feature kWebAssemblyThreads { +@@ -776,8 +776,8 @@ const base::Feature kWebAssemblyThreads { }; // Enable WebAssembly trap handler. --#if (defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX)) && \ -+#if (defined(OS_BSD) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX)) && \ +-#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || \ +- defined(OS_MAC)) && \ ++#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_BSD) || \ ++ defined(OS_MAC)) && \ defined(ARCH_CPU_X86_64) const base::Feature kWebAssemblyTrapHandler{"WebAssemblyTrapHandler", base::FEATURE_ENABLED_BY_DEFAULT}; -@@ -760,7 +760,7 @@ const base::Feature kWebAuth{"WebAuthentication", +@@ -807,7 +807,7 @@ const base::Feature kWebAuth{"WebAuthentication", // https://w3c.github.io/webauthn const base::Feature kWebAuthCable { "WebAuthenticationCable", 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 2717008affee..de2c96996248 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,15 @@ ---- content/public/common/content_switches.cc.orig 2020-07-07 21:58:15 UTC +--- content/public/common/content_switches.cc.orig 2020-11-13 06:36:43 UTC +++ content/public/common/content_switches.cc -@@ -1032,7 +1032,7 @@ const char kEnableAggressiveDOMStorageFlushing[] = +@@ -905,7 +905,7 @@ const char kWebXrRuntimeWMR[] = "windows-mixed-reality + const char kDisableAcceleratedVideoDecode[] = + "disable-accelerated-video-decode"; + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)) || defined(OS_BSD) + // Enables hardware acceleration of video decoding on linux. (defaults to off) + const char kEnableAcceleratedVideoDecode[] = "enable-accelerated-video-decode"; + #endif +@@ -969,7 +969,7 @@ const char kEnableAggressiveDOMStorageFlushing[] = // Enable indication that browser is controlled by automation. const char kEnableAutomation[] = "enable-automation"; 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 13f119841dcf..fc3899dfcf88 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,15 @@ ---- content/public/common/content_switches.h.orig 2020-07-07 21:58:15 UTC +--- content/public/common/content_switches.h.orig 2020-11-13 06:36:43 UTC +++ content/public/common/content_switches.h -@@ -284,7 +284,7 @@ CONTENT_EXPORT extern const char kRemoteDebuggingSocke +@@ -248,7 +248,7 @@ CONTENT_EXPORT extern const char kWebXrRuntimeOrientat + CONTENT_EXPORT extern const char kWebXrRuntimeOpenXr[]; + CONTENT_EXPORT extern const char kWebXrRuntimeWMR[]; + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)) || defined(OS_BSD) + CONTENT_EXPORT extern const char kEnableAcceleratedVideoDecode[]; + #endif + CONTENT_EXPORT extern const char kDisableAcceleratedVideoDecode[]; +@@ -269,7 +269,7 @@ CONTENT_EXPORT extern const char kRemoteDebuggingSocke CONTENT_EXPORT extern const char kRendererWaitForJavaDebugger[]; #endif diff --git a/www/chromium/files/patch-content_public_common_use__zoom__for__dsf__policy.cc b/www/chromium/files/patch-content_public_common_use__zoom__for__dsf__policy.cc index b448c3f07db5..604ce8e271a4 100644 --- a/www/chromium/files/patch-content_public_common_use__zoom__for__dsf__policy.cc +++ b/www/chromium/files/patch-content_public_common_use__zoom__for__dsf__policy.cc @@ -1,11 +1,11 @@ ---- content/public/common/use_zoom_for_dsf_policy.cc.orig 2019-03-11 22:00:58 UTC +--- content/public/common/use_zoom_for_dsf_policy.cc.orig 2020-11-13 06:36:43 UTC +++ content/public/common/use_zoom_for_dsf_policy.cc @@ -25,7 +25,7 @@ const base::Feature kUseZoomForDsfEnabledByDefault{ #endif bool IsUseZoomForDSFEnabledByDefault() { --#if defined(OS_LINUX) || defined(OS_FUCHSIA) -+#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD) return true; #elif defined(OS_WIN) || defined(OS_ANDROID) return base::FeatureList::IsEnabled(kUseZoomForDsfEnabledByDefault); diff --git a/www/chromium/files/patch-services_service__manager_zygote_common_zygote__features.gni b/www/chromium/files/patch-content_public_common_zygote_features.gni index d6dc2aed4fb6..3778ba0f5ee8 100644 --- a/www/chromium/files/patch-services_service__manager_zygote_common_zygote__features.gni +++ b/www/chromium/files/patch-content_public_common_zygote_features.gni @@ -1,5 +1,5 @@ ---- services/service_manager/zygote/common/zygote_features.gni.orig 2019-03-11 22:01:02 UTC -+++ services/service_manager/zygote/common/zygote_features.gni +--- content/public/common/zygote/features.gni.orig 2020-11-13 06:36:43 UTC ++++ content/public/common/zygote/features.gni @@ -2,4 +2,4 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. 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 42e45dc869e8..c27c7664f2a7 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,15 +1,6 @@ ---- content/public/test/browser_test_base.cc.orig 2020-07-07 21:58:15 UTC +--- content/public/test/browser_test_base.cc.orig 2020-11-13 06:36:43 UTC +++ content/public/test/browser_test_base.cc -@@ -74,7 +74,7 @@ - #include "ui/gl/gl_implementation.h" - #include "ui/gl/gl_switches.h" - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - #include "ui/platform_window/common/platform_window_defaults.h" // nogncheck - #endif - -@@ -100,6 +100,10 @@ +@@ -105,6 +105,10 @@ #include "ui/views/test/event_generator_delegate_mac.h" #endif @@ -20,12 +11,3 @@ #if defined(OS_POSIX) #include "base/process/process_handle.h" #endif -@@ -186,7 +190,7 @@ BrowserTestBase::BrowserTestBase() - "a new browser test suite that runs on Android, please add it to " - "//build/android/pylib/gtest/gtest_test_instance.py."; - g_instance_already_created = true; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - ui::test::EnableTestConfigForPlatformWindows(); - #endif - diff --git a/www/chromium/files/patch-content_public_test_content__browser__test.cc b/www/chromium/files/patch-content_public_test_content__browser__test.cc index 9fc68f4a88c5..b2d6867f7f88 100644 --- a/www/chromium/files/patch-content_public_test_content__browser__test.cc +++ b/www/chromium/files/patch-content_public_test_content__browser__test.cc @@ -1,6 +1,6 @@ ---- content/public/test/content_browser_test.cc.orig 2020-05-13 18:40:32 UTC +--- content/public/test/content_browser_test.cc.orig 2020-11-13 06:36:43 UTC +++ content/public/test/content_browser_test.cc -@@ -25,7 +25,7 @@ +@@ -26,7 +26,7 @@ #include "base/mac/foundation_util.h" #endif @@ -9,7 +9,7 @@ #include "ui/base/ime/init/input_method_initializer.h" #endif -@@ -82,7 +82,7 @@ void ContentBrowserTest::SetUp() { +@@ -87,7 +87,7 @@ void ContentBrowserTest::SetUp() { #endif // LinuxInputMethodContextFactory has to be initialized. @@ -18,7 +18,7 @@ ui::InitializeInputMethodForTesting(); #endif -@@ -95,7 +95,7 @@ void ContentBrowserTest::TearDown() { +@@ -100,7 +100,7 @@ void ContentBrowserTest::TearDown() { BrowserTestBase::TearDown(); // LinuxInputMethodContextFactory has to be shutdown. diff --git a/www/chromium/files/patch-content_public_test_mock__render__thread.cc b/www/chromium/files/patch-content_public_test_mock__render__thread.cc index a4b6aaad576b..63b38ac82ada 100644 --- a/www/chromium/files/patch-content_public_test_mock__render__thread.cc +++ b/www/chromium/files/patch-content_public_test_mock__render__thread.cc @@ -1,11 +1,11 @@ ---- content/public/test/mock_render_thread.cc.orig 2020-05-13 18:40:32 UTC +--- content/public/test/mock_render_thread.cc.orig 2020-11-13 06:36:43 UTC +++ content/public/test/mock_render_thread.cc -@@ -51,7 +51,7 @@ class MockRenderMessageFilterImpl : public mojom::Rend +@@ -52,7 +52,7 @@ class MockRenderMessageFilterImpl : public mojom::Rend std::move(callback).Run(false); } --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) void SetThreadPriority(int32_t platform_thread_id, base::ThreadPriority thread_priority) override {} #endif diff --git a/www/chromium/files/patch-content_renderer_BUILD.gn b/www/chromium/files/patch-content_renderer_BUILD.gn deleted file mode 100644 index c0d1e3c03069..000000000000 --- a/www/chromium/files/patch-content_renderer_BUILD.gn +++ /dev/null @@ -1,18 +0,0 @@ ---- content/renderer/BUILD.gn.orig 2020-07-07 21:58:15 UTC -+++ content/renderer/BUILD.gn -@@ -454,10 +454,11 @@ target(link_target_type, "renderer") { - } - - if (is_linux) { -- deps += [ -- "//components/services/font/public/cpp", -- "//services/service_manager/zygote", -- ] -+ deps += [ "//components/services/font/public/cpp" ] -+ -+ if (!is_bsd) { -+ deps += [ "//services/service_manager/zygote" ] -+ } - } - - if (is_mac) { 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 571543b9e088..cd059b17d6b3 100644 --- a/www/chromium/files/patch-content_renderer_render__process__impl.cc +++ b/www/chromium/files/patch-content_renderer_render__process__impl.cc @@ -1,20 +1,20 @@ ---- content/renderer/render_process_impl.cc.orig 2020-07-07 21:57:37 UTC +--- content/renderer/render_process_impl.cc.orig 2020-11-13 06:36:43 UTC +++ content/renderer/render_process_impl.cc @@ -44,7 +44,7 @@ #if defined(OS_WIN) #include "base/win/win_util.h" #endif --#if defined(OS_LINUX) && defined(ARCH_CPU_X86_64) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(ARCH_CPU_X86_64) +-#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(ARCH_CPU_X86_64) ++#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(ARCH_CPU_X86_64) #include "v8/include/v8-wasm-trap-handler-posix.h" #endif namespace { -@@ -161,7 +161,7 @@ RenderProcessImpl::RenderProcessImpl() +@@ -177,7 +177,7 @@ RenderProcessImpl::RenderProcessImpl() SetV8FlagIfNotFeature(features::kWebAssemblyTrapHandler, "--no-wasm-trap-handler"); --#if defined(OS_LINUX) && defined(ARCH_CPU_X86_64) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(ARCH_CPU_X86_64) +-#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(ARCH_CPU_X86_64) ++#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(ARCH_CPU_X86_64) if (base::FeatureList::IsEnabled(features::kWebAssemblyTrapHandler)) { base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); - if (!command_line->HasSwitch( + if (!command_line->HasSwitch(switches::kDisableInProcessStackTraces)) { 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 aed580dbffd6..14054a1ffec9 100644 --- a/www/chromium/files/patch-content_renderer_render__thread__impl.cc +++ b/www/chromium/files/patch-content_renderer_render__thread__impl.cc @@ -1,38 +1,11 @@ ---- content/renderer/render_thread_impl.cc.orig 2020-07-07 21:58:16 UTC +--- content/renderer/render_thread_impl.cc.orig 2020-11-13 06:36:43 UTC +++ content/renderer/render_thread_impl.cc -@@ -177,7 +177,7 @@ +@@ -173,7 +173,7 @@ - #if defined(OS_MACOSX) + #if defined(OS_MAC) #include <malloc/malloc.h> -#else +#elif !defined(OS_BSD) #include <malloc.h> #endif -@@ -744,7 +744,7 @@ void RenderThreadImpl::Init() { - DCHECK(parsed_num_raster_threads) << string_value; - DCHECK_GT(num_raster_threads, 0); - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - categorized_worker_pool_->SetBackgroundingCallback( - main_thread_scheduler_->DefaultTaskRunner(), - base::BindOnce( -@@ -767,7 +767,7 @@ void RenderThreadImpl::Init() { - base::DiscardableMemoryAllocator::SetInstance( - discardable_memory_allocator_.get()); - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - if (base::FeatureList::IsEnabled( - blink::features::kBlinkCompositorUseDisplayThreadPriority)) { - render_message_filter()->SetThreadPriority( -@@ -1151,7 +1151,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: - !cmd_line->HasSwitch(switches::kDisableGpuMemoryBufferVideoFrames); - #else - cmd_line->HasSwitch(switches::kEnableGpuMemoryBufferVideoFrames); --#endif // defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_WIN) -+#endif // defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) - const bool enable_media_stream_gpu_memory_buffers = - enable_gpu_memory_buffers && - base::FeatureList::IsEnabled( 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 c9c79f4f1826..049a555c28b5 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,47 +1,47 @@ ---- content/renderer/renderer_blink_platform_impl.cc.orig 2020-07-07 21:58:16 UTC +--- content/renderer/renderer_blink_platform_impl.cc.orig 2020-11-13 06:36:43 UTC +++ content/renderer/renderer_blink_platform_impl.cc @@ -97,7 +97,7 @@ - #if defined(OS_MACOSX) + #if defined(OS_MAC) #include "content/child/child_process_sandbox_support_impl_mac.h" --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) ++#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "content/child/child_process_sandbox_support_impl_linux.h" #endif -@@ -172,7 +172,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -169,7 +169,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( + main_thread_scheduler_(main_thread_scheduler) { + // RenderThread may not exist in some tests. if (RenderThreadImpl::current()) { - io_runner_ = RenderThreadImpl::current()->GetIOTaskRunner(); - thread_safe_sender_ = RenderThreadImpl::current()->thread_safe_sender(); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) mojo::PendingRemote<font_service::mojom::FontService> font_service; RenderThreadImpl::current()->BindHostReceiver( font_service.InitWithNewPipeAndPassReceiver()); -@@ -182,7 +182,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -179,7 +179,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( #endif } --#if defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) if (sandboxEnabled()) { - #if defined(OS_MACOSX) + #if defined(OS_MAC) sandbox_support_ = std::make_unique<WebSandboxSupportMac>(); -@@ -264,7 +264,7 @@ RendererBlinkPlatformImpl::CreateNetworkURLLoaderFacto +@@ -232,7 +232,7 @@ RendererBlinkPlatformImpl::WrapSharedURLLoaderFactory( void RendererBlinkPlatformImpl::SetDisplayThreadPriority( base::PlatformThreadId thread_id) { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) if (RenderThreadImpl* render_thread = RenderThreadImpl::current()) { render_thread->render_message_filter()->SetThreadPriority( thread_id, base::ThreadPriority::DISPLAY); -@@ -277,7 +277,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop +@@ -245,7 +245,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop } blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() { --#if defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) return sandbox_support_.get(); #else // These platforms do not require sandbox support. diff --git a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h index 4d33c7856bc3..1cbaf977d592 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,29 +1,29 @@ ---- content/renderer/renderer_blink_platform_impl.h.orig 2020-05-13 18:39:43 UTC +--- content/renderer/renderer_blink_platform_impl.h.orig 2020-11-13 06:36:43 UTC +++ content/renderer/renderer_blink_platform_impl.h -@@ -30,7 +30,7 @@ +@@ -29,7 +29,7 @@ #include "third_party/blink/public/mojom/cache_storage/cache_storage.mojom.h" #include "third_party/blink/public/mojom/loader/code_cache.mojom.h" --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "components/services/font/public/cpp/font_loader.h" // nogncheck #include "third_party/skia/include/core/SkRefCnt.h" // nogncheck #endif -@@ -219,7 +219,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -221,7 +221,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi + // Return the mojo interface for making CodeCache calls. + blink::mojom::CodeCacheHost& GetCodeCacheHost(); - scoped_refptr<base::SingleThreadTaskRunner> io_runner_; - --#if defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) std::unique_ptr<blink::WebSandboxSupport> sandbox_support_; #endif -@@ -243,7 +243,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -242,7 +242,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi mojo::PendingRemote<blink::mojom::CodeCacheHost> code_cache_host_remote_; mojo::SharedRemote<blink::mojom::CodeCacheHost> code_cache_host_; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) sk_sp<font_service::FontLoader> font_loader_; #endif diff --git a/www/chromium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc b/www/chromium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc index 3c78e664138b..0b64b2082386 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 2020-03-16 18:39:50 UTC +--- content/renderer/renderer_main_platform_delegate_linux.cc.orig 2020-11-13 06:36:43 UTC +++ content/renderer/renderer_main_platform_delegate_linux.cc @@ -30,6 +30,7 @@ void RendererMainPlatformDelegate::PlatformUninitializ } diff --git a/www/chromium/files/patch-content_shell_BUILD.gn b/www/chromium/files/patch-content_shell_BUILD.gn index 6b4a3928ef91..2018bba2e725 100644 --- a/www/chromium/files/patch-content_shell_BUILD.gn +++ b/www/chromium/files/patch-content_shell_BUILD.gn @@ -1,29 +1,42 @@ ---- content/shell/BUILD.gn.orig 2020-07-07 21:58:16 UTC +--- content/shell/BUILD.gn.orig 2020-11-13 06:36:43 UTC +++ content/shell/BUILD.gn -@@ -227,7 +227,7 @@ static_library("content_shell_app") { - "//content/public/app", - "//v8", - ] +@@ -94,7 +94,7 @@ static_library("content_shell_app") { + "//content/web_test:web_test_renderer", + ] + } - if (!is_fuchsia) { + if (!is_fuchsia && !is_bsd) { deps += [ "//components/crash/core/app", "//components/crash/core/app:test_support", -@@ -495,6 +495,13 @@ static_library("content_shell_lib") { - ] - deps += [ "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.ui.policy" ] - } -+ if (is_bsd) { -+ deps -= [ -+ "//components/crash/content/browser", -+ "//components/crash/core/app", -+ "//components/crash/core/app:test_support", -+ ] -+ } +@@ -253,7 +253,7 @@ static_library("content_shell_lib") { - if (enable_plugins) { + if (is_fuchsia) { + deps += [ "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.ui.policy" ] +- } else { ++ } else if (!is_bsd) { deps += [ -@@ -1070,7 +1077,7 @@ group("content_shell_crash_test") { + "//components/crash/content/browser", + "//components/crash/core/app", +@@ -505,7 +505,7 @@ if (is_android) { + } + } + +- if (is_win || is_linux || is_chromeos) { ++ if ((is_win || is_linux || is_chromeos) && !is_bsd) { + data_deps += + [ "//third_party/crashpad/crashpad/handler:crashpad_handler" ] + } +@@ -789,7 +789,7 @@ group("content_shell_crash_test") { + mac_bin_path + "otool", + ] + } +- if (is_posix) { ++ if (is_posix && !is_bsd) { + data += [ + "//components/crash/content/tools/generate_breakpad_symbols.py", + "//components/crash/content/tools/dmp2minidump.py", +@@ -798,7 +798,7 @@ group("content_shell_crash_test") { if (is_win) { data_deps += [ "//build/win:copy_cdb_to_output" ] } diff --git a/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc b/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc index a2bfc6210d23..d7508e191661 100644 --- a/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc +++ b/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc @@ -1,20 +1,29 @@ ---- content/shell/app/shell_main_delegate.cc.orig 2020-05-13 18:39:43 UTC +--- content/shell/app/shell_main_delegate.cc.orig 2020-11-13 06:36:43 UTC +++ content/shell/app/shell_main_delegate.cc -@@ -181,7 +181,7 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit - } +@@ -186,7 +186,7 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit void ShellMainDelegate::PreSandboxStartup() { --#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX)) -+#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)) + #if defined(ARCH_CPU_ARM_FAMILY) && \ +- (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS)) ++ (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) // Create an instance of the CPU class to parse /proc/cpuinfo and cache // cpu_brand info. base::CPU cpu_info; -@@ -200,7 +200,7 @@ void ShellMainDelegate::PreSandboxStartup() { - // Reporting for sub-processes will be initialized in ZygoteForked. - if (process_type != service_manager::switches::kZygoteProcess) { - crash_reporter::InitializeCrashpad(process_type.empty(), process_type); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - crash_reporter::SetFirstChanceExceptionHandler( - v8::TryHandleWebAssemblyTrapPosix); +@@ -195,7 +195,7 @@ void ShellMainDelegate::PreSandboxStartup() { + // Disable platform crash handling and initialize the crash reporter, if + // requested. + // TODO(crbug.com/753619): Implement crash reporter integration for Fuchsia. +-#if !defined(OS_FUCHSIA) ++#if !defined(OS_FUCHSIA) && !defined(OS_BSD) + if (base::CommandLine::ForCurrentProcess()->HasSwitch( + switches::kEnableCrashReporter)) { + std::string process_type = +@@ -211,7 +211,7 @@ void ShellMainDelegate::PreSandboxStartup() { #endif + } + } +-#endif // !defined(OS_FUCHSIA) ++#endif // !defined(OS_FUCHSIA) && !defined(OS_BSD) + + crash_reporter::InitializeCrashKeys(); + diff --git a/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc b/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc index d9388fc9f1d2..9ca13a820081 100644 --- a/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc +++ b/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc @@ -1,20 +1,20 @@ ---- content/shell/browser/shell_browser_context.cc.orig 2019-10-21 19:06:33 UTC +--- content/shell/browser/shell_browser_context.cc.orig 2020-11-13 06:36:43 UTC +++ content/shell/browser/shell_browser_context.cc -@@ -32,7 +32,7 @@ +@@ -31,7 +31,7 @@ #if defined(OS_WIN) #include "base/base_paths_win.h" --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) ++#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "base/nix/xdg_util.h" - #elif defined(OS_MACOSX) + #elif defined(OS_MAC) #include "base/base_paths_mac.h" -@@ -107,7 +107,7 @@ void ShellBrowserContext::InitWhileIOAllowed() { +@@ -104,7 +104,7 @@ void ShellBrowserContext::InitWhileIOAllowed() { #if defined(OS_WIN) CHECK(base::PathService::Get(base::DIR_LOCAL_APP_DATA, &path_)); path_ = path_.Append(std::wstring(L"content_shell")); --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) ++#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) std::unique_ptr<base::Environment> env(base::Environment::Create()); base::FilePath config_dir( base::nix::GetXDGDirectory(env.get(), 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 5d67147c3284..c8e68f977a92 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 2020-07-07 21:58:16 UTC +--- content/shell/browser/shell_browser_main_parts.cc.orig 2020-11-13 06:36:43 UTC +++ content/shell/browser/shell_browser_main_parts.cc -@@ -47,7 +47,7 @@ +@@ -54,7 +54,7 @@ #if defined(USE_AURA) && defined(USE_X11) #include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck #endif @@ -9,9 +9,9 @@ #include "ui/base/ime/init/input_method_initializer.h" #endif #if defined(OS_CHROMEOS) -@@ -132,7 +132,7 @@ int ShellBrowserMainParts::PreEarlyInitialization() { - #if defined(USE_X11) - ui::SetDefaultX11ErrorHandlers(); +@@ -141,7 +141,7 @@ int ShellBrowserMainParts::PreEarlyInitialization() { + if (!features::IsUsingOzonePlatform()) + ui::SetDefaultX11ErrorHandlers(); #endif -#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX) +#if !defined(OS_CHROMEOS) && defined(USE_AURA) && (defined(OS_BSD) || defined(OS_LINUX)) diff --git a/www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__context.cc b/www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__context.cc deleted file mode 100644 index 9b97dcc3d655..000000000000 --- a/www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__context.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- content/shell/browser/web_test/web_test_browser_context.cc.orig 2020-07-07 21:58:16 UTC -+++ content/shell/browser/web_test/web_test_browser_context.cc -@@ -26,7 +26,7 @@ - - #if defined(OS_WIN) - #include "base/base_paths_win.h" --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) - #include "base/nix/xdg_util.h" - #elif defined(OS_MACOSX) - #include "base/base_paths_mac.h" diff --git a/www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__main__parts.cc b/www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__main__parts.cc deleted file mode 100644 index 4d55f97a6b88..000000000000 --- a/www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__main__parts.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- content/shell/browser/web_test/web_test_browser_main_parts.cc.orig 2020-07-07 21:57:37 UTC -+++ content/shell/browser/web_test/web_test_browser_main_parts.cc -@@ -37,7 +37,7 @@ - #if defined(USE_AURA) && defined(USE_X11) - #include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck - #endif --#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX) -+#if !defined(OS_CHROMEOS) && defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD)) - #include "ui/base/ime/init/input_method_initializer.h" - #endif - diff --git a/www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__main__runner.cc b/www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__main__runner.cc deleted file mode 100644 index fded6524feb6..000000000000 --- a/www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__main__runner.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- content/shell/browser/web_test/web_test_browser_main_runner.cc.orig 2020-07-13 09:42:59 UTC -+++ content/shell/browser/web_test/web_test_browser_main_runner.cc -@@ -205,7 +205,7 @@ void WebTestBrowserMainRunner::Initialize() { - command_line.AppendSwitch( - switches::kDisableGpuProcessForDX12VulkanInfoCollection); - --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - content::WebTestBrowserPlatformInitialize(); - #endif - diff --git a/www/chromium/files/patch-content_shell_renderer_web__test_test__runner.cc b/www/chromium/files/patch-content_shell_renderer_web__test_test__runner.cc deleted file mode 100644 index 3e2eefb3df6d..000000000000 --- a/www/chromium/files/patch-content_shell_renderer_web__test_test__runner.cc +++ /dev/null @@ -1,29 +0,0 @@ ---- content/shell/renderer/web_test/test_runner.cc.orig 2020-07-07 21:58:16 UTC -+++ content/shell/renderer/web_test/test_runner.cc -@@ -73,7 +73,7 @@ - #include "ui/gfx/skia_util.h" - #include "ui/gfx/test/icc_profiles.h" - --#if defined(OS_LINUX) || defined(OS_FUCHSIA) -+#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) - #include "third_party/blink/public/platform/web_font_render_style.h" - #endif - -@@ -1842,7 +1842,7 @@ void TestRunner::Reset() { - drag_image_.reset(); - - blink::WebSecurityPolicy::ClearOriginAccessList(); --#if defined(OS_LINUX) || defined(OS_FUCHSIA) -+#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) - blink::WebFontRenderStyle::SetSubpixelPositioning(false); - #endif - blink::ResetDomainRelaxationForTest(); -@@ -2426,7 +2426,7 @@ void TestRunner::AddOriginAccessAllowListEntry( - } - - void TestRunner::SetTextSubpixelPositioning(bool value) { --#if defined(OS_LINUX) || defined(OS_FUCHSIA) -+#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) - // Since FontConfig doesn't provide a variable to control subpixel - // positioning, we'll fall back to setting it globally for all fonts. - blink::WebFontRenderStyle::SetSubpixelPositioning(value); diff --git a/www/chromium/files/patch-content_test_BUILD.gn b/www/chromium/files/patch-content_test_BUILD.gn index 4c053ec97b0a..5ff957e1cd4b 100644 --- a/www/chromium/files/patch-content_test_BUILD.gn +++ b/www/chromium/files/patch-content_test_BUILD.gn @@ -1,34 +1,28 @@ ---- content/test/BUILD.gn.orig 2020-07-07 21:58:16 UTC +--- content/test/BUILD.gn.orig 2020-11-13 06:36:43 UTC +++ content/test/BUILD.gn -@@ -1330,15 +1330,22 @@ test("content_browsertests") { +@@ -1402,10 +1402,12 @@ test("content_browsertests") { } - if (is_linux) { + if (is_linux || is_chromeos) { - sources += [ - "../browser/utility_process_sandbox_browsertest.cc", -- "../zygote/zygote_browsertest.cc", +- "../browser/zygote_host/zygote_browsertest.cc", - ] -- deps += [ -- "//services/service_manager/tests:interfaces", -- "//services/service_manager/zygote", -- "//ui/gfx:test_support", -- ] -+ if (is_bsd) { -+ deps += [ -+ "//services/service_manager/tests:interfaces", -+ "//ui/gfx:test_support", -+ ] -+ } else { ++ if (!is_bsd) { + sources += [ + "../browser/utility_process_sandbox_browsertest.cc", -+ "../zygote/zygote_browsertest.cc", -+ ] -+ deps += [ -+ "//services/service_manager/tests:interfaces", -+ "//services/service_manager/zygote", -+ "//ui/gfx:test_support", ++ "../browser/zygote_host/zygote_browsertest.cc", + ] + } - - if (use_atk) { - sources += [ + deps += [ + "//services/service_manager/tests:interfaces", + "//ui/gfx:test_support", +@@ -1625,7 +1627,7 @@ static_library("run_all_unittests") { + ":test_support", + "//base/test:test_support", + ] +- if (is_linux || is_chromeos) { ++ if ((is_linux || is_chromeos) && !is_bsd) { + deps += [ "//content/common:set_process_title_linux" ] + } + } diff --git a/www/chromium/files/patch-content_test_content__test__suite.cc b/www/chromium/files/patch-content_test_content__test__suite.cc index b70aa3d92b44..e5425d8392da 100644 --- a/www/chromium/files/patch-content_test_content__test__suite.cc +++ b/www/chromium/files/patch-content_test_content__test__suite.cc @@ -1,4 +1,4 @@ ---- content/test/content_test_suite.cc.orig 2020-07-07 21:57:37 UTC +--- content/test/content_test_suite.cc.orig 2020-11-13 06:36:43 UTC +++ content/test/content_test_suite.cc @@ -83,6 +83,7 @@ void ContentTestSuite::Initialize() { // to initialize GL, so don't do it here. diff --git a/www/chromium/files/patch-content_utility_BUILD.gn b/www/chromium/files/patch-content_utility_BUILD.gn index af5f3ef3326b..d6217cc7ee98 100644 --- a/www/chromium/files/patch-content_utility_BUILD.gn +++ b/www/chromium/files/patch-content_utility_BUILD.gn @@ -1,11 +1,11 @@ ---- content/utility/BUILD.gn.orig 2020-07-07 21:58:16 UTC +--- content/utility/BUILD.gn.orig 2020-11-17 10:17:48 UTC +++ content/utility/BUILD.gn -@@ -82,7 +82,7 @@ jumbo_source_set("utility") { +@@ -84,7 +84,7 @@ source_set("utility") { deps += [ "//services/proxy_resolver:lib" ] } -- if (is_linux) { -+ if (is_linux && !is_bsd) { +- if (is_linux || is_chromeos) { ++ if ((is_linux || is_chromeos) && !is_bsd) { deps += [ "//content/utility/speech:speech_recognition_sandbox_hook" ] } diff --git a/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc b/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc index 37e61a50af20..2827d4871ec0 100644 --- a/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc +++ b/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc @@ -1,11 +1,11 @@ ---- content/utility/utility_blink_platform_with_sandbox_support_impl.cc.orig 2019-12-16 21:50:48 UTC +--- content/utility/utility_blink_platform_with_sandbox_support_impl.cc.orig 2020-11-13 06:36:43 UTC +++ content/utility/utility_blink_platform_with_sandbox_support_impl.cc @@ -9,7 +9,7 @@ - #if defined(OS_MACOSX) + #if defined(OS_MAC) #include "content/child/child_process_sandbox_support_impl_mac.h" --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) ++#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "content/child/child_process_sandbox_support_impl_linux.h" #endif @@ -13,8 +13,8 @@ UtilityBlinkPlatformWithSandboxSupportImpl:: UtilityBlinkPlatformWithSandboxSupportImpl() { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) mojo::PendingRemote<font_service::mojom::FontService> font_service; UtilityThread::Get()->BindHostReceiver( font_service.InitWithNewPipeAndPassReceiver()); @@ -22,8 +22,8 @@ blink::WebSandboxSupport* UtilityBlinkPlatformWithSandboxSupportImpl::GetSandboxSupport() { --#if defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) return sandbox_support_.get(); #else return nullptr; diff --git a/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h b/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h index 23f525c1b117..16b3bee50f67 100644 --- a/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h +++ b/www/chromium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h @@ -1,11 +1,11 @@ ---- content/utility/utility_blink_platform_with_sandbox_support_impl.h.orig 2019-12-16 21:50:48 UTC +--- content/utility/utility_blink_platform_with_sandbox_support_impl.h.orig 2020-11-13 06:36:43 UTC +++ content/utility/utility_blink_platform_with_sandbox_support_impl.h @@ -11,7 +11,7 @@ #include "build/build_config.h" #include "third_party/blink/public/platform/platform.h" --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "components/services/font/public/cpp/font_loader.h" // nogncheck #include "third_party/skia/include/core/SkRefCnt.h" // nogncheck #endif @@ -13,12 +13,12 @@ blink::WebSandboxSupport* GetSandboxSupport() override; private: --#if defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) std::unique_ptr<blink::WebSandboxSupport> sandbox_support_; #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) sk_sp<font_service::FontLoader> font_loader_; #endif diff --git a/www/chromium/files/patch-content_zygote_zygote__linux.cc b/www/chromium/files/patch-content_zygote_zygote__linux.cc new file mode 100644 index 000000000000..a88eb2cc6b16 --- /dev/null +++ b/www/chromium/files/patch-content_zygote_zygote__linux.cc @@ -0,0 +1,16 @@ +--- content/zygote/zygote_linux.cc.orig 2020-11-13 06:36:43 UTC ++++ content/zygote/zygote_linux.cc +@@ -1,7 +1,7 @@ + // Copyright (c) 2012 The Chromium Authors. All rights reserved. + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. +- ++#if 0 + #include "content/zygote/zygote_linux.h" + + #include <errno.h> +@@ -650,3 +650,4 @@ bool Zygote::HandleGetSandboxStatus(int fd, base::Pick + } + + } // namespace content ++#endif diff --git a/www/chromium/files/patch-services_service__manager_zygote_zygote__main__linux.cc b/www/chromium/files/patch-content_zygote_zygote__main__linux.cc index d643ceecc85f..eac44788eb45 100644 --- a/www/chromium/files/patch-services_service__manager_zygote_zygote__main__linux.cc +++ b/www/chromium/files/patch-content_zygote_zygote__main__linux.cc @@ -1,5 +1,5 @@ ---- services/service_manager/zygote/zygote_main_linux.cc.orig 2020-05-13 18:39:47 UTC -+++ services/service_manager/zygote/zygote_main_linux.cc +--- content/zygote/zygote_main_linux.cc.orig 2020-11-13 06:36:43 UTC ++++ content/zygote/zygote_main_linux.cc @@ -11,7 +11,9 @@ #include <stddef.h> #include <stdint.h> @@ -20,29 +20,29 @@ @@ -131,6 +134,9 @@ static bool EnterSuidSandbox(sandbox::SetuidSandboxCli - CHECK(service_manager::SandboxDebugHandling::SetDumpableStatusAndHandlers()); + CHECK(sandbox::policy::SandboxDebugHandling::SetDumpableStatusAndHandlers()); return true; +#else + return false; -+#endif ++#endif // !defined(OS_BSD) } static void DropAllCapabilities(int proc_fd) { -@@ -176,6 +182,7 @@ static void EnterLayerOneSandbox(service_manager::Sand +@@ -176,6 +182,7 @@ static void EnterLayerOneSandbox(sandbox::policy::Sand bool ZygoteMain( std::vector<std::unique_ptr<ZygoteForkDelegate>> fork_delegates) { +#if !defined(OS_BSD) sandbox::SetAmZygoteOrRenderer(true, GetSandboxFD()); - auto* linux_sandbox = service_manager::SandboxLinux::GetInstance(); + auto* linux_sandbox = sandbox::policy::SandboxLinux::GetInstance(); @@ -240,6 +247,9 @@ bool ZygoteMain( // This function call can return multiple times, once per fork(). return zygote.ProcessRequests(); +#else + return false; -+#endif ++#endif // !defined(OS_BSD) } - } // namespace service_manager + } // namespace content diff --git a/www/chromium/files/patch-device_bluetooth_BUILD.gn b/www/chromium/files/patch-device_bluetooth_BUILD.gn index 222316adc8f5..0c73128d83a9 100644 --- a/www/chromium/files/patch-device_bluetooth_BUILD.gn +++ b/www/chromium/files/patch-device_bluetooth_BUILD.gn @@ -1,6 +1,15 @@ ---- device/bluetooth/BUILD.gn.orig 2020-03-16 18:39:51 UTC +--- device/bluetooth/BUILD.gn.orig 2020-11-13 06:36:43 UTC +++ device/bluetooth/BUILD.gn -@@ -275,7 +275,7 @@ component("bluetooth") { +@@ -8,7 +8,7 @@ if (is_android) { + } + if (is_chromeos) { + import("//chromeos/dbus/use_real_dbus_clients.gni") +-} else if (use_dbus) { ++} else if (use_dbus && !is_bsd) { + use_real_dbus_clients = false + } + +@@ -294,7 +294,7 @@ component("bluetooth") { ] } diff --git a/www/chromium/files/patch-device_gamepad_gamepad__provider.cc b/www/chromium/files/patch-device_gamepad_gamepad__provider.cc index 7c9a18a60c34..4bb83b9e08d0 100644 --- a/www/chromium/files/patch-device_gamepad_gamepad__provider.cc +++ b/www/chromium/files/patch-device_gamepad_gamepad__provider.cc @@ -1,11 +1,11 @@ ---- device/gamepad/gamepad_provider.cc.orig 2020-03-16 18:39:51 UTC +--- device/gamepad/gamepad_provider.cc.orig 2020-11-13 06:36:43 UTC +++ device/gamepad/gamepad_provider.cc -@@ -147,7 +147,7 @@ void GamepadProvider::Initialize(std::unique_ptr<Gamep +@@ -149,7 +149,7 @@ void GamepadProvider::Initialize(std::unique_ptr<Gamep if (!polling_thread_) polling_thread_.reset(new base::Thread("Gamepad polling thread")); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // On Linux, the data fetcher needs to watch file descriptors, so the message // loop needs to be a libevent loop. const base::MessagePumpType kMessageLoopType = base::MessagePumpType::IO; diff --git a/www/chromium/files/patch-device_gamepad_hid__writer__linux.cc b/www/chromium/files/patch-device_gamepad_hid__writer__linux.cc index f962ad16a8f5..6c3d10eb0c84 100644 --- a/www/chromium/files/patch-device_gamepad_hid__writer__linux.cc +++ b/www/chromium/files/patch-device_gamepad_hid__writer__linux.cc @@ -1,4 +1,4 @@ ---- device/gamepad/hid_writer_linux.cc.orig 2019-10-31 07:37:06 UTC +--- device/gamepad/hid_writer_linux.cc.orig 2020-11-13 06:36:43 UTC +++ device/gamepad/hid_writer_linux.cc @@ -4,6 +4,8 @@ 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 1d023f8ef171..44d5b84a2d28 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,4 +1,4 @@ ---- extensions/browser/api/declarative_webrequest/webrequest_action.cc.orig 2020-07-07 21:57:38 UTC +--- extensions/browser/api/declarative_webrequest/webrequest_action.cc.orig 2020-11-13 06:36:43 UTC +++ extensions/browser/api/declarative_webrequest/webrequest_action.cc @@ -28,7 +28,11 @@ #include "extensions/common/extension.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 7ded2d7c1140..e933f06e16c6 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,34 +1,35 @@ ---- extensions/browser/api/messaging/message_service.cc.orig 2020-02-03 21:52:46 UTC +--- extensions/browser/api/messaging/message_service.cc.orig 2020-11-13 06:36:43 UTC +++ extensions/browser/api/messaging/message_service.cc @@ -61,7 +61,7 @@ namespace { const char kReceivingEndDoesntExistError[] = "Could not establish connection. Receiving end does not exist."; --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) const char kMissingPermissionError[] = "Access to native messaging requires nativeMessaging permission."; - const char kProhibitedByPoliciesError[] = -@@ -391,7 +391,7 @@ void MessageService::OpenChannelToNativeApp( +@@ -392,7 +392,7 @@ void MessageService::OpenChannelToNativeApp( if (!opener_port->IsValidPort()) return; --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) bool has_permission = extension->permissions_data()->HasAPIPermission( APIPermission::kNativeMessaging); - if (!has_permission) { -@@ -441,11 +441,11 @@ void MessageService::OpenChannelToNativeApp( +@@ -443,12 +443,12 @@ void MessageService::OpenChannelToNativeApp( channel->opener->IncrementLazyKeepaliveCount(); AddChannel(std::move(channel), receiver_port_id); --#else // !(defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)) -+#else // !(defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)) +-#else // !(defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || ++#else // !(defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || + // defined(OS_CHROMEOS)) const char kNativeMessagingNotSupportedError[] = "Native Messaging is not supported on this platform."; opener_port->DispatchOnDisconnect(kNativeMessagingNotSupportedError); --#endif // !(defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)) -+#endif // !(defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)) +-#endif // !(defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || ++#endif // !(defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || + // defined(OS_CHROMEOS)) } - void MessageService::OpenChannelToTab(const ChannelEndpoint& source, diff --git a/www/chromium/files/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc b/www/chromium/files/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc index aa2f5369b993..7f12ad43e7ff 100644 --- a/www/chromium/files/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc +++ b/www/chromium/files/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc @@ -1,4 +1,4 @@ ---- extensions/browser/api/networking_private/networking_private_delegate_factory.cc.orig 2019-03-11 22:00:58 UTC +--- extensions/browser/api/networking_private/networking_private_delegate_factory.cc.orig 2020-11-13 06:36:43 UTC +++ extensions/browser/api/networking_private/networking_private_delegate_factory.cc @@ -11,7 +11,7 @@ @@ -7,7 +7,7 @@ -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) #include "extensions/browser/api/networking_private/networking_private_linux.h" - #elif defined(OS_WIN) || defined(OS_MACOSX) + #elif defined(OS_WIN) || defined(OS_MAC) #include "components/wifi/wifi_service.h" @@ -61,7 +61,7 @@ KeyedService* NetworkingPrivateDelegateFactory::BuildS NetworkingPrivateDelegate* delegate; @@ -16,5 +16,5 @@ -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) delegate = new NetworkingPrivateLinux(); - #elif defined(OS_WIN) || defined(OS_MACOSX) + #elif defined(OS_WIN) || defined(OS_MAC) std::unique_ptr<wifi::WiFiService> wifi_service(wifi::WiFiService::Create()); 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 b91676441b5d..1a4fe35cc742 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,4 +1,4 @@ ---- extensions/browser/api/web_request/form_data_parser.cc.orig 2020-07-07 21:57:38 UTC +--- extensions/browser/api/web_request/form_data_parser.cc.orig 2020-11-13 06:36:43 UTC +++ extensions/browser/api/web_request/form_data_parser.cc @@ -16,7 +16,11 @@ #include "base/values.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 13fef4dc69a1..28b9a0db40af 100644 --- a/www/chromium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc +++ b/www/chromium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc @@ -1,11 +1,11 @@ ---- extensions/browser/browser_context_keyed_service_factories.cc.orig 2020-07-07 21:57:38 UTC +--- extensions/browser/browser_context_keyed_service_factories.cc.orig 2020-11-13 06:36:43 UTC +++ extensions/browser/browser_context_keyed_service_factories.cc -@@ -92,7 +92,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() +@@ -96,7 +96,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() #if defined(OS_CHROMEOS) NetworkingConfigServiceFactory::GetInstance(); #endif --#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX) -+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || \ ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_BSD) || \ + defined(OS_MAC) NetworkingPrivateEventRouterFactory::GetInstance(); #endif - PowerAPI::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 6f4c1ea4a82e..75fdfdc7cc54 100644 --- a/www/chromium/files/patch-extensions_common_api___permission__features.json +++ b/www/chromium/files/patch-extensions_common_api___permission__features.json @@ -1,4 +1,4 @@ ---- extensions/common/api/_permission_features.json.orig 2020-07-07 21:58:16 UTC +--- extensions/common/api/_permission_features.json.orig 2020-11-13 06:36:43 UTC +++ extensions/common/api/_permission_features.json @@ -135,7 +135,7 @@ { @@ -9,16 +9,16 @@ "whitelist": [ "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80", // http://crbug.com/387169 "A3BC37E2148AC4E99BE4B16AF9D42DD1E592BBBE", // http://crbug.com/387169 -@@ -483,7 +483,7 @@ - "platform_app", - "login_screen_extension" - ], +@@ -473,7 +473,7 @@ + }, { + "channel": "stable", + "extension_types": ["extension", "legacy_packaged_app", "platform_app"], - "platforms": ["chromeos", "mac", "win", "linux"], + "platforms": ["chromeos", "mac", "win", "linux", "bsd"], "whitelist": [ "0DE0F05680A4A056BCEC864ED8DDA84296F82B40", // http://crbug.com/434651 "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80", // http://crbug.com/293683 -@@ -522,7 +522,7 @@ +@@ -508,7 +508,7 @@ "networkingPrivate": { "channel": "stable", "extension_types": ["extension", "legacy_packaged_app", "platform_app"], diff --git a/www/chromium/files/patch-extensions_common_api_runtime.json b/www/chromium/files/patch-extensions_common_api_runtime.json index 9d5dea52dcbc..4d1942d04b5b 100644 --- a/www/chromium/files/patch-extensions_common_api_runtime.json +++ b/www/chromium/files/patch-extensions_common_api_runtime.json @@ -1,4 +1,4 @@ ---- extensions/common/api/runtime.json.orig 2020-02-03 21:53:31 UTC +--- extensions/common/api/runtime.json.orig 2020-11-13 06:36:43 UTC +++ extensions/common/api/runtime.json @@ -68,7 +68,7 @@ "id": "PlatformOs", diff --git a/www/chromium/files/patch-extensions_common_feature__switch.cc b/www/chromium/files/patch-extensions_common_feature__switch.cc index a83f1aa327b9..23e2b07ffa28 100644 --- a/www/chromium/files/patch-extensions_common_feature__switch.cc +++ b/www/chromium/files/patch-extensions_common_feature__switch.cc @@ -1,4 +1,4 @@ ---- extensions/common/feature_switch.cc.orig 2020-05-13 18:39:44 UTC +--- extensions/common/feature_switch.cc.orig 2020-11-13 06:36:43 UTC +++ extensions/common/feature_switch.cc @@ -39,11 +39,11 @@ class CommonSwitches { FeatureSwitch::DEFAULT_ENABLED), diff --git a/www/chromium/files/patch-extensions_common_features_feature.cc b/www/chromium/files/patch-extensions_common_features_feature.cc index e97794f406b1..f02a0aab2ed0 100644 --- a/www/chromium/files/patch-extensions_common_features_feature.cc +++ b/www/chromium/files/patch-extensions_common_features_feature.cc @@ -1,11 +1,11 @@ ---- extensions/common/features/feature.cc.orig 2019-07-24 18:58:27 UTC +--- extensions/common/features/feature.cc.orig 2020-11-13 06:36:43 UTC +++ extensions/common/features/feature.cc -@@ -20,7 +20,7 @@ namespace extensions { - Feature::Platform Feature::GetCurrentPlatform() { - #if defined(OS_CHROMEOS) +@@ -26,7 +26,7 @@ Feature::Platform Feature::GetCurrentPlatform() { + return LACROS_PLATFORM; + #elif defined(OS_CHROMEOS) && !BUILDFLAG(IS_LACROS) return CHROMEOS_PLATFORM; -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) return LINUX_PLATFORM; - #elif defined(OS_MACOSX) + #elif defined(OS_MAC) return MACOSX_PLATFORM; diff --git a/www/chromium/files/patch-extensions_common_image__util.cc b/www/chromium/files/patch-extensions_common_image__util.cc index 99ed2a04e619..38860031e556 100644 --- a/www/chromium/files/patch-extensions_common_image__util.cc +++ b/www/chromium/files/patch-extensions_common_image__util.cc @@ -1,4 +1,4 @@ ---- extensions/common/image_util.cc.orig 2020-07-07 21:57:38 UTC +--- extensions/common/image_util.cc.orig 2020-11-13 06:36:43 UTC +++ extensions/common/image_util.cc @@ -20,7 +20,11 @@ #include "base/strings/stringprintf.h" diff --git a/www/chromium/files/patch-extensions_common_stack__frame.cc b/www/chromium/files/patch-extensions_common_stack__frame.cc index cb1f991f448f..16a026549310 100644 --- a/www/chromium/files/patch-extensions_common_stack__frame.cc +++ b/www/chromium/files/patch-extensions_common_stack__frame.cc @@ -1,4 +1,4 @@ ---- extensions/common/stack_frame.cc.orig 2019-03-11 22:00:58 UTC +--- extensions/common/stack_frame.cc.orig 2020-11-13 06:36:43 UTC +++ extensions/common/stack_frame.cc @@ -7,7 +7,11 @@ #include <string> diff --git a/www/chromium/files/patch-extensions_renderer_bindings_api__binding__util.cc b/www/chromium/files/patch-extensions_renderer_bindings_api__binding__util.cc index 14d315831491..2e8150300bea 100644 --- a/www/chromium/files/patch-extensions_renderer_bindings_api__binding__util.cc +++ b/www/chromium/files/patch-extensions_renderer_bindings_api__binding__util.cc @@ -1,4 +1,4 @@ ---- extensions/renderer/bindings/api_binding_util.cc.orig 2020-07-07 21:57:38 UTC +--- extensions/renderer/bindings/api_binding_util.cc.orig 2020-11-13 06:36:43 UTC +++ extensions/renderer/bindings/api_binding_util.cc @@ -130,6 +130,8 @@ std::string GetPlatformString() { return "mac"; diff --git a/www/chromium/files/patch-extensions_shell_BUILD.gn b/www/chromium/files/patch-extensions_shell_BUILD.gn index 7c0cc29f2729..1bf65fe32ff7 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 2020-05-18 11:01:17 UTC +--- extensions/shell/BUILD.gn.orig 2020-11-13 06:36:43 UTC +++ extensions/shell/BUILD.gn -@@ -193,7 +193,7 @@ source_set("app_shell_lib") { +@@ -202,7 +202,7 @@ source_set("app_shell_lib") { } } diff --git a/www/chromium/files/patch-extensions_shell_app_shell__main__delegate.cc b/www/chromium/files/patch-extensions_shell_app_shell__main__delegate.cc index 196003fc999d..40070ec0725b 100644 --- a/www/chromium/files/patch-extensions_shell_app_shell__main__delegate.cc +++ b/www/chromium/files/patch-extensions_shell_app_shell__main__delegate.cc @@ -1,20 +1,20 @@ ---- extensions/shell/app/shell_main_delegate.cc.orig 2019-09-09 21:55:17 UTC +--- extensions/shell/app/shell_main_delegate.cc.orig 2020-11-13 06:36:43 UTC +++ extensions/shell/app/shell_main_delegate.cc -@@ -38,7 +38,7 @@ +@@ -37,7 +37,7 @@ #if defined(OS_WIN) #include "base/base_paths_win.h" --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) ++#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "base/nix/xdg_util.h" - #elif defined(OS_MACOSX) + #elif defined(OS_MAC) #include "base/base_paths_mac.h" -@@ -70,7 +70,7 @@ base::FilePath GetDataPath() { +@@ -69,7 +69,7 @@ base::FilePath GetDataPath() { return cmd_line->GetSwitchValuePath(switches::kContentShellDataPath); base::FilePath data_dir; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) std::unique_ptr<base::Environment> env(base::Environment::Create()); data_dir = base::nix::GetXDGDirectory( env.get(), base::nix::kXdgConfigHomeEnvVar, base::nix::kDotConfigDir); diff --git a/www/chromium/files/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc b/www/chromium/files/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc index 194f3950299b..3c8a1aa478c5 100644 --- a/www/chromium/files/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc +++ b/www/chromium/files/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc @@ -1,4 +1,4 @@ ---- extensions/shell/browser/api/runtime/shell_runtime_api_delegate.cc.orig 2019-09-16 09:48:37 UTC +--- extensions/shell/browser/api/runtime/shell_runtime_api_delegate.cc.orig 2020-11-13 06:36:43 UTC +++ extensions/shell/browser/api/runtime/shell_runtime_api_delegate.cc @@ -45,7 +45,7 @@ void ShellRuntimeAPIDelegate::OpenURL(const GURL& unin bool ShellRuntimeAPIDelegate::GetPlatformInfo(PlatformInfo* info) { diff --git a/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.cc b/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.cc index 7333dad7d6bf..ceb3d1694b28 100644 --- a/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.cc +++ b/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.cc @@ -1,4 +1,4 @@ ---- extensions/shell/browser/shell_extensions_api_client.cc.orig 2019-09-09 21:55:17 UTC +--- extensions/shell/browser/shell_extensions_api_client.cc.orig 2020-11-13 06:36:43 UTC +++ extensions/shell/browser/shell_extensions_api_client.cc @@ -16,7 +16,7 @@ #include "extensions/shell/browser/shell_virtual_keyboard_delegate.h" diff --git a/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.h b/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.h index 31f01db1d1d5..fe532e143d36 100644 --- a/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.h +++ b/www/chromium/files/patch-extensions_shell_browser_shell__extensions__api__client.h @@ -1,6 +1,6 @@ ---- extensions/shell/browser/shell_extensions_api_client.h.orig 2019-09-09 21:55:17 UTC +--- extensions/shell/browser/shell_extensions_api_client.h.orig 2020-11-13 06:36:43 UTC +++ extensions/shell/browser/shell_extensions_api_client.h -@@ -32,14 +32,14 @@ class ShellExtensionsAPIClient : public ExtensionsAPIC +@@ -33,14 +33,14 @@ class ShellExtensionsAPIClient : public ExtensionsAPIC content::BrowserContext* browser_context) const override; std::unique_ptr<DisplayInfoProvider> CreateDisplayInfoProvider() const override; diff --git a/www/chromium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc b/www/chromium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc index 7a7e1a0192c2..893371dc19d4 100644 --- a/www/chromium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc +++ b/www/chromium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc @@ -1,4 +1,4 @@ ---- google_apis/gcm/engine/heartbeat_manager.cc.orig 2020-03-16 18:39:51 UTC +--- google_apis/gcm/engine/heartbeat_manager.cc.orig 2020-11-13 06:36:43 UTC +++ google_apis/gcm/engine/heartbeat_manager.cc @@ -31,13 +31,13 @@ const int kMinClientHeartbeatIntervalMs = 1000 * 30; // Minimum time spent sleeping before we force a new heartbeat. 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 fd129c7331df..41954dc99e58 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,11 +1,11 @@ ---- gpu/command_buffer/common/gpu_memory_buffer_support.cc.orig 2020-07-07 21:57:38 UTC +--- gpu/command_buffer/common/gpu_memory_buffer_support.cc.orig 2020-11-13 06:36:43 UTC +++ gpu/command_buffer/common/gpu_memory_buffer_support.cc @@ -55,7 +55,7 @@ bool IsImageSizeValidForGpuMemoryBufferFormat(const gf uint32_t GetPlatformSpecificTextureTarget() { - #if defined(OS_MACOSX) + #if defined(OS_MAC) return macos_specific_texture_target; --#elif defined(OS_ANDROID) || defined(OS_LINUX) -+#elif defined(OS_ANDROID) || defined(OS_LINUX) || 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) return GL_TEXTURE_EXTERNAL_OES; #elif defined(OS_WIN) || defined(OS_FUCHSIA) return GL_TEXTURE_2D; @@ -13,8 +13,8 @@ GPU_EXPORT bool NativeBufferNeedsPlatformSpecificTextureTarget( gfx::BufferFormat format) { --#if defined(USE_OZONE) || defined(OS_LINUX) -+#if defined(USE_OZONE) || defined(OS_LINUX) || 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) // 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 new file mode 100644 index 000000000000..0592463f04ec --- /dev/null +++ b/www/chromium/files/patch-gpu_command__buffer_service_external__semaphore.cc @@ -0,0 +1,11 @@ +--- gpu/command_buffer/service/external_semaphore.cc.orig 2020-11-16 14:42:25 UTC ++++ gpu/command_buffer/service/external_semaphore.cc +@@ -39,7 +39,7 @@ GLuint ImportSemaphoreHandleToGLSemaphore(SemaphoreHan + }, + base::Time::Now())); + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) + if (handle.vk_handle_type() != + VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT) { + DLOG(ERROR) << "Importing semaphore handle of unexpected type:" diff --git a/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc b/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc index 2d079b4a4239..ad516bbc7f71 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,38 +1,38 @@ ---- gpu/command_buffer/service/external_vk_image_backing.cc.orig 2020-07-07 21:58:16 UTC +--- gpu/command_buffer/service/external_vk_image_backing.cc.orig 2020-11-13 06:36:43 UTC +++ gpu/command_buffer/service/external_vk_image_backing.cc @@ -29,7 +29,7 @@ #include "ui/gl/gl_version_info.h" #include "ui/gl/scoped_binders.h" --#if defined(OS_LINUX) && BUILDFLAG(USE_DAWN) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && BUILDFLAG(USE_DAWN) +-#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && BUILDFLAG(USE_DAWN) ++#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && BUILDFLAG(USE_DAWN) #include "gpu/command_buffer/service/external_vk_image_dawn_representation.h" #endif -@@ -503,7 +503,7 @@ std::unique_ptr<SharedImageRepresentationDawn> +@@ -583,7 +583,7 @@ std::unique_ptr<SharedImageRepresentationDawn> ExternalVkImageBacking::ProduceDawn(SharedImageManager* manager, MemoryTypeTracker* tracker, WGPUDevice wgpuDevice) { --#if defined(OS_LINUX) && BUILDFLAG(USE_DAWN) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && BUILDFLAG(USE_DAWN) +-#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && BUILDFLAG(USE_DAWN) ++#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && BUILDFLAG(USE_DAWN) auto wgpu_format = viz::ToWGPUFormat(format()); if (wgpu_format == WGPUTextureFormat_Undefined) { -@@ -522,7 +522,7 @@ ExternalVkImageBacking::ProduceDawn(SharedImageManager +@@ -602,7 +602,7 @@ ExternalVkImageBacking::ProduceDawn(SharedImageManager return std::make_unique<ExternalVkImageDawnRepresentation>( manager, this, tracker, wgpuDevice, wgpu_format, std::move(memory_fd)); --#else // !defined(OS_LINUX) || !BUILDFLAG(USE_DAWN) -+#else // (!defined(OS_LINUX) && !defined(OS_BSD)) || !BUILDFLAG(USE_DAWN) +-#else // (!defined(OS_LINUX) && !defined(OS_CHROMEOS)) || !BUILDFLAG(USE_DAWN) ++#else // (!defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_BSD)) || !BUILDFLAG(USE_DAWN) NOTIMPLEMENTED_LOG_ONCE(); return nullptr; #endif -@@ -535,7 +535,7 @@ GLuint ExternalVkImageBacking::ProduceGLTextureInterna +@@ -615,7 +615,7 @@ GLuint ExternalVkImageBacking::ProduceGLTextureInterna gl::GLApi* api = gl::g_current_gl_context; base::Optional<ScopedDedicatedMemoryObject> memory_object; if (!use_separate_gl_texture()) { --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) auto memory_fd = image_->GetMemoryFd(); if (!memory_fd.is_valid()) return 0; diff --git a/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.h b/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.h deleted file mode 100644 index 70b970e2aab2..000000000000 --- a/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.h +++ /dev/null @@ -1,11 +0,0 @@ ---- gpu/command_buffer/service/external_vk_image_backing.h.orig 2020-05-13 18:40:32 UTC -+++ gpu/command_buffer/service/external_vk_image_backing.h -@@ -151,7 +151,7 @@ class ExternalVkImageBacking final : public ClearTrack - - private: - --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) - // Extract file descriptor from image - int GetMemoryFd(const GrVkImageInfo& image_info); - #endif diff --git a/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__gl__representation.cc b/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__gl__representation.cc deleted file mode 100644 index 321531baa60d..000000000000 --- a/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__gl__representation.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- gpu/command_buffer/service/external_vk_image_gl_representation.cc.orig 2020-07-07 21:58:16 UTC -+++ gpu/command_buffer/service/external_vk_image_gl_representation.cc -@@ -178,7 +178,7 @@ GLuint ExternalVkImageGLRepresentationShared::ImportVk - SemaphoreHandle handle) { - if (!handle.is_valid()) - return 0; --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) - if (handle.vk_handle_type() != - VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT) { - DLOG(ERROR) << "Importing semaphore handle of unexpected type:" diff --git a/www/chromium/files/patch-gpu_command__buffer_service_program__manager.cc b/www/chromium/files/patch-gpu_command__buffer_service_program__manager.cc index 9309b4a0c7ce..8eeac5d06944 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,4 +1,4 @@ ---- gpu/command_buffer/service/program_manager.cc.orig 2019-03-11 22:00:59 UTC +--- gpu/command_buffer/service/program_manager.cc.orig 2020-11-13 06:36:44 UTC +++ gpu/command_buffer/service/program_manager.cc @@ -30,7 +30,11 @@ #include "gpu/command_buffer/service/program_cache.h" diff --git a/www/chromium/files/patch-gpu_command__buffer_tests_gl__copy__texture__CHROMIUM__unittest.cc b/www/chromium/files/patch-gpu_command__buffer_tests_gl__copy__texture__CHROMIUM__unittest.cc index efb8db3c0dc3..631b91856b6e 100644 --- a/www/chromium/files/patch-gpu_command__buffer_tests_gl__copy__texture__CHROMIUM__unittest.cc +++ b/www/chromium/files/patch-gpu_command__buffer_tests_gl__copy__texture__CHROMIUM__unittest.cc @@ -1,11 +1,31 @@ ---- gpu/command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc.orig 2020-03-16 18:39:51 UTC +--- gpu/command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc.orig 2020-11-13 06:36:44 UTC +++ gpu/command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc -@@ -642,7 +642,7 @@ class GLCopyTextureCHROMIUMES3Test : public GLCopyText +@@ -258,7 +258,7 @@ void getExpectedColorAndMask(GLenum src_internal_forma + + setColor(adjusted_color[0], adjusted_color[1], adjusted_color[2], + alpha_value, expected_color); +-#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + // The alpha channel values for LUMINANCE_ALPHA source don't work OK + // on Mac or Linux, so skip comparison of those, see crbug.com/926579 + setColor(1, 1, 1, src_internal_format != GL_LUMINANCE_ALPHA, +@@ -643,8 +643,8 @@ class GLCopyTextureCHROMIUMES3Test : public GLCopyText bool ShouldSkipNorm16() const { DCHECK(!ShouldSkipTest()); --#if (defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX)) && \ -+#if (defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)) && \ +-#if (defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || \ +- defined(OS_CHROMEOS)) && \ ++#if (defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ ++ defined(OS_CHROMEOS)) && \ (defined(ARCH_CPU_X86) || defined(ARCH_CPU_X86_64)) // Make sure it's tested; it is safe to assume that the flag is always true // on desktop. +@@ -656,7 +656,7 @@ class GLCopyTextureCHROMIUMES3Test : public GLCopyText + + bool ShouldSkipRGBA16ToRGB10A2() const { + DCHECK(!ShouldSkipTest()); +-#if (defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS)) && \ ++#if (defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && \ + (defined(ARCH_CPU_X86) || defined(ARCH_CPU_X86_64)) + // // TODO(crbug.com/1046873): Fails on mac and linux intel. + return true; diff --git a/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc b/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc index 9867201456bf..05cd8a857e25 100644 --- a/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc +++ b/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc @@ -1,20 +1,20 @@ ---- gpu/command_buffer/tests/gl_test_utils.cc.orig 2020-03-16 18:39:51 UTC +--- gpu/command_buffer/tests/gl_test_utils.cc.orig 2020-11-13 06:36:44 UTC +++ gpu/command_buffer/tests/gl_test_utils.cc -@@ -23,7 +23,7 @@ +@@ -24,7 +24,7 @@ #include "ui/gl/gl_version_info.h" #include "ui/gl/init/gl_factory.h" --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "ui/gl/gl_image_native_pixmap.h" #endif -@@ -445,7 +445,7 @@ void GpuCommandBufferTestEGL::RestoreGLDefault() { +@@ -451,7 +451,7 @@ void GpuCommandBufferTestEGL::RestoreGLDefault() { window_system_binding_info_ = gl::GLWindowSystemBindingInfo(); } --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) scoped_refptr<gl::GLImageNativePixmap> GpuCommandBufferTestEGL::CreateGLImageNativePixmap(gfx::BufferFormat format, gfx::Size size, diff --git a/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.h b/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.h index 2a43e73c2793..04e23c35a6f5 100644 --- a/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.h +++ b/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.h @@ -1,11 +1,11 @@ ---- gpu/command_buffer/tests/gl_test_utils.h.orig 2019-10-21 19:06:35 UTC +--- gpu/command_buffer/tests/gl_test_utils.h.orig 2020-11-13 06:36:44 UTC +++ gpu/command_buffer/tests/gl_test_utils.h @@ -120,7 +120,7 @@ class GpuCommandBufferTestEGL { return gfx::HasExtension(gl_extensions_, extension); } --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Create GLImageNativePixmap filled in with the given pixels. scoped_refptr<gl::GLImageNativePixmap> CreateGLImageNativePixmap( gfx::BufferFormat format, diff --git a/www/chromium/files/patch-gpu_command__buffer_tests_webgpu__test.cc b/www/chromium/files/patch-gpu_command__buffer_tests_webgpu__test.cc index e085b3ab87e9..b690a7c50469 100644 --- a/www/chromium/files/patch-gpu_command__buffer_tests_webgpu__test.cc +++ b/www/chromium/files/patch-gpu_command__buffer_tests_webgpu__test.cc @@ -1,20 +1,22 @@ ---- gpu/command_buffer/tests/webgpu_test.cc.orig 2020-07-13 09:46:01 UTC +--- gpu/command_buffer/tests/webgpu_test.cc.orig 2020-11-13 06:36:44 UTC +++ gpu/command_buffer/tests/webgpu_test.cc -@@ -51,7 +51,7 @@ bool WebGPUTest::WebGPUSupported() const { +@@ -51,8 +51,8 @@ bool WebGPUTest::WebGPUSupported() const { bool WebGPUTest::WebGPUSharedImageSupported() const { // Currently WebGPUSharedImage is only implemented on Mac, Linux and Windows --#if (defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_WIN)) && \ -+#if (defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)) && \ +-#if (defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ +- defined(OS_WIN)) && \ ++#if (defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ ++ defined(OS_WIN)) && \ BUILDFLAG(USE_DAWN) return true; #else -@@ -62,7 +62,7 @@ bool WebGPUTest::WebGPUSharedImageSupported() const { +@@ -63,7 +63,7 @@ bool WebGPUTest::WebGPUSharedImageSupported() const { void WebGPUTest::SetUp() { gpu::GpuPreferences gpu_preferences; gpu_preferences.enable_webgpu = true; --#if defined(OS_LINUX) && BUILDFLAG(USE_DAWN) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && BUILDFLAG(USE_DAWN) +-#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && BUILDFLAG(USE_DAWN) ++#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && BUILDFLAG(USE_DAWN) gpu_preferences.use_vulkan = gpu::VulkanImplementationName::kNative; gpu_preferences.gr_context_type = gpu::GrContextType::kVulkan; #elif defined(OS_WIN) 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 2001389bf837..c6e1ab16ac2c 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 2020-07-07 21:58:16 UTC +--- gpu/config/gpu_control_list.cc.orig 2020-11-13 06:36:44 UTC +++ gpu/config/gpu_control_list.cc -@@ -16,7 +16,11 @@ +@@ -17,7 +17,11 @@ #include "base/values.h" #include "build/build_config.h" #include "gpu/config/gpu_util.h" @@ -12,21 +12,21 @@ namespace gpu { namespace { -@@ -247,7 +251,7 @@ bool GpuControlList::More::GLVersionInfoMismatch( +@@ -275,7 +279,7 @@ bool GpuControlList::More::GLVersionInfoMismatch( GpuControlList::GLType GpuControlList::More::GetDefaultGLType() { #if defined(OS_CHROMEOS) return kGLTypeGL; -#elif defined(OS_LINUX) || defined(OS_OPENBSD) +#elif defined(OS_LINUX) || defined(OS_BSD) return kGLTypeGL; - #elif defined(OS_MACOSX) + #elif defined(OS_MAC) return kGLTypeGL; -@@ -748,7 +752,7 @@ GpuControlList::OsType GpuControlList::GetOsType() { +@@ -781,7 +785,7 @@ GpuControlList::OsType GpuControlList::GetOsType() { return kOsAndroid; #elif defined(OS_FUCHSIA) return kOsFuchsia; -#elif defined(OS_LINUX) || defined(OS_OPENBSD) +#elif defined(OS_LINUX) || defined(OS_BSD) return kOsLinux; - #elif defined(OS_MACOSX) + #elif defined(OS_MAC) return kOsMacosx; diff --git a/www/chromium/files/patch-gpu_config_gpu__test__config.cc b/www/chromium/files/patch-gpu_config_gpu__test__config.cc index c5c6e5e16c76..03202ff9b382 100644 --- a/www/chromium/files/patch-gpu_config_gpu__test__config.cc +++ b/www/chromium/files/patch-gpu_config_gpu__test__config.cc @@ -1,6 +1,6 @@ ---- gpu/config/gpu_test_config.cc.orig 2019-03-11 22:00:59 UTC +--- gpu/config/gpu_test_config.cc.orig 2020-11-13 06:36:44 UTC +++ gpu/config/gpu_test_config.cc -@@ -25,7 +25,7 @@ namespace { +@@ -27,7 +27,7 @@ namespace { GPUTestConfig::OS GetCurrentOS() { #if defined(OS_CHROMEOS) return GPUTestConfig::kOsChromeOS; 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 f72aa998482e..36aa5093b793 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,47 +1,47 @@ ---- gpu/ipc/common/gpu_memory_buffer_support.cc.orig 2020-07-07 21:58:16 UTC +--- gpu/ipc/common/gpu_memory_buffer_support.cc.orig 2020-11-13 06:36:44 UTC +++ gpu/ipc/common/gpu_memory_buffer_support.cc -@@ -15,7 +15,7 @@ +@@ -16,7 +16,7 @@ #include "gpu/ipc/common/gpu_memory_buffer_impl_io_surface.h" #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "ui/gfx/client_native_pixmap_factory.h" #include "ui/gfx/linux/client_native_pixmap_factory_dmabuf.h" #endif -@@ -25,7 +25,7 @@ +@@ -26,7 +26,7 @@ #include "ui/ozone/public/ozone_platform.h" #endif --#if defined(USE_OZONE) || defined(OS_LINUX) -+#if defined(USE_OZONE) || defined(OS_LINUX) || 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) #include "gpu/ipc/common/gpu_memory_buffer_impl_native_pixmap.h" #endif -@@ -43,7 +43,7 @@ namespace gpu { - GpuMemoryBufferSupport::GpuMemoryBufferSupport() { - #if defined(USE_OZONE) - client_native_pixmap_factory_ = ui::CreateClientNativePixmapFactoryOzone(); --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +@@ -52,7 +52,7 @@ GpuMemoryBufferSupport::GpuMemoryBufferSupport() { + return; + } + #endif +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) client_native_pixmap_factory_.reset( gfx::CreateClientNativePixmapFactoryDmabuf()); #endif -@@ -57,7 +57,7 @@ GpuMemoryBufferSupport::GetNativeGpuMemoryBufferType() +@@ -66,7 +66,7 @@ GpuMemoryBufferSupport::GetNativeGpuMemoryBufferType() return gfx::IO_SURFACE_BUFFER; #elif defined(OS_ANDROID) return gfx::ANDROID_HARDWARE_BUFFER; --#elif defined(OS_LINUX) || defined(USE_OZONE) -+#elif defined(OS_LINUX) || defined(USE_OZONE) || defined(OS_BSD) +-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(USE_OZONE) ++#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || defined(USE_OZONE) return gfx::NATIVE_PIXMAP; #elif defined(OS_WIN) return gfx::DXGI_SHARED_HANDLE; -@@ -182,7 +182,7 @@ GpuMemoryBufferSupport::CreateGpuMemoryBufferImplFromH +@@ -194,7 +194,7 @@ GpuMemoryBufferSupport::CreateGpuMemoryBufferImplFromH return GpuMemoryBufferImplIOSurface::CreateFromHandle( std::move(handle), size, format, usage, std::move(callback)); #endif --#if defined(OS_LINUX) || defined(USE_OZONE) -+#if defined(OS_LINUX) || defined(USE_OZONE) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(USE_OZONE) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || defined(USE_OZONE) case gfx::NATIVE_PIXMAP: return GpuMemoryBufferImplNativePixmap::CreateFromHandle( client_native_pixmap_factory(), std::move(handle), size, format, diff --git a/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.h b/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.h index dc652a126740..f9b58c5152b6 100644 --- a/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.h +++ b/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.h @@ -1,11 +1,11 @@ ---- gpu/ipc/common/gpu_memory_buffer_support.h.orig 2019-12-16 21:50:48 UTC +--- gpu/ipc/common/gpu_memory_buffer_support.h.orig 2020-11-13 06:36:44 UTC +++ gpu/ipc/common/gpu_memory_buffer_support.h @@ -16,7 +16,7 @@ #include "ui/gfx/geometry/size.h" #include "ui/gfx/gpu_memory_buffer.h" --#if defined(OS_LINUX) || defined(USE_OZONE) -+#if defined(OS_LINUX) || defined(OS_BSD) || defined(USE_OZONE) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(USE_OZONE) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || defined(USE_OZONE) namespace gfx { class ClientNativePixmapFactory; } @@ -13,8 +13,8 @@ bool IsNativeGpuMemoryBufferConfigurationSupported(gfx::BufferFormat format, gfx::BufferUsage usage); --#if defined(OS_LINUX) || defined(USE_OZONE) -+#if defined(OS_LINUX) || defined(OS_BSD) || defined(USE_OZONE) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(USE_OZONE) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || defined(USE_OZONE) gfx::ClientNativePixmapFactory* client_native_pixmap_factory() { return client_native_pixmap_factory_.get(); } @@ -22,8 +22,8 @@ GpuMemoryBufferImpl::DestructionCallback callback); private: --#if defined(OS_LINUX) || defined(USE_OZONE) -+#if defined(OS_LINUX) || defined(OS_BSD) || defined(USE_OZONE) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(USE_OZONE) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || defined(USE_OZONE) std::unique_ptr<gfx::ClientNativePixmapFactory> client_native_pixmap_factory_; #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 f33260dc9b3e..bed8e2d4079d 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 2020-07-07 21:58:16 UTC +--- gpu/ipc/service/gpu_init.cc.orig 2020-11-13 06:36:44 UTC +++ gpu/ipc/service/gpu_init.cc -@@ -92,7 +92,7 @@ void InitializePlatformOverlaySettings(GPUInfo* gpu_in +@@ -107,7 +107,7 @@ void InitializePlatformOverlaySettings(GPUInfo* gpu_in #endif } @@ -9,7 +9,7 @@ bool CanAccessNvidiaDeviceFile() { bool res = true; base::ScopedBlockingCall scoped_blocking_call(FROM_HERE, -@@ -103,7 +103,7 @@ bool CanAccessNvidiaDeviceFile() { +@@ -118,7 +118,7 @@ bool CanAccessNvidiaDeviceFile() { } return res; } @@ -18,7 +18,7 @@ class GpuWatchdogInit { public: -@@ -160,7 +160,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -203,7 +203,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL device_perf_info_ = device_perf_info; } @@ -27,110 +27,74 @@ if (gpu_info_.gpu.vendor_id == 0x10de && // NVIDIA gpu_info_.gpu.driver_vendor == "NVIDIA" && !CanAccessNvidiaDeviceFile()) return false; -@@ -212,7 +212,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL - delayed_watchdog_enable = true; - #endif - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - // PreSandbox is mainly for resource handling and not related to the GPU - // driver, it doesn't need the GPU watchdog. The loadLibrary may take long - // time that killing and restarting the GPU process will not help. -@@ -257,7 +257,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL - } - - bool attempted_startsandbox = false; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) && !defined(OS_BSD) - // On Chrome OS ARM Mali, GPU driver userspace creates threads when - // initializing a GL context, so start the sandbox early. - // TODO(zmo): Need to collect OS version before this. -@@ -266,7 +266,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL - watchdog_thread_.get(), &gpu_info_, gpu_preferences_); - attempted_startsandbox = true; - } --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) && !defined(OS_BSD) - - base::TimeTicks before_initialize_one_off = base::TimeTicks::Now(); - -@@ -289,14 +289,14 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -337,14 +337,14 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } - if (gl_initialized && use_swiftshader && + if (gl_initialized && gl_use_swiftshader_ && gl::GetGLImplementation() != gl::kGLImplementationSwiftShaderGL) { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " << "on Linux"; return false; #else gl::init::ShutdownGL(true); gl_initialized = false; --#endif // OS_LINUX -+#endif // OS_LINUX || OS_BSD +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) } if (!gl_initialized) { -@@ -322,7 +322,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL - } - } - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) && !defined(OS_BSD) - // The ContentSandboxHelper is currently the only one implementation of - // gpu::GpuSandboxHelper and it has no dependency. Except on Linux where - // VaapiWrapper checks the GL implementation to determine which display -@@ -373,7 +373,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -424,7 +424,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL command_line, gpu_feature_info_, gpu_preferences_.disable_software_rasterizer, false); - if (use_swiftshader) { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) + if (gl_use_swiftshader_) { +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " << "on Linux"; return false; -@@ -387,7 +387,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -438,7 +438,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL << "failed"; return false; } --#endif // OS_LINUX -+#endif // OS_LINUX || OS_BSD +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) } - } else { // use_swiftshader == true + } else { // gl_use_swiftshader_ == true switch (gpu_preferences_.use_vulkan) { -@@ -443,7 +443,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -514,7 +514,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL - InitializePlatformOverlaySettings(&gpu_info_); + InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // 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. -@@ -462,7 +462,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -533,7 +533,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL return false; } } --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - if (use_swiftshader) { + if (gl_use_swiftshader_) { AdjustInfoToSwiftShader(); -@@ -628,7 +628,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -701,7 +701,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c - InitializePlatformOverlaySettings(&gpu_info_); + InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // 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. -@@ -648,7 +648,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -721,7 +721,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c } } } --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - if (use_swiftshader) { + if (gl_use_swiftshader_) { AdjustInfoToSwiftShader(); diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc b/www/chromium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc index af39329a6e9d..a76d05b6ab34 100644 --- a/www/chromium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc +++ b/www/chromium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc @@ -1,11 +1,11 @@ ---- gpu/ipc/service/gpu_memory_buffer_factory.cc.orig 2019-07-24 18:58:27 UTC +--- gpu/ipc/service/gpu_memory_buffer_factory.cc.orig 2020-11-13 06:36:44 UTC +++ gpu/ipc/service/gpu_memory_buffer_factory.cc @@ -12,7 +12,7 @@ #include "gpu/ipc/service/gpu_memory_buffer_factory_io_surface.h" #endif --#if defined(OS_LINUX) || defined(OS_FUCHSIA) -+#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD) #include "gpu/ipc/service/gpu_memory_buffer_factory_native_pixmap.h" #endif @@ -13,8 +13,8 @@ return std::make_unique<GpuMemoryBufferFactoryIOSurface>(); #elif defined(OS_ANDROID) return std::make_unique<GpuMemoryBufferFactoryAndroidHardwareBuffer>(); --#elif defined(OS_LINUX) || defined(OS_FUCHSIA) -+#elif defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) ++#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD) return std::make_unique<GpuMemoryBufferFactoryNativePixmap>( vulkan_context_provider); #elif defined(OS_WIN) 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 9cd7f68d1d12..12e75d6fe7f2 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,15 +1,15 @@ ---- gpu/ipc/service/gpu_watchdog_thread.cc.orig 2020-05-13 18:39:44 UTC +--- gpu/ipc/service/gpu_watchdog_thread.cc.orig 2020-11-13 06:36:44 UTC +++ gpu/ipc/service/gpu_watchdog_thread.cc -@@ -64,7 +64,7 @@ void GpuWatchdogTimeoutHistogram(GpuWatchdogTimeoutEve - base::UmaHistogramEnumeration("GPU.WatchdogThread.V1.Timeout", timeout_event); - } +@@ -57,7 +57,7 @@ const int kNewGpuTimeout = 17000; + const int kNewGpuTimeout = 15000; + #endif -#if defined(USE_X11) +#if defined(USE_X11) && !defined(OS_BSD) const base::FilePath::CharType kTtyFilePath[] = FILE_PATH_LITERAL("/sys/class/tty/tty0/active"); #endif -@@ -82,7 +82,7 @@ GpuWatchdogThreadImplV1::GpuWatchdogThreadImplV1() +@@ -75,7 +75,7 @@ GpuWatchdogThreadImplV1::GpuWatchdogThreadImplV1() arm_cpu_time_(), #endif suspension_counter_(this) @@ -18,7 +18,7 @@ , host_tty_(-1) #endif -@@ -104,7 +104,7 @@ GpuWatchdogThreadImplV1::GpuWatchdogThreadImplV1() +@@ -97,7 +97,7 @@ GpuWatchdogThreadImplV1::GpuWatchdogThreadImplV1() DCHECK(result); #endif @@ -27,7 +27,7 @@ tty_file_ = base::OpenFile(base::FilePath(kTtyFilePath), "r"); UpdateActiveTTY(); host_tty_ = active_tty_; -@@ -252,7 +252,7 @@ GpuWatchdogThreadImplV1::~GpuWatchdogThreadImplV1() { +@@ -239,7 +239,7 @@ GpuWatchdogThreadImplV1::~GpuWatchdogThreadImplV1() { base::PowerMonitor::RemoveObserver(this); @@ -36,7 +36,7 @@ if (tty_file_) fclose(tty_file_); #endif -@@ -435,7 +435,7 @@ void GpuWatchdogThreadImplV1::DeliberatelyTerminateToR +@@ -388,7 +388,7 @@ void GpuWatchdogThreadImplV1::DeliberatelyTerminateToR return; #endif @@ -45,7 +45,7 @@ // Don't crash if we're not on the TTY of our host X11 server. UpdateActiveTTY(); if (host_tty_ != -1 && active_tty_ != -1 && host_tty_ != active_tty_) { -@@ -610,7 +610,7 @@ base::ThreadTicks GpuWatchdogThreadImplV1::GetWatchedT +@@ -548,7 +548,7 @@ base::ThreadTicks GpuWatchdogThreadImplV1::GetWatchedT } #endif diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h b/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h index efcc11f3008d..c711d7bec6e5 100644 --- a/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h +++ b/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h @@ -1,6 +1,6 @@ ---- gpu/ipc/service/gpu_watchdog_thread.h.orig 2020-07-07 21:58:16 UTC +--- gpu/ipc/service/gpu_watchdog_thread.h.orig 2020-11-13 06:36:44 UTC +++ gpu/ipc/service/gpu_watchdog_thread.h -@@ -216,7 +216,7 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThreadImplV1 +@@ -213,7 +213,7 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThreadImplV1 base::ThreadTicks GetWatchedThreadTime(); #endif @@ -9,9 +9,9 @@ void UpdateActiveTTY(); #endif -@@ -274,7 +274,7 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThreadImplV1 - // whether GpuWatchdogThreadEvent::kGpuWatchdogStart has been recorded. - bool is_watchdog_start_histogram_recorded = false; +@@ -261,7 +261,7 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThreadImplV1 + base::Time check_time_; + base::TimeTicks check_timeticks_; -#if defined(USE_X11) +#if defined(USE_X11) && !defined(OS_BSD) diff --git a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc index e9e398152dbe..a157b6395de7 100644 --- a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc +++ b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc @@ -1,20 +1,20 @@ ---- gpu/vulkan/vulkan_function_pointers.cc.orig 2020-07-07 21:58:16 UTC +--- gpu/vulkan/vulkan_function_pointers.cc.orig 2020-11-13 06:36:44 UTC +++ gpu/vulkan/vulkan_function_pointers.cc @@ -862,7 +862,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer } #endif // defined(OS_ANDROID) --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) if (gfx::HasExtension(enabled_extensions, VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME)) { - vkGetSemaphoreFdKHRFn = reinterpret_cast<PFN_vkGetSemaphoreFdKHR>( + vkGetSemaphoreFdKHR = reinterpret_cast<PFN_vkGetSemaphoreFdKHR>( @@ -881,7 +881,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer return false; } } --#endif // defined(OS_LINUX) || defined(OS_ANDROID) -+#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) #if defined(OS_WIN) if (gfx::HasExtension(enabled_extensions, @@ -22,17 +22,17 @@ } #endif // defined(OS_WIN) --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) if (gfx::HasExtension(enabled_extensions, VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME)) { - vkGetMemoryFdKHRFn = reinterpret_cast<PFN_vkGetMemoryFdKHR>( + vkGetMemoryFdKHR = reinterpret_cast<PFN_vkGetMemoryFdKHR>( @@ -926,7 +926,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer return false; } } --#endif // defined(OS_LINUX) || defined(OS_ANDROID) -+#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) #if defined(OS_WIN) if (gfx::HasExtension(enabled_extensions, diff --git a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h index 22094637bcf5..0a2245d10a9b 100644 --- a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h +++ b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h @@ -1,69 +1,69 @@ ---- gpu/vulkan/vulkan_function_pointers.h.orig 2020-07-07 21:58:16 UTC +--- gpu/vulkan/vulkan_function_pointers.h.orig 2020-11-13 06:36:44 UTC +++ gpu/vulkan/vulkan_function_pointers.h -@@ -235,10 +235,10 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers - vkGetAndroidHardwareBufferPropertiesANDROIDFn; +@@ -236,10 +236,10 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers + vkGetAndroidHardwareBufferPropertiesANDROID; #endif // defined(OS_ANDROID) --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) - VulkanFunction<PFN_vkGetSemaphoreFdKHR> vkGetSemaphoreFdKHRFn; - VulkanFunction<PFN_vkImportSemaphoreFdKHR> vkImportSemaphoreFdKHRFn; --#endif // defined(OS_LINUX) || defined(OS_ANDROID) -+#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) + VulkanFunction<PFN_vkGetSemaphoreFdKHR> vkGetSemaphoreFdKHR; + VulkanFunction<PFN_vkImportSemaphoreFdKHR> vkImportSemaphoreFdKHR; +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) #if defined(OS_WIN) - VulkanFunction<PFN_vkGetSemaphoreWin32HandleKHR> + VulkanFunction<PFN_vkGetSemaphoreWin32HandleKHR> vkGetSemaphoreWin32HandleKHR; @@ -247,10 +247,10 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers - vkImportSemaphoreWin32HandleKHRFn; + vkImportSemaphoreWin32HandleKHR; #endif // defined(OS_WIN) --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) - VulkanFunction<PFN_vkGetMemoryFdKHR> vkGetMemoryFdKHRFn; - VulkanFunction<PFN_vkGetMemoryFdPropertiesKHR> vkGetMemoryFdPropertiesKHRFn; --#endif // defined(OS_LINUX) || defined(OS_ANDROID) -+#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) + VulkanFunction<PFN_vkGetMemoryFdKHR> vkGetMemoryFdKHR; + VulkanFunction<PFN_vkGetMemoryFdPropertiesKHR> vkGetMemoryFdPropertiesKHR; +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) #if defined(OS_WIN) - VulkanFunction<PFN_vkGetMemoryWin32HandleKHR> vkGetMemoryWin32HandleKHRFn; -@@ -950,7 +950,7 @@ ALWAYS_INLINE VkResult vkGetAndroidHardwareBufferPrope + VulkanFunction<PFN_vkGetMemoryWin32HandleKHR> vkGetMemoryWin32HandleKHR; +@@ -955,7 +955,7 @@ ALWAYS_INLINE VkResult vkGetAndroidHardwareBufferPrope } #endif // defined(OS_ANDROID) --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) ALWAYS_INLINE VkResult vkGetSemaphoreFdKHR(VkDevice device, const VkSemaphoreGetFdInfoKHR* pGetFdInfo, -@@ -964,7 +964,7 @@ ALWAYS_INLINE VkResult vkImportSemaphoreFdKHR( - return gpu::GetVulkanFunctionPointers()->vkImportSemaphoreFdKHRFn( +@@ -969,7 +969,7 @@ ALWAYS_INLINE VkResult vkImportSemaphoreFdKHR( + return gpu::GetVulkanFunctionPointers()->vkImportSemaphoreFdKHR( device, pImportSemaphoreFdInfo); } --#endif // defined(OS_LINUX) || defined(OS_ANDROID) -+#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) #if defined(OS_WIN) ALWAYS_INLINE VkResult vkGetSemaphoreWin32HandleKHR( -@@ -983,7 +983,7 @@ vkImportSemaphoreWin32HandleKHR(VkDevice device, +@@ -988,7 +988,7 @@ vkImportSemaphoreWin32HandleKHR(VkDevice device, } #endif // defined(OS_WIN) --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) ALWAYS_INLINE VkResult vkGetMemoryFdKHR(VkDevice device, const VkMemoryGetFdInfoKHR* pGetFdInfo, int* pFd) { -@@ -998,7 +998,7 @@ vkGetMemoryFdPropertiesKHR(VkDevice device, - return gpu::GetVulkanFunctionPointers()->vkGetMemoryFdPropertiesKHRFn( +@@ -1003,7 +1003,7 @@ vkGetMemoryFdPropertiesKHR(VkDevice device, + return gpu::GetVulkanFunctionPointers()->vkGetMemoryFdPropertiesKHR( device, handleType, fd, pMemoryFdProperties); } --#endif // defined(OS_LINUX) || defined(OS_ANDROID) -+#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) #if defined(OS_WIN) ALWAYS_INLINE VkResult vkGetMemoryWin32HandleKHR( -@@ -1079,4 +1079,4 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue - pPresentInfo); +@@ -1083,4 +1083,4 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue + pPresentInfo); } -#endif // GPU_VULKAN_VULKAN_FUNCTION_POINTERS_H_ diff --git a/www/chromium/files/patch-headless_BUILD.gn b/www/chromium/files/patch-headless_BUILD.gn index 3cf1b71d4df7..0dc7c04448e8 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 2020-07-07 21:58:16 UTC +--- headless/BUILD.gn.orig 2020-11-13 06:36:44 UTC +++ headless/BUILD.gn -@@ -264,7 +264,7 @@ source_set("headless_shared_sources") { +@@ -275,7 +275,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", -@@ -284,7 +284,7 @@ source_set("headless_shared_sources") { +@@ -295,7 +295,7 @@ source_set("headless_shared_sources") { "//url", ] @@ -18,7 +18,7 @@ deps += [ "//components/crash/content/browser" ] } if (is_component_build && is_win) { -@@ -435,7 +435,7 @@ component("headless_non_renderer") { +@@ -448,7 +448,7 @@ component("headless_non_renderer") { "//v8", ] @@ -27,7 +27,7 @@ deps += [ "//components/crash/content/browser" ] } if (is_win) { -@@ -710,7 +710,7 @@ static_library("headless_shell_lib") { +@@ -732,7 +732,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 new file mode 100644 index 000000000000..0fb4e2bd8bd3 --- /dev/null +++ b/www/chromium/files/patch-headless_lib_browser_headless__browser__main__parts.h @@ -0,0 +1,11 @@ +--- headless/lib/browser/headless_browser_main_parts.h.orig 2020-11-13 06:36:44 UTC ++++ headless/lib/browser/headless_browser_main_parts.h +@@ -32,7 +32,7 @@ class HeadlessBrowserMainParts : public content::Brows + #if defined(OS_MAC) + void PreMainMessageLoopStart() override; + #endif +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + void PostMainMessageLoopStart() 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 new file mode 100644 index 000000000000..7c0d138cc5ad --- /dev/null +++ b/www/chromium/files/patch-headless_lib_browser_headless__browser__main__parts__linux.cc @@ -0,0 +1,11 @@ +--- headless/lib/browser/headless_browser_main_parts_linux.cc.orig 2020-11-13 06:36:44 UTC ++++ headless/lib/browser/headless_browser_main_parts_linux.cc +@@ -10,7 +10,7 @@ + namespace headless { + + void HeadlessBrowserMainParts::PostMainMessageLoopStart() { +-#if defined(USE_DBUS) && !defined(OS_CHROMEOS) ++#if defined(USE_DBUS) && !defined(OS_CHROMEOS) && !defined(OS_BSD) + bluez::BluezDBusManager::Initialize(/*system_bus=*/nullptr); + #endif + } diff --git a/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc b/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc index 1c789d6aabed..5fc8a5654fd0 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,29 +1,11 @@ ---- headless/lib/browser/headless_content_browser_client.cc.orig 2020-07-07 21:57:38 UTC +--- headless/lib/browser/headless_content_browser_client.cc.orig 2020-11-13 06:36:44 UTC +++ headless/lib/browser/headless_content_browser_client.cc -@@ -158,7 +158,7 @@ HeadlessContentBrowserClient::GetGeneratedCodeCacheSet - return content::GeneratedCodeCacheSettings(true, 0, context->GetPath()); - } - --#if defined(OS_POSIX) && !defined(OS_MACOSX) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) - void HeadlessContentBrowserClient::GetAdditionalMappedFilesForChildProcess( - const base::CommandLine& command_line, - int child_process_id, -@@ -169,7 +169,7 @@ void HeadlessContentBrowserClient::GetAdditionalMapped - mappings->Share(service_manager::kCrashDumpSignal, crash_signal_fd); - #endif // defined(HEADLESS_USE_BREAKPAD) - } --#endif // defined(OS_POSIX) && !defined(OS_MACOSX) -+#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) - - void HeadlessContentBrowserClient::AppendExtraCommandLineSwitches( - base::CommandLine* command_line, @@ -241,7 +241,7 @@ void HeadlessContentBrowserClient::AppendExtraCommandL process_type, child_process_id); } --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Processes may only query perf_event_open with the BPF sandbox disabled. if (old_command_line.HasSwitch(::switches::kEnableThreadInstructionCount) && - old_command_line.HasSwitch(service_manager::switches::kNoSandbox)) { + old_command_line.HasSwitch(sandbox::policy::switches::kNoSandbox)) { diff --git a/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h b/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h deleted file mode 100644 index f29e51b1a4f7..000000000000 --- a/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h +++ /dev/null @@ -1,11 +0,0 @@ ---- headless/lib/browser/headless_content_browser_client.h.orig 2020-03-16 18:39:51 UTC -+++ headless/lib/browser/headless_content_browser_client.h -@@ -29,7 +29,7 @@ class HeadlessContentBrowserClient : public content::C - override; - content::GeneratedCodeCacheSettings GetGeneratedCodeCacheSettings( - content::BrowserContext* context) override; --#if defined(OS_POSIX) && !defined(OS_MACOSX) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) - void GetAdditionalMappedFilesForChildProcess( - const base::CommandLine& command_line, - int child_process_id, diff --git a/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc b/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc index 5c79311cf636..008d6bead46c 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 2020-07-07 21:58:16 UTC +--- headless/lib/browser/headless_request_context_manager.cc.orig 2020-11-13 06:36:44 UTC +++ headless/lib/browser/headless_request_context_manager.cc -@@ -27,7 +27,7 @@ namespace headless { +@@ -26,7 +26,7 @@ namespace headless { namespace { @@ -9,7 +9,7 @@ constexpr char kProductName[] = "HeadlessChrome"; #endif -@@ -57,7 +57,7 @@ net::NetworkTrafficAnnotationTag GetProxyConfigTraffic +@@ -56,7 +56,7 @@ net::NetworkTrafficAnnotationTag GetProxyConfigTraffic return traffic_annotation; } @@ -18,7 +18,7 @@ ::network::mojom::CryptConfigPtr BuildCryptConfigOnce( const base::FilePath& user_data_path) { static bool done_once = false; -@@ -215,7 +215,7 @@ HeadlessRequestContextManager::HeadlessRequestContextM +@@ -213,7 +213,7 @@ HeadlessRequestContextManager::HeadlessRequestContextM proxy_config_monitor_ = std::make_unique<HeadlessProxyConfigMonitor>( base::ThreadTaskRunnerHandle::Get()); } 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 8b7349c15ece..56dccc3ff747 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 2020-07-07 21:58:16 UTC +--- headless/lib/headless_content_main_delegate.cc.orig 2020-11-13 06:36:44 UTC +++ headless/lib/headless_content_main_delegate.cc -@@ -317,7 +317,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( +@@ -323,7 +323,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( const base::CommandLine& command_line) { if (command_line.HasSwitch(::switches::kDisableBreakpad)) return; @@ -9,7 +9,7 @@ // TODO(fuchsia): Implement this when crash reporting/Breakpad are available // in Fuchsia. (crbug.com/753619) NOTIMPLEMENTED(); -@@ -346,7 +346,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( +@@ -352,7 +352,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( crash_reporter::InitializeCrashpadWithEmbeddedHandler( process_type.empty(), process_type, "", base::FilePath()); #endif // defined(HEADLESS_USE_BREAKPAD) @@ -18,21 +18,3 @@ } -@@ -398,7 +398,7 @@ int HeadlessContentMainDelegate::RunProcess( - return 0; - } - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - void SIGTERMProfilingShutdown(int signal) { - content::Profiling::Stop(); - struct sigaction sigact; -@@ -433,7 +433,7 @@ void HeadlessContentMainDelegate::ZygoteForked() { - breakpad::InitCrashReporter(process_type); - #endif - } --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) - - // static - HeadlessContentMainDelegate* HeadlessContentMainDelegate::GetInstance() { diff --git a/www/chromium/files/patch-headless_lib_headless__content__main__delegate.h b/www/chromium/files/patch-headless_lib_headless__content__main__delegate.h deleted file mode 100644 index cd90ab68eb3d..000000000000 --- a/www/chromium/files/patch-headless_lib_headless__content__main__delegate.h +++ /dev/null @@ -1,11 +0,0 @@ ---- headless/lib/headless_content_main_delegate.h.orig 2020-07-07 21:57:38 UTC -+++ headless/lib/headless_content_main_delegate.h -@@ -57,7 +57,7 @@ class HEADLESS_EXPORT HeadlessContentMainDelegate - - HeadlessBrowserImpl* browser() const { return browser_.get(); } - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - void ZygoteForked() override; - #endif - diff --git a/www/chromium/files/patch-headless_lib_headless__macros.h b/www/chromium/files/patch-headless_lib_headless__macros.h index 0e99c3066d6d..af529b47d195 100644 --- a/www/chromium/files/patch-headless_lib_headless__macros.h +++ b/www/chromium/files/patch-headless_lib_headless__macros.h @@ -1,13 +1,13 @@ ---- headless/lib/headless_macros.h.orig 2019-03-11 22:00:59 UTC +--- headless/lib/headless_macros.h.orig 2020-11-13 06:36:44 UTC +++ headless/lib/headless_macros.h @@ -7,8 +7,8 @@ #include "build/build_config.h" --#if defined(OS_POSIX) && !defined(OS_MACOSX) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) +-#if defined(OS_POSIX) && !defined(OS_MAC) ++#if defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_BSD) #define HEADLESS_USE_BREAKPAD --#endif // defined(OS_POSIX) && !defined(OS_MACOSX) -+#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) +-#endif // defined(OS_POSIX) && !defined(OS_MAC) ++#endif // defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_BSD) #endif // HEADLESS_LIB_HEADLESS_MACROS_H_ diff --git a/www/chromium/files/patch-ipc_ipc__channel.h b/www/chromium/files/patch-ipc_ipc__channel.h index 81baee2eca8d..573333487b91 100644 --- a/www/chromium/files/patch-ipc_ipc__channel.h +++ b/www/chromium/files/patch-ipc_ipc__channel.h @@ -1,11 +1,11 @@ ---- ipc/ipc_channel.h.orig 2020-02-03 21:53:32 UTC +--- ipc/ipc_channel.h.orig 2020-11-13 06:36:44 UTC +++ ipc/ipc_channel.h -@@ -282,7 +282,7 @@ class COMPONENT_EXPORT(IPC) Channel : public Sender { +@@ -244,7 +244,7 @@ class COMPONENT_EXPORT(IPC) Channel : public Sender { static std::string GenerateUniqueRandomChannelID(); #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Sandboxed processes live in a PID namespace, so when sending the IPC hello // message from client to server we need to send the PID from the global // PID namespace. diff --git a/www/chromium/files/patch-ipc_ipc__channel__common.cc b/www/chromium/files/patch-ipc_ipc__channel__common.cc index 9a59e5cfaff6..5a4c61e14608 100644 --- a/www/chromium/files/patch-ipc_ipc__channel__common.cc +++ b/www/chromium/files/patch-ipc_ipc__channel__common.cc @@ -1,11 +1,11 @@ ---- ipc/ipc_channel_common.cc.orig 2020-02-03 21:52:47 UTC +--- ipc/ipc_channel_common.cc.orig 2020-11-13 06:36:44 UTC +++ ipc/ipc_channel_common.cc @@ -10,7 +10,7 @@ namespace IPC { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) namespace { int g_global_pid = 0; @@ -13,8 +13,8 @@ return g_global_pid; } --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // static std::unique_ptr<Channel> Channel::CreateClient( diff --git a/www/chromium/files/patch-ipc_ipc__channel__mojo.cc b/www/chromium/files/patch-ipc_ipc__channel__mojo.cc index 54e779282f74..15d972062a10 100644 --- a/www/chromium/files/patch-ipc_ipc__channel__mojo.cc +++ b/www/chromium/files/patch-ipc_ipc__channel__mojo.cc @@ -1,15 +1,15 @@ ---- ipc/ipc_channel_mojo.cc.orig 2020-02-03 21:52:47 UTC +--- ipc/ipc_channel_mojo.cc.orig 2020-11-13 06:36:44 UTC +++ ipc/ipc_channel_mojo.cc @@ -74,10 +74,10 @@ class MojoChannelFactory : public ChannelFactory { }; base::ProcessId GetSelfPID() { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) if (int global_pid = Channel::GetGlobalPid()) return global_pid; --#endif // OS_LINUX -+#endif // OS_LINUX || OS_BSD +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #if defined(OS_NACL) return -1; #else diff --git a/www/chromium/files/patch-ipc_ipc__message__utils.cc b/www/chromium/files/patch-ipc_ipc__message__utils.cc index 00d57043fb58..7cc7762cf5c9 100644 --- a/www/chromium/files/patch-ipc_ipc__message__utils.cc +++ b/www/chromium/files/patch-ipc_ipc__message__utils.cc @@ -1,11 +1,11 @@ ---- ipc/ipc_message_utils.cc.orig 2019-07-24 18:58:29 UTC +--- ipc/ipc_message_utils.cc.orig 2020-11-13 06:36:44 UTC +++ ipc/ipc_message_utils.cc -@@ -355,7 +355,7 @@ void ParamTraits<unsigned int>::Log(const param_type& +@@ -356,7 +356,7 @@ void ParamTraits<unsigned int>::Log(const param_type& l->append(base::NumberToString(p)); } --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_FUCHSIA) || \ -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) || \ - (defined(OS_ANDROID) && defined(ARCH_CPU_64_BITS)) +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ + defined(OS_FUCHSIA) || (defined(OS_ANDROID) && defined(ARCH_CPU_64_BITS)) void ParamTraits<long>::Log(const param_type& p, std::string* l) { l->append(base::NumberToString(p)); diff --git a/www/chromium/files/patch-ipc_ipc__message__utils.h b/www/chromium/files/patch-ipc_ipc__message__utils.h index 39fc150c1a08..bd39e70a710f 100644 --- a/www/chromium/files/patch-ipc_ipc__message__utils.h +++ b/www/chromium/files/patch-ipc_ipc__message__utils.h @@ -1,11 +1,11 @@ ---- ipc/ipc_message_utils.h.orig 2020-02-03 21:53:32 UTC +--- ipc/ipc_message_utils.h.orig 2020-11-13 06:36:44 UTC +++ ipc/ipc_message_utils.h @@ -209,7 +209,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. --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_FUCHSIA) || \ -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) || \ - (defined(OS_ANDROID) && defined(ARCH_CPU_64_BITS)) +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ + defined(OS_FUCHSIA) || (defined(OS_ANDROID) && defined(ARCH_CPU_64_BITS)) template <> struct ParamTraits<long> { diff --git a/www/chromium/files/patch-media_BUILD.gn b/www/chromium/files/patch-media_BUILD.gn index f9064df21a72..48848b25bd1a 100644 --- a/www/chromium/files/patch-media_BUILD.gn +++ b/www/chromium/files/patch-media_BUILD.gn @@ -1,6 +1,6 @@ ---- media/BUILD.gn.orig 2020-07-07 21:58:16 UTC +--- media/BUILD.gn.orig 2020-11-13 06:36:44 UTC +++ media/BUILD.gn -@@ -64,6 +64,9 @@ config("media_config") { +@@ -65,6 +65,9 @@ config("media_config") { defines += [ "DLOPEN_PULSEAUDIO" ] } } diff --git a/www/chromium/files/patch-media_audio_BUILD.gn b/www/chromium/files/patch-media_audio_BUILD.gn index a37b99f54c9c..0b4e4efe428a 100644 --- a/www/chromium/files/patch-media_audio_BUILD.gn +++ b/www/chromium/files/patch-media_audio_BUILD.gn @@ -1,13 +1,20 @@ ---- media/audio/BUILD.gn.orig 2020-03-16 18:40:33 UTC +--- media/audio/BUILD.gn.orig 2020-11-13 06:36:44 UTC +++ media/audio/BUILD.gn -@@ -232,8 +232,18 @@ source_set("audio") { +@@ -236,7 +236,7 @@ source_set("audio") { ] } -- if (is_linux) { -+ if (is_linux && !use_sndio) { +- if (is_linux || is_chromeos) { ++ if ((is_linux || is_chromeos) && !use_sndio) { sources += [ "linux/audio_manager_linux.cc" ] + } + +@@ -299,6 +299,17 @@ source_set("audio") { + } else { + deps += [ ":libpulse_stubs" ] + } + } ++ + if (use_sndio) { + libs += [ "sndio" ] + sources += [ @@ -15,8 +22,8 @@ + "sndio/sndio_input.cc", + "sndio/sndio_input.h", + "sndio/sndio_output.cc", -+ "sndio/sndio_output.h" ++ "sndio/sndio_output.h", + ] } - if (use_alsa) { + if (is_fuchsia) { diff --git a/www/chromium/files/patch-media_audio_alsa_audio__manager__alsa.cc b/www/chromium/files/patch-media_audio_alsa_audio__manager__alsa.cc index 313dd1df12eb..d47fe4f206e9 100644 --- a/www/chromium/files/patch-media_audio_alsa_audio__manager__alsa.cc +++ b/www/chromium/files/patch-media_audio_alsa_audio__manager__alsa.cc @@ -1,6 +1,6 @@ ---- media/audio/alsa/audio_manager_alsa.cc.orig 2019-04-30 22:22:52 UTC +--- media/audio/alsa/audio_manager_alsa.cc.orig 2020-11-13 06:36:44 UTC +++ media/audio/alsa/audio_manager_alsa.cc -@@ -92,7 +92,9 @@ void AudioManagerAlsa::GetAlsaAudioDevices(StreamType +@@ -89,7 +89,9 @@ void AudioManagerAlsa::GetAlsaAudioDevices(StreamType int card = -1; // Loop through the sound cards to get ALSA device hints. @@ -10,7 +10,7 @@ void** hints = NULL; int error = wrapper_->DeviceNameHint(card, kPcmInterfaceName, &hints); if (!error) { -@@ -104,7 +106,9 @@ void AudioManagerAlsa::GetAlsaAudioDevices(StreamType +@@ -101,7 +103,9 @@ void AudioManagerAlsa::GetAlsaAudioDevices(StreamType DLOG(WARNING) << "GetAlsaAudioDevices: unable to get device hints: " << wrapper_->StrError(error); } @@ -20,7 +20,7 @@ } void AudioManagerAlsa::GetAlsaDevicesInfo(AudioManagerAlsa::StreamType type, -@@ -187,7 +191,11 @@ bool AudioManagerAlsa::IsAlsaDeviceAvailable( +@@ -184,7 +188,11 @@ bool AudioManagerAlsa::IsAlsaDeviceAvailable( // goes through software conversion if needed (e.g. incompatible // sample rate). // TODO(joi): Should we prefer "hw" instead? @@ -32,7 +32,7 @@ return strncmp(kDeviceTypeDesired, device_name, base::size(kDeviceTypeDesired) - 1) == 0; } -@@ -209,7 +217,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDevice( +@@ -206,7 +214,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDevice( // Loop through the sound cards. // Don't use snd_device_name_hint(-1,..) since there is a access violation // inside this ALSA API with libasound.so.2.0.0. @@ -42,7 +42,7 @@ int error = wrapper_->DeviceNameHint(card, kPcmInterfaceName, &hints); if (!error) { for (void** hint_iter = hints; *hint_iter != NULL; hint_iter++) { -@@ -233,7 +243,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDevice( +@@ -230,7 +240,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDevice( DLOG(WARNING) << "HasAnyAudioDevice: unable to get device hints: " << wrapper_->StrError(error); } diff --git a/www/chromium/files/patch-media_audio_audio__features.cc b/www/chromium/files/patch-media_audio_audio__features.cc index 85573fb29e7a..1bd001c55cba 100644 --- a/www/chromium/files/patch-media_audio_audio__features.cc +++ b/www/chromium/files/patch-media_audio_audio__features.cc @@ -1,11 +1,11 @@ ---- media/audio/audio_features.cc.orig 2020-05-15 15:14:56 UTC +--- media/audio/audio_features.cc.orig 2020-11-13 06:36:44 UTC +++ media/audio/audio_features.cc @@ -11,7 +11,7 @@ namespace features { // detected. It will be restarted when needed. const base::Feature kAudioServiceOutOfProcessKillAtHang{ "AudioServiceOutOfProcessKillAtHang", --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) base::FEATURE_ENABLED_BY_DEFAULT #else - base::FEATURE_DISABLED_BY_DEFAULT diff --git a/www/chromium/files/patch-media_audio_audio__input__device.cc b/www/chromium/files/patch-media_audio_audio__input__device.cc index 59aaa7fab815..a86c8fae1c1c 100644 --- a/www/chromium/files/patch-media_audio_audio__input__device.cc +++ b/www/chromium/files/patch-media_audio_audio__input__device.cc @@ -1,11 +1,11 @@ ---- media/audio/audio_input_device.cc.orig 2020-07-07 21:58:16 UTC +--- media/audio/audio_input_device.cc.orig 2020-11-13 06:36:44 UTC +++ media/audio/audio_input_device.cc -@@ -247,7 +247,7 @@ void AudioInputDevice::OnStreamCreated( - // also a risk of false positives if we are suspending when starting the stream +@@ -253,7 +253,7 @@ void AudioInputDevice::OnStreamCreated( // here. See comments in AliveChecker and PowerObserverHelper for details and // todos. --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - const bool stop_at_first_alive_notification = true; - const bool pause_check_during_suspend = false; + if (detect_dead_stream_ == DeadStreamDetection::kEnabled) { +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + const bool stop_at_first_alive_notification = true; + const bool pause_check_during_suspend = false; #else diff --git a/www/chromium/files/patch-media_audio_audio__manager.cc b/www/chromium/files/patch-media_audio_audio__manager.cc index 5720491adf54..f57712a6bd1d 100644 --- a/www/chromium/files/patch-media_audio_audio__manager.cc +++ b/www/chromium/files/patch-media_audio_audio__manager.cc @@ -1,11 +1,11 @@ ---- media/audio/audio_manager.cc.orig 2019-03-11 22:00:59 UTC +--- media/audio/audio_manager.cc.orig 2020-11-13 06:36:44 UTC +++ media/audio/audio_manager.cc @@ -48,7 +48,7 @@ class AudioManagerHelper { } #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) void set_app_name(const std::string& app_name) { app_name_ = app_name; } const std::string& app_name() const { return app_name_; } #endif @@ -13,8 +13,8 @@ std::unique_ptr<base::win::ScopedCOMInitializer> com_initializer_for_testing_; #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) std::string app_name_; #endif @@ -22,8 +22,8 @@ return Create(std::move(audio_thread), GetHelper()->fake_log_factory()); } --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // static void AudioManager::SetGlobalAppName(const std::string& app_name) { GetHelper()->set_app_name(app_name); diff --git a/www/chromium/files/patch-media_audio_audio__manager.h b/www/chromium/files/patch-media_audio_audio__manager.h index 817c3d812b8e..9e8b152c548c 100644 --- a/www/chromium/files/patch-media_audio_audio__manager.h +++ b/www/chromium/files/patch-media_audio_audio__manager.h @@ -1,11 +1,11 @@ ---- media/audio/audio_manager.h.orig 2019-03-11 22:00:59 UTC +--- media/audio/audio_manager.h.orig 2020-11-13 06:36:44 UTC +++ media/audio/audio_manager.h @@ -60,7 +60,7 @@ class MEDIA_EXPORT AudioManager { static std::unique_ptr<AudioManager> CreateForTesting( std::unique_ptr<AudioThread> audio_thread); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Sets the name of the audio source as seen by external apps. Only actually // used with PulseAudio as of this writing. static void SetGlobalAppName(const std::string& app_name); diff --git a/www/chromium/files/patch-media_audio_audio__output__proxy__unittest.cc b/www/chromium/files/patch-media_audio_audio__output__proxy__unittest.cc new file mode 100644 index 000000000000..8589a043b84d --- /dev/null +++ b/www/chromium/files/patch-media_audio_audio__output__proxy__unittest.cc @@ -0,0 +1,11 @@ +--- media/audio/audio_output_proxy_unittest.cc.orig 2020-11-13 06:36:44 UTC ++++ media/audio/audio_output_proxy_unittest.cc +@@ -412,7 +412,7 @@ class AudioOutputProxyTest : public testing::Test { + // |stream| is closed at this point. Start() should reopen it again. + EXPECT_CALL(manager(), MakeAudioOutputStream(_, _, _)) + .Times(2) +- .WillRepeatedly(Return(reinterpret_cast<AudioOutputStream*>(NULL))); ++ .WillRepeatedly(Return(static_cast<AudioOutputStream*>(NULL))); + + EXPECT_CALL(callback_, OnError(_)).Times(2); + diff --git a/www/chromium/files/patch-media_base_audio__latency.cc b/www/chromium/files/patch-media_base_audio__latency.cc index 5ce5289c442e..5b02680849b4 100644 --- a/www/chromium/files/patch-media_base_audio__latency.cc +++ b/www/chromium/files/patch-media_base_audio__latency.cc @@ -1,11 +1,11 @@ ---- media/base/audio_latency.cc.orig 2020-05-13 18:39:45 UTC +--- media/base/audio_latency.cc.orig 2020-11-13 06:36:44 UTC +++ media/base/audio_latency.cc @@ -113,7 +113,7 @@ int AudioLatency::GetRtcBufferSize(int sample_rate, in return frames_per_buffer; } --#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_FUCHSIA) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) || \ + defined(OS_FUCHSIA) // On Linux, MacOS and Fuchsia, the low level IO implementations on the // browser side supports all buffer size the clients want. We use the native - // peer connection buffer size (10ms) to achieve best possible performance. diff --git a/www/chromium/files/patch-media_base_media__switches.cc b/www/chromium/files/patch-media_base_media__switches.cc index d04079357bca..c6400112c6e7 100644 --- a/www/chromium/files/patch-media_base_media__switches.cc +++ b/www/chromium/files/patch-media_base_media__switches.cc @@ -1,18 +1,18 @@ ---- media/base/media_switches.cc.orig 2020-07-07 21:58:16 UTC +--- media/base/media_switches.cc.orig 2020-11-13 06:36:44 UTC +++ media/base/media_switches.cc -@@ -343,7 +343,7 @@ const base::Feature kGav1VideoDecoder{"Gav1VideoDecode +@@ -361,7 +361,7 @@ const base::Feature kGav1VideoDecoder{"Gav1VideoDecode const base::Feature kGlobalMediaControls { "GlobalMediaControls", - #if defined(OS_WIN) || defined(OS_MACOSX) || \ + #if defined(OS_WIN) || defined(OS_MAC) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -368,7 +368,7 @@ const base::Feature kGlobalMediaControlsOverlayControl - const base::Feature kGlobalMediaControlsPictureInPicture{ +@@ -390,7 +390,7 @@ const base::Feature kGlobalMediaControlsOverlayControl + const base::Feature kGlobalMediaControlsPictureInPicture { "GlobalMediaControlsPictureInPicture", - #if defined(OS_WIN) || defined(OS_MACOSX) || \ + #if defined(OS_WIN) || defined(OS_MAC) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) base::FEATURE_ENABLED_BY_DEFAULT diff --git a/www/chromium/files/patch-media_base_scopedfd__helper.h b/www/chromium/files/patch-media_base_scopedfd__helper.h index 5b097ec108c3..12a98b3f6f5d 100644 --- a/www/chromium/files/patch-media_base_scopedfd__helper.h +++ b/www/chromium/files/patch-media_base_scopedfd__helper.h @@ -1,23 +1,19 @@ ---- media/base/scopedfd_helper.h.orig 2019-09-09 21:55:20 UTC +--- media/base/scopedfd_helper.h.orig 2020-11-13 06:36:44 UTC +++ media/base/scopedfd_helper.h -@@ -11,17 +11,17 @@ - namespace media { - - // Theoretically, we can test on defined(OS_POSIX) || defined(OS_FUCHSIA), but --// since the only current user is V4L2 we are limiting the scope to OS_LINUX so -+// since the only current user is V4L2 we are limiting the scope to OS_LINUX || OS_BSD so +@@ -14,14 +14,14 @@ namespace media { + // since the only current user is V4L2 we are limiting the scope to OS_LINUX so // the binary size does not inflate on non-using systems. Feel free to adapt // this and BUILD.gn as our needs evolve. --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Return a new vector containing duplicates of |fds|, or PCHECKs in case of an // error. MEDIA_EXPORT std::vector<base::ScopedFD> DuplicateFDs( const std::vector<base::ScopedFD>& fds); --#endif // OS_LINUX -+#endif // OS_LINUX || OS_BSD +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) } // namespace media diff --git a/www/chromium/files/patch-media_base_status.cc b/www/chromium/files/patch-media_base_status.cc index 984c997749f1..7a444801bb53 100644 --- a/www/chromium/files/patch-media_base_status.cc +++ b/www/chromium/files/patch-media_base_status.cc @@ -1,6 +1,6 @@ ---- media/base/status.cc.orig 2020-05-22 09:19:37 UTC +--- media/base/status.cc.orig 2020-11-13 06:36:44 UTC +++ media/base/status.cc -@@ -66,7 +66,9 @@ Status&& Status::AddCause(Status&& cause) && { +@@ -70,7 +70,9 @@ Status&& Status::AddCause(Status&& cause) && { void Status::AddFrame(const base::Location& location) { DCHECK(data_); diff --git a/www/chromium/files/patch-media_base_video__frame.cc b/www/chromium/files/patch-media_base_video__frame.cc index 8e84e08c288c..4d515983bf0c 100644 --- a/www/chromium/files/patch-media_base_video__frame.cc +++ b/www/chromium/files/patch-media_base_video__frame.cc @@ -1,74 +1,83 @@ ---- media/base/video_frame.cc.orig 2020-05-13 18:39:45 UTC +--- media/base/video_frame.cc.orig 2020-11-13 06:36:44 UTC +++ media/base/video_frame.cc -@@ -57,7 +57,7 @@ std::string VideoFrame::StorageTypeToString( +@@ -60,7 +60,7 @@ std::string VideoFrame::StorageTypeToString( return "OWNED_MEMORY"; case VideoFrame::STORAGE_SHMEM: return "SHMEM"; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) case VideoFrame::STORAGE_DMABUFS: return "DMABUFS"; #endif -@@ -74,7 +74,7 @@ std::string VideoFrame::StorageTypeToString( +@@ -77,7 +77,7 @@ std::string VideoFrame::StorageTypeToString( // static bool VideoFrame::IsStorageTypeMappable(VideoFrame::StorageType storage_type) { return --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // This is not strictly needed but makes explicit that, at VideoFrame // level, DmaBufs are not mappable from userspace. storage_type != VideoFrame::STORAGE_DMABUFS && -@@ -259,7 +259,7 @@ static base::Optional<VideoFrameLayout> GetDefaultLayo +@@ -262,7 +262,7 @@ static base::Optional<VideoFrameLayout> GetDefaultLayo return VideoFrameLayout::CreateWithPlanes(format, coded_size, planes); } --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // This class allows us to embed a vector<ScopedFD> into a scoped_refptr, and // thus to have several VideoFrames share the same set of DMABUF FDs. class VideoFrame::DmabufHolder -@@ -277,7 +277,7 @@ class VideoFrame::DmabufHolder +@@ -280,7 +280,7 @@ class VideoFrame::DmabufHolder friend class base::RefCountedThreadSafe<DmabufHolder>; ~DmabufHolder() = default; }; --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // static bool VideoFrame::IsValidConfig(VideoPixelFormat format, -@@ -590,7 +590,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM +@@ -607,7 +607,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM + } + + uint64_t modifier = gfx::NativePixmapHandle::kNoModifier; +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + if (gpu_memory_buffer->GetType() == gfx::NATIVE_PIXMAP) { + const auto gmb_handle = gpu_memory_buffer->CloneHandle(); + if (gmb_handle.is_null() || +@@ -645,7 +645,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM return frame; } --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // static scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs( const VideoFrameLayout& layout, -@@ -726,7 +726,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame( +@@ -847,7 +847,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame( } } --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) DCHECK(frame->dmabuf_fds_); // If there are any |dmabuf_fds_| plugged in, we should refer them too. wrapping_frame->dmabuf_fds_ = frame->dmabuf_fds_; -@@ -1059,7 +1059,7 @@ VideoFrame::mailbox_holder(size_t texture_index) const +@@ -1190,7 +1190,7 @@ VideoFrame::mailbox_holder(size_t texture_index) const : mailbox_holders_[texture_index]; } --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) const std::vector<base::ScopedFD>& VideoFrame::DmabufFds() const { DCHECK_EQ(storage_type_, STORAGE_DMABUFS); -@@ -1142,7 +1142,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout, +@@ -1273,7 +1273,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout, storage_type_(storage_type), visible_rect_(Intersection(visible_rect, gfx::Rect(layout.coded_size()))), natural_size_(natural_size), --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) dmabuf_fds_(base::MakeRefCounted<DmabufHolder>()), #endif timestamp_(timestamp), diff --git a/www/chromium/files/patch-media_base_video__frame.h b/www/chromium/files/patch-media_base_video__frame.h index 4606b563e730..2bd506c057b4 100644 --- a/www/chromium/files/patch-media_base_video__frame.h +++ b/www/chromium/files/patch-media_base_video__frame.h @@ -1,50 +1,50 @@ ---- media/base/video_frame.h.orig 2020-07-07 21:58:16 UTC +--- media/base/video_frame.h.orig 2020-11-13 06:36:44 UTC +++ media/base/video_frame.h -@@ -40,9 +40,9 @@ +@@ -41,9 +41,9 @@ #include "base/mac/scoped_cftyperef.h" - #endif // defined(OS_MACOSX) + #endif // defined(OS_MAC) --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "base/files/scoped_file.h" --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) namespace gfx { class GpuMemoryBuffer; -@@ -81,7 +81,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -83,7 +83,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte STORAGE_UNOWNED_MEMORY = 2, // External, non owned data pointers. STORAGE_OWNED_MEMORY = 3, // VideoFrame has allocated its own data buffer. STORAGE_SHMEM = 4, // Backed by unsafe (writable) shared memory. --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // TODO(mcasas): Consider turning this type into STORAGE_NATIVE // based on the idea of using this same enum value for both DMA // buffers on Linux and CVPixelBuffers on Mac (which currently use -@@ -245,7 +245,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -260,7 +260,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte ReleaseMailboxCB mailbox_holder_release_cb, base::TimeDelta timestamp); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // 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 -@@ -485,7 +485,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -507,7 +507,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; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // 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 -@@ -663,7 +663,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -696,7 +696,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_; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) class DmabufHolder; // Dmabufs for the frame, used when storage is STORAGE_DMABUFS. Size is either diff --git a/www/chromium/files/patch-media_capture_video_create__video__capture__device__factory.cc b/www/chromium/files/patch-media_capture_video_create__video__capture__device__factory.cc index ab3b5a40d144..83318cc386d4 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 2019-10-21 19:06:36 UTC +--- media/capture/video/create_video_capture_device_factory.cc.orig 2020-11-13 06:36:44 UTC +++ media/capture/video/create_video_capture_device_factory.cc @@ -10,7 +10,7 @@ #include "media/capture/video/fake_video_capture_device_factory.h" diff --git a/www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc b/www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc index 76d95eebd304..3d8955a0c18d 100644 --- a/www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc +++ b/www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc @@ -1,11 +1,11 @@ ---- media/capture/video/fake_video_capture_device_factory.cc.orig 2019-12-16 21:50:49 UTC +--- media/capture/video/fake_video_capture_device_factory.cc.orig 2020-11-13 06:36:44 UTC +++ media/capture/video/fake_video_capture_device_factory.cc -@@ -208,7 +208,7 @@ void FakeVideoCaptureDeviceFactory::GetDeviceDescripto +@@ -208,7 +208,7 @@ void FakeVideoCaptureDeviceFactory::GetDevicesInfo( + int entry_index = 0; for (const auto& entry : devices_config_) { - device_descriptors->emplace_back( - base::StringPrintf("fake_device_%d", entry_index), entry.device_id, --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - VideoCaptureApi::LINUX_V4L2_SINGLE_PLANE - #elif defined(OS_MACOSX) - VideoCaptureApi::MACOSX_AVFOUNDATION + VideoCaptureApi api = +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + VideoCaptureApi::LINUX_V4L2_SINGLE_PLANE; + #elif defined(OS_MAC) + VideoCaptureApi::MACOSX_AVFOUNDATION; diff --git a/www/chromium/files/patch-media_capture_video_file__video__capture__device__factory.cc b/www/chromium/files/patch-media_capture_video_file__video__capture__device__factory.cc index b1cc42128fa5..62f27a926259 100644 --- a/www/chromium/files/patch-media_capture_video_file__video__capture__device__factory.cc +++ b/www/chromium/files/patch-media_capture_video_file__video__capture__device__factory.cc @@ -1,11 +1,11 @@ ---- media/capture/video/file_video_capture_device_factory.cc.orig 2019-04-30 22:22:52 UTC +--- media/capture/video/file_video_capture_device_factory.cc.orig 2020-11-13 06:36:44 UTC +++ media/capture/video/file_video_capture_device_factory.cc -@@ -54,7 +54,7 @@ void FileVideoCaptureDeviceFactory::GetDeviceDescripto - #elif defined(OS_MACOSX) - command_line_file_path.value(), kFileVideoCaptureDeviceName, - VideoCaptureApi::MACOSX_AVFOUNDATION --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) - command_line_file_path.value(), kFileVideoCaptureDeviceName, - VideoCaptureApi::LINUX_V4L2_SINGLE_PLANE +@@ -52,7 +52,7 @@ void FileVideoCaptureDeviceFactory::GetDevicesInfo( + VideoCaptureApi::WIN_DIRECT_SHOW; + #elif defined(OS_MAC) + VideoCaptureApi::MACOSX_AVFOUNDATION; +-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) ++#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + VideoCaptureApi::LINUX_V4L2_SINGLE_PLANE; #else + VideoCaptureApi::UNKNOWN; diff --git a/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc b/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc index 3de31922be93..022ce49c709c 100644 --- a/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc +++ b/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc @@ -1,4 +1,4 @@ ---- media/capture/video/linux/v4l2_capture_delegate.cc.orig 2019-03-11 22:00:59 UTC +--- media/capture/video/linux/v4l2_capture_delegate.cc.orig 2020-11-13 06:36:44 UTC +++ media/capture/video/linux/v4l2_capture_delegate.cc @@ -4,8 +4,10 @@ diff --git a/www/chromium/files/patch-media_capture_video_video__capture__buffer__pool__impl.cc b/www/chromium/files/patch-media_capture_video_video__capture__buffer__pool__impl.cc index f20fd7f94ed5..56c2b763c8a6 100644 --- a/www/chromium/files/patch-media_capture_video_video__capture__buffer__pool__impl.cc +++ b/www/chromium/files/patch-media_capture_video_video__capture__buffer__pool__impl.cc @@ -1,11 +1,11 @@ ---- media/capture/video/video_capture_buffer_pool_impl.cc.orig 2020-05-13 18:39:45 UTC +--- media/capture/video/video_capture_buffer_pool_impl.cc.orig 2020-11-13 06:36:44 UTC +++ media/capture/video/video_capture_buffer_pool_impl.cc @@ -58,7 +58,7 @@ VideoCaptureBufferPoolImpl::CreateSharedMemoryViaRawFi int buffer_id) { // This requires platforms where base::SharedMemoryHandle is backed by a // file descriptor. --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) base::AutoLock lock(lock_); VideoCaptureBufferTracker* tracker = GetTracker(buffer_id); diff --git a/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc b/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc index d386237ba83c..8b9c2d879958 100644 --- a/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc +++ b/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc @@ -1,11 +1,11 @@ ---- media/capture/video/video_capture_device_client.cc.orig 2020-05-13 18:39:45 UTC +--- media/capture/video/video_capture_device_client.cc.orig 2020-11-13 06:36:44 UTC +++ media/capture/video/video_capture_device_client.cc -@@ -301,7 +301,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData( +@@ -318,7 +318,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData( // see http://linuxtv.org/downloads/v4l-dvb-apis/packed-rgb.html. // Windows RGB24 defines blue at lowest byte, // see https://msdn.microsoft.com/en-us/library/windows/desktop/dd407253 --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) fourcc_format = libyuv::FOURCC_RAW; #elif defined(OS_WIN) fourcc_format = libyuv::FOURCC_24BG; diff --git a/www/chromium/files/patch-media_filters_vp9__parser.h b/www/chromium/files/patch-media_filters_vp9__parser.h index 5e1f90d692b3..d79b26535f0d 100644 --- a/www/chromium/files/patch-media_filters_vp9__parser.h +++ b/www/chromium/files/patch-media_filters_vp9__parser.h @@ -1,4 +1,4 @@ ---- media/filters/vp9_parser.h.orig 2019-03-11 22:00:59 UTC +--- media/filters/vp9_parser.h.orig 2020-11-13 06:36:44 UTC +++ media/filters/vp9_parser.h @@ -14,6 +14,7 @@ diff --git a/www/chromium/files/patch-media_formats_common_offset__byte__queue.cc b/www/chromium/files/patch-media_formats_common_offset__byte__queue.cc index 38994431f986..678d6b00054a 100644 --- a/www/chromium/files/patch-media_formats_common_offset__byte__queue.cc +++ b/www/chromium/files/patch-media_formats_common_offset__byte__queue.cc @@ -1,6 +1,6 @@ ---- media/formats/common/offset_byte_queue.cc.orig 2019-03-11 22:00:59 UTC +--- media/formats/common/offset_byte_queue.cc.orig 2020-11-13 06:36:44 UTC +++ media/formats/common/offset_byte_queue.cc -@@ -46,13 +46,13 @@ void OffsetByteQueue::PeekAt(int64_t offset, const uin +@@ -47,13 +47,13 @@ void OffsetByteQueue::PeekAt(int64_t offset, const uin *size = tail() - offset; } diff --git a/www/chromium/files/patch-media_formats_common_offset__byte__queue.h b/www/chromium/files/patch-media_formats_common_offset__byte__queue.h index 659dd9dfe9b3..041713da87a9 100644 --- a/www/chromium/files/patch-media_formats_common_offset__byte__queue.h +++ b/www/chromium/files/patch-media_formats_common_offset__byte__queue.h @@ -1,4 +1,4 @@ ---- media/formats/common/offset_byte_queue.h.orig 2019-03-11 22:00:59 UTC +--- media/formats/common/offset_byte_queue.h.orig 2020-11-13 06:36:44 UTC +++ media/formats/common/offset_byte_queue.h @@ -36,15 +36,15 @@ class MEDIA_EXPORT OffsetByteQueue { // a null |buf| and a |size| of zero. diff --git a/www/chromium/files/patch-media_formats_mp2t_es__parser__adts.cc b/www/chromium/files/patch-media_formats_mp2t_es__parser__adts.cc index a9a96b393d53..968e0e6d9c35 100644 --- a/www/chromium/files/patch-media_formats_mp2t_es__parser__adts.cc +++ b/www/chromium/files/patch-media_formats_mp2t_es__parser__adts.cc @@ -1,4 +1,4 @@ ---- media/formats/mp2t/es_parser_adts.cc.orig 2019-04-30 22:22:52 UTC +--- media/formats/mp2t/es_parser_adts.cc.orig 2020-11-13 06:36:44 UTC +++ media/formats/mp2t/es_parser_adts.cc @@ -62,11 +62,11 @@ bool EsParserAdts::LookForAdtsFrame(AdtsFrame* adts_fr const uint8_t* es; diff --git a/www/chromium/files/patch-media_formats_mp2t_es__parser__mpeg1audio.cc b/www/chromium/files/patch-media_formats_mp2t_es__parser__mpeg1audio.cc index cd5710c554b0..95b91bba1f90 100644 --- a/www/chromium/files/patch-media_formats_mp2t_es__parser__mpeg1audio.cc +++ b/www/chromium/files/patch-media_formats_mp2t_es__parser__mpeg1audio.cc @@ -1,4 +1,4 @@ ---- media/formats/mp2t/es_parser_mpeg1audio.cc.orig 2019-03-11 22:00:59 UTC +--- media/formats/mp2t/es_parser_mpeg1audio.cc.orig 2020-11-13 06:36:44 UTC +++ media/formats/mp2t/es_parser_mpeg1audio.cc @@ -108,11 +108,11 @@ bool EsParserMpeg1Audio::LookForMpeg1AudioFrame( const uint8_t* es; diff --git a/www/chromium/files/patch-media_gpu_buffer__validation.cc b/www/chromium/files/patch-media_gpu_buffer__validation.cc index 7f3005140bd8..b1846b45a0b5 100644 --- a/www/chromium/files/patch-media_gpu_buffer__validation.cc +++ b/www/chromium/files/patch-media_gpu_buffer__validation.cc @@ -1,21 +1,21 @@ ---- media/gpu/buffer_validation.cc.orig 2019-12-17 19:41:51 UTC +--- media/gpu/buffer_validation.cc.orig 2020-11-13 06:36:44 UTC +++ media/gpu/buffer_validation.cc @@ -12,15 +12,15 @@ #include "ui/gfx/geometry/size.h" #include "ui/gfx/gpu_memory_buffer.h" --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include <sys/types.h> #include <unistd.h> --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) namespace media { bool GetFileSize(const int fd, size_t* size) { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) if (fd < 0) { VLOGF(1) << "Invalid file descriptor"; return false; @@ -23,8 +23,8 @@ #else NOTIMPLEMENTED(); return false; --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) } bool VerifyGpuMemoryBufferHandle(media::VideoPixelFormat pixel_format, @@ -32,8 +32,8 @@ VLOGF(1) << "Unexpected GpuMemoryBufferType: " << gmb_handle.type; return false; } --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) const size_t num_planes = media::VideoFrame::NumPlanes(pixel_format); if (num_planes != gmb_handle.native_pixmap_handle.planes.size() || num_planes == 0) { @@ -41,8 +41,8 @@ #else NOTIMPLEMENTED(); return false; --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) } } // namespace media diff --git a/www/chromium/files/patch-media_media__options.gni b/www/chromium/files/patch-media_media__options.gni index a8d84a5ba3eb..ba12f2052a2d 100644 --- a/www/chromium/files/patch-media_media__options.gni +++ b/www/chromium/files/patch-media_media__options.gni @@ -1,4 +1,4 @@ ---- media/media_options.gni.orig 2020-07-07 21:58:16 UTC +--- media/media_options.gni.orig 2020-11-13 06:36:44 UTC +++ media/media_options.gni @@ -120,6 +120,9 @@ declare_args() { # Enables runtime selection of ALSA library for audio. diff --git a/www/chromium/files/patch-media_mojo_clients_mojo__video__encode__accelerator.cc b/www/chromium/files/patch-media_mojo_clients_mojo__video__encode__accelerator.cc index 76130e60b14a..c5f8f2c594c7 100644 --- a/www/chromium/files/patch-media_mojo_clients_mojo__video__encode__accelerator.cc +++ b/www/chromium/files/patch-media_mojo_clients_mojo__video__encode__accelerator.cc @@ -1,11 +1,11 @@ ---- media/mojo/clients/mojo_video_encode_accelerator.cc.orig 2020-05-13 18:39:45 UTC +--- media/mojo/clients/mojo_video_encode_accelerator.cc.orig 2020-11-13 06:36:44 UTC +++ media/mojo/clients/mojo_video_encode_accelerator.cc @@ -132,7 +132,7 @@ void MojoVideoEncodeAccelerator::Encode(scoped_refptr< DCHECK_EQ(num_planes, frame->layout().num_planes()); DCHECK(vea_.is_bound()); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // TODO(crbug.com/1003197): Remove this once we stop supporting STORAGE_DMABUF // in VideoEncodeAccelerator. if (frame->storage_type() == VideoFrame::STORAGE_DMABUFS) { diff --git a/www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc b/www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc index 17e409cbac8e..182e87a59a63 100644 --- a/www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc +++ b/www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc @@ -1,14 +1,14 @@ ---- media/mojo/mojom/video_frame_mojom_traits.cc.orig 2020-07-07 21:58:16 UTC +--- media/mojo/mojom/video_frame_mojom_traits.cc.orig 2020-11-13 06:36:44 UTC +++ media/mojo/mojom/video_frame_mojom_traits.cc @@ -21,9 +21,9 @@ - #include "ui/gfx/mojom/buffer_types_mojom_traits.h" #include "ui/gfx/mojom/color_space_mojom_traits.h" + #include "ui/gl/mojom/hdr_metadata_mojom_traits.h" --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "base/posix/eintr_wrapper.h" --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) namespace mojo { @@ -16,8 +16,8 @@ std::move(offsets))); } --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) if (input->storage_type() == media::VideoFrame::STORAGE_DMABUFS) { std::vector<mojo::PlatformHandle> dmabuf_fds; @@ -25,8 +25,8 @@ shared_buffer_data.TakeFrameData(), shared_buffer_data.frame_data_size(), std::move(offsets), std::move(strides), timestamp); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) } else if (data.is_dmabuf_data()) { media::mojom::DmabufVideoFrameDataDataView dmabuf_data; data.GetDmabufDataDataView(&dmabuf_data); diff --git a/www/chromium/files/patch-media_mojo_services_gpu__mojo__media__client.cc b/www/chromium/files/patch-media_mojo_services_gpu__mojo__media__client.cc index 160cd4d2cfc2..1ba7d826e18f 100644 --- a/www/chromium/files/patch-media_mojo_services_gpu__mojo__media__client.cc +++ b/www/chromium/files/patch-media_mojo_services_gpu__mojo__media__client.cc @@ -1,20 +1,20 @@ ---- media/mojo/services/gpu_mojo_media_client.cc.orig 2020-07-07 21:58:16 UTC +--- media/mojo/services/gpu_mojo_media_client.cc.orig 2020-11-13 06:36:44 UTC +++ media/mojo/services/gpu_mojo_media_client.cc -@@ -63,7 +63,7 @@ namespace media { +@@ -67,7 +67,7 @@ namespace media { namespace { - #if defined(OS_ANDROID) || defined(OS_CHROMEOS) || defined(OS_MACOSX) || \ + #if defined(OS_ANDROID) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ - defined(OS_WIN) || defined(OS_LINUX) + defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) gpu::CommandBufferStub* GetCommandBufferStub( scoped_refptr<base::SingleThreadTaskRunner> gpu_task_runner, base::WeakPtr<MediaGpuChannelManager> media_gpu_channel_manager, -@@ -280,7 +280,7 @@ std::unique_ptr<VideoDecoder> GpuMojoMediaClient::Crea +@@ -298,7 +298,7 @@ std::unique_ptr<VideoDecoder> GpuMojoMediaClient::Crea command_buffer_id->route_id)); } --#elif defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) -+#elif defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) +-#elif defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || \ ++#elif defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) #if defined(OS_WIN) // Don't instantiate the DXVA decoder if it's not supported. - if (gpu_workarounds_.disable_dxva_video_decoder) diff --git a/www/chromium/files/patch-media_video_fake__gpu__memory__buffer.cc b/www/chromium/files/patch-media_video_fake__gpu__memory__buffer.cc index 684c9adbd4b4..7c2f053d4e3d 100644 --- a/www/chromium/files/patch-media_video_fake__gpu__memory__buffer.cc +++ b/www/chromium/files/patch-media_video_fake__gpu__memory__buffer.cc @@ -1,38 +1,38 @@ ---- media/video/fake_gpu_memory_buffer.cc.orig 2019-12-17 19:43:52 UTC +--- media/video/fake_gpu_memory_buffer.cc.orig 2020-11-13 06:36:45 UTC +++ media/video/fake_gpu_memory_buffer.cc -@@ -6,7 +6,7 @@ +@@ -10,7 +10,7 @@ + #include "media/base/format_utils.h" + #include "media/base/video_frame.h" - #include "build/build_config.h" - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include <fcntl.h> #include <sys/stat.h> #include <sys/types.h> -@@ -44,7 +44,7 @@ class FakeGpuMemoryBufferImpl : public gpu::GpuMemoryB +@@ -48,7 +48,7 @@ class FakeGpuMemoryBufferImpl : public gpu::GpuMemoryB } // namespace --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) base::ScopedFD GetDummyFD() { base::ScopedFD fd(open("/dev/zero", O_RDWR)); DCHECK(fd.is_valid()); -@@ -67,7 +67,7 @@ FakeGpuMemoryBuffer::FakeGpuMemoryBuffer(const gfx::Si - // Set a dummy id since this is for testing only. - handle_.id = gfx::GpuMemoryBufferId(0); +@@ -78,7 +78,7 @@ FakeGpuMemoryBuffer::FakeGpuMemoryBuffer(const gfx::Si + static base::NoDestructor<base::AtomicSequenceNumber> buffer_id_generator; + handle_.id = gfx::GpuMemoryBufferId(buffer_id_generator->GetNext()); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - // Set a dummy fd since this is for testing only. - handle_.native_pixmap_handle.planes.push_back( - gfx::NativePixmapPlane(size_.width(), 0, y_plane_size, GetDummyFD())); -@@ -76,7 +76,7 @@ FakeGpuMemoryBuffer::FakeGpuMemoryBuffer(const gfx::Si - size_.width(), handle_.native_pixmap_handle.planes[0].size, - uv_plane_size, GetDummyFD())); +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + for (size_t i = 0; i < VideoFrame::NumPlanes(video_pixel_format_); i++) { + const gfx::Size plane_size_in_bytes = + VideoFrame::PlaneSize(video_pixel_format_, i, size_); +@@ -87,7 +87,7 @@ FakeGpuMemoryBuffer::FakeGpuMemoryBuffer(const gfx::Si + GetDummyFD()); } --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) + handle_.native_pixmap_handle.modifier = modifier; +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) } FakeGpuMemoryBuffer::~FakeGpuMemoryBuffer() = default; @@ -40,8 +40,8 @@ gfx::GpuMemoryBufferHandle handle; handle.type = gfx::NATIVE_PIXMAP; handle.id = handle_.id; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) handle.native_pixmap_handle = gfx::CloneHandleForIPC(handle_.native_pixmap_handle); #endif diff --git a/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc b/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc index 3941ed5af217..a61fb6029368 100644 --- a/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc +++ b/www/chromium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc @@ -1,11 +1,11 @@ ---- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2020-02-03 21:53:32 UTC +--- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2020-11-13 06:36:45 UTC +++ media/video/gpu_memory_buffer_video_frame_pool.cc -@@ -572,7 +572,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa +@@ -573,7 +573,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa } bool is_software_backed_video_frame = !video_frame->HasTextures(); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) is_software_backed_video_frame &= !video_frame->HasDmaBufs(); #endif 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 dec03d588689..f7f4a4769b81 100644 --- a/www/chromium/files/patch-mojo_public_c_system_thunks.cc +++ b/www/chromium/files/patch-mojo_public_c_system_thunks.cc @@ -1,49 +1,46 @@ ---- mojo/public/c/system/thunks.cc.orig 2020-02-03 21:52:48 UTC +--- mojo/public/c/system/thunks.cc.orig 2020-11-13 06:36:45 UTC +++ mojo/public/c/system/thunks.cc -@@ -15,7 +15,7 @@ - #include "build/build_config.h" +@@ -20,7 +20,7 @@ #include "mojo/public/c/system/core.h" + #include "mojo/public/c/system/macros.h" -#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) +#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) #include "base/environment.h" #include "base/files/file_path.h" #include "base/optional.h" -@@ -58,7 +58,7 @@ namespace mojo { - class CoreLibraryInitializer { - public: - CoreLibraryInitializer(const MojoInitializeOptions* options) { +@@ -68,7 +68,7 @@ class CoreLibraryInitializer { + ~CoreLibraryInitializer() = default; + + MojoResult LoadLibrary(base::FilePath library_path) { -#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) +#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) - bool application_provided_path = false; - base::Optional<base::FilePath> library_path; - if (options && options->struct_size >= sizeof(*options) && -@@ -77,7 +77,7 @@ class CoreLibraryInitializer { + if (library_ && library_->is_valid()) + return MOJO_RESULT_OK; + +@@ -82,7 +82,7 @@ class CoreLibraryInitializer { - if (!library_path) { + if (library_path.empty()) { // Default to looking for the library in the current working directory. -#if defined(OS_CHROMEOS) || defined(OS_LINUX) +#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) const base::FilePath::CharType kDefaultLibraryPathValue[] = FILE_PATH_LITERAL("./libmojo_core.so"); #elif defined(OS_WIN) -@@ -127,16 +127,16 @@ class CoreLibraryInitializer { +@@ -126,13 +126,13 @@ class CoreLibraryInitializer { - CHECK_GT(g_thunks.size, 0u) - << "Invalid mojo_core library: " << library_path->value(); --#else // defined(OS_CHROMEOS) || defined(OS_LINUX) -+#else // defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) - NOTREACHED() - << "Dynamic mojo_core loading is not supported on this platform."; --#endif // defined(OS_CHROMEOS) || defined(OS_LINUX) -+#endif // defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) + library_ = std::move(library); + return MOJO_RESULT_OK; +-#else // defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) ++#else // defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) + return MOJO_RESULT_UNIMPLEMENTED; +-#endif // defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) ++#endif // defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) } - ~CoreLibraryInitializer() = default; - 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_; #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 4af98b7fc4b7..3b93a4c33865 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,9 +1,9 @@ ---- mojo/public/js/mojo_bindings_resources.grd.orig 2020-07-07 21:58:16 UTC +--- mojo/public/js/mojo_bindings_resources.grd.orig 2020-11-13 06:36:45 UTC +++ mojo/public/js/mojo_bindings_resources.grd -@@ -70,7 +70,7 @@ +@@ -59,7 +59,7 @@ + file="${root_gen_dir}/mojo/public/mojom/base/text_direction.mojom-lite.js" use_base_dir="false" - type="BINDATA" - compress="gzip" /> + type="BINDATA" /> - <if expr="is_win or is_macosx or is_linux or is_android"> + <if expr="is_win or is_macosx or is_posix or is_android"> <include name="IDR_MOJO_TIME_MOJOM_HTML" diff --git a/www/chromium/files/patch-net_BUILD.gn b/www/chromium/files/patch-net_BUILD.gn index 0793a036c42e..99e5c28e7ab8 100644 --- a/www/chromium/files/patch-net_BUILD.gn +++ b/www/chromium/files/patch-net_BUILD.gn @@ -1,15 +1,15 @@ ---- net/BUILD.gn.orig 2020-07-07 21:58:16 UTC +--- net/BUILD.gn.orig 2020-11-13 06:36:45 UTC +++ net/BUILD.gn -@@ -103,7 +103,7 @@ net_configs = [ +@@ -99,7 +99,7 @@ net_configs = [ "//build/config/compiler:wexit_time_destructors", ] --if (is_linux) { -+if (is_linux && !is_bsd) { +-if (is_linux || is_chromeos) { ++if ((is_linux || is_chromeos) && !is_bsd) { net_configs += [ "//build/config/linux:libresolv" ] } -@@ -1251,6 +1251,16 @@ component("net") { +@@ -1261,6 +1261,16 @@ component("net") { ] } @@ -26,7 +26,7 @@ if (is_mac) { sources += [ "base/network_notification_thread_mac.cc", -@@ -1381,7 +1391,7 @@ component("net") { +@@ -1397,7 +1407,7 @@ component("net") { } } @@ -35,12 +35,21 @@ sources += [ "base/network_change_notifier_posix.cc", "base/network_change_notifier_posix.h", -@@ -1414,7 +1424,7 @@ component("net") { +@@ -1430,7 +1440,7 @@ component("net") { } - # Use getifaddrs() on POSIX platforms, except Linux and Android. -- if (is_posix && !is_linux && !is_android) { -+ if (is_posix && ((!is_linux && !is_android) || (is_bsd))) { + # 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", +@@ -4770,7 +4780,7 @@ test("net_unittests") { + } + + # Use getifaddrs() on POSIX platforms, except Linux and Android. +- if (is_posix && !is_linux && !is_chromeos && !is_android) { ++ if ((is_posix && !is_linux && !is_chromeos && !is_android) || is_bsd) { + sources += [ "base/network_interfaces_getifaddrs_unittest.cc" ] + } + diff --git a/www/chromium/files/patch-net_base_address__tracker__linux.cc b/www/chromium/files/patch-net_base_address__tracker__linux.cc index 01047dcf1d20..1209941137d6 100644 --- a/www/chromium/files/patch-net_base_address__tracker__linux.cc +++ b/www/chromium/files/patch-net_base_address__tracker__linux.cc @@ -1,4 +1,4 @@ ---- net/base/address_tracker_linux.cc.orig 2020-03-03 18:53:55 UTC +--- net/base/address_tracker_linux.cc.orig 2020-11-13 06:36:45 UTC +++ net/base/address_tracker_linux.cc @@ -5,7 +5,9 @@ #include "net/base/address_tracker_linux.h" @@ -10,15 +10,23 @@ #include <stdint.h> #include <sys/ioctl.h> #include <utility> -@@ -177,6 +179,7 @@ AddressTrackerLinux::AddressTrackerLinux( - AddressTrackerLinux::~AddressTrackerLinux() = default; - - void AddressTrackerLinux::Init() { +@@ -190,6 +192,7 @@ void AddressTrackerLinux::Init() { + DCHECK_LT(base::android::BuildInfo::GetInstance()->sdk_int(), + base::android::SDK_VERSION_P); + #endif +#if !defined(OS_FREEBSD) netlink_fd_.reset(socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE)); if (!netlink_fd_.is_valid()) { PLOG(ERROR) << "Could not create NETLINK socket"; -@@ -272,6 +275,7 @@ void AddressTrackerLinux::AbortAndForceOnline() { +@@ -274,6 +277,7 @@ void AddressTrackerLinux::Init() { + base::BindRepeating(&AddressTrackerLinux::OnFileCanReadWithoutBlocking, + base::Unretained(this))); + } ++#endif // !OS_FREEBSD + } + + void AddressTrackerLinux::AbortAndForceOnline() { +@@ -285,6 +289,7 @@ void AddressTrackerLinux::AbortAndForceOnline() { connection_type_initialized_cv_.Broadcast(); } @@ -26,7 +34,7 @@ AddressTrackerLinux::AddressMap AddressTrackerLinux::GetAddressMap() const { AddressTrackerAutoLock lock(*this, address_map_lock_); return address_map_; -@@ -290,6 +294,7 @@ bool AddressTrackerLinux::IsInterfaceIgnored(int inter +@@ -303,6 +308,7 @@ bool AddressTrackerLinux::IsInterfaceIgnored(int inter const char* interface_name = get_interface_name_(interface_index, buf); return ignored_interfaces_.find(interface_name) != ignored_interfaces_.end(); } @@ -34,7 +42,7 @@ NetworkChangeNotifier::ConnectionType AddressTrackerLinux::GetCurrentConnectionType() { -@@ -348,6 +353,7 @@ void AddressTrackerLinux::HandleMessage(const char* bu +@@ -361,6 +367,7 @@ void AddressTrackerLinux::HandleMessage(const char* bu bool* address_changed, bool* link_changed, bool* tunnel_changed) { @@ -42,7 +50,7 @@ DCHECK(buffer); // Note that NLMSG_NEXT decrements |length| to reflect the number of bytes // remaining in |buffer|. -@@ -460,6 +466,10 @@ void AddressTrackerLinux::HandleMessage(const char* bu +@@ -473,6 +480,10 @@ void AddressTrackerLinux::HandleMessage(const char* bu break; } } @@ -53,36 +61,21 @@ } void AddressTrackerLinux::OnFileCanReadWithoutBlocking() { -@@ -487,31 +497,7 @@ bool AddressTrackerLinux::IsTunnelInterfaceName(const +@@ -500,6 +511,7 @@ bool AddressTrackerLinux::IsTunnelInterfaceName(const } void AddressTrackerLinux::UpdateCurrentConnectionType() { -- AddressTrackerLinux::AddressMap address_map = GetAddressMap(); -- std::unordered_set<int> online_links = GetOnlineLinks(); -- -- // Strip out tunnel interfaces from online_links -- for (auto it = online_links.cbegin(); it != online_links.cend();) { -- if (IsTunnelInterface(*it)) { -- it = online_links.erase(it); -- } else { -- ++it; -- } -- } -- -- NetworkInterfaceList networks; -- NetworkChangeNotifier::ConnectionType type = -- NetworkChangeNotifier::CONNECTION_NONE; -- if (GetNetworkListImpl(&networks, 0, online_links, address_map, -- get_interface_name_)) { -- type = NetworkChangeNotifier::ConnectionTypeFromInterfaceList(networks); -- } else { -- type = online_links.empty() ? NetworkChangeNotifier::CONNECTION_NONE -- : NetworkChangeNotifier::CONNECTION_UNKNOWN; -- } -- -- AddressTrackerAutoLock lock(*this, connection_type_lock_); -- current_connection_type_ = type; ++#if !defined(OS_FREEBSD) + AddressTrackerLinux::AddressMap address_map = GetAddressMap(); + std::unordered_set<int> online_links = GetOnlineLinks(); + +@@ -525,6 +537,9 @@ void AddressTrackerLinux::UpdateCurrentConnectionType( + + AddressTrackerAutoLock lock(*this, connection_type_lock_); + current_connection_type_ = type; ++#else + NOTIMPLEMENTED(); ++#endif } int AddressTrackerLinux::GetThreadsWaitingForConnectionTypeInitForTesting() { diff --git a/www/chromium/files/patch-net_base_address__tracker__linux.h b/www/chromium/files/patch-net_base_address__tracker__linux.h index 50b6ecbc20fb..19d6f2dfce7f 100644 --- a/www/chromium/files/patch-net_base_address__tracker__linux.h +++ b/www/chromium/files/patch-net_base_address__tracker__linux.h @@ -1,4 +1,4 @@ ---- net/base/address_tracker_linux.h.orig 2019-03-11 22:01:00 UTC +--- net/base/address_tracker_linux.h.orig 2020-11-13 06:36:45 UTC +++ net/base/address_tracker_linux.h @@ -7,9 +7,6 @@ diff --git a/www/chromium/files/patch-net_base_address__tracker__linux__unittest.cc b/www/chromium/files/patch-net_base_address__tracker__linux__unittest.cc index 58a442e0f159..34f963ee46d4 100644 --- a/www/chromium/files/patch-net_base_address__tracker__linux__unittest.cc +++ b/www/chromium/files/patch-net_base_address__tracker__linux__unittest.cc @@ -1,4 +1,4 @@ ---- net/base/address_tracker_linux_unittest.cc.orig 2019-03-11 22:01:00 UTC +--- net/base/address_tracker_linux_unittest.cc.orig 2020-11-13 06:36:45 UTC +++ net/base/address_tracker_linux_unittest.cc @@ -4,7 +4,11 @@ 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 b570610a6483..d168e63e4da2 100644 --- a/www/chromium/files/patch-net_base_network__change__notifier.cc +++ b/www/chromium/files/patch-net_base_network__change__notifier.cc @@ -1,26 +1,22 @@ ---- net/base/network_change_notifier.cc.orig 2020-02-03 21:52:49 UTC +--- net/base/network_change_notifier.cc.orig 2020-11-13 06:36:45 UTC +++ net/base/network_change_notifier.cc -@@ -35,7 +35,7 @@ +@@ -36,7 +36,7 @@ #include "net/base/network_change_notifier_linux.h" - #elif defined(OS_MACOSX) + #elif defined(OS_APPLE) #include "net/base/network_change_notifier_mac.h" -#elif defined(OS_CHROMEOS) || defined(OS_ANDROID) +#elif defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) #include "net/base/network_change_notifier_posix.h" #elif defined(OS_FUCHSIA) #include "net/base/network_change_notifier_fuchsia.h" -@@ -229,7 +229,7 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo - // service in a separate process. - return std::make_unique<NetworkChangeNotifierPosix>(initial_type, - initial_subtype); --#elif defined(OS_CHROMEOS) -+#elif defined(OS_CHROMEOS) || defined(OS_BSD) - return std::make_unique<NetworkChangeNotifierPosix>(initial_type, - initial_subtype); - #elif defined(OS_LINUX) -@@ -241,7 +241,6 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo +@@ -249,8 +249,11 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo + #elif defined(OS_FUCHSIA) return std::make_unique<NetworkChangeNotifierFuchsia>( - 0 /* required_features */); + fuchsia::hardware::ethernet::Features()); ++#elif defined(OS_BSD) ++ return std::make_unique<MockNetworkChangeNotifier>( ++ std::make_unique<SystemDnsConfigChangeNotifier>( ++ nullptr /* task_runner */, nullptr /* dns_config_service */)); #else - NOTIMPLEMENTED(); return NULL; diff --git a/www/chromium/files/patch-net_base_network__interfaces__posix.h b/www/chromium/files/patch-net_base_network__interfaces__posix.h index 44b17ad3eafa..7df6b7186157 100644 --- a/www/chromium/files/patch-net_base_network__interfaces__posix.h +++ b/www/chromium/files/patch-net_base_network__interfaces__posix.h @@ -1,4 +1,4 @@ ---- net/base/network_interfaces_posix.h.orig 2019-03-11 22:01:00 UTC +--- net/base/network_interfaces_posix.h.orig 2020-11-13 06:36:45 UTC +++ net/base/network_interfaces_posix.h @@ -8,6 +8,8 @@ // This file provides some basic functionality shared between diff --git a/www/chromium/files/patch-net_cert_cert__verifier.cc b/www/chromium/files/patch-net_cert_cert__verifier.cc index 896ab86ea90b..446d86f5577d 100644 --- a/www/chromium/files/patch-net_cert_cert__verifier.cc +++ b/www/chromium/files/patch-net_cert_cert__verifier.cc @@ -1,4 +1,4 @@ ---- net/cert/cert_verifier.cc.orig 2020-07-13 09:51:56 UTC +--- net/cert/cert_verifier.cc.orig 2020-11-13 06:36:45 UTC +++ net/cert/cert_verifier.cc @@ -87,7 +87,7 @@ std::unique_ptr<CertVerifier> CertVerifier::CreateDefa return std::unique_ptr<CertVerifier>(); 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 6c82b8ad6a5a..eb52c78c9634 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 2020-07-07 21:58:16 UTC +--- net/cert/cert_verify_proc.cc.orig 2020-11-13 06:36:45 UTC +++ net/cert/cert_verify_proc.cc -@@ -494,7 +494,7 @@ base::Value CertVerifyParams(X509Certificate* cert, +@@ -493,7 +493,7 @@ base::Value CertVerifyParams(X509Certificate* cert, } // namespace diff --git a/www/chromium/files/patch-net_cert_cert__verify__proc.h b/www/chromium/files/patch-net_cert_cert__verify__proc.h index 06f2a3cc65a3..5b0640280fbb 100644 --- a/www/chromium/files/patch-net_cert_cert__verify__proc.h +++ b/www/chromium/files/patch-net_cert_cert__verify__proc.h @@ -1,4 +1,4 @@ ---- net/cert/cert_verify_proc.h.orig 2020-07-13 09:52:59 UTC +--- net/cert/cert_verify_proc.h.orig 2020-11-13 06:36:45 UTC +++ net/cert/cert_verify_proc.h @@ -66,7 +66,7 @@ class NET_EXPORT CertVerifyProc kMaxValue = kChainLengthOne diff --git a/www/chromium/files/patch-net_cert_test__root__certs.h b/www/chromium/files/patch-net_cert_test__root__certs.h new file mode 100644 index 000000000000..17734ab7c047 --- /dev/null +++ b/www/chromium/files/patch-net_cert_test__root__certs.h @@ -0,0 +1,26 @@ +--- net/cert/test_root_certs.h.orig 2020-11-13 06:36:45 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_disk__cache_blockfile_disk__format.h b/www/chromium/files/patch-net_disk__cache_blockfile_disk__format.h index 655e5cca978c..f2361be73f9d 100644 --- a/www/chromium/files/patch-net_disk__cache_blockfile_disk__format.h +++ b/www/chromium/files/patch-net_disk__cache_blockfile_disk__format.h @@ -1,4 +1,4 @@ ---- net/disk_cache/blockfile/disk_format.h.orig 2019-03-11 22:01:01 UTC +--- net/disk_cache/blockfile/disk_format.h.orig 2020-11-13 06:36:45 UTC +++ net/disk_cache/blockfile/disk_format.h @@ -149,7 +149,9 @@ struct RankingsNode { }; diff --git a/www/chromium/files/patch-net_dns_address__sorter__posix.cc b/www/chromium/files/patch-net_dns_address__sorter__posix.cc index f462de801f4a..f41d29636c7b 100644 --- a/www/chromium/files/patch-net_dns_address__sorter__posix.cc +++ b/www/chromium/files/patch-net_dns_address__sorter__posix.cc @@ -1,4 +1,4 @@ ---- net/dns/address_sorter_posix.cc.orig 2019-03-11 22:01:01 UTC +--- net/dns/address_sorter_posix.cc.orig 2020-11-13 06:36:45 UTC +++ net/dns/address_sorter_posix.cc @@ -13,7 +13,9 @@ #include <sys/socket.h> // Must be included before ifaddrs.h. diff --git a/www/chromium/files/patch-net_dns_dns__config__service__posix__unittest.cc b/www/chromium/files/patch-net_dns_dns__config__service__posix__unittest.cc index d2dc0e74e27d..bf12c27d0d25 100644 --- a/www/chromium/files/patch-net_dns_dns__config__service__posix__unittest.cc +++ b/www/chromium/files/patch-net_dns_dns__config__service__posix__unittest.cc @@ -1,4 +1,4 @@ ---- net/dns/dns_config_service_posix_unittest.cc.orig 2020-05-13 18:39:46 UTC +--- net/dns/dns_config_service_posix_unittest.cc.orig 2020-11-13 06:36:45 UTC +++ net/dns/dns_config_service_posix_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be @@ -9,39 +9,3 @@ #include <memory> #include "base/cancelable_callback.h" -@@ -51,7 +49,7 @@ const char* const kNameserversIPv4[] = { - "1.0.0.1", - }; - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - const char* const kNameserversIPv6[] = { - NULL, - "2001:DB8:0::42", -@@ -87,7 +85,7 @@ void InitializeResState(res_state res) { - ++res->nscount; - } - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - // Install IPv6 addresses, replacing the corresponding IPv4 addresses. - unsigned nscount6 = 0; - for (unsigned i = 0; i < base::size(kNameserversIPv6) && i < MAXNS; ++i) { -@@ -108,7 +106,7 @@ void InitializeResState(res_state res) { - } - - void CloseResState(res_state res) { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - for (int i = 0; i < res->nscount; ++i) { - if (res->_u._ext.nsaddrs[i] != NULL) - free(res->_u._ext.nsaddrs[i]); -@@ -133,7 +131,7 @@ void InitializeExpectedConfig(DnsConfig* config) { - config->nameservers.push_back(IPEndPoint(ip, NS_DEFAULTPORT + i)); - } - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - for (unsigned i = 0; i < base::size(kNameserversIPv6) && i < MAXNS; ++i) { - if (!kNameserversIPv6[i]) - continue; diff --git a/www/chromium/files/patch-net_dns_dns__reloader.cc b/www/chromium/files/patch-net_dns_dns__reloader.cc index 34eb7a2e01ca..40f7336282b3 100644 --- a/www/chromium/files/patch-net_dns_dns__reloader.cc +++ b/www/chromium/files/patch-net_dns_dns__reloader.cc @@ -1,7 +1,7 @@ ---- net/dns/dns_reloader.cc.orig 2019-03-11 22:01:01 UTC +--- net/dns/dns_reloader.cc.orig 2020-11-13 06:36:45 UTC +++ net/dns/dns_reloader.cc @@ -7,6 +7,10 @@ - #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \ + #if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \ !defined(OS_ANDROID) && !defined(OS_FUCHSIA) +#if defined(OS_FREEBSD) diff --git a/www/chromium/files/patch-net_dns_dns__util.cc b/www/chromium/files/patch-net_dns_dns__util.cc index cb4c2beba91c..b6b7cfad0efa 100644 --- a/www/chromium/files/patch-net_dns_dns__util.cc +++ b/www/chromium/files/patch-net_dns_dns__util.cc @@ -1,4 +1,4 @@ ---- net/dns/dns_util.cc.orig 2020-05-13 18:39:46 UTC +--- net/dns/dns_util.cc.orig 2020-11-13 06:36:45 UTC +++ net/dns/dns_util.cc @@ -39,6 +39,8 @@ const uint16_t kFlagNamePointer = 0xc000; diff --git a/www/chromium/files/patch-net_dns_host__resolver__proc.cc b/www/chromium/files/patch-net_dns_host__resolver__proc.cc index 752211dde398..38a8b5af6946 100644 --- a/www/chromium/files/patch-net_dns_host__resolver__proc.cc +++ b/www/chromium/files/patch-net_dns_host__resolver__proc.cc @@ -1,11 +1,11 @@ ---- net/dns/host_resolver_proc.cc.orig 2020-02-03 21:52:49 UTC +--- net/dns/host_resolver_proc.cc.orig 2020-11-13 06:36:45 UTC +++ net/dns/host_resolver_proc.cc @@ -159,7 +159,7 @@ int SystemHostResolverCall(const std::string& host, base::ScopedBlockingCall scoped_blocking_call(FROM_HERE, base::BlockingType::WILL_BLOCK); --#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \ -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) && \ +-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \ ++#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_BSD) && \ !defined(OS_ANDROID) && !defined(OS_FUCHSIA) DnsReloaderMaybeReload(); #endif diff --git a/www/chromium/files/patch-net_features.gni b/www/chromium/files/patch-net_features.gni deleted file mode 100644 index cb5adcfbf764..000000000000 --- a/www/chromium/files/patch-net_features.gni +++ /dev/null @@ -1,11 +0,0 @@ ---- net/features.gni.orig 2019-09-09 21:55:21 UTC -+++ net/features.gni -@@ -23,7 +23,7 @@ declare_args() { - disable_brotli_filter = false - - # Multicast DNS. -- enable_mdns = is_win || is_linux || is_fuchsia || is_mac || is_ios -+ enable_mdns = is_win || is_linux || is_fuchsia || is_mac || is_ios || is_bsd - - # Reporting not used on iOS. - enable_reporting = !is_ios diff --git a/www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc b/www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc index f4c603544da0..977ea2213277 100644 --- a/www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc +++ b/www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc @@ -1,8 +1,8 @@ ---- net/http/http_auth_gssapi_posix.cc.orig 2020-02-03 21:52:49 UTC +--- net/http/http_auth_gssapi_posix.cc.orig 2020-11-13 06:36:45 UTC +++ net/http/http_auth_gssapi_posix.cc @@ -367,8 +367,9 @@ base::NativeLibrary GSSAPISharedLibrary::LoadSharedLib static const char* const kDefaultLibraryNames[] = { - #if defined(OS_MACOSX) + #if defined(OS_APPLE) "/System/Library/Frameworks/GSS.framework/GSS" -#elif defined(OS_OPENBSD) - "libgssapi.so" // Heimdal - OpenBSD diff --git a/www/chromium/files/patch-net_http_http__auth__gssapi__posix.h b/www/chromium/files/patch-net_http_http__auth__gssapi__posix.h index e333287758ee..0572dbf7fa4e 100644 --- a/www/chromium/files/patch-net_http_http__auth__gssapi__posix.h +++ b/www/chromium/files/patch-net_http_http__auth__gssapi__posix.h @@ -1,4 +1,4 @@ ---- net/http/http_auth_gssapi_posix.h.orig 2019-09-09 21:55:21 UTC +--- net/http/http_auth_gssapi_posix.h.orig 2020-11-13 06:36:45 UTC +++ net/http/http_auth_gssapi_posix.h @@ -21,6 +21,9 @@ #include <GSS/gssapi.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 7a7f92cb82a1..61d161af8c80 100644 --- a/www/chromium/files/patch-net_nqe_network__quality__estimator.cc +++ b/www/chromium/files/patch-net_nqe_network__quality__estimator.cc @@ -1,11 +1,11 @@ ---- net/nqe/network_quality_estimator.cc.orig 2020-07-07 21:57:40 UTC +--- net/nqe/network_quality_estimator.cc.orig 2020-11-13 06:36:46 UTC +++ net/nqe/network_quality_estimator.cc -@@ -105,7 +105,7 @@ nqe::internal::NetworkID DoGetCurrentNetworkID( +@@ -108,7 +108,7 @@ nqe::internal::NetworkID DoGetCurrentNetworkID( case NetworkChangeNotifier::ConnectionType::CONNECTION_ETHERNET: break; case NetworkChangeNotifier::ConnectionType::CONNECTION_WIFI: --#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_WIN) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) +-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ + defined(OS_WIN) network_id.id = GetWifiSSID(); #endif - break; diff --git a/www/chromium/files/patch-net_nqe_network__quality__estimator__unittest.cc b/www/chromium/files/patch-net_nqe_network__quality__estimator__unittest.cc index 6851ab0d6bc3..42e0ff1ef406 100644 --- a/www/chromium/files/patch-net_nqe_network__quality__estimator__unittest.cc +++ b/www/chromium/files/patch-net_nqe_network__quality__estimator__unittest.cc @@ -1,6 +1,6 @@ ---- net/nqe/network_quality_estimator_unittest.cc.orig 2020-03-16 18:39:54 UTC +--- net/nqe/network_quality_estimator_unittest.cc.orig 2020-11-13 06:36:46 UTC +++ net/nqe/network_quality_estimator_unittest.cc -@@ -2107,7 +2107,7 @@ TEST_F(NetworkQualityEstimatorTest, TestGlobalSocketWa +@@ -2114,7 +2114,7 @@ TEST_F(NetworkQualityEstimatorTest, TestGlobalSocketWa // TestTCPSocketRTT requires kernel support for tcp_info struct, and so it is // enabled only on certain platforms. // ChromeOS is disabled due to crbug.com/986904 diff --git a/www/chromium/files/patch-net_proxy__resolution_configured__proxy__resolution__service.cc b/www/chromium/files/patch-net_proxy__resolution_configured__proxy__resolution__service.cc index ed8fc03ddcf0..9c985de0331b 100644 --- a/www/chromium/files/patch-net_proxy__resolution_configured__proxy__resolution__service.cc +++ b/www/chromium/files/patch-net_proxy__resolution_configured__proxy__resolution__service.cc @@ -1,7 +1,7 @@ ---- net/proxy_resolution/configured_proxy_resolution_service.cc.orig 2020-07-07 21:58:16 UTC +--- net/proxy_resolution/configured_proxy_resolution_service.cc.orig 2020-11-13 06:36:46 UTC +++ net/proxy_resolution/configured_proxy_resolution_service.cc -@@ -47,7 +47,7 @@ - #elif defined(OS_MACOSX) +@@ -46,7 +46,7 @@ + #elif defined(OS_MAC) #include "net/proxy_resolution/proxy_config_service_mac.h" #include "net/proxy_resolution/proxy_resolver_mac.h" -#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) @@ -9,16 +9,16 @@ #include "net/proxy_resolution/proxy_config_service_linux.h" #elif defined(OS_ANDROID) #include "net/proxy_resolution/proxy_config_service_android.h" -@@ -61,7 +61,7 @@ namespace net { +@@ -60,7 +60,7 @@ namespace net { namespace { - #if defined(OS_WIN) || defined(OS_IOS) || defined(OS_MACOSX) || \ + #if defined(OS_WIN) || defined(OS_APPLE) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) constexpr net::NetworkTrafficAnnotationTag kSystemProxyConfigTrafficAnnotation = net::DefineNetworkTrafficAnnotation("proxy_config_system", R"( semantics { -@@ -1438,7 +1438,7 @@ ConfiguredProxyResolutionService::CreateSystemProxyCon +@@ -1408,7 +1408,7 @@ ConfiguredProxyResolutionService::CreateSystemProxyCon << "profile_io_data.cc::CreateProxyConfigService and this should " << "be used only for examples."; return std::make_unique<UnsetProxyConfigService>(); 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 46b4163d20c8..0aabe8b3b06c 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 2020-05-13 18:39:46 UTC +--- net/proxy_resolution/proxy_config_service_linux.cc.orig 2020-11-13 06:36:46 UTC +++ net/proxy_resolution/proxy_config_service_linux.cc @@ -6,7 +6,9 @@ diff --git a/www/chromium/files/patch-net_socket_socket__posix.cc b/www/chromium/files/patch-net_socket_socket__posix.cc index 6b1297662465..ba32bb36a27a 100644 --- a/www/chromium/files/patch-net_socket_socket__posix.cc +++ b/www/chromium/files/patch-net_socket_socket__posix.cc @@ -1,11 +1,11 @@ ---- net/socket/socket_posix.cc.orig 2019-12-16 21:51:27 UTC +--- net/socket/socket_posix.cc.orig 2020-11-13 06:36:46 UTC +++ net/socket/socket_posix.cc @@ -517,7 +517,7 @@ void SocketPosix::ReadCompleted() { } int SocketPosix::DoWrite(IOBuffer* buf, int buf_len) { --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) // Disable SIGPIPE for this write. Although Chromium globally disables // SIGPIPE, the net stack may be used in other consumers which do not do // this. MSG_NOSIGNAL is a Linux-only API. On OS X, this is a setsockopt on diff --git a/www/chromium/files/patch-net_socket_socks5__client__socket.cc b/www/chromium/files/patch-net_socket_socks5__client__socket.cc index 1df3deefc418..5746c85429ac 100644 --- a/www/chromium/files/patch-net_socket_socks5__client__socket.cc +++ b/www/chromium/files/patch-net_socket_socks5__client__socket.cc @@ -1,4 +1,4 @@ ---- net/socket/socks5_client_socket.cc.orig 2019-04-30 22:22:55 UTC +--- net/socket/socks5_client_socket.cc.orig 2020-11-13 06:36:46 UTC +++ net/socket/socks5_client_socket.cc @@ -4,6 +4,10 @@ diff --git a/www/chromium/files/patch-net_socket_tcp__socket__posix.cc b/www/chromium/files/patch-net_socket_tcp__socket__posix.cc index d2a7091eac8d..a5d447abc7dc 100644 --- a/www/chromium/files/patch-net_socket_tcp__socket__posix.cc +++ b/www/chromium/files/patch-net_socket_tcp__socket__posix.cc @@ -1,4 +1,4 @@ ---- net/socket/tcp_socket_posix.cc.orig 2019-03-17 15:46:01 UTC +--- net/socket/tcp_socket_posix.cc.orig 2020-11-13 06:36:46 UTC +++ net/socket/tcp_socket_posix.cc @@ -88,6 +88,17 @@ bool SetTCPKeepAlive(int fd, bool enable, int delay) { PLOG(ERROR) << "Failed to set TCP_KEEPALIVE on fd: " << fd; 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 ab7b488ba777..9eb5240440a5 100644 --- a/www/chromium/files/patch-net_socket_udp__socket__posix.cc +++ b/www/chromium/files/patch-net_socket_udp__socket__posix.cc @@ -1,93 +1,67 @@ ---- net/socket/udp_socket_posix.cc.orig 2020-05-13 18:39:46 UTC +--- net/socket/udp_socket_posix.cc.orig 2020-11-13 06:36:46 UTC +++ net/socket/udp_socket_posix.cc -@@ -70,7 +70,7 @@ const int kActivityMonitorMinimumSamplesForThroughputE +@@ -70,6 +70,32 @@ const int kActivityMonitorMinimumSamplesForThroughputE const base::TimeDelta kActivityMonitorMsThreshold = base::TimeDelta::FromMilliseconds(100); --#if defined(OS_MACOSX) -+#if defined(OS_MACOSX) || defined(OS_BSD) - // When enabling multicast using setsockopt(IP_MULTICAST_IF) MacOS - // requires passing IPv4 address instead of interface index. This function - // resolves IPv4 address by interface index. The |address| is returned in -@@ -99,7 +99,7 @@ int GetIPv4AddressFromIndex(int socket, uint32_t index - return OK; - } - --#endif // OS_MACOSX -+#endif // OS_MACOSX || OS_BSD - - #if defined(OS_MACOSX) && !defined(OS_IOS) ++#if defined(OS_BSD) ++int GetIPv4AddressFromIndex(int socket, uint32_t index, uint32_t* address) { ++ if (!index) { ++ *address = htonl(INADDR_ANY); ++ return OK; ++ } ++ ++ sockaddr_in* result = nullptr; ++ ++ ifreq ifr; ++ ifr.ifr_addr.sa_family = AF_INET; ++ if (!if_indextoname(index, ifr.ifr_name)) ++ return MapSystemError(errno); ++ int rv = ioctl(socket, SIOCGIFADDR, &ifr); ++ if (rv == -1) ++ return MapSystemError(errno); ++ result = reinterpret_cast<sockaddr_in*>(&ifr.ifr_addr); ++ ++ if (!result) ++ return ERR_ADDRESS_INVALID; ++ ++ *address = result->sin_addr.s_addr; ++ return OK; ++} ++#endif ++ + #if defined(OS_MAC) -@@ -645,13 +645,13 @@ int UDPSocketPosix::SetDoNotFragment() { + // On OSX the file descriptor is guarded to detect the cause of +@@ -622,13 +648,13 @@ int UDPSocketPosix::SetDoNotFragment() { } void UDPSocketPosix::SetMsgConfirm(bool confirm) { --#if !defined(OS_MACOSX) && !defined(OS_IOS) -+#if !defined(OS_MACOSX) && !defined(OS_IOS) && !defined(OS_BSD) +-#if !defined(OS_APPLE) ++#if !defined(OS_APPLE) && !defined(OS_BSD) if (confirm) { sendto_flags_ |= MSG_CONFIRM; } else { sendto_flags_ &= ~MSG_CONFIRM; } --#endif // !defined(OS_MACOSX) && !defined(OS_IOS) -+#endif // !defined(OS_MACOSX) && !defined(OS_IOS) && !defined(OS_BSD) +-#endif // !defined(OS_APPLE) ++#endif // !defined(OS_APPLE) && !defined(OS_BSD) } int UDPSocketPosix::AllowAddressReuse() { -@@ -666,17 +666,20 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) { - DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); - int value = broadcast ? 1 : 0; - int rv; --#if defined(OS_MACOSX) -+#if defined(OS_MACOSX) || defined(OS_BSD) - // SO_REUSEPORT on OSX permits multiple processes to each receive - // UDP multicast or broadcast datagrams destined for the bound - // port. - // This is only being set on OSX because its behavior is platform dependent - // and we are playing it safe by only setting it on platforms where things - // break. -+ rv = setsockopt(socket_, SOL_SOCKET, SO_REUSEADDR, &value, sizeof(value)); -+ if (rv != 0) -+ return MapSystemError(errno); - rv = setsockopt(socket_, SOL_SOCKET, SO_REUSEPORT, &value, sizeof(value)); - if (rv != 0) - return MapSystemError(errno); --#endif // defined(OS_MACOSX) -+#endif // defined(OS_MACOSX) || defined(OS_BSD) - rv = setsockopt(socket_, SOL_SOCKET, SO_BROADCAST, &value, sizeof(value)); - - return rv == 0 ? OK : MapSystemError(errno); -@@ -936,7 +939,7 @@ int UDPSocketPosix::SetMulticastOptions() { - if (multicast_interface_ != 0) { - switch (addr_family_) { - case AF_INET: { --#if defined(OS_MACOSX) -+#if defined(OS_MACOSX) || defined(OS_BSD) - ip_mreq mreq = {}; - int error = GetIPv4AddressFromIndex(socket_, multicast_interface_, - &mreq.imr_interface.s_addr); -@@ -948,7 +951,11 @@ int UDPSocketPosix::SetMulticastOptions() { +@@ -917,7 +943,11 @@ int UDPSocketPosix::SetMulticastOptions() { + mreq.imr_ifindex = multicast_interface_; mreq.imr_address.s_addr = htonl(INADDR_ANY); - #endif // !defined(OS_MACOSX) int rv = setsockopt(socket_, IPPROTO_IP, IP_MULTICAST_IF, +#if defined(OS_BSD) -+ reinterpret_cast<const char*>(&mreq.imr_interface.s_addr), sizeof(mreq.imr_interface.s_addr)); ++ reinterpret_cast<const char*>(&mreq.imr_address.s_addr), sizeof(mreq.imr_address.s_addr)); +#else reinterpret_cast<const char*>(&mreq), sizeof(mreq)); +#endif if (rv) return MapSystemError(errno); break; -@@ -1010,7 +1017,7 @@ int UDPSocketPosix::JoinGroup(const IPAddress& group_a - if (addr_family_ != AF_INET) - return ERR_ADDRESS_INVALID; - --#if defined(OS_MACOSX) -+#if defined(OS_MACOSX) || defined(OS_BSD) - ip_mreq mreq = {}; - int error = GetIPv4AddressFromIndex(socket_, multicast_interface_, - &mreq.imr_interface.s_addr); -@@ -1058,9 +1065,18 @@ int UDPSocketPosix::LeaveGroup(const IPAddress& group_ +@@ -1018,9 +1048,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_socket_udp__socket__posix.h b/www/chromium/files/patch-net_socket_udp__socket__posix.h index 373c468ca84d..1bfe271addac 100644 --- a/www/chromium/files/patch-net_socket_udp__socket__posix.h +++ b/www/chromium/files/patch-net_socket_udp__socket__posix.h @@ -1,11 +1,11 @@ ---- net/socket/udp_socket_posix.h.orig 2019-06-07 19:57:25 UTC +--- net/socket/udp_socket_posix.h.orig 2020-11-13 06:36:46 UTC +++ net/socket/udp_socket_posix.h -@@ -33,7 +33,7 @@ +@@ -35,7 +35,7 @@ #if defined(__ANDROID__) && defined(__aarch64__) #define HAVE_SENDMMSG 1 --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) ++#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #define HAVE_SENDMMSG 1 #else #define HAVE_SENDMMSG 0 diff --git a/www/chromium/files/patch-net_socket_unix__domain__client__socket__posix.cc b/www/chromium/files/patch-net_socket_unix__domain__client__socket__posix.cc index 24b9cfee354e..0527d804a652 100644 --- a/www/chromium/files/patch-net_socket_unix__domain__client__socket__posix.cc +++ b/www/chromium/files/patch-net_socket_unix__domain__client__socket__posix.cc @@ -1,11 +1,11 @@ ---- net/socket/unix_domain_client_socket_posix.cc.orig 2020-07-07 21:57:40 UTC +--- net/socket/unix_domain_client_socket_posix.cc.orig 2020-11-13 06:36:46 UTC +++ net/socket/unix_domain_client_socket_posix.cc @@ -57,7 +57,7 @@ bool UnixDomainClientSocket::FillAddress(const std::st return true; } --#if defined(OS_ANDROID) || defined(OS_LINUX) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Convert the path given into abstract socket name. It must start with // the '\0' character, so we are adding it. |addr_len| must specify the // length of the structure exactly, as potentially the socket name may diff --git a/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc b/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc index 1e987d9088ec..0acb3dd1e9ce 100644 --- a/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc +++ b/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc @@ -1,11 +1,11 @@ ---- net/tools/cert_verify_tool/cert_verify_tool.cc.orig 2020-07-07 21:57:40 UTC +--- net/tools/cert_verify_tool/cert_verify_tool.cc.orig 2020-11-13 06:36:46 UTC +++ net/tools/cert_verify_tool/cert_verify_tool.cc @@ -29,7 +29,7 @@ #include "net/url_request/url_request_context_builder.h" #include "net/url_request/url_request_context_getter.h" --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "net/proxy_resolution/proxy_config.h" #include "net/proxy_resolution/proxy_config_service_fixed.h" #endif @@ -13,8 +13,8 @@ base::WaitableEvent* initialization_complete_event) { net::URLRequestContextBuilder url_request_context_builder; url_request_context_builder.set_user_agent(GetUserAgent()); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // On Linux, use a fixed ProxyConfigService, since the default one // depends on glib. // 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 0f6aa920f7ed..8e4684ae8a28 100644 --- a/www/chromium/files/patch-net_tools_quic_quic__http__proxy__backend.cc +++ b/www/chromium/files/patch-net_tools_quic_quic__http__proxy__backend.cc @@ -1,11 +1,11 @@ ---- net/tools/quic/quic_http_proxy_backend.cc.orig 2020-05-13 18:39:46 UTC +--- net/tools/quic/quic_http_proxy_backend.cc.orig 2020-11-13 06:36:46 UTC +++ net/tools/quic/quic_http_proxy_backend.cc @@ -162,7 +162,7 @@ void QuicHttpProxyBackend::InitializeURLRequestContext // Enable HTTP2, but disable QUIC on the backend context_builder.SetSpdyAndQuicEnabled(true /* http2 */, false /* quic */); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // On Linux, use a fixed ProxyConfigService, since the default one // depends on glib. context_builder.set_proxy_config_service( diff --git a/www/chromium/files/patch-net_traffic__annotation_network__traffic__annotation.h b/www/chromium/files/patch-net_traffic__annotation_network__traffic__annotation.h index 7f70fcc54ea6..5eee818cd3ec 100644 --- a/www/chromium/files/patch-net_traffic__annotation_network__traffic__annotation.h +++ b/www/chromium/files/patch-net_traffic__annotation_network__traffic__annotation.h @@ -1,6 +1,6 @@ ---- net/traffic_annotation/network_traffic_annotation.h.orig 2019-09-16 09:58:42 UTC +--- net/traffic_annotation/network_traffic_annotation.h.orig 2020-11-13 06:36:46 UTC +++ net/traffic_annotation/network_traffic_annotation.h -@@ -356,7 +356,7 @@ struct MutablePartialNetworkTrafficAnnotationTag { +@@ -359,7 +359,7 @@ struct MutablePartialNetworkTrafficAnnotationTag { } // namespace net // Placeholder for unannotated usages. @@ -9,7 +9,7 @@ #define TRAFFIC_ANNOTATION_WITHOUT_PROTO(ANNOTATION_ID) \ net::DefineNetworkTrafficAnnotation(ANNOTATION_ID, "No proto yet.") #endif -@@ -367,7 +367,7 @@ struct MutablePartialNetworkTrafficAnnotationTag { +@@ -370,7 +370,7 @@ struct MutablePartialNetworkTrafficAnnotationTag { // // On Linux and Windows, use MISSING_TRAFFIC_ANNOTATION or // TRAFFIC_ANNOTATION_FOR_TESTS. diff --git a/www/chromium/files/patch-net_url__request_url__fetcher.cc b/www/chromium/files/patch-net_url__request_url__fetcher.cc index 8af45ede1fe2..01968d36f989 100644 --- a/www/chromium/files/patch-net_url__request_url__fetcher.cc +++ b/www/chromium/files/patch-net_url__request_url__fetcher.cc @@ -1,4 +1,4 @@ ---- net/url_request/url_fetcher.cc.orig 2020-07-07 21:57:40 UTC +--- net/url_request/url_fetcher.cc.orig 2020-11-13 06:36:46 UTC +++ net/url_request/url_fetcher.cc @@ -21,7 +21,7 @@ void URLFetcher::SetIgnoreCertificateRequests(bool ign URLFetcherImpl::SetIgnoreCertificateRequests(ignored); diff --git a/www/chromium/files/patch-net_url__request_url__fetcher.h b/www/chromium/files/patch-net_url__request_url__fetcher.h index 07e0026df1a8..4e3a3d93df1c 100644 --- a/www/chromium/files/patch-net_url__request_url__fetcher.h +++ b/www/chromium/files/patch-net_url__request_url__fetcher.h @@ -1,4 +1,4 @@ ---- net/url_request/url_fetcher.h.orig 2020-07-07 21:57:40 UTC +--- net/url_request/url_fetcher.h.orig 2020-11-13 06:36:46 UTC +++ net/url_request/url_fetcher.h @@ -355,7 +355,7 @@ class NET_EXPORT URLFetcher { // The unannotated Create() methods are not available on desktop Linux + diff --git a/www/chromium/files/patch-net_url__request_url__request__context.cc b/www/chromium/files/patch-net_url__request_url__request__context.cc index 43cbe2a0589b..1ea01133b90b 100644 --- a/www/chromium/files/patch-net_url__request_url__request__context.cc +++ b/www/chromium/files/patch-net_url__request_url__request__context.cc @@ -1,6 +1,6 @@ ---- net/url_request/url_request_context.cc.orig 2020-07-07 21:57:40 UTC +--- net/url_request/url_request_context.cc.orig 2020-11-13 06:36:46 UTC +++ net/url_request/url_request_context.cc -@@ -90,7 +90,7 @@ const HttpNetworkSession::Context* URLRequestContext:: +@@ -91,7 +91,7 @@ const HttpNetworkSession::Context* URLRequestContext:: return &network_session->context(); } diff --git a/www/chromium/files/patch-net_url__request_url__request__context.h b/www/chromium/files/patch-net_url__request_url__request__context.h index cc9af1e29180..a66630e19ee4 100644 --- a/www/chromium/files/patch-net_url__request_url__request__context.h +++ b/www/chromium/files/patch-net_url__request_url__request__context.h @@ -1,6 +1,6 @@ ---- net/url_request/url_request_context.h.orig 2020-03-16 18:40:33 UTC +--- net/url_request/url_request_context.h.orig 2020-11-13 06:36:46 UTC +++ net/url_request/url_request_context.h -@@ -82,7 +82,7 @@ class NET_EXPORT URLRequestContext +@@ -83,7 +83,7 @@ class NET_EXPORT URLRequestContext // session. const HttpNetworkSession::Context* GetNetworkSessionContext() const; diff --git a/www/chromium/files/patch-net_url__request_url__request__context__builder.cc b/www/chromium/files/patch-net_url__request_url__request__context__builder.cc index f69727d63b47..dc8e084656c5 100644 --- a/www/chromium/files/patch-net_url__request_url__request__context__builder.cc +++ b/www/chromium/files/patch-net_url__request_url__request__context__builder.cc @@ -1,20 +1,20 @@ ---- net/url_request/url_request_context_builder.cc.orig 2020-07-07 21:58:16 UTC +--- net/url_request/url_request_context_builder.cc.orig 2020-11-13 06:36:46 UTC +++ net/url_request/url_request_context_builder.cc -@@ -486,7 +486,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu +@@ -497,7 +497,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu } if (!proxy_resolution_service_) { --#if !defined(OS_LINUX) && !defined(OS_ANDROID) -+#if !defined(OS_LINUX) && !defined(OS_ANDROID) && !defined(OS_BSD) +-#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID) ++#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID) && !defined(OS_BSD) // TODO(willchan): Switch to using this code when // ConfiguredProxyResolutionService::CreateSystemProxyConfigService()'s // signature doesn't suck. -@@ -495,7 +495,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu +@@ -506,7 +506,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu ConfiguredProxyResolutionService::CreateSystemProxyConfigService( base::ThreadTaskRunnerHandle::Get().get()); } --#endif // !defined(OS_LINUX) && !defined(OS_ANDROID) -+#endif // !defined(OS_LINUX) && !defined(OS_ANDROID) && !defined(OS_BSD) +-#endif // !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID) ++#endif // !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID) && !defined(OS_BSD) proxy_resolution_service_ = CreateProxyResolutionService( std::move(proxy_config_service_), context.get(), context->host_resolver(), context->network_delegate(), diff --git a/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc b/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc index a3e9a92305b1..32ca7ec091d9 100644 --- a/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc +++ b/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc @@ -1,56 +1,56 @@ ---- pdf/pdfium/pdfium_engine.cc.orig 2020-07-07 21:58:16 UTC +--- pdf/pdfium/pdfium_engine.cc.orig 2020-11-13 06:36:46 UTC +++ pdf/pdfium/pdfium_engine.cc -@@ -57,7 +57,7 @@ - #include "ui/gfx/geometry/rect.h" +@@ -69,7 +69,7 @@ + #include "ui/gfx/geometry/vector2d.h" #include "v8/include/v8.h" --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "pdf/pdfium/pdfium_font_linux.h" #endif -@@ -381,7 +381,7 @@ void InitializeSDK(bool enable_v8) { - config.m_v8EmbedderSlot = gin::kEmbedderPDFium; +@@ -416,7 +416,7 @@ void InitializeSDK(bool enable_v8) { + FPDF_InitLibraryWithConfig(&config); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) InitializeLinuxFontMapper(); #endif -@@ -422,7 +422,7 @@ PDFiumEngine::PDFiumEngine(PDFEngine::Client* client, +@@ -475,7 +475,7 @@ PDFiumEngine::PDFiumEngine(PDFEngine::Client* client, IFSDK_PAUSE::user = nullptr; IFSDK_PAUSE::NeedToPauseNow = Pause_NeedToPauseNow; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // PreviewModeClient does not know its pp::Instance. SetLastInstance(client_->GetPluginInstance()); #endif -@@ -896,7 +896,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesAsRasterPdf( +@@ -948,7 +948,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesAsRasterPdf( KillFormFocus(); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) SetLastInstance(client_->GetPluginInstance()); #endif -@@ -2919,7 +2919,7 @@ bool PDFiumEngine::ContinuePaint(int progressive_index - DCHECK(image_data); +@@ -3042,7 +3042,7 @@ bool PDFiumEngine::ContinuePaint(int progressive_index + DCHECK_LT(static_cast<size_t>(progressive_index), progressive_paints_.size()); last_progressive_start_time_ = base::Time::Now(); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) SetLastInstance(client_->GetPluginInstance()); #endif -@@ -3415,7 +3415,7 @@ void PDFiumEngine::SetCurrentPage(int index) { +@@ -3529,7 +3529,7 @@ void PDFiumEngine::SetCurrentPage(int index) { FORM_DoPageAAction(old_page, form(), FPDFPAGE_AACTION_CLOSE); } most_visible_page_ = index; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) SetLastInstance(client_->GetPluginInstance()); #endif if (most_visible_page_ != -1 && called_do_document_action_) { diff --git a/www/chromium/files/patch-ppapi_proxy_file__io__resource.cc b/www/chromium/files/patch-ppapi_proxy_file__io__resource.cc index cbec18fa6c1d..fc27ddf38414 100644 --- a/www/chromium/files/patch-ppapi_proxy_file__io__resource.cc +++ b/www/chromium/files/patch-ppapi_proxy_file__io__resource.cc @@ -1,4 +1,4 @@ ---- ppapi/proxy/file_io_resource.cc.orig 2020-07-07 21:57:40 UTC +--- ppapi/proxy/file_io_resource.cc.orig 2020-11-13 06:36:46 UTC +++ ppapi/proxy/file_io_resource.cc @@ -284,17 +284,19 @@ int32_t FileIOResource::Write(int64_t offset, diff --git a/www/chromium/files/patch-ppapi_proxy_flash__resource.cc b/www/chromium/files/patch-ppapi_proxy_flash__resource.cc index a45deba61a6e..3c8227e6f9b4 100644 --- a/www/chromium/files/patch-ppapi_proxy_flash__resource.cc +++ b/www/chromium/files/patch-ppapi_proxy_flash__resource.cc @@ -1,11 +1,11 @@ ---- ppapi/proxy/flash_resource.cc.orig 2019-09-16 10:01:18 UTC +--- ppapi/proxy/flash_resource.cc.orig 2020-11-13 06:36:46 UTC +++ ppapi/proxy/flash_resource.cc @@ -136,7 +136,7 @@ double FlashResource::GetLocalTimeZoneOffset(PP_Instan // require filesystem access prohibited by the sandbox. // TODO(shess): Figure out why OSX needs the access, the sandbox warmup should // handle it. http://crbug.com/149006 --#if defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) int32_t result = SyncCall<PpapiPluginMsg_Flash_GetLocalTimeZoneOffsetReply>( BROWSER, PpapiHostMsg_Flash_GetLocalTimeZoneOffset(PPTimeToTime(t)), diff --git a/www/chromium/files/patch-printing_cups__config__helper.py b/www/chromium/files/patch-printing_cups__config__helper.py index 0795067ee45f..96478de590a1 100644 --- a/www/chromium/files/patch-printing_cups__config__helper.py +++ b/www/chromium/files/patch-printing_cups__config__helper.py @@ -1,4 +1,4 @@ ---- printing/cups_config_helper.py.orig 2019-12-16 21:50:51 UTC +--- printing/cups_config_helper.py.orig 2020-11-13 06:36:46 UTC +++ printing/cups_config_helper.py @@ -67,7 +67,7 @@ def main(): mode = sys.argv[1] diff --git a/www/chromium/files/patch-printing_print__settings.cc b/www/chromium/files/patch-printing_print__settings.cc new file mode 100644 index 000000000000..3722d8967d42 --- /dev/null +++ b/www/chromium/files/patch-printing_print__settings.cc @@ -0,0 +1,14 @@ +--- printing/print_settings.cc.orig 2020-11-16 14:50:08 UTC ++++ printing/print_settings.cc +@@ -277,9 +277,9 @@ void PrintSettings::Clear() { + #endif + is_modifiable_ = true; + pages_per_sheet_ = 1; +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + advanced_settings_.clear(); +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + #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 new file mode 100644 index 000000000000..fa3c1bda3d7d --- /dev/null +++ b/www/chromium/files/patch-printing_print__settings.h @@ -0,0 +1,56 @@ +--- printing/print_settings.h.orig 2020-11-13 06:36:46 UTC ++++ printing/print_settings.h +@@ -19,11 +19,11 @@ + #include "ui/gfx/geometry/rect.h" + #include "ui/gfx/geometry/size.h" + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + #include <map> + + #include "base/values.h" +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + namespace printing { + +@@ -80,9 +80,9 @@ class PRINTING_EXPORT PrintSettings { + } + }; + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + using AdvancedSettings = std::map<std::string, base::Value>; +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + PrintSettings(); + PrintSettings(const PrintSettings&) = delete; +@@ -221,12 +221,12 @@ class PRINTING_EXPORT PrintSettings { + pages_per_sheet_ = pages_per_sheet; + } + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + AdvancedSettings& advanced_settings() { return advanced_settings_; } + const AdvancedSettings& advanced_settings() const { + return advanced_settings_; + } +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + #if defined(OS_CHROMEOS) + void set_send_user_info(bool send_user_info) { +@@ -320,10 +320,10 @@ class PRINTING_EXPORT PrintSettings { + // Number of pages per sheet. + int pages_per_sheet_; + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + // Advanced settings. + AdvancedSettings advanced_settings_; +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + #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 new file mode 100644 index 000000000000..b0e71bb303b7 --- /dev/null +++ b/www/chromium/files/patch-printing_print__settings__conversion.cc @@ -0,0 +1,28 @@ +--- printing/print_settings_conversion.cc.orig 2020-11-16 14:49:24 UTC ++++ printing/print_settings_conversion.cc +@@ -182,7 +182,7 @@ std::unique_ptr<PrintSettings> PrintSettingsFromJobSet + return nullptr; + } + +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + base::Optional<int> dpi_horizontal = + job_settings.FindIntKey(kSettingDpiHorizontal); + base::Optional<int> dpi_vertical = +@@ -212,14 +212,14 @@ std::unique_ptr<PrintSettings> PrintSettingsFromJobSet + #endif + } + +-#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); + 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) && defined(USE_CUPS)) ++#endif // defined(OS_CHROMEOS) || ((defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_CUPS)) + + #if defined(OS_CHROMEOS) + bool send_user_info = diff --git a/www/chromium/files/patch-printing_printing__features.cc b/www/chromium/files/patch-printing_printing__features.cc new file mode 100644 index 000000000000..de84417203a9 --- /dev/null +++ b/www/chromium/files/patch-printing_printing__features.cc @@ -0,0 +1,18 @@ +--- printing/printing_features.cc.orig 2020-11-16 14:50:34 UTC ++++ printing/printing_features.cc +@@ -47,13 +47,13 @@ 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) + // Enables printing interactions with the operating system to be performed + // out-of-process. + const base::Feature kEnableOopPrintDrivers{"EnableOopPrintDrivers", + base::FEATURE_DISABLED_BY_DEFAULT}; +-#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || + // defined(OS_CHROMEOS) + + } // namespace features diff --git a/www/chromium/files/patch-printing_printing__features.h b/www/chromium/files/patch-printing_printing__features.h new file mode 100644 index 000000000000..f0c1ca5c9cf2 --- /dev/null +++ b/www/chromium/files/patch-printing_printing__features.h @@ -0,0 +1,15 @@ +--- printing/printing_features.h.orig 2020-11-16 14:50:53 UTC ++++ printing/printing_features.h +@@ -37,10 +37,10 @@ PRINTING_EXPORT bool IsXpsPrintCapabilityRequired(); + PRINTING_EXPORT 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; +-#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) + + } // namespace features diff --git a/www/chromium/files/patch-remoting_base_chromoting__event.cc b/www/chromium/files/patch-remoting_base_chromoting__event.cc index 93df172fe5e5..44282a11be83 100644 --- a/www/chromium/files/patch-remoting_base_chromoting__event.cc +++ b/www/chromium/files/patch-remoting_base_chromoting__event.cc @@ -1,11 +1,11 @@ ---- remoting/base/chromoting_event.cc.orig 2019-09-09 21:55:22 UTC +--- remoting/base/chromoting_event.cc.orig 2020-11-13 06:36:46 UTC +++ remoting/base/chromoting_event.cc @@ -188,7 +188,7 @@ void ChromotingEvent::AddSystemInfo() { SetString(kCpuKey, base::SysInfo::OperatingSystemArchitecture()); SetString(kOsVersionKey, base::SysInfo::OperatingSystemVersion()); SetString(kWebAppVersionKey, STRINGIZE(VERSION)); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) Os os = Os::CHROMOTING_LINUX; #elif defined(OS_CHROMEOS) Os os = Os::CHROMOTING_CHROMEOS; diff --git a/www/chromium/files/patch-remoting_client_display_sys__opengl.h b/www/chromium/files/patch-remoting_client_display_sys__opengl.h index cb1787f42c60..ee211a9212f6 100644 --- a/www/chromium/files/patch-remoting_client_display_sys__opengl.h +++ b/www/chromium/files/patch-remoting_client_display_sys__opengl.h @@ -1,11 +1,11 @@ ---- remoting/client/display/sys_opengl.h.orig 2019-03-11 22:01:01 UTC +--- remoting/client/display/sys_opengl.h.orig 2020-11-13 06:36:46 UTC +++ remoting/client/display/sys_opengl.h @@ -9,7 +9,7 @@ #if defined(OS_IOS) #include <OpenGLES/ES3/gl.h> --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) ++#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #define GL_GLEXT_PROTOTYPES #include <GL/gl.h> #include <GL/glext.h> diff --git a/www/chromium/files/patch-remoting_host_desktop__resizer__ozone.cc b/www/chromium/files/patch-remoting_host_desktop__resizer__ozone.cc new file mode 100644 index 000000000000..b778c451d5e2 --- /dev/null +++ b/www/chromium/files/patch-remoting_host_desktop__resizer__ozone.cc @@ -0,0 +1,11 @@ +--- remoting/host/desktop_resizer_ozone.cc.orig 2020-11-16 14:51:21 UTC ++++ remoting/host/desktop_resizer_ozone.cc +@@ -32,7 +32,7 @@ void DesktopResizerOzone::RestoreResolution(const Scre + // 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 + // desktopresizer to use based on IsUsingOzonePlatform feature flag. +-#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_BSD) + std::unique_ptr<DesktopResizer> DesktopResizer::Create() { + return base::WrapUnique(new DesktopResizerOzone); + } diff --git a/www/chromium/files/patch-remoting_host_evaluate__capability.cc b/www/chromium/files/patch-remoting_host_evaluate__capability.cc index 565d577bd91b..e4941a2e877d 100644 --- a/www/chromium/files/patch-remoting_host_evaluate__capability.cc +++ b/www/chromium/files/patch-remoting_host_evaluate__capability.cc @@ -1,11 +1,11 @@ ---- remoting/host/evaluate_capability.cc.orig 2019-03-11 22:01:01 UTC +--- remoting/host/evaluate_capability.cc.orig 2020-11-13 06:36:46 UTC +++ remoting/host/evaluate_capability.cc -@@ -50,7 +50,7 @@ base::FilePath BuildHostBinaryPath() { +@@ -51,7 +51,7 @@ base::FilePath BuildHostBinaryPath() { } #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) if (path.BaseName().value() == FILE_PATH_LITERAL("chrome-remote-desktop-host")) { return path; diff --git a/www/chromium/files/patch-remoting_host_host__attributes.cc b/www/chromium/files/patch-remoting_host_host__attributes.cc index d0d8bf080bb8..3dda092d35f6 100644 --- a/www/chromium/files/patch-remoting_host_host__attributes.cc +++ b/www/chromium/files/patch-remoting_host_host__attributes.cc @@ -1,11 +1,11 @@ ---- remoting/host/host_attributes.cc.orig 2020-05-13 18:40:33 UTC +--- remoting/host/host_attributes.cc.orig 2020-11-13 06:36:46 UTC +++ remoting/host/host_attributes.cc @@ -120,7 +120,7 @@ std::string GetHostAttributes() { media::InitializeMediaFoundation()) { result.push_back("HWEncoder"); } --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) ++#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) result.push_back("HWEncoder"); #endif diff --git a/www/chromium/files/patch-remoting_host_host__details.cc b/www/chromium/files/patch-remoting_host_host__details.cc index 2467708caed9..be26a2e9fc20 100644 --- a/www/chromium/files/patch-remoting_host_host__details.cc +++ b/www/chromium/files/patch-remoting_host_host__details.cc @@ -1,4 +1,4 @@ ---- remoting/host/host_details.cc.orig 2019-09-09 21:55:22 UTC +--- remoting/host/host_details.cc.orig 2020-11-13 06:36:46 UTC +++ remoting/host/host_details.cc @@ -22,7 +22,7 @@ std::string GetHostOperatingSystemName() { return "Mac"; diff --git a/www/chromium/files/patch-remoting_host_host__main.cc b/www/chromium/files/patch-remoting_host_host__main.cc index cd189d01ec16..98eebc5469e8 100644 --- a/www/chromium/files/patch-remoting_host_host__main.cc +++ b/www/chromium/files/patch-remoting_host_host__main.cc @@ -1,14 +1,14 @@ ---- remoting/host/host_main.cc.orig 2020-07-07 21:57:41 UTC +--- remoting/host/host_main.cc.orig 2020-11-13 06:36:46 UTC +++ remoting/host/host_main.cc @@ -48,9 +48,9 @@ int DesktopProcessMain(); int FileChooserMain(); int RdpDesktopSessionMain(); #endif // defined(OS_WIN) --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) int XSessionChooserMain(); --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) namespace { @@ -16,12 +16,12 @@ } else if (process_type == kProcessTypeRdpDesktopSession) { main_routine = &RdpDesktopSessionMain; #endif // defined(OS_WIN) --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) } else if (process_type == kProcessTypeXSessionChooser) { main_routine = &XSessionChooserMain; --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) } return main_routine; diff --git a/www/chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc b/www/chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc index ca1e5dce0129..e0c6c02a18c6 100644 --- a/www/chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc +++ b/www/chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc @@ -1,35 +1,36 @@ ---- remoting/host/it2me/it2me_native_messaging_host_main.cc.orig 2020-02-03 21:52:49 UTC +--- remoting/host/it2me/it2me_native_messaging_host_main.cc.orig 2020-11-13 06:36:46 UTC +++ remoting/host/it2me/it2me_native_messaging_host_main.cc -@@ -29,12 +29,12 @@ +@@ -29,13 +29,13 @@ #include "remoting/host/switches.h" #include "remoting/host/usage_stats_consent.h" --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include <gtk/gtk.h> #include "base/linux_util.h" + #include "ui/events/platform/x11/x11_event_source.h" #include "ui/gfx/x/x11.h" --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - #if defined(OS_MACOSX) + #if defined(OS_APPLE) #include "base/mac/mac_util.h" -@@ -112,7 +112,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv +@@ -113,7 +113,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv remoting::LoadResources(""); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Required in order for us to run multiple X11 threads. XInitThreads(); -@@ -128,7 +128,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv +@@ -134,7 +134,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv // Need to prime the host OS version value for linux to prevent IO on the // network thread. base::GetLinuxDistro() caches the result. base::GetLinuxDistro(); --#endif // OS_LINUX -+#endif // OS_LINUX || OS_BSD +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) base::File read_file; base::File write_file; 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 af1299dd2bdf..eff53ba2235c 100644 --- a/www/chromium/files/patch-remoting_host_me2me__desktop__environment.cc +++ b/www/chromium/files/patch-remoting_host_me2me__desktop__environment.cc @@ -1,11 +1,11 @@ ---- remoting/host/me2me_desktop_environment.cc.orig 2019-09-09 21:55:22 UTC +--- remoting/host/me2me_desktop_environment.cc.orig 2020-11-13 06:36:46 UTC +++ remoting/host/me2me_desktop_environment.cc -@@ -129,7 +129,7 @@ bool Me2MeDesktopEnvironment::InitializeSecurity( +@@ -130,7 +130,7 @@ bool Me2MeDesktopEnvironment::InitializeSecurity( // Otherwise, if the session is shared with the local user start monitoring // the local input and create the in-session UI. --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) bool want_user_interface = false; - #elif defined(OS_MACOSX) + #elif defined(OS_APPLE) // Don't try to display any UI on top of the system's login screen as this diff --git a/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc b/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc index 881e5c7bf25e..92a68a4d2586 100644 --- a/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc +++ b/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc @@ -1,95 +1,97 @@ ---- remoting/host/remoting_me2me_host.cc.orig 2020-07-07 21:58:16 UTC +--- remoting/host/remoting_me2me_host.cc.orig 2020-11-13 06:36:46 UTC +++ remoting/host/remoting_me2me_host.cc -@@ -118,13 +118,13 @@ +@@ -118,7 +118,7 @@ #include "remoting/host/mac/permission_utils.h" - #endif // defined(OS_MACOSX) + #endif // defined(OS_APPLE) --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include <gtk/gtk.h> + #include "base/linux_util.h" - #include "remoting/host/audio_capturer_linux.h" +@@ -126,7 +126,7 @@ #include "remoting/host/linux/certificate_watcher.h" + #include "ui/events/platform/x11/x11_event_source.h" #include "ui/gfx/x/x11.h" --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #if defined(OS_WIN) #include <commctrl.h> -@@ -159,11 +159,11 @@ const char kApplicationName[] = "chromoting"; +@@ -161,11 +161,11 @@ const char kApplicationName[] = "chromoting"; const char kStdinConfigPath[] = "-"; #endif // !defined(REMOTING_MULTI_PROCESS) --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // The command line switch used to pass name of the pipe to capture audio on // linux. const char kAudioPipeSwitchName[] = "audio-pipe-name"; --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #if defined(OS_POSIX) // The command line switch used to pass name of the unix domain socket used to -@@ -353,7 +353,7 @@ class HostProcess : public ConfigWatcher::Delegate, +@@ -362,7 +362,7 @@ class HostProcess : public ConfigWatcher::Delegate, std::unique_ptr<ChromotingHostContext> context_; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Watch for certificate changes and kill the host when changes occur std::unique_ptr<CertificateWatcher> cert_watcher_; #endif -@@ -749,7 +749,7 @@ void HostProcess::CreateAuthenticatorFactory() { +@@ -761,7 +761,7 @@ void HostProcess::CreateAuthenticatorFactory() { DCHECK(third_party_auth_config_.token_url.is_valid()); DCHECK(third_party_auth_config_.token_validation_url.is_valid()); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) if (!cert_watcher_) { - cert_watcher_.reset(new CertificateWatcher( - base::Bind(&HostProcess::ShutdownHost, this, kSuccessExitCode), -@@ -835,7 +835,7 @@ void HostProcess::StartOnUiThread() { - base::Bind(&HostProcess::OnPolicyUpdate, base::Unretained(this)), - base::Bind(&HostProcess::OnPolicyError, base::Unretained(this))); + cert_watcher_ = std::make_unique<CertificateWatcher>( + base::BindRepeating(&HostProcess::ShutdownHost, this, +@@ -848,7 +848,7 @@ void HostProcess::StartOnUiThread() { + base::BindRepeating(&HostProcess::OnPolicyUpdate, base::Unretained(this)), + base::BindRepeating(&HostProcess::OnPolicyError, base::Unretained(this))); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // 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()-> -@@ -844,7 +844,7 @@ void HostProcess::StartOnUiThread() { +@@ -857,7 +857,7 @@ void HostProcess::StartOnUiThread() { remoting::AudioCapturerLinux::InitializePipeReader( context_->audio_task_runner(), audio_pipe_name); } --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #if defined(OS_POSIX) base::FilePath security_key_socket_name = -@@ -893,7 +893,7 @@ void HostProcess::ShutdownOnUiThread() { +@@ -906,7 +906,7 @@ void HostProcess::ShutdownOnUiThread() { // It is now safe for the HostProcess to be deleted. self_ = nullptr; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // 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. -@@ -1486,7 +1486,7 @@ void HostProcess::StartHost() { +@@ -1512,7 +1512,7 @@ void HostProcess::StartHost() { host_->AddExtension(std::make_unique<TestEchoExtension>()); // TODO(simonmorris): Get the maximum session duration from a policy. --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) host_->SetMaximumSessionDuration(base::TimeDelta::FromHours(20)); #endif -@@ -1656,7 +1656,7 @@ void HostProcess::OnCrash(const std::string& function_ +@@ -1687,7 +1687,7 @@ void HostProcess::OnCrash(const std::string& function_ int HostProcessMain() { HOST_LOG << "Starting host process: version " << STRINGIZE(VERSION); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + std::unique_ptr<ui::X11EventSource> event_source; if (!base::CommandLine::ForCurrentProcess()->HasSwitch( kReportOfflineReasonSwitchName)) { - // Required in order for us to run multiple X11 threads. diff --git a/www/chromium/files/patch-remoting_host_switches.cc b/www/chromium/files/patch-remoting_host_switches.cc index feb1d19fe0ec..d5ffd7a56bda 100644 --- a/www/chromium/files/patch-remoting_host_switches.cc +++ b/www/chromium/files/patch-remoting_host_switches.cc @@ -1,14 +1,14 @@ ---- remoting/host/switches.cc.orig 2019-10-30 16:21:28 UTC +--- remoting/host/switches.cc.orig 2020-11-13 06:36:46 UTC +++ remoting/host/switches.cc @@ -21,9 +21,9 @@ const char kProcessTypeHost[] = "host"; const char kProcessTypeRdpDesktopSession[] = "rdp_desktop_session"; const char kProcessTypeEvaluateCapability[] = "evaluate_capability"; const char kProcessTypeFileChooser[] = "file_chooser"; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) const char kProcessTypeXSessionChooser[] = "xsession_chooser"; --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) const char kEvaluateCapabilitySwitchName[] = "evaluate-type"; diff --git a/www/chromium/files/patch-remoting_host_switches.h b/www/chromium/files/patch-remoting_host_switches.h index 39fcdf4bebb2..f962c05b04c7 100644 --- a/www/chromium/files/patch-remoting_host_switches.h +++ b/www/chromium/files/patch-remoting_host_switches.h @@ -1,14 +1,14 @@ ---- remoting/host/switches.h.orig 2019-10-30 16:21:42 UTC +--- remoting/host/switches.h.orig 2020-11-13 06:36:46 UTC +++ remoting/host/switches.h @@ -34,9 +34,9 @@ extern const char kProcessTypeHost[]; extern const char kProcessTypeRdpDesktopSession[]; extern const char kProcessTypeEvaluateCapability[]; extern const char kProcessTypeFileChooser[]; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) extern const char kProcessTypeXSessionChooser[]; --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) extern const char kEvaluateCapabilitySwitchName[]; diff --git a/www/chromium/files/patch-remoting_resources_remoting__strings.grd b/www/chromium/files/patch-remoting_resources_remoting__strings.grd index 3336d67349a3..81b9eb06617a 100644 --- a/www/chromium/files/patch-remoting_resources_remoting__strings.grd +++ b/www/chromium/files/patch-remoting_resources_remoting__strings.grd @@ -1,4 +1,4 @@ ---- remoting/resources/remoting_strings.grd.orig 2020-05-13 18:39:46 UTC +--- remoting/resources/remoting_strings.grd.orig 2020-11-13 06:36:46 UTC +++ remoting/resources/remoting_strings.grd @@ -880,7 +880,7 @@ If '<ph name="SERVICE_SCRIPT_NAME">$3<ex>org.chromium. Open Screen Recording Preferences diff --git a/www/chromium/files/patch-remoting_test_it2me__standalone__host.cc b/www/chromium/files/patch-remoting_test_it2me__standalone__host.cc index b02ec414092e..f5c71cebcabc 100644 --- a/www/chromium/files/patch-remoting_test_it2me__standalone__host.cc +++ b/www/chromium/files/patch-remoting_test_it2me__standalone__host.cc @@ -1,11 +1,11 @@ ---- remoting/test/it2me_standalone_host.cc.orig 2020-07-13 09:57:40 UTC +--- remoting/test/it2me_standalone_host.cc.orig 2020-11-13 06:36:46 UTC +++ remoting/test/it2me_standalone_host.cc @@ -49,7 +49,7 @@ It2MeStandaloneHost::It2MeStandaloneHost() context_->ui_task_runner()), connection_(base::WrapUnique(new testing::NiceMock<MockSession>())), session_jid_(kSessionJid), --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // We cannot support audio capturing for linux, since a pipe name is // needed to initialize AudioCapturerLinux. config_(protocol::SessionConfig::ForTest()), diff --git a/www/chromium/files/patch-remoting_test_it2me__standalone__host__main.cc b/www/chromium/files/patch-remoting_test_it2me__standalone__host__main.cc index 07508465e607..fb0c7c1fe120 100644 --- a/www/chromium/files/patch-remoting_test_it2me__standalone__host__main.cc +++ b/www/chromium/files/patch-remoting_test_it2me__standalone__host__main.cc @@ -1,39 +1,35 @@ ---- remoting/test/it2me_standalone_host_main.cc.orig 2020-07-13 09:56:53 UTC +--- remoting/test/it2me_standalone_host_main.cc.orig 2020-11-13 06:36:46 UTC +++ remoting/test/it2me_standalone_host_main.cc -@@ -9,19 +9,19 @@ +@@ -9,20 +9,20 @@ #include "remoting/proto/event.pb.h" #include "remoting/test/it2me_standalone_host.h" --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include <gtk/gtk.h> #include "base/linux_util.h" + #include "ui/events/platform/x11/x11_event_source.h" #include "ui/gfx/x/x11.h" --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) int main(int argc, const char** argv) { base::AtExitManager at_exit_manager; base::CommandLine::Init(argc, argv); remoting::test::It2MeStandaloneHost host; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Required in order for us to run multiple X11 threads. XInitThreads(); -@@ -34,10 +34,12 @@ int main(int argc, const char** argv) { - gtk_init(nullptr, nullptr); - #endif - -+#if !defined(OS_BSD) +@@ -43,7 +43,7 @@ int main(int argc, const char** argv) { // Need to prime the host OS version value for linux to prevent IO on the // network thread. base::GetLinuxDistro() caches the result. base::GetLinuxDistro(); --#endif // OS_LINUX -+#endif -+#endif // OS_LINUX || OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) remoting::LoadResources(""); host.StartOutputTimer(); host.Run(); diff --git a/www/chromium/files/patch-sandbox_BUILD.gn b/www/chromium/files/patch-sandbox_BUILD.gn new file mode 100644 index 000000000000..5a4a1d9de2ae --- /dev/null +++ b/www/chromium/files/patch-sandbox_BUILD.gn @@ -0,0 +1,11 @@ +--- sandbox/BUILD.gn.orig 2020-11-17 10:04:06 UTC ++++ sandbox/BUILD.gn +@@ -27,7 +27,7 @@ group("sandbox") { + "//sandbox/mac:system_services", + "//sandbox/mac/mojom", + ] +- } else if (is_linux || is_chromeos || is_android) { ++ } else if ((is_linux || is_chromeos || is_android) && !is_bsd) { + public_deps = [ "//sandbox/linux:sandbox" ] + } + } diff --git a/www/chromium/files/patch-sandbox_features.gni b/www/chromium/files/patch-sandbox_features.gni index b5a277f82178..87ef9a8c547e 100644 --- a/www/chromium/files/patch-sandbox_features.gni +++ b/www/chromium/files/patch-sandbox_features.gni @@ -1,11 +1,11 @@ ---- sandbox/features.gni.orig 2020-03-16 18:39:54 UTC +--- sandbox/features.gni.orig 2020-11-13 06:36:46 UTC +++ sandbox/features.gni @@ -8,7 +8,7 @@ import("//build/config/nacl/config.gni") # currently. # Do not disable seccomp_bpf anywhere without talking to # security@chromium.org! --use_seccomp_bpf = (is_linux || is_android) && -+use_seccomp_bpf = (is_linux || is_android) && !is_bsd && +-use_seccomp_bpf = (is_linux || is_chromeos || is_android) && ++use_seccomp_bpf = (is_linux || is_chromeos || is_android) && !is_bsd && (current_cpu == "x86" || current_cpu == "x64" || current_cpu == "arm" || current_cpu == "arm64" || current_cpu == "mipsel" || current_cpu == "mips64el") diff --git a/www/chromium/files/patch-sandbox_linux_BUILD.gn b/www/chromium/files/patch-sandbox_linux_BUILD.gn index 3b9d933a14cd..7c9271b57cec 100644 --- a/www/chromium/files/patch-sandbox_linux_BUILD.gn +++ b/www/chromium/files/patch-sandbox_linux_BUILD.gn @@ -1,22 +1,6 @@ ---- sandbox/linux/BUILD.gn.orig 2020-03-16 18:39:54 UTC +--- sandbox/linux/BUILD.gn.orig 2020-11-13 06:36:46 UTC +++ sandbox/linux/BUILD.gn -@@ -12,12 +12,12 @@ if (is_android) { - } - - declare_args() { -- compile_suid_client = is_linux -+ compile_suid_client = is_linux && !is_bsd - -- compile_credentials = is_linux -+ compile_credentials = is_linux && !is_bsd - - # On Android, use plain GTest. -- use_base_test_suite = is_linux -+ use_base_test_suite = is_linux && !is_bsd - } - - if (is_nacl_nonsfi) { -@@ -370,7 +370,7 @@ component("sandbox_services") { +@@ -386,7 +386,7 @@ component("sandbox_services") { public_deps += [ ":sandbox_services_headers" ] } @@ -25,7 +9,7 @@ cflags = [ "-fgnu-inline-asm" ] sources -= [ -@@ -378,6 +378,8 @@ component("sandbox_services") { +@@ -394,6 +394,8 @@ component("sandbox_services") { "services/init_process_reaper.h", "services/scoped_process.cc", "services/scoped_process.h", @@ -34,14 +18,3 @@ "services/yama.cc", "services/yama.h", "syscall_broker/broker_channel.cc", -@@ -396,6 +398,10 @@ component("sandbox_services") { - "syscall_broker/broker_process.h", - "syscall_broker/broker_simple_message.cc", - "syscall_broker/broker_simple_message.h", -+ ] -+ sources += [ -+ "services/libc_interceptor.cc", -+ "services/libc_interceptor.h", - ] - } else if (!is_android) { - sources += [ diff --git a/www/chromium/files/patch-sandbox_linux_services_init__process__reaper.cc b/www/chromium/files/patch-sandbox_linux_services_init__process__reaper.cc index ce19163df699..2b6e26b4391e 100644 --- a/www/chromium/files/patch-sandbox_linux_services_init__process__reaper.cc +++ b/www/chromium/files/patch-sandbox_linux_services_init__process__reaper.cc @@ -1,4 +1,4 @@ ---- sandbox/linux/services/init_process_reaper.cc.orig 2019-03-11 22:01:01 UTC +--- sandbox/linux/services/init_process_reaper.cc.orig 2020-11-13 06:36:46 UTC +++ sandbox/linux/services/init_process_reaper.cc @@ -1,6 +1,7 @@ // Copyright 2013 The Chromium Authors. All rights reserved. diff --git a/www/chromium/files/patch-sandbox_linux_services_libc__interceptor.cc b/www/chromium/files/patch-sandbox_linux_services_libc__interceptor.cc index d31824506bd2..f0bccd613a94 100644 --- a/www/chromium/files/patch-sandbox_linux_services_libc__interceptor.cc +++ b/www/chromium/files/patch-sandbox_linux_services_libc__interceptor.cc @@ -1,4 +1,4 @@ ---- sandbox/linux/services/libc_interceptor.cc.orig 2020-07-07 21:57:41 UTC +--- sandbox/linux/services/libc_interceptor.cc.orig 2020-11-13 06:36:46 UTC +++ sandbox/linux/services/libc_interceptor.cc @@ -11,7 +11,9 @@ #include <stddef.h> diff --git a/www/chromium/files/patch-sandbox_policy_BUILD.gn b/www/chromium/files/patch-sandbox_policy_BUILD.gn new file mode 100644 index 000000000000..0df50a887585 --- /dev/null +++ b/www/chromium/files/patch-sandbox_policy_BUILD.gn @@ -0,0 +1,11 @@ +--- sandbox/policy/BUILD.gn.orig 2020-11-13 06:36:46 UTC ++++ sandbox/policy/BUILD.gn +@@ -27,7 +27,7 @@ component("policy") { + "//sandbox:common", + ] + public_deps = [] +- if (is_linux || is_chromeos) { ++ if ((is_linux || is_chromeos) && !is_bsd) { + sources += [ + "linux/bpf_audio_policy_linux.cc", + "linux/bpf_audio_policy_linux.h", diff --git a/www/chromium/files/patch-sandbox_policy_switches.cc b/www/chromium/files/patch-sandbox_policy_switches.cc new file mode 100644 index 000000000000..f7e5ea3832c3 --- /dev/null +++ b/www/chromium/files/patch-sandbox_policy_switches.cc @@ -0,0 +1,11 @@ +--- sandbox/policy/switches.cc.orig 2020-11-13 06:36:46 UTC ++++ sandbox/policy/switches.cc +@@ -81,7 +81,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"; + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + // Instructs the zygote to launch without a sandbox. Processes forked from this + // type of zygote will apply their own custom sandboxes later. + const char kNoZygoteSandbox[] = "no-zygote-sandbox"; diff --git a/www/chromium/files/patch-sandbox_policy_switches.h b/www/chromium/files/patch-sandbox_policy_switches.h new file mode 100644 index 000000000000..6470be393f73 --- /dev/null +++ b/www/chromium/files/patch-sandbox_policy_switches.h @@ -0,0 +1,11 @@ +--- sandbox/policy/switches.h.orig 2020-11-13 06:36:46 UTC ++++ sandbox/policy/switches.h +@@ -53,7 +53,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[]; +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + SANDBOX_POLICY_EXPORT extern const char kNoZygoteSandbox[]; + #endif + #if defined(OS_WIN) diff --git a/www/chromium/files/patch-services_audio_BUILD.gn b/www/chromium/files/patch-services_audio_BUILD.gn index 83d0bd577519..f00f7215529c 100644 --- a/www/chromium/files/patch-services_audio_BUILD.gn +++ b/www/chromium/files/patch-services_audio_BUILD.gn @@ -1,11 +1,11 @@ ---- services/audio/BUILD.gn.orig 2020-07-07 21:58:16 UTC +--- services/audio/BUILD.gn.orig 2020-11-13 06:36:46 UTC +++ services/audio/BUILD.gn -@@ -74,7 +74,7 @@ source_set("audio") { - "//services/service_manager/sandbox", +@@ -73,7 +73,7 @@ source_set("audio") { + "//services/audio/public/mojom", ] -- if (is_linux) { -+ if ((is_linux) && (!is_bsd)) { +- if (is_linux || is_chromeos) { ++ if ((is_linux || is_chromeos) && !is_bsd) { sources += [ "audio_sandbox_hook_linux.cc", "audio_sandbox_hook_linux.h", 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 949e923aae2f..224466f3032d 100644 --- a/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc +++ b/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc @@ -1,11 +1,11 @@ ---- services/device/geolocation/location_arbitrator.cc.orig 2020-07-07 21:57:41 UTC +--- services/device/geolocation/location_arbitrator.cc.orig 2020-11-13 06:36:46 UTC +++ services/device/geolocation/location_arbitrator.cc @@ -156,7 +156,7 @@ LocationArbitrator::NewNetworkLocationProvider( std::unique_ptr<LocationProvider> LocationArbitrator::NewSystemLocationProvider() { --#if defined(OS_LINUX) || defined(OS_FUCHSIA) -+#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD) return nullptr; #else return device::NewSystemLocationProvider(); diff --git a/www/chromium/files/patch-services_device_hid_BUILD.gn b/www/chromium/files/patch-services_device_hid_BUILD.gn index 01a7f29e58fa..e5ced79573da 100644 --- a/www/chromium/files/patch-services_device_hid_BUILD.gn +++ b/www/chromium/files/patch-services_device_hid_BUILD.gn @@ -1,14 +1,10 @@ ---- services/device/hid/BUILD.gn.orig 2019-06-04 18:55:28 UTC +--- services/device/hid/BUILD.gn.orig 2020-11-13 06:36:46 UTC +++ services/device/hid/BUILD.gn -@@ -51,6 +51,19 @@ source_set("hid") { +@@ -43,6 +43,15 @@ source_set("hid") { deps += [ "//device/udev_linux" ] } + if (is_bsd) { -+ sources -= [ -+ "hid_connection_linux.cc", -+ "hid_connection_linux.h", -+ ] + sources += [ + "hid_connection_freebsd.cc", + "hid_connection_freebsd.h", 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 6596d22b2635..f845e4994f50 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 2020-08-18 20:44:53 UTC +--- services/device/hid/hid_connection_freebsd.cc.orig 2020-11-16 10:08:51 UTC +++ services/device/hid/hid_connection_freebsd.cc @@ -0,0 +1,240 @@ +// Copyright (c) 2014 The Chromium Authors. All rights reserved. diff --git a/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.h b/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.h index 4592669a2790..87cd6a671dea 100644 --- a/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.h +++ b/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.h @@ -1,4 +1,4 @@ ---- services/device/hid/hid_connection_freebsd.h.orig 2020-08-18 20:44:53 UTC +--- services/device/hid/hid_connection_freebsd.h.orig 2020-11-16 10:08:51 UTC +++ services/device/hid/hid_connection_freebsd.h @@ -0,0 +1,65 @@ +// Copyright (c) 2014 The Chromium Authors. All rights reserved. diff --git a/www/chromium/files/patch-services_device_hid_hid__service.cc b/www/chromium/files/patch-services_device_hid_hid__service.cc index cadfcbe6b358..8b180637923c 100644 --- a/www/chromium/files/patch-services_device_hid_hid__service.cc +++ b/www/chromium/files/patch-services_device_hid_hid__service.cc @@ -1,20 +1,20 @@ ---- services/device/hid/hid_service.cc.orig 2019-03-11 22:01:01 UTC +--- services/device/hid/hid_service.cc.orig 2020-11-13 06:36:46 UTC +++ services/device/hid/hid_service.cc @@ -16,6 +16,8 @@ - #if defined(OS_LINUX) && defined(USE_UDEV) + #if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(USE_UDEV) #include "services/device/hid/hid_service_linux.h" -+#elif defined(OS_BSD) ++#elif defined(OS_FREEBSD) +#include "services/device/hid/hid_service_freebsd.h" - #elif defined(OS_MACOSX) + #elif defined(OS_MAC) #include "services/device/hid/hid_service_mac.h" #elif defined(OS_WIN) @@ -36,6 +38,8 @@ constexpr base::TaskTraits HidService::kBlockingTaskTr std::unique_ptr<HidService> HidService::Create() { - #if defined(OS_LINUX) && defined(USE_UDEV) + #if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(USE_UDEV) return base::WrapUnique(new HidServiceLinux()); -+#elif defined(OS_BSD) ++#elif defined(OS_FREEBSD) + return base::WrapUnique(new HidServiceFreeBSD()); - #elif defined(OS_MACOSX) + #elif defined(OS_MAC) return base::WrapUnique(new HidServiceMac()); #elif defined(OS_WIN) 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 4e18e3341bc9..3528e64255c0 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 2020-08-18 20:44:53 UTC +--- services/device/hid/hid_service_freebsd.cc.orig 2020-11-16 10:08:51 UTC +++ services/device/hid/hid_service_freebsd.cc @@ -0,0 +1,382 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. diff --git a/www/chromium/files/patch-services_device_hid_hid__service__freebsd.h b/www/chromium/files/patch-services_device_hid_hid__service__freebsd.h index 2ca5e86459af..59c71be313d9 100644 --- a/www/chromium/files/patch-services_device_hid_hid__service__freebsd.h +++ b/www/chromium/files/patch-services_device_hid_hid__service__freebsd.h @@ -1,4 +1,4 @@ ---- services/device/hid/hid_service_freebsd.h.orig 2020-08-18 20:44:53 UTC +--- services/device/hid/hid_service_freebsd.h.orig 2020-11-16 10:08:51 UTC +++ services/device/hid/hid_service_freebsd.h @@ -0,0 +1,46 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. diff --git a/www/chromium/files/patch-services_device_serial_BUILD.gn b/www/chromium/files/patch-services_device_serial_BUILD.gn index 81589aec985e..be3edea49a39 100644 --- a/www/chromium/files/patch-services_device_serial_BUILD.gn +++ b/www/chromium/files/patch-services_device_serial_BUILD.gn @@ -1,11 +1,11 @@ ---- services/device/serial/BUILD.gn.orig 2019-03-11 22:01:01 UTC +--- services/device/serial/BUILD.gn.orig 2020-11-13 06:36:46 UTC +++ services/device/serial/BUILD.gn -@@ -4,7 +4,7 @@ +@@ -11,7 +11,7 @@ import("//build/config/features.gni") + import("//build/config/deprecated_default_sources_assignment_filter.gni") + set_sources_assignment_filter(deprecated_default_sources_assignment_filter) - import("//build/config/features.gni") - --if (is_win || (is_linux && use_udev) || is_mac) { -+if (is_win || (is_linux && use_udev) || is_mac || is_bsd) { +-if (is_win || ((is_linux || is_chromeos) && use_udev) || is_mac) { ++if (is_win || ((is_linux || is_chromeos) && use_udev) || is_mac || is_bsd) { config("platform_support") { visibility = [ ":serial" ] if (is_win) { diff --git a/www/chromium/files/patch-services_device_serial_serial__device__enumerator.cc b/www/chromium/files/patch-services_device_serial_serial__device__enumerator.cc index 677f72959ac8..4a2f6433ce3b 100644 --- a/www/chromium/files/patch-services_device_serial_serial__device__enumerator.cc +++ b/www/chromium/files/patch-services_device_serial_serial__device__enumerator.cc @@ -1,20 +1,20 @@ ---- services/device/serial/serial_device_enumerator.cc.orig 2020-05-15 15:19:57 UTC +--- services/device/serial/serial_device_enumerator.cc.orig 2020-11-13 06:36:46 UTC +++ services/device/serial/serial_device_enumerator.cc -@@ -9,7 +9,7 @@ - #include "base/unguessable_token.h" +@@ -10,7 +10,7 @@ #include "build/build_config.h" + #include "components/device_event_log/device_event_log.h" --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "services/device/serial/serial_device_enumerator_linux.h" - #elif defined(OS_MACOSX) + #elif defined(OS_MAC) #include "services/device/serial/serial_device_enumerator_mac.h" -@@ -22,7 +22,7 @@ namespace device { +@@ -23,7 +23,7 @@ namespace device { // static std::unique_ptr<SerialDeviceEnumerator> SerialDeviceEnumerator::Create( scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - return std::make_unique<SerialDeviceEnumeratorLinux>(); - #elif defined(OS_MACOSX) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + return SerialDeviceEnumeratorLinux::Create(); + #elif defined(OS_MAC) return std::make_unique<SerialDeviceEnumeratorMac>(); diff --git a/www/chromium/files/patch-services_device_serial_serial__io__handler__posix.cc b/www/chromium/files/patch-services_device_serial_serial__io__handler__posix.cc index 0e541369c70d..12e644baf348 100644 --- a/www/chromium/files/patch-services_device_serial_serial__io__handler__posix.cc +++ b/www/chromium/files/patch-services_device_serial_serial__io__handler__posix.cc @@ -1,22 +1,22 @@ ---- services/device/serial/serial_io_handler_posix.cc.orig 2020-05-13 18:39:47 UTC +--- services/device/serial/serial_io_handler_posix.cc.orig 2020-11-13 06:36:46 UTC +++ services/device/serial/serial_io_handler_posix.cc -@@ -36,6 +36,10 @@ struct termios2 { +@@ -37,6 +37,10 @@ struct termios2 { - #endif // defined(OS_LINUX) + #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_BSD) +#include <sys/serial.h> +#endif + - #if defined(OS_MACOSX) + #if defined(OS_MAC) #include <IOKit/serial/ioss.h> #endif -@@ -66,7 +70,7 @@ bool BitrateToSpeedConstant(int bitrate, speed_t* spee +@@ -67,7 +71,7 @@ bool BitrateToSpeedConstant(int bitrate, speed_t* spee BITRATE_TO_SPEED_CASE(9600) BITRATE_TO_SPEED_CASE(19200) BITRATE_TO_SPEED_CASE(38400) --#if !defined(OS_MACOSX) -+#if !defined(OS_MACOSX) && !defined(OS_BSD) +-#if !defined(OS_MAC) ++#if !defined(OS_MAC) && !defined(OS_BSD) BITRATE_TO_SPEED_CASE(57600) BITRATE_TO_SPEED_CASE(115200) BITRATE_TO_SPEED_CASE(230400) diff --git a/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc b/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc index cff5f136f844..32cd6093ada7 100644 --- a/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc +++ b/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc @@ -1,4 +1,4 @@ ---- services/device/time_zone_monitor/time_zone_monitor_linux.cc.orig 2020-03-16 18:39:54 UTC +--- services/device/time_zone_monitor/time_zone_monitor_linux.cc.orig 2020-11-13 06:36:46 UTC +++ services/device/time_zone_monitor/time_zone_monitor_linux.cc @@ -127,7 +127,11 @@ class TimeZoneMonitorLinuxImpl // false positives are harmless, assuming the false positive rate is diff --git a/www/chromium/files/patch-services_device_usb_BUILD.gn b/www/chromium/files/patch-services_device_usb_BUILD.gn index c8fd1084c327..23535f348f91 100644 --- a/www/chromium/files/patch-services_device_usb_BUILD.gn +++ b/www/chromium/files/patch-services_device_usb_BUILD.gn @@ -1,6 +1,6 @@ ---- services/device/usb/BUILD.gn.orig 2020-07-07 21:57:41 UTC +--- services/device/usb/BUILD.gn.orig 2020-11-13 06:36:46 UTC +++ services/device/usb/BUILD.gn -@@ -112,7 +112,7 @@ static_library("usb") { +@@ -125,7 +125,7 @@ static_library("usb") { deps += [ "//third_party/re2" ] } diff --git a/www/chromium/files/patch-services_network_BUILD.gn b/www/chromium/files/patch-services_network_BUILD.gn index 1bbb99196176..2c5e3d3f6194 100644 --- a/www/chromium/files/patch-services_network_BUILD.gn +++ b/www/chromium/files/patch-services_network_BUILD.gn @@ -1,10 +1,19 @@ ---- services/network/BUILD.gn.orig 2020-07-07 21:58:16 UTC +--- services/network/BUILD.gn.orig 2020-11-13 06:36:46 UTC +++ services/network/BUILD.gn -@@ -261,7 +261,6 @@ jumbo_component("network_service") { +@@ -261,9 +261,15 @@ component("network_service") { + deps += [ "//components/certificate_transparency" ] + } - if (is_linux) { +- if (is_linux || is_chromeos) { ++ if ((is_linux && !is_bsd) || is_chromeos) { deps += [ -- "//sandbox/linux:sandbox_services", - "//services/service_manager/sandbox:sandbox", + "//sandbox/linux:sandbox_services", ++ "//sandbox/policy", ++ ] ++ } ++ ++ if (is_bsd) { ++ deps += [ + "//sandbox/policy", ] } diff --git a/www/chromium/files/patch-services_network_network__context.cc b/www/chromium/files/patch-services_network_network__context.cc index 89ffe2c5fb63..bc2d8c8610d5 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 2020-07-07 21:58:16 UTC +--- services/network/network_context.cc.orig 2020-11-13 06:36:46 UTC +++ services/network/network_context.cc -@@ -1756,7 +1756,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestC +@@ -1916,7 +1916,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestC net::CookieCryptoDelegate* crypto_delegate = nullptr; if (params_->enable_encrypted_cookies) { diff --git a/www/chromium/files/patch-services_network_network__sandbox__hook__linux.cc b/www/chromium/files/patch-services_network_network__sandbox__hook__linux.cc index b7b7be5079f4..d62bb574fdb4 100644 --- a/www/chromium/files/patch-services_network_network__sandbox__hook__linux.cc +++ b/www/chromium/files/patch-services_network_network__sandbox__hook__linux.cc @@ -1,15 +1,15 @@ ---- services/network/network_sandbox_hook_linux.cc.orig 2019-03-11 22:01:01 UTC +--- services/network/network_sandbox_hook_linux.cc.orig 2020-11-13 06:36:46 UTC +++ services/network/network_sandbox_hook_linux.cc @@ -14,6 +14,7 @@ using sandbox::syscall_broker::MakeBrokerCommandSet; namespace network { - bool NetworkPreSandboxHook(service_manager::SandboxLinux::Options options) { + bool NetworkPreSandboxHook(sandbox::policy::SandboxLinux::Options options) { +#if !defined(OS_BSD) - auto* instance = service_manager::SandboxLinux::GetInstance(); + auto* instance = sandbox::policy::SandboxLinux::GetInstance(); // TODO(tsepez): remove universal permission under filesytem root. -@@ -32,6 +33,7 @@ bool NetworkPreSandboxHook(service_manager::SandboxLin - service_manager::SandboxLinux::PreSandboxHook(), options); +@@ -32,6 +33,7 @@ bool NetworkPreSandboxHook(sandbox::policy::SandboxLin + sandbox::policy::SandboxLinux::PreSandboxHook(), options); instance->EngageNamespaceSandboxIfPossible(); +#endif // defined(OS_BSD) diff --git a/www/chromium/files/patch-services_network_network__service.cc b/www/chromium/files/patch-services_network_network__service.cc index 8ed8a125c504..44a28b358f2a 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 2020-05-13 18:40:33 UTC +--- services/network/network_service.cc.orig 2020-11-13 06:36:46 UTC +++ services/network/network_service.cc -@@ -67,7 +67,7 @@ +@@ -70,7 +70,7 @@ #include "third_party/boringssl/src/include/openssl/cpu.h" #endif @@ -9,7 +9,7 @@ #include "components/os_crypt/key_storage_config_linux.h" #endif -@@ -630,7 +630,7 @@ void NetworkService::OnCertDBChanged() { +@@ -670,7 +670,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 4645795c9a67..590b643b6ede 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 2020-05-13 18:40:33 UTC +--- services/network/network_service.h.orig 2020-11-13 06:36:46 UTC +++ services/network/network_service.h -@@ -156,7 +156,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService +@@ -196,7 +196,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService base::span<const uint8_t> config, mojom::NetworkService::UpdateLegacyTLSConfigCallback callback) override; void OnCertDBChanged() override; @@ -8,4 +8,4 @@ +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) void SetCryptConfig(mojom::CryptConfigPtr crypt_config) override; #endif - #if defined(OS_WIN) || (defined(OS_MACOSX) && !defined(OS_IOS)) + #if defined(OS_WIN) || defined(OS_MAC) diff --git a/www/chromium/files/patch-services_network_public_cpp_cert__verifier_cert__verifier__creation.cc b/www/chromium/files/patch-services_network_public_cpp_cert__verifier_cert__verifier__creation.cc index d9102ff03143..e1dbf5f89ef6 100644 --- a/www/chromium/files/patch-services_network_public_cpp_cert__verifier_cert__verifier__creation.cc +++ b/www/chromium/files/patch-services_network_public_cpp_cert__verifier_cert__verifier__creation.cc @@ -1,4 +1,4 @@ ---- services/network/public/cpp/cert_verifier/cert_verifier_creation.cc.orig 2020-07-13 09:58:25 UTC +--- services/network/public/cpp/cert_verifier/cert_verifier_creation.cc.orig 2020-11-13 06:36:46 UTC +++ services/network/public/cpp/cert_verifier/cert_verifier_creation.cc @@ -70,7 +70,7 @@ scoped_refptr<net::CertVerifyProc> CreateCertVerifyPro 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 4c391c6c24c4..193a206ad746 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,20 +1,20 @@ ---- services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc.orig 2019-09-09 21:55:22 UTC +--- services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc.orig 2020-11-13 06:36:46 UTC +++ services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc -@@ -43,7 +43,7 @@ namespace { +@@ -45,7 +45,7 @@ namespace { uint32_t CalculatePrivateFootprintKb(const mojom::RawOSMemDump& os_dump, uint32_t shared_resident_kb) { DCHECK(os_dump.platform_private_footprint); --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) 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; return (rss_anon_bytes + vm_swap_bytes) / 1024; -@@ -82,7 +82,7 @@ memory_instrumentation::mojom::OSMemDumpPtr CreatePubl +@@ -84,7 +84,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); --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) os_dump->private_footprint_swap_kb = internal_os_dump.platform_private_footprint->vm_swap_bytes / 1024; #endif diff --git a/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h b/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h index f8b2542dae6e..2f43090d5ab4 100644 --- a/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h +++ b/www/chromium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h @@ -1,32 +1,32 @@ ---- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h.orig 2019-07-24 18:58:35 UTC +--- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h.orig 2020-11-13 06:36:46 UTC +++ services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h -@@ -28,9 +28,9 @@ class COMPONENT_EXPORT( +@@ -45,9 +45,9 @@ class COMPONENT_EXPORT( mojom::RawOSMemDump*); static std::vector<mojom::VmRegionPtr> GetProcessMemoryMaps(base::ProcessId); --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) static void SetProcSmapsForTesting(FILE*); --#endif // defined(OS_LINUX) || defined(OS_ANDROID) -+#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) private: FRIEND_TEST_ALL_PREFIXES(OSMetricsTest, ParseProcSmaps); -@@ -44,7 +44,7 @@ class COMPONENT_EXPORT( +@@ -61,7 +61,7 @@ class COMPONENT_EXPORT( static std::vector<mojom::VmRegionPtr> GetProcessModules(base::ProcessId); #endif --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) - // Provides information on the dump state of resident pages. - enum class MappedAndResidentPagesDumpState { - // Access to /proc/<pid>/pagemap can be denied for android devices running -@@ -68,7 +68,7 @@ class COMPONENT_EXPORT( +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) + // Provides information on the dump state of resident pages. These values are + // written to logs. New enum values can be added, but existing enums must + // never be renumbered or deleted and reused. +@@ -96,7 +96,7 @@ class COMPONENT_EXPORT( // TODO(chiniforooshan): move to /base/process/process_metrics_linux.cc after // making sure that peak RSS is useful. static size_t GetPeakResidentSetSize(base::ProcessId pid); --#endif // defined(OS_LINUX) || defined(OS_ANDROID) -+#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) }; } // namespace memory_instrumentation 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 440b79e2bffa..f4c067dc3abf 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,17 +1,29 @@ ---- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc.orig 2020-07-07 21:58:16 UTC +--- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc.orig 2020-11-13 06:36:46 UTC +++ services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc -@@ -22,8 +22,10 @@ +@@ -5,7 +5,6 @@ + #include <dlfcn.h> + #include <fcntl.h> + #include <stdint.h> +-#include <sys/prctl.h> + + #include <memory> + +@@ -25,8 +24,14 @@ #include "build/build_config.h" #include "services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h" +#if !defined(OS_BSD) ++#include <sys/prctl.h> ++#endif ++ ++#if !defined(OS_BSD) // Symbol with virtual address of the start of ELF header of the current binary. extern char __ehdr_start; +#endif namespace memory_instrumentation { -@@ -86,6 +88,7 @@ struct ModuleData { +@@ -89,6 +94,7 @@ struct ModuleData { ModuleData GetMainModuleData() { ModuleData module_data; @@ -19,7 +31,7 @@ Dl_info dl_info; if (dladdr(&__ehdr_start, &dl_info)) { base::debug::ElfBuildIdBuffer build_id; -@@ -96,6 +99,7 @@ ModuleData GetMainModuleData() { +@@ -99,6 +105,7 @@ ModuleData GetMainModuleData() { module_data.build_id = std::string(build_id, build_id_length); } } @@ -27,7 +39,7 @@ return module_data; } -@@ -143,14 +147,14 @@ bool ParseSmapsHeader(const char* header_line, +@@ -146,14 +153,14 @@ bool ParseSmapsHeader(const char* header_line, // Build ID is needed to symbolize heap profiles, and is generated only on // official builds. Build ID is only added for the current library (chrome) // since it is racy to read other libraries which can be unmapped any time. @@ -44,7 +56,36 @@ return res; } -@@ -241,6 +245,7 @@ bool OSMetrics::FillOSMemoryDump(base::ProcessId pid, +@@ -236,6 +243,7 @@ uint32_t ReadLinuxProcSmapsFile(FILE* smaps_file, + class ScopedProcessSetDumpable { + public: + ScopedProcessSetDumpable() { ++#if !defined(OS_BSD) + int result = prctl(PR_GET_DUMPABLE, 0, 0, 0, 0); + if (result < 0) { + PLOG(ERROR) << "prctl"; +@@ -251,15 +259,20 @@ class ScopedProcessSetDumpable { + AvoidPrctlOnDestruction(); + } + } ++#else ++ was_dumpable_ = true; ++#endif + } + + ScopedProcessSetDumpable(const ScopedProcessSetDumpable&) = delete; + ScopedProcessSetDumpable& operator=(const ScopedProcessSetDumpable&) = delete; + + ~ScopedProcessSetDumpable() { ++#if !defined(OS_BSD) + if (!was_dumpable_) { + PCHECK(prctl(PR_SET_DUMPABLE, 0, 0, 0, 0) == 0) << "prctl"; + } ++#endif + } + + private: +@@ -282,6 +295,7 @@ bool OSMetrics::FillOSMemoryDump(base::ProcessId pid, mojom::RawOSMemDump* dump) { // TODO(chiniforooshan): There is no need to read both /statm and /status // files. Refactor to get everything from /status using ProcessMetric. @@ -52,7 +93,7 @@ auto statm_file = GetProcPidDir(pid).Append("statm"); auto autoclose = base::ScopedFD(open(statm_file.value().c_str(), O_RDONLY)); int statm_fd = autoclose.get(); -@@ -255,6 +260,10 @@ bool OSMetrics::FillOSMemoryDump(base::ProcessId pid, +@@ -296,6 +310,10 @@ bool OSMetrics::FillOSMemoryDump(base::ProcessId pid, if (!success) return false; @@ -63,7 +104,7 @@ auto process_metrics = CreateProcessMetrics(pid); -@@ -295,6 +304,10 @@ bool OSMetrics::FillOSMemoryDump(base::ProcessId pid, +@@ -340,6 +358,10 @@ bool OSMetrics::FillOSMemoryDump(base::ProcessId pid, // static std::vector<VmRegionPtr> OSMetrics::GetProcessMemoryMaps(base::ProcessId pid) { @@ -74,7 +115,7 @@ std::vector<VmRegionPtr> maps; uint32_t res = 0; if (g_proc_smaps_for_testing) { -@@ -312,6 +325,7 @@ std::vector<VmRegionPtr> OSMetrics::GetProcessMemoryMa +@@ -357,6 +379,7 @@ std::vector<VmRegionPtr> OSMetrics::GetProcessMemoryMa return std::vector<VmRegionPtr>(); return maps; @@ -82,7 +123,7 @@ } // static -@@ -319,6 +333,10 @@ OSMetrics::MappedAndResidentPagesDumpState OSMetrics:: +@@ -364,6 +387,10 @@ OSMetrics::MappedAndResidentPagesDumpState OSMetrics:: const size_t start_address, const size_t end_address, std::vector<uint8_t>* accessed_pages_bitmap) { @@ -93,7 +134,7 @@ const char* kPagemap = "/proc/self/pagemap"; base::ScopedFILE pagemap_file(fopen(kPagemap, "r")); -@@ -360,6 +378,7 @@ OSMetrics::MappedAndResidentPagesDumpState OSMetrics:: +@@ -411,6 +438,7 @@ OSMetrics::MappedAndResidentPagesDumpState OSMetrics:: } } return OSMetrics::MappedAndResidentPagesDumpState::kSuccess; diff --git a/www/chromium/files/patch-services_service__manager_BUILD.gn b/www/chromium/files/patch-services_service__manager_BUILD.gn new file mode 100644 index 000000000000..55d40b8f071a --- /dev/null +++ b/www/chromium/files/patch-services_service__manager_BUILD.gn @@ -0,0 +1,11 @@ +--- services/service_manager/BUILD.gn.orig 2020-11-17 10:19:16 UTC ++++ services/service_manager/BUILD.gn +@@ -65,7 +65,7 @@ source_set("service_manager") { + ] + } + +- if (is_linux || is_chromeos) { ++ if ((is_linux || is_chromeos) && !is_bsd) { + deps += [ "//sandbox/linux:sandbox_services" ] + } + } diff --git a/www/chromium/files/patch-services_service__manager_embedder_set__process__title__linux.h b/www/chromium/files/patch-services_service__manager_embedder_set__process__title__linux.h deleted file mode 100644 index 0e1eb1ce1d32..000000000000 --- a/www/chromium/files/patch-services_service__manager_embedder_set__process__title__linux.h +++ /dev/null @@ -1,20 +0,0 @@ ---- services/service_manager/embedder/set_process_title_linux.h.orig 2019-03-11 22:01:02 UTC -+++ services/service_manager/embedder/set_process_title_linux.h -@@ -5,6 +5,9 @@ - #ifndef SERVICES_SERVICE_MANAGER_EMBEDDER_SET_PROCESS_TITLE_LINUX_H_ - #define SERVICES_SERVICE_MANAGER_EMBEDDER_SET_PROCESS_TITLE_LINUX_H_ - -+#include "build/build_config.h" -+ -+#if !defined(OS_FREEBSD) - // Set the process title that will show in "ps" and similar tools. Takes - // printf-style format string and arguments. After calling setproctitle() - // the original main() argv[] array should not be used. By default, the -@@ -14,6 +17,7 @@ - // This signature and naming is to be compatible with most other Unix - // implementations of setproctitle(). - void setproctitle(const char* fmt, ...); -+#endif - - // Initialize state needed for setproctitle() on Linux. Pass the argv pointer - // from main() to setproctitle_init() before calling setproctitle(). diff --git a/www/chromium/files/patch-services_service__manager_public_cpp_service__executable_BUILD.gn b/www/chromium/files/patch-services_service__manager_public_cpp_service__executable_BUILD.gn index 4e2b8913bd0b..188da9d73d08 100644 --- a/www/chromium/files/patch-services_service__manager_public_cpp_service__executable_BUILD.gn +++ b/www/chromium/files/patch-services_service__manager_public_cpp_service__executable_BUILD.gn @@ -1,14 +1,11 @@ ---- services/service_manager/public/cpp/service_executable/BUILD.gn.orig 2019-04-30 22:22:56 UTC +--- services/service_manager/public/cpp/service_executable/BUILD.gn.orig 2020-11-13 06:36:46 UTC +++ services/service_manager/public/cpp/service_executable/BUILD.gn -@@ -29,6 +29,11 @@ source_set("support") { - "//sandbox/linux:seccomp_bpf", - ] - } -+ if (is_bsd) { -+ deps -= [ -+ "//sandbox/linux:seccomp_bpf" -+ ] -+ } - } +@@ -22,7 +22,7 @@ source_set("support") { + "//services/service_manager/public/mojom", + ] - source_set("switches") { +- if (is_linux || is_chromeos) { ++ if ((is_linux || is_chromeos) && !is_bsd) { + deps += [ + "//sandbox/linux:sandbox", + "//sandbox/linux:sandbox_services", diff --git a/www/chromium/files/patch-services_service__manager_sandbox_BUILD.gn b/www/chromium/files/patch-services_service__manager_sandbox_BUILD.gn deleted file mode 100644 index 79967079b24d..000000000000 --- a/www/chromium/files/patch-services_service__manager_sandbox_BUILD.gn +++ /dev/null @@ -1,11 +0,0 @@ ---- services/service_manager/sandbox/BUILD.gn.orig 2020-03-16 18:40:34 UTC -+++ services/service_manager/sandbox/BUILD.gn -@@ -26,7 +26,7 @@ component("sandbox") { - "//base", - "//sandbox:common", - ] -- if (is_linux) { -+ if (is_linux && !is_bsd) { - sources += [ - "linux/bpf_audio_policy_linux.cc", - "linux/bpf_audio_policy_linux.h", diff --git a/www/chromium/files/patch-services_service__manager_zygote_zygote__linux.cc b/www/chromium/files/patch-services_service__manager_zygote_zygote__linux.cc deleted file mode 100644 index 3a2ff8db55e7..000000000000 --- a/www/chromium/files/patch-services_service__manager_zygote_zygote__linux.cc +++ /dev/null @@ -1,15 +0,0 @@ ---- services/service_manager/zygote/zygote_linux.cc.orig 2019-06-04 18:55:28 UTC -+++ services/service_manager/zygote/zygote_linux.cc -@@ -1,6 +1,7 @@ - // Copyright (c) 2012 The Chromium Authors. All rights reserved. - // Use of this source code is governed by a BSD-style license that can be - // found in the LICENSE file. -+#if 0 - - #include "services/service_manager/zygote/zygote_linux.h" - -@@ -657,3 +658,4 @@ bool Zygote::HandleGetSandboxStatus(int fd, base::Pick - } - - } // namespace service_manager -+#endif diff --git a/www/chromium/files/patch-services_tracing_public_cpp_BUILD.gn b/www/chromium/files/patch-services_tracing_public_cpp_BUILD.gn deleted file mode 100644 index 5dd58766265e..000000000000 --- a/www/chromium/files/patch-services_tracing_public_cpp_BUILD.gn +++ /dev/null @@ -1,11 +0,0 @@ ---- services/tracing/public/cpp/BUILD.gn.orig 2020-07-13 12:06:56 UTC -+++ services/tracing/public/cpp/BUILD.gn -@@ -141,7 +141,7 @@ target(tracing_lib_type, "cpp") { - ] - } - -- if (is_linux && !is_fuchsia) { -+ if (is_linux && !is_fuchsia && !is_bsd) { - deps += [ "//components/crash/core/app:app" ] - } - 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 index 3d1509228a5b..8857145dc420 100644 --- 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 @@ -1,14 +1,15 @@ ---- services/tracing/public/cpp/perfetto/trace_time.cc.orig 2020-07-07 21:57:41 UTC +--- services/tracing/public/cpp/perfetto/trace_time.cc.orig 2020-11-13 06:36:46 UTC +++ services/tracing/public/cpp/perfetto/trace_time.cc -@@ -12,13 +12,17 @@ namespace tracing { +@@ -12,14 +12,18 @@ namespace tracing { int64_t TraceBootTicksNow() { // On Windows and Mac, TRACE_TIME_TICKS_NOW() behaves like boottime already. --#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) || \ + defined(OS_FUCHSIA) struct timespec ts; -+#if defined(OS_BSD) + int res = clock_gettime(CLOCK_UPTIME, &ts); ++#if defined(OS_BSD) +#else int res = clock_gettime(CLOCK_BOOTTIME, &ts); +#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 31d7a54601da..cae3a3bcb6fc 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,11 +1,11 @@ ---- services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc.orig 2020-07-07 21:58:16 UTC +--- services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc.orig 2020-11-13 06:36:46 UTC +++ services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc -@@ -525,7 +525,7 @@ void TracingSamplerProfiler::TracingProfileBuilder::Sa +@@ -546,7 +546,7 @@ void TracingSamplerProfiler::TracingProfileBuilder::Sa // static void TracingSamplerProfiler::MangleModuleIDIfNeeded(std::string* module_id) { --#if defined(OS_ANDROID) || defined(OS_LINUX) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Linux ELF module IDs are 160bit integers, which we need to mangle // down to 128bit integers to match the id that Breakpad outputs. // Example on version '66.0.3359.170' x64: diff --git a/www/chromium/files/patch-services_video__capture_broadcasting__receiver.cc b/www/chromium/files/patch-services_video__capture_broadcasting__receiver.cc index 53310cf132a5..f58bf0ac34a3 100644 --- a/www/chromium/files/patch-services_video__capture_broadcasting__receiver.cc +++ b/www/chromium/files/patch-services_video__capture_broadcasting__receiver.cc @@ -1,20 +1,20 @@ ---- services/video_capture/broadcasting_receiver.cc.orig 2020-05-13 18:39:47 UTC +--- services/video_capture/broadcasting_receiver.cc.orig 2020-11-13 06:36:46 UTC +++ services/video_capture/broadcasting_receiver.cc @@ -39,7 +39,7 @@ void CloneSharedBufferHandle(const mojo::ScopedSharedB void CloneSharedBufferToRawFileDescriptorHandle( const mojo::ScopedSharedBufferHandle& source, media::mojom::VideoBufferHandlePtr* target) { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // |source| is unwrapped to a |PlatformSharedMemoryRegion|, from whence a file // descriptor can be extracted which is then mojo-wrapped. base::subtle::PlatformSharedMemoryRegion platform_region = -@@ -182,7 +182,7 @@ void BroadcastingReceiver::BufferContext:: +@@ -184,7 +184,7 @@ void BroadcastingReceiver::BufferContext:: ConvertRawFileDescriptorToSharedBuffer() { DCHECK(buffer_handle_->is_shared_memory_via_raw_file_descriptor()); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // The conversion unwraps the descriptor from its mojo handle to the raw file // descriptor (ie, an int). This is used to create a // PlatformSharedMemoryRegion which is then wrapped as a diff --git a/www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp b/www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp index e619801ca914..f1f9e801d24d 100644 --- a/www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp +++ b/www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp @@ -1,4 +1,4 @@ ---- skia/ext/SkMemory_new_handler.cpp.orig 2020-07-07 21:57:41 UTC +--- skia/ext/SkMemory_new_handler.cpp.orig 2020-11-13 06:36:46 UTC +++ skia/ext/SkMemory_new_handler.cpp @@ -78,7 +78,7 @@ static void* malloc_nothrow(size_t size) { // TODO(b.kelemen): we should always use UncheckedMalloc but currently it diff --git a/www/chromium/files/patch-third__party_angle_BUILD.gn b/www/chromium/files/patch-third__party_angle_BUILD.gn index 364195df8094..ca75a0ea0c83 100644 --- a/www/chromium/files/patch-third__party_angle_BUILD.gn +++ b/www/chromium/files/patch-third__party_angle_BUILD.gn @@ -1,6 +1,34 @@ ---- third_party/angle/BUILD.gn.orig 2020-07-07 22:03:17 UTC +--- third_party/angle/BUILD.gn.orig 2020-11-13 06:42:14 UTC +++ third_party/angle/BUILD.gn -@@ -363,6 +363,7 @@ angle_static_library("angle_gpu_info_util") { +@@ -141,10 +141,17 @@ config("extra_warnings") { + ] + } + if (is_clang) { ++ if (!is_bsd) { ++ cflags += [ ++ "-Wdeprecated-copy", ++ "-Wsuggest-destructor-override", ++ "-Wsuggest-override", ++ ] ++ } ++ + cflags += [ + "-Wbad-function-cast", + "-Wconditional-uninitialized", +- "-Wdeprecated-copy", + "-Wextra-semi-stmt", + "-Wfloat-conversion", + "-Winconsistent-missing-destructor-override", +@@ -154,8 +161,6 @@ config("extra_warnings") { + "-Wredundant-parens", + "-Wreturn-std-move-in-c++11", + "-Wshadow-field", +- "-Wsuggest-destructor-override", +- "-Wsuggest-override", + "-Wtautological-type-limit-compare", + "-Wundefined-reinterpret-cast", + "-Wunneeded-internal-declaration", +@@ -396,6 +401,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__internal.h b/www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__internal.h index 3d393c5b6483..de1db9fa6465 100644 --- a/www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__internal.h +++ b/www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__internal.h @@ -1,4 +1,4 @@ ---- third_party/angle/src/gpu_info_util/SystemInfo_internal.h.orig 2019-03-11 22:07:59 UTC +--- third_party/angle/src/gpu_info_util/SystemInfo_internal.h.orig 2020-11-13 06:42:14 UTC +++ third_party/angle/src/gpu_info_util/SystemInfo_internal.h @@ -14,8 +14,13 @@ namespace angle diff --git a/www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__libpci.cpp b/www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__libpci.cpp index 8c7b858de64b..18c36e1708af 100644 --- a/www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__libpci.cpp +++ b/www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__libpci.cpp @@ -1,4 +1,4 @@ ---- third_party/angle/src/gpu_info_util/SystemInfo_libpci.cpp.orig 2019-03-11 22:07:59 UTC +--- third_party/angle/src/gpu_info_util/SystemInfo_libpci.cpp.orig 2020-11-13 06:42:14 UTC +++ third_party/angle/src/gpu_info_util/SystemInfo_libpci.cpp @@ -12,6 +12,11 @@ #include <pci/pci.h> 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 d69b549c46b1..506fed0244dd 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,4 +1,4 @@ ---- third_party/angle/src/gpu_info_util/SystemInfo_linux.cpp.orig 2019-03-11 22:07:59 UTC +--- third_party/angle/src/gpu_info_util/SystemInfo_linux.cpp.orig 2020-11-13 06:42:14 UTC +++ third_party/angle/src/gpu_info_util/SystemInfo_linux.cpp @@ -71,10 +71,18 @@ bool GetPCIDevicesWithLibPCI(std::vector<GPUDeviceInfo diff --git a/www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__x11.cpp b/www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__x11.cpp index 6b9bc94938ad..3454438f1209 100644 --- a/www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__x11.cpp +++ b/www/chromium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__x11.cpp @@ -1,4 +1,4 @@ ---- third_party/angle/src/gpu_info_util/SystemInfo_x11.cpp.orig 2019-03-11 22:07:59 UTC +--- third_party/angle/src/gpu_info_util/SystemInfo_x11.cpp.orig 2020-11-13 06:42:14 UTC +++ third_party/angle/src/gpu_info_util/SystemInfo_x11.cpp @@ -8,6 +8,8 @@ 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 ae471f19d258..97366af14810 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,47 +1,47 @@ ---- third_party/angle/src/libANGLE/Display.cpp.orig 2020-07-07 22:03:18 UTC +--- third_party/angle/src/libANGLE/Display.cpp.orig 2020-11-13 06:42:14 UTC +++ third_party/angle/src/libANGLE/Display.cpp -@@ -54,7 +54,7 @@ +@@ -55,7 +55,7 @@ # include "libANGLE/renderer/gl/cgl/DisplayCGL.h" # elif defined(ANGLE_PLATFORM_IOS) # include "libANGLE/renderer/gl/eagl/DisplayEAGL.h" -# elif defined(ANGLE_PLATFORM_LINUX) +# elif defined(ANGLE_PLATFORM_POSIX) - # if defined(ANGLE_USE_OZONE) - # include "libANGLE/renderer/gl/egl/ozone/DisplayOzone.h" - # else -@@ -252,7 +252,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di + # include "libANGLE/renderer/gl/egl/DisplayEGL.h" + # if defined(ANGLE_USE_GBM) + # include "libANGLE/renderer/gl/egl/gbm/DisplayGbm.h" +@@ -264,7 +264,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di impl = new rx::DisplayCGL(state); # elif defined(ANGLE_PLATFORM_IOS) impl = new rx::DisplayEAGL(state); -# elif defined(ANGLE_PLATFORM_LINUX) +# elif defined(ANGLE_PLATFORM_POSIX) - # if defined(ANGLE_USE_OZONE) - // This might work but has never been tried, so disallow for now. - impl = nullptr; -@@ -284,7 +284,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di + # if defined(ANGLE_USE_GBM) + if (platformType == 0) + { +@@ -305,7 +305,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di #if defined(ANGLE_ENABLE_OPENGL) # if defined(ANGLE_PLATFORM_WINDOWS) impl = new rx::DisplayWGL(state); -# elif defined(ANGLE_PLATFORM_LINUX) +# elif defined(ANGLE_PLATFORM_POSIX) - # if defined(ANGLE_USE_OZONE) - impl = new rx::DisplayOzone(state); - # else -@@ -315,7 +315,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di + # if defined(ANGLE_USE_GBM) + if (platformType == 0) + { +@@ -346,7 +346,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di { impl = rx::CreateVulkanWin32Display(state); } -# elif defined(ANGLE_PLATFORM_LINUX) +# elif defined(ANGLE_PLATFORM_POSIX) - if (rx::IsVulkanXcbDisplayAvailable()) + # if defined(ANGLE_USE_X11) + if (platformType == EGL_PLATFORM_X11_EXT && rx::IsVulkanXcbDisplayAvailable()) { - impl = rx::CreateVulkanXcbDisplay(state); -@@ -1395,7 +1395,7 @@ static ClientExtensions GenerateClientExtensions() +@@ -1612,7 +1612,7 @@ static ClientExtensions GenerateClientExtensions() extensions.x11Visual = true; #endif --#if defined(ANGLE_PLATFORM_LINUX) && !defined(ANGLE_USE_OZONE) -+#if defined(ANGLE_PLATFORM_POSIX) && !defined(ANGLE_USE_OZONE) +-#if defined(ANGLE_PLATFORM_LINUX) ++#if defined(ANGLE_PLATFORM_POSIX) extensions.platformANGLEDeviceTypeEGLANGLE = 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 588d82ab099e..4b89216ca42f 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,6 +1,6 @@ ---- third_party/angle/src/libANGLE/renderer/driver_utils.cpp.orig 2020-05-18 12:56:36 UTC +--- third_party/angle/src/libANGLE/renderer/driver_utils.cpp.orig 2020-11-13 06:42:14 UTC +++ third_party/angle/src/libANGLE/renderer/driver_utils.cpp -@@ -16,7 +16,7 @@ +@@ -17,7 +17,7 @@ # include <sys/system_properties.h> #endif @@ -9,7 +9,7 @@ # include <sys/utsname.h> #endif -@@ -206,7 +206,7 @@ OSVersion GetMacOSVersion() +@@ -207,7 +207,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. -@@ -218,6 +218,14 @@ bool ParseLinuxOSVersion(const char *version, int *maj +@@ -219,6 +219,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; -@@ -228,6 +236,7 @@ bool ParseLinuxOSVersion(const char *version, int *maj +@@ -229,6 +237,7 @@ bool ParseLinuxOSVersion(const char *version, int *maj { return false; } @@ -41,7 +41,7 @@ return true; } -@@ -235,7 +244,7 @@ bool ParseLinuxOSVersion(const char *version, int *maj +@@ -236,7 +245,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 1b7b10632f71..18043f6cd60a 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 2020-05-13 18:41:47 UTC +--- third_party/angle/src/libANGLE/renderer/driver_utils.h.orig 2020-11-13 06:42:14 UTC +++ third_party/angle/src/libANGLE/renderer/driver_utils.h -@@ -133,7 +133,7 @@ inline bool IsWindows() +@@ -145,7 +145,7 @@ inline bool IsWindows() inline bool IsLinux() { diff --git a/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h b/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h index aa021274cc80..1d028b65cef8 100644 --- a/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h +++ b/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h @@ -1,4 +1,4 @@ ---- third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk_api.h.orig 2020-02-03 21:54:48 UTC +--- third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk_api.h.orig 2020-11-13 06:42:14 UTC +++ third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk_api.h @@ -19,10 +19,10 @@ bool IsVulkanWin32DisplayAvailable(); DisplayImpl *CreateVulkanWin32Display(const egl::DisplayState &state); diff --git a/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_loader.c b/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_loader.c index 95d1dd2edfc9..b06ae7262239 100644 --- a/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_loader.c +++ b/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_loader.c @@ -1,6 +1,6 @@ ---- third_party/angle/third_party/vulkan-loader/src/loader/loader.c.orig 2020-07-07 22:03:29 UTC +--- third_party/angle/third_party/vulkan-loader/src/loader/loader.c.orig 2020-11-13 06:42:27 UTC +++ third_party/angle/third_party/vulkan-loader/src/loader/loader.c -@@ -241,7 +241,7 @@ void *loader_device_heap_realloc(const struct loader_d +@@ -250,7 +250,7 @@ void *loader_device_heap_realloc(const struct loader_d } // Environment variables diff --git a/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_vk__loader__platform.h b/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_vk__loader__platform.h index 674705f68fd5..689f2d76f21b 100644 --- a/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_vk__loader__platform.h +++ b/www/chromium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_vk__loader__platform.h @@ -1,4 +1,4 @@ ---- third_party/angle/third_party/vulkan-loader/src/loader/vk_loader_platform.h.orig 2019-03-11 22:08:05 UTC +--- third_party/angle/third_party/vulkan-loader/src/loader/vk_loader_platform.h.orig 2020-11-13 06:42:27 UTC +++ third_party/angle/third_party/vulkan-loader/src/loader/vk_loader_platform.h @@ -31,7 +31,7 @@ #include "vulkan/vk_platform.h" diff --git a/www/chromium/files/patch-third__party_angle_third__party_vulkan-validation-layers_src_layers_vk__loader__platform.h b/www/chromium/files/patch-third__party_angle_third__party_vulkan-validation-layers_src_layers_vk__loader__platform.h index ae25143a7898..745b91cb05ec 100644 --- a/www/chromium/files/patch-third__party_angle_third__party_vulkan-validation-layers_src_layers_vk__loader__platform.h +++ b/www/chromium/files/patch-third__party_angle_third__party_vulkan-validation-layers_src_layers_vk__loader__platform.h @@ -1,4 +1,4 @@ ---- third_party/angle/third_party/vulkan-validation-layers/src/layers/vk_loader_platform.h.orig 2020-05-13 18:41:57 UTC +--- third_party/angle/third_party/vulkan-validation-layers/src/layers/vk_loader_platform.h.orig 2020-11-13 06:42:27 UTC +++ third_party/angle/third_party/vulkan-validation-layers/src/layers/vk_loader_platform.h @@ -33,7 +33,7 @@ #undef NOMINMAX diff --git a/www/chromium/files/patch-third__party_blink_public_common_privacy__budget_identifiable__token.h b/www/chromium/files/patch-third__party_blink_public_common_privacy__budget_identifiable__token.h new file mode 100644 index 000000000000..8108d552954d --- /dev/null +++ b/www/chromium/files/patch-third__party_blink_public_common_privacy__budget_identifiable__token.h @@ -0,0 +1,11 @@ +--- third_party/blink/public/common/privacy_budget/identifiable_token.h.orig 2020-11-18 10:21:45 UTC ++++ third_party/blink/public/common/privacy_budget/identifiable_token.h +@@ -118,7 +118,7 @@ class IdentifiableToken { + + // Enums. Punt to the underlying type. + template <typename T, +- typename U = typename std::underlying_type<T>::type, ++ typename U = typename std::__sfinae_underlying_type<T>::type, + typename std::enable_if_t<std::is_enum<T>::value>* = nullptr> + constexpr IdentifiableToken(T in) // NOLINT(google-explicit-constructor) + : IdentifiableToken(static_cast<U>(in)) {} diff --git a/www/chromium/files/patch-third__party_blink_renderer_BUILD.gn b/www/chromium/files/patch-third__party_blink_renderer_BUILD.gn index 3ee19aa5429f..a69ab245ee57 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_BUILD.gn +++ b/www/chromium/files/patch-third__party_blink_renderer_BUILD.gn @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/BUILD.gn.orig 2020-03-16 18:40:34 UTC +--- third_party/blink/renderer/BUILD.gn.orig 2020-11-13 06:36:47 UTC +++ third_party/blink/renderer/BUILD.gn @@ -45,8 +45,8 @@ config("inside_blink") { "-Wconversion", diff --git a/www/chromium/files/patch-third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py b/www/chromium/files/patch-third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py index 697429afdc26..af95e3247fea 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py +++ b/www/chromium/files/patch-third__party_blink_renderer_bindings_scripts_bind__gen_style__format.py @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py.orig 2020-05-18 13:31:13 UTC +--- third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py.orig 2020-11-13 06:36:47 UTC +++ third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py @@ -29,6 +29,9 @@ def init(root_src_dir): elif sys.platform.startswith(("cygwin", "win")): 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 b904b155325c..662760163cd0 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,34 +1,34 @@ ---- third_party/blink/renderer/controller/blink_initializer.cc.orig 2020-07-07 21:58:17 UTC +--- third_party/blink/renderer/controller/blink_initializer.cc.orig 2020-11-13 06:36:47 UTC +++ third_party/blink/renderer/controller/blink_initializer.cc -@@ -66,11 +66,11 @@ +@@ -68,11 +68,11 @@ #include "third_party/blink/renderer/controller/oom_intervention_impl.h" #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "third_party/blink/renderer/controller/memory_usage_monitor_posix.h" #endif --#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_MACOSX) || \ -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_MACOSX) || defined(OS_BSD) || \ - 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) || \ + 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 +@@ -154,7 +154,7 @@ void InitializeCommon(Platform* platform, mojo::Binder CrashMemoryMetricsReporterImpl::Instance(); #endif --#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_MACOSX) || \ -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_MACOSX) || defined(OS_BSD) || \ - 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) || \ + defined(OS_MAC) || defined(OS_WIN) // Initialize UserLevelMemoryPressureSignalGenerator so it starts monitoring. if (UserLevelMemoryPressureSignalGenerator::Enabled()) -@@ -195,7 +195,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder - &CrashMemoryMetricsReporterImpl::Bind)), +@@ -212,7 +212,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder main_thread->GetTaskRunner()); #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) binders.Add(ConvertToBaseRepeatingCallback( CrossThreadBindRepeating(&MemoryUsageMonitorPosix::Bind)), main_thread->GetTaskRunner()); diff --git a/www/chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc b/www/chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc index 0206165988cf..71d1124c2a04 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc @@ -1,11 +1,11 @@ ---- third_party/blink/renderer/controller/memory_usage_monitor_posix.cc.orig 2020-05-15 15:24:43 UTC +--- third_party/blink/renderer/controller/memory_usage_monitor_posix.cc.orig 2020-11-13 06:36:47 UTC +++ third_party/blink/renderer/controller/memory_usage_monitor_posix.cc @@ -134,7 +134,7 @@ void MemoryUsageMonitorPosix::SetProcFiles(base::File status_fd_.reset(status_file.TakePlatformFile()); } --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // static void MemoryUsageMonitorPosix::Bind( mojo::PendingReceiver<mojom::blink::MemoryUsageMonitorLinux> receiver) { diff --git a/www/chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.h b/www/chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.h index 0c30711ac49d..d8e874b85037 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.h +++ b/www/chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.h @@ -1,11 +1,11 @@ ---- third_party/blink/renderer/controller/memory_usage_monitor_posix.h.orig 2020-03-17 10:18:29 UTC +--- third_party/blink/renderer/controller/memory_usage_monitor_posix.h.orig 2020-11-13 06:36:47 UTC +++ third_party/blink/renderer/controller/memory_usage_monitor_posix.h @@ -12,7 +12,7 @@ #include "third_party/blink/renderer/controller/controller_export.h" #include "third_party/blink/renderer/controller/memory_usage_monitor.h" --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "third_party/blink/public/mojom/memory_usage_monitor_linux.mojom-blink.h" #endif @@ -13,8 +13,8 @@ // MemoryUsageMonitor implementation for Android and Linux. class CONTROLLER_EXPORT MemoryUsageMonitorPosix : public MemoryUsageMonitor --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) , public mojom::blink::MemoryUsageMonitorLinux #endif @@ -22,8 +22,8 @@ public: MemoryUsageMonitorPosix() = default; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) static void Bind( mojo::PendingReceiver<mojom::blink::MemoryUsageMonitorLinux> receiver); #endif @@ -31,8 +31,8 @@ uint64_t* vm_size, uint64_t* vm_hwm_size); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // mojom::MemoryUsageMonitorLinux implementations: void SetProcFiles(base::File statm_file, base::File status_file) override; #endif @@ -40,8 +40,8 @@ base::ScopedFD statm_fd_; base::ScopedFD status_fd_; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) mojo::Receiver<mojom::blink::MemoryUsageMonitorLinux> receiver_{this}; #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 new file mode 100644 index 000000000000..585e9452f272 --- /dev/null +++ b/www/chromium/files/patch-third__party_blink_renderer_core_clipboard_system__clipboard.cc @@ -0,0 +1,15 @@ +--- third_party/blink/renderer/core/clipboard/system_clipboard.cc.orig 2020-11-16 14:53:50 UTC ++++ third_party/blink/renderer/core/clipboard/system_clipboard.cc +@@ -41,10 +41,10 @@ SystemClipboard::SystemClipboard(LocalFrame* frame) + frame->GetBrowserInterfaceBroker().GetInterface( + clipboard_.BindNewPipeAndPassReceiver( + frame->GetTaskRunner(TaskType::kUserInteraction))); +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + is_selection_buffer_available_ = + frame->GetSettings()->GetSelectionClipboardBufferAvailable(); +-#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || 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 1ba55b799c74..15c245cea9dc 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_editing_editing__behavior.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_editing_editing__behavior.cc @@ -1,11 +1,11 @@ ---- third_party/blink/renderer/core/editing/editing_behavior.cc.orig 2020-03-16 18:39:56 UTC +--- third_party/blink/renderer/core/editing/editing_behavior.cc.orig 2020-11-13 06:36:47 UTC +++ third_party/blink/renderer/core/editing/editing_behavior.cc @@ -274,7 +274,7 @@ bool EditingBehavior::ShouldInsertCharacter(const Keyb // unexpected behaviour if (ch < ' ') return false; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // According to XKB map no keyboard combinations with ctrl key are mapped to // printable characters, however we need the filter as the DomKey/text could // contain printable characters. diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__frame__test.cc b/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__frame__test.cc index 10d93b4ff97d..53ac078049c6 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__frame__test.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__frame__test.cc @@ -1,20 +1,20 @@ ---- third_party/blink/renderer/core/exported/web_frame_test.cc.orig 2020-07-13 10:01:14 UTC +--- third_party/blink/renderer/core/exported/web_frame_test.cc.orig 2020-11-13 06:36:47 UTC +++ third_party/blink/renderer/core/exported/web_frame_test.cc -@@ -5964,7 +5964,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) { +@@ -6054,7 +6054,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) { EXPECT_EQ(64, ComputeOffset(layout_object, 1000, 1000)); } --#if !defined(OS_MACOSX) && !defined(OS_LINUX) -+#if !defined(OS_MACOSX) && !defined(OS_LINUX) && !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) TEST_F(WebFrameTest, SelectRangeStaysHorizontallyAlignedWhenMoved) { RegisterMockedHttpURLLoad("move_caret.html"); -@@ -6297,7 +6297,7 @@ TEST_F(CompositedSelectionBoundsTest, Editable) { +@@ -6387,7 +6387,7 @@ TEST_F(CompositedSelectionBoundsTest, Editable) { TEST_F(CompositedSelectionBoundsTest, EditableDiv) { RunTest("composited_selection_bounds_editable_div.html"); } --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #if !defined(OS_ANDROID) TEST_F(CompositedSelectionBoundsTest, Input) { RunTest("composited_selection_bounds_input.html"); diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc b/www/chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc index a42d176dc91e..aab266a5d53b 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc @@ -1,11 +1,11 @@ ---- third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig 2020-05-13 18:40:34 UTC +--- third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig 2020-11-13 06:36:47 UTC +++ third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc -@@ -40,7 +40,7 @@ constexpr base::TimeDelta kEncodeRowSlackBeforeDeadlin +@@ -43,7 +43,7 @@ constexpr base::TimeDelta kEncodeRowSlackBeforeDeadlin base::TimeDelta::FromMicroseconds(100); /* The value is based on user statistics on Nov 2017. */ --#if (defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)) -+#if (defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)) || defined(OS_BSD) +-#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ ++#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) || \ + defined(OS_WIN)) const double kIdleTaskStartTimeoutDelayMs = 1000.0; #else - const double kIdleTaskStartTimeoutDelayMs = 4000.0; // For ChromeOS, Mobile diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc b/www/chromium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc index fab556d7fc68..84cc6fd425e2 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc @@ -1,11 +1,11 @@ ---- third_party/blink/renderer/core/html/forms/internal_popup_menu.cc.orig 2020-07-07 21:58:17 UTC +--- third_party/blink/renderer/core/html/forms/internal_popup_menu.cc.orig 2020-11-13 06:36:47 UTC +++ third_party/blink/renderer/core/html/forms/internal_popup_menu.cc -@@ -113,7 +113,7 @@ class InternalPopupMenu::ItemIterationContext { +@@ -155,7 +155,7 @@ class InternalPopupMenu::ItemIterationContext { is_in_group_(false), buffer_(buffer) { DCHECK(buffer_); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // On other platforms, the <option> background color is the same as the // <select> background color. On Linux, that makes the <option> // background color very dark, so by default, try to use a lighter diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc b/www/chromium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc index c453dedf861f..a826b36aa82c 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc @@ -1,11 +1,11 @@ ---- third_party/blink/renderer/core/inspector/inspector_memory_agent.cc.orig 2020-05-13 18:39:48 UTC +--- third_party/blink/renderer/core/inspector/inspector_memory_agent.cc.orig 2020-11-13 06:36:47 UTC +++ third_party/blink/renderer/core/inspector/inspector_memory_agent.cc -@@ -185,7 +185,7 @@ InspectorMemoryAgent::GetSamplingProfileById(uint32_t +@@ -186,7 +186,7 @@ InspectorMemoryAgent::GetSamplingProfileById(uint32_t Vector<String> InspectorMemoryAgent::Symbolize( const WebVector<void*>& addresses) { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // TODO(alph): Move symbolization to the client. Vector<void*> addresses_to_symbolize; for (size_t i = 0; i < addresses.size(); i++) { diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc b/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc index c0d73aa54377..1949b0cf6773 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/layout/layout_view.cc.orig 2020-07-07 21:58:17 UTC +--- third_party/blink/renderer/core/layout/layout_view.cc.orig 2020-11-13 06:36:47 UTC +++ third_party/blink/renderer/core/layout/layout_view.cc -@@ -61,7 +61,7 @@ +@@ -62,7 +62,7 @@ #include "third_party/blink/renderer/platform/instrumentation/tracing/traced_value.h" #include "third_party/blink/renderer/platform/runtime_enabled_features.h" @@ -9,7 +9,7 @@ #include "third_party/blink/renderer/platform/fonts/font_cache.h" #endif -@@ -329,7 +329,7 @@ void LayoutView::UpdateLayout() { +@@ -347,7 +347,7 @@ void LayoutView::UpdateLayout() { DCHECK(!layout_state_); LayoutState root_layout_state(*this); diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc b/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc index 3d568f18d12f..85139cee827f 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc @@ -1,11 +1,11 @@ ---- third_party/blink/renderer/core/paint/paint_layer.cc.orig 2020-07-07 21:58:17 UTC +--- third_party/blink/renderer/core/paint/paint_layer.cc.orig 2020-11-13 06:36:48 UTC +++ third_party/blink/renderer/core/paint/paint_layer.cc -@@ -108,7 +108,7 @@ namespace { +@@ -110,7 +110,7 @@ namespace { static CompositingQueryMode g_compositing_query_mode = kCompositingQueriesAreOnlyAllowedInCertainDocumentLifecyclePhases; --#ifdef OS_LINUX -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) struct SameSizeAsPaintLayer : DisplayItemClient { // The bit fields may fit into the machine word of DisplayItemClient which // has only 8-bit data. diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc b/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc index d9d385128571..9f60639f6ca1 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,4 +1,4 @@ ---- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2020-05-13 18:39:48 UTC +--- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2020-11-13 06:36:48 UTC +++ third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc @@ -137,7 +137,7 @@ bool ScrollbarThemeAura::SupportsDragSnapBack() const // Disable snapback on desktop Linux to better integrate with the desktop @@ -9,7 +9,7 @@ return false; #else return true; -@@ -301,7 +301,7 @@ ScrollbarPart ScrollbarThemeAura::PartsToInvalidateOnT +@@ -303,7 +303,7 @@ ScrollbarPart ScrollbarThemeAura::PartsToInvalidateOnT bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scrollbar& scrollbar, const WebMouseEvent& event) { diff --git a/www/chromium/files/patch-content_renderer_media_audio_audio__device__factory.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_media_audio_web__audio__device__factory.cc index 34d33fece481..169dde0e05b5 100644 --- a/www/chromium/files/patch-content_renderer_media_audio_audio__device__factory.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_modules_media_audio_web__audio__device__factory.cc @@ -1,9 +1,9 @@ ---- content/renderer/media/audio/audio_device_factory.cc.orig 2020-07-07 21:58:15 UTC -+++ content/renderer/media/audio/audio_device_factory.cc -@@ -37,7 +37,7 @@ AudioDeviceFactory* AudioDeviceFactory::factory_ = nul +--- third_party/blink/renderer/modules/media/audio/web_audio_device_factory.cc.orig 2020-11-16 14:54:17 UTC ++++ third_party/blink/renderer/modules/media/audio/web_audio_device_factory.cc +@@ -33,7 +33,7 @@ WebAudioDeviceFactory* WebAudioDeviceFactory::factory_ namespace { - #if defined(OS_WIN) || defined(OS_MACOSX) || \ + #if defined(OS_WIN) || defined(OS_MAC) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) // Due to driver deadlock issues on Windows (http://crbug/422522) there is a 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 700447cffeaa..4e381229ad4c 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,8 +1,8 @@ ---- third_party/blink/renderer/modules/mediastream/processed_local_audio_source.cc.orig 2020-07-07 21:58:17 UTC +--- third_party/blink/renderer/modules/mediastream/processed_local_audio_source.cc.orig 2020-11-13 06:36:48 UTC +++ third_party/blink/renderer/modules/mediastream/processed_local_audio_source.cc -@@ -407,7 +407,7 @@ void ProcessedLocalAudioSource::CaptureUsingProcessor( +@@ -408,7 +408,7 @@ void ProcessedLocalAudioSource::CaptureUsingProcessor( bool key_pressed) { - #if defined(OS_WIN) || defined(OS_MACOSX) + #if defined(OS_WIN) || defined(OS_MAC) DCHECK_LE(volume, 1.0); -#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_OPENBSD) +#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) 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 cfb3a7419840..f604f1027b1c 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,11 +1,11 @@ ---- third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig 2020-07-13 10:01:57 UTC +--- third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig 2020-11-13 06:36:48 UTC +++ third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc -@@ -243,7 +243,7 @@ TEST_F(WebRtcAudioRendererTest, MultipleRenderers) { - TEST_F(WebRtcAudioRendererTest, VerifySinkParameters) { +@@ -272,7 +272,7 @@ TEST_F(MAYBE_WebRtcAudioRendererTest, MultipleRenderer + TEST_F(MAYBE_WebRtcAudioRendererTest, VerifySinkParameters) { SetupRenderer(kDefaultOutputDeviceId); renderer_proxy_->Start(); --#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_FUCHSIA) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) || \ + defined(OS_FUCHSIA) static const int kExpectedBufferSize = kHardwareSampleRate / 100; #elif defined(OS_ANDROID) - static const int kExpectedBufferSize = 2 * kHardwareSampleRate / 100; diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc index 753361abf198..db7ad8d0b6ee 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,11 +1,13 @@ ---- third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc.orig 2020-07-13 10:02:28 UTC +--- third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc.orig 2020-11-13 06:36:48 UTC +++ third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc -@@ -132,7 +132,7 @@ class AudioWorkletThreadTest : public PageTestBase { - ASSERT_TRUE(thread->IsCurrentThread()); - // TODO(crbug.com/1022888): The worklet thread priority is always NORMAL on - // linux. --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - EXPECT_EQ(base::PlatformThread::GetCurrentThreadPriority(), - base::ThreadPriority::NORMAL); - #else +@@ -373,8 +373,8 @@ class AudioWorkletThreadPriorityTest + base::PlatformThread::GetCurrentThreadPriority(); + + // TODO(crbug.com/1022888): The worklet thread priority is always NORMAL +- // on OS_LINUX and OS_CHROMEOS regardless of the thread priority setting. +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++ // on OS_LINUX, OS_CHROMEOS and OS_BSD regardless of the thread priority setting. ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + if (expected_priority == base::ThreadPriority::REALTIME_AUDIO || + expected_priority == base::ThreadPriority::DISPLAY) { + EXPECT_EQ(actual_priority, base::ThreadPriority::NORMAL); diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn b/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn index 027bb5d83172..7ddf0fd9a11c 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 2020-07-07 21:58:17 UTC +--- third_party/blink/renderer/platform/BUILD.gn.orig 2020-11-13 06:36:48 UTC +++ third_party/blink/renderer/platform/BUILD.gn -@@ -103,6 +103,7 @@ executable("character_data_generator") { +@@ -110,6 +110,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 2fe87557e6d5..494d457e7234 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 2020-07-07 21:58:17 UTC +--- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2020-11-13 06:36:48 UTC +++ third_party/blink/renderer/platform/fonts/font_cache.cc -@@ -83,7 +83,7 @@ static const char kColorEmojiLocale[] = "und-Zsye"; +@@ -80,7 +80,7 @@ const char kColorEmojiLocale[] = "und-Zsye"; SkFontMgr* FontCache::static_font_manager_ = nullptr; @@ -9,12 +9,12 @@ float FontCache::device_scale_factor_ = 1.0; #endif -@@ -123,7 +123,7 @@ FontCache::FontCache() +@@ -120,7 +120,7 @@ FontCache::FontCache() FontPlatformData* FontCache::SystemFontPlatformData( const FontDescription& font_description) { const AtomicString& family = FontCache::SystemFontFamily(); --#if defined(OS_LINUX) || defined(OS_FUCHSIA) -+#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD) if (family.IsEmpty() || family == font_family_names::kSystemUi) return nullptr; #else diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h index 42d7e8063d30..802a3f44ede2 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h @@ -1,15 +1,15 @@ ---- third_party/blink/renderer/platform/fonts/font_cache.h.orig 2020-07-07 21:58:17 UTC +--- third_party/blink/renderer/platform/fonts/font_cache.h.orig 2020-11-13 06:36:48 UTC +++ third_party/blink/renderer/platform/fonts/font_cache.h @@ -58,7 +58,7 @@ #include "third_party/skia/include/core/SkFontMgr.h" #include "third_party/skia/include/core/SkRefCnt.h" --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "ui/gfx/font_fallback_linux.h" #endif -@@ -170,7 +170,7 @@ class PLATFORM_EXPORT FontCache { +@@ -167,7 +167,7 @@ class PLATFORM_EXPORT FontCache { sk_sp<SkFontMgr> FontManager() { return font_manager_; } static void SetFontManager(sk_sp<SkFontMgr>); @@ -18,36 +18,36 @@ // These are needed for calling QueryRenderStyleForStrike, since // gfx::GetFontRenderParams makes distinctions based on DSF. static float DeviceScaleFactor() { return device_scale_factor_; } -@@ -245,11 +245,11 @@ class PLATFORM_EXPORT FontCache { +@@ -242,11 +242,11 @@ class PLATFORM_EXPORT FontCache { const FontDescription&); #endif // defined(OS_ANDROID) --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) static bool GetFontForCharacter(UChar32, const char* preferred_locale, gfx::FallbackFontData*); --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) scoped_refptr<SimpleFontData> FontDataFromFontPlatformData( const FontPlatformData*, -@@ -330,12 +330,12 @@ class PLATFORM_EXPORT FontCache { +@@ -320,12 +320,12 @@ class PLATFORM_EXPORT FontCache { const FontFaceCreationParams&, std::string& name); --#if defined(OS_ANDROID) || defined(OS_LINUX) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) static AtomicString GetFamilyNameForCharacter(SkFontMgr*, UChar32, const FontDescription&, FontFallbackPriority); --#endif // defined(OS_ANDROID) || defined(OS_LINUX) -+#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) scoped_refptr<SimpleFontData> FallbackOnStandardFontStyle( const FontDescription&, -@@ -375,7 +375,7 @@ class PLATFORM_EXPORT FontCache { +@@ -365,7 +365,7 @@ class PLATFORM_EXPORT FontCache { std::unique_ptr<FallbackFamilyStyleCache> fallback_params_cache_; #endif // defined(OS_WIN) diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc index 7a5fb5e58d72..6f91e36aef37 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 2020-07-07 21:58:17 UTC +--- third_party/blink/renderer/platform/fonts/font_description.cc.orig 2020-11-13 06:36:48 UTC +++ third_party/blink/renderer/platform/fonts/font_description.cc -@@ -38,7 +38,7 @@ +@@ -39,7 +39,7 @@ #include "third_party/blink/renderer/platform/wtf/text/string_hash.h" #include "third_party/blink/renderer/platform/wtf/text/string_hasher.h" diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__metrics.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__metrics.cc index 4445ec96128b..7d23e127f075 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__metrics.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__metrics.cc @@ -1,29 +1,29 @@ ---- third_party/blink/renderer/platform/fonts/font_metrics.cc.orig 2019-07-24 18:58:42 UTC +--- third_party/blink/renderer/platform/fonts/font_metrics.cc.orig 2020-11-13 06:36:48 UTC +++ third_party/blink/renderer/platform/fonts/font_metrics.cc @@ -38,7 +38,7 @@ namespace blink { --#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) || \ + defined(OS_FUCHSIA) // This is the largest VDMX table which we'll try to load and parse. static const size_t kMaxVDMXTableSize = 1024 * 1024; // 1 MB - #endif -@@ -60,7 +60,7 @@ void FontMetrics::AscentDescentWithHacks( +@@ -68,7 +68,7 @@ void FontMetrics::AscentDescentWithHacks( int vdmx_ascent = 0, vdmx_descent = 0; bool is_vdmx_valid = false; --#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) || \ + defined(OS_FUCHSIA) // Manually digging up VDMX metrics is only applicable when bytecode hinting // using FreeType. With DirectWrite or CoreText, no bytecode hinting is ever - // done. This code should be pushed into FreeType (hinted font metrics). -@@ -106,7 +106,7 @@ void FontMetrics::AscentDescentWithHacks( +@@ -116,7 +116,7 @@ void FontMetrics::AscentDescentWithHacks( visual_overflow_inflation_for_ascent = 1; if (descent < metrics.fDescent) { visual_overflow_inflation_for_descent = 1; --#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) || \ + defined(OS_FUCHSIA) // When subpixel positioning is enabled, if the descent is rounded down, // the descent part of the glyph may be truncated when displayed in a - // 'overflow: hidden' container. To avoid that, borrow 1 unit from the diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc index 4766c40ab521..c8b2a9aac204 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc @@ -1,11 +1,11 @@ ---- third_party/blink/renderer/platform/fonts/font_unique_name_lookup.cc.orig 2019-06-04 18:55:30 UTC +--- third_party/blink/renderer/platform/fonts/font_unique_name_lookup.cc.orig 2020-11-13 06:36:48 UTC +++ third_party/blink/renderer/platform/fonts/font_unique_name_lookup.cc @@ -8,7 +8,7 @@ #if defined(OS_ANDROID) #include "third_party/blink/public/mojom/font_unique_name_lookup/font_unique_name_lookup.mojom-blink.h" #include "third_party/blink/renderer/platform/fonts/android/font_unique_name_lookup_android.h" --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) ++#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "third_party/blink/renderer/platform/fonts/linux/font_unique_name_lookup_linux.h" #elif defined(OS_WIN) #include "third_party/blink/renderer/platform/fonts/win/font_unique_name_lookup_win.h" @@ -13,8 +13,8 @@ FontUniqueNameLookup::GetPlatformUniqueNameLookup() { #if defined(OS_ANDROID) return std::make_unique<FontUniqueNameLookupAndroid>(); --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) ++#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) return std::make_unique<FontUniqueNameLookupLinux>(); #elif defined(OS_WIN) return std::make_unique<FontUniqueNameLookupWin>(); 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 75fffdbe36dc..6825c3dab999 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,11 +1,11 @@ ---- third_party/blink/renderer/platform/fonts/shaping/harfbuzz_shaper_test.cc.orig 2020-07-13 10:02:58 UTC +--- third_party/blink/renderer/platform/fonts/shaping/harfbuzz_shaper_test.cc.orig 2020-11-13 06:36:48 UTC +++ third_party/blink/renderer/platform/fonts/shaping/harfbuzz_shaper_test.cc -@@ -667,7 +667,7 @@ TEST_P(ShapeParameterTest, MaxGlyphsClusterDevanagari) +@@ -651,7 +651,7 @@ TEST_P(ShapeParameterTest, MaxGlyphsClusterDevanagari) HarfBuzzShaper shaper(string); scoped_refptr<ShapeResult> result = ShapeWithParameter(&shaper); EXPECT_EQ(length, result->NumCharacters()); --#if defined(OS_LINUX) || defined(OS_FUCHSIA) -+#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD) // Linux and Fuchsia use Lohit Devanagari. When using that font the shaper // returns 32767 glyphs instead of 32769. // TODO(crbug.com/933551): Add Noto Sans Devanagari to 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 ee42d5ea5b4a..aee1b1146f3a 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,11 +1,11 @@ ---- third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc.orig 2020-07-07 21:57:43 UTC +--- third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc.orig 2020-11-13 06:36:48 UTC +++ third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc @@ -61,7 +61,7 @@ AtomicString ToAtomicString(const SkString& str) { return AtomicString::FromUTF8(str.c_str(), str.size()); } --#if defined(OS_ANDROID) || defined(OS_LINUX) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // 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. @@ -13,8 +13,8 @@ typeface->getFamilyName(&skia_family_name); return ToAtomicString(skia_family_name); } --#endif // defined(OS_ANDROID) || defined(OS_LINUX) -+#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) void FontCache::PlatformInit() {} @@ -22,17 +22,17 @@ } #endif --#if defined(OS_LINUX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_BSD) // 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 -@@ -263,7 +263,7 @@ std::unique_ptr<FontPlatformData> FontCache::CreateFon +@@ -256,7 +256,7 @@ std::unique_ptr<FontPlatformData> FontCache::CreateFon std::string name; sk_sp<SkTypeface> typeface; --#if defined(OS_ANDROID) || defined(OS_LINUX) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) if (alternate_name == AlternateFontName::kLocalUniqueFace && RuntimeEnabledFeatures::FontSrcLocalMatchingEnabled()) { typeface = CreateTypefaceFromUniqueName(creation_params); diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_image__frame__generator__test.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_image__frame__generator__test.cc index 5bb3bf609ccf..3db90c2f87e0 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_image__frame__generator__test.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_image__frame__generator__test.cc @@ -1,19 +1,19 @@ ---- third_party/blink/renderer/platform/graphics/image_frame_generator_test.cc.orig 2020-07-13 10:03:26 UTC +--- third_party/blink/renderer/platform/graphics/image_frame_generator_test.cc.orig 2020-11-13 06:36:48 UTC +++ third_party/blink/renderer/platform/graphics/image_frame_generator_test.cc @@ -244,14 +244,14 @@ static void DecodeThreadMain(ImageFrameGenerator* gene cc::PaintImage::kDefaultGeneratorClientId); } --#if defined(OS_ANDROID) || defined(OS_LINUX) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // TODO(crbug.com/948641) #define MAYBE_incompleteDecodeBecomesCompleteMultiThreaded \ DISABLED_incompleteDecodeBecomesCompleteMultiThreaded #else #define MAYBE_incompleteDecodeBecomesCompleteMultiThreaded \ incompleteDecodeBecomesCompleteMultiThreaded --#endif // defined(OS_ANDROID) || defined(OS_LINUX) -+#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) TEST_F(ImageFrameGeneratorTest, MAYBE_incompleteDecodeBecomesCompleteMultiThreaded) { SetFrameStatus(ImageFrame::kFramePartial); 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 ac15b14a300e..3b9f1f53ca21 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,11 +1,11 @@ ---- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig 2020-07-07 21:58:17 UTC +--- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig 2020-11-13 06:36:48 UTC +++ third_party/blink/renderer/platform/graphics/video_frame_submitter.cc -@@ -196,7 +196,7 @@ void VideoFrameSubmitter::OnBeginFrame( +@@ -192,7 +192,7 @@ void VideoFrameSubmitter::OnBeginFrame( if (viz::FrameTokenGT(pair.key, *next_frame_token_)) continue; - --#ifdef OS_LINUX -+#if defined(OS_LINUX) || defined(OS_BSD) + auto& feedback = pair.value.presentation_feedback; +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // TODO: On Linux failure flag is unreliable, and perfectly rendered frames // are reported as failures all the time. bool presentation_failure = false; diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_container__annotations.h b/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_container__annotations.h index 27b83fe51ce9..8cc35c28ac89 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_container__annotations.h +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_container__annotations.h @@ -1,27 +1,27 @@ ---- third_party/blink/renderer/platform/wtf/container_annotations.h.orig 2019-06-04 18:55:30 UTC +--- third_party/blink/renderer/platform/wtf/container_annotations.h.orig 2020-11-13 06:36:48 UTC +++ third_party/blink/renderer/platform/wtf/container_annotations.h -@@ -10,7 +10,7 @@ - +@@ -11,7 +11,7 @@ // TODO(ochang): Remove the ARCH_CPU_X86_64 condition to enable this for X86 // once the crashes there have been fixed: http://crbug.com/461406 --#if defined(ADDRESS_SANITIZER) && defined(OS_LINUX) && defined(ARCH_CPU_X86_64) -+#if defined(ADDRESS_SANITIZER) && (defined(OS_LINUX) || defined(OS_BSD)) && defined(ARCH_CPU_X86_64) + #if defined(ADDRESS_SANITIZER) && \ +- (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(ARCH_CPU_X86_64) ++ (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(ARCH_CPU_X86_64) #define ANNOTATE_CONTIGUOUS_CONTAINER #define ANNOTATE_NEW_BUFFER(buffer, capacity, newSize) \ if (buffer) { \ -@@ -35,13 +35,13 @@ +@@ -36,13 +36,13 @@ ANNOTATE_NEW_BUFFER(buffer, newCapacity, bufferSize); // Annotations require buffers to begin on an 8-byte boundary. --#else // ADDRESS_SANITIZER && OS_LINUX && ARCH_CPU_X86_64 -+#else // ADDRESS_SANITIZER && (OS_LINUX || OS_BSD) && ARCH_CPU_X86_64 +-#else // ADDRESS_SANITIZER && (OS_LINUX || OS_CHROMEOS) && ARCH_CPU_X86_64 ++#else // ADDRESS_SANITIZER && (OS_LINUX || OS_CHROMEOS || OS_BSD) && ARCH_CPU_X86_64 #define ANNOTATE_NEW_BUFFER(buffer, capacity, newSize) #define ANNOTATE_DELETE_BUFFER(buffer, capacity, oldSize) #define ANNOTATE_CHANGE_SIZE(buffer, capacity, oldSize, newSize) #define ANNOTATE_CHANGE_CAPACITY(buffer, oldCapacity, bufferSize, newCapacity) --#endif // ADDRESS_SANITIZER && OS_LINUX && ARCH_CPU_X86_64 -+#endif // ADDRESS_SANITIZER && (OS_LINUX || OS_BSD) && ARCH_CPU_X86_64 +-#endif // ADDRESS_SANITIZER && (OS_LINUX || OS_CHROMEOS) && ARCH_CPU_X86_64 ++#endif // ADDRESS_SANITIZER && (OS_LINUX || OS_CHROMEOS || OS_BSD) && ARCH_CPU_X86_64 #endif // THIRD_PARTY_BLINK_RENDERER_PLATFORM_WTF_CONTAINER_ANNOTATIONS_H_ 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 24a812ce5223..0877157652be 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 2019-06-04 18:55:30 UTC +--- third_party/blink/renderer/platform/wtf/stack_util.cc.orig 2020-11-13 06:36:48 UTC +++ third_party/blink/renderer/platform/wtf/stack_util.cc -@@ -17,6 +17,11 @@ +@@ -18,6 +18,11 @@ extern "C" void* __libc_stack_end; // NOLINT #endif diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_threading__pthreads.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_threading__pthreads.cc index 1ab0c14a5a4e..f542e18d6e22 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_threading__pthreads.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_threading__pthreads.cc @@ -1,16 +1,16 @@ ---- third_party/blink/renderer/platform/wtf/threading_pthreads.cc.orig 2019-12-16 21:50:53 UTC +--- third_party/blink/renderer/platform/wtf/threading_pthreads.cc.orig 2020-11-13 06:36:48 UTC +++ third_party/blink/renderer/platform/wtf/threading_pthreads.cc @@ -50,12 +50,17 @@ #include <objc/objc-auto.h> #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include <sys/syscall.h> #endif --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) #include <unistd.h> +#endif + diff --git a/www/chromium/files/patch-third__party_boringssl_BUILD.gn b/www/chromium/files/patch-third__party_boringssl_BUILD.gn deleted file mode 100644 index 5fe68da0ea25..000000000000 --- a/www/chromium/files/patch-third__party_boringssl_BUILD.gn +++ /dev/null @@ -1,36 +0,0 @@ ---- third_party/boringssl/BUILD.gn.orig 2020-05-13 18:40:00 UTC -+++ third_party/boringssl/BUILD.gn -@@ -72,7 +72,7 @@ if (is_win && !is_msan && current_cpu != "arm64") { - } else if (current_cpu == "x64") { - if (is_mac) { - sources += crypto_sources_mac_x86_64 -- } else if (is_linux || is_android) { -+ } else if (is_linux || is_bsd || is_android) { - sources += crypto_sources_linux_x86_64 - } else { - public_configs = [ ":no_asm_config" ] -@@ -80,13 +80,13 @@ if (is_win && !is_msan && current_cpu != "arm64") { - } else if (current_cpu == "x86") { - if (is_mac) { - sources += crypto_sources_mac_x86 -- } else if (is_linux || is_android) { -+ } else if (is_linux || is_bsd || is_android) { - sources += crypto_sources_linux_x86 - } else { - public_configs = [ ":no_asm_config" ] - } - } else if (current_cpu == "arm") { -- if (is_linux || is_android) { -+ if (is_linux || is_bsd || is_android) { - sources += crypto_sources_linux_arm - } else if (is_ios) { - sources += crypto_sources_ios_arm -@@ -94,7 +94,7 @@ if (is_win && !is_msan && current_cpu != "arm64") { - public_configs = [ ":no_asm_config" ] - } - } else if (current_cpu == "arm64") { -- if (is_linux || is_android) { -+ if (is_linux || is_bsd || is_android) { - sources += crypto_sources_linux_aarch64 - } else if (is_ios) { - sources += crypto_sources_ios_aarch64 diff --git a/www/chromium/files/patch-third__party_boringssl_src_crypto_cpu-aarch64-linux.c b/www/chromium/files/patch-third__party_boringssl_src_crypto_cpu-aarch64-linux.c index 5856c89852d1..4204638aa8f4 100644 --- a/www/chromium/files/patch-third__party_boringssl_src_crypto_cpu-aarch64-linux.c +++ b/www/chromium/files/patch-third__party_boringssl_src_crypto_cpu-aarch64-linux.c @@ -1,4 +1,4 @@ ---- third_party/boringssl/src/crypto/cpu-aarch64-linux.c.orig 2020-03-03 18:55:22 UTC +--- third_party/boringssl/src/crypto/cpu-aarch64-linux.c.orig 2020-11-13 06:42:13 UTC +++ third_party/boringssl/src/crypto/cpu-aarch64-linux.c @@ -14,49 +14,45 @@ diff --git a/www/chromium/files/patch-third__party_boringssl_src_crypto_ex__data.c b/www/chromium/files/patch-third__party_boringssl_src_crypto_ex__data.c index 6f2127918315..1c2247710a9d 100644 --- a/www/chromium/files/patch-third__party_boringssl_src_crypto_ex__data.c +++ b/www/chromium/files/patch-third__party_boringssl_src_crypto_ex__data.c @@ -1,4 +1,4 @@ ---- third_party/boringssl/src/crypto/ex_data.c.orig 2019-03-11 22:07:58 UTC +--- third_party/boringssl/src/crypto/ex_data.c.orig 2020-11-13 06:42:13 UTC +++ third_party/boringssl/src/crypto/ex_data.c @@ -186,7 +186,9 @@ int CRYPTO_set_ex_data(CRYPTO_EX_DATA *ad, int index, } diff --git a/www/chromium/files/patch-third__party_breakpad_breakpad_src_common_simple__string__dictionary.h b/www/chromium/files/patch-third__party_breakpad_breakpad_src_common_simple__string__dictionary.h index b0aaa7abccb6..fa056291b8cf 100644 --- a/www/chromium/files/patch-third__party_breakpad_breakpad_src_common_simple__string__dictionary.h +++ b/www/chromium/files/patch-third__party_breakpad_breakpad_src_common_simple__string__dictionary.h @@ -1,4 +1,4 @@ ---- third_party/breakpad/breakpad/src/common/simple_string_dictionary.h.orig 2019-03-11 22:07:58 UTC +--- third_party/breakpad/breakpad/src/common/simple_string_dictionary.h.orig 2020-11-13 06:42:14 UTC +++ third_party/breakpad/breakpad/src/common/simple_string_dictionary.h @@ -33,7 +33,7 @@ #include <assert.h> diff --git a/www/chromium/files/patch-third__party_cacheinvalidation_src_google_cacheinvalidation_include_types.h b/www/chromium/files/patch-third__party_cacheinvalidation_src_google_cacheinvalidation_include_types.h deleted file mode 100644 index 0a76ed7ccadc..000000000000 --- a/www/chromium/files/patch-third__party_cacheinvalidation_src_google_cacheinvalidation_include_types.h +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/cacheinvalidation/src/google/cacheinvalidation/include/types.h.orig 2019-03-11 22:01:15 UTC -+++ third_party/cacheinvalidation/src/google/cacheinvalidation/include/types.h -@@ -334,6 +334,8 @@ class Status { - */ - PERMANENT_FAILURE - }; -+ -+ Status() : code_(SUCCESS), message_() {} - - /* Creates a new Status object given the code and message. */ - Status(Code code, const string& message) : code_(code), message_(message) {} diff --git a/www/chromium/files/patch-third__party_crashpad_crashpad_build_crashpad__buildconfig.gni b/www/chromium/files/patch-third__party_crashpad_crashpad_build_crashpad__buildconfig.gni deleted file mode 100644 index 97991dfed588..000000000000 --- a/www/chromium/files/patch-third__party_crashpad_crashpad_build_crashpad__buildconfig.gni +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/crashpad/crashpad/build/crashpad_buildconfig.gni.orig 2020-02-03 21:53:08 UTC -+++ third_party/crashpad/crashpad/build/crashpad_buildconfig.gni -@@ -38,7 +38,7 @@ if (crashpad_is_in_chromium) { - crashpad_is_mac = is_mac - crashpad_is_ios = is_ios - crashpad_is_win = is_win -- crashpad_is_linux = is_linux -+ crashpad_is_linux = is_linux && !is_bsd - crashpad_is_android = is_android - crashpad_is_fuchsia = is_fuchsia - 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 8b35da84f023..53f692a2a18d 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,6 +1,6 @@ ---- third_party/crashpad/crashpad/client/BUILD.gn.orig 2020-07-07 21:57:56 UTC +--- third_party/crashpad/crashpad/client/BUILD.gn.orig 2020-11-13 06:37:02 UTC +++ third_party/crashpad/crashpad/client/BUILD.gn -@@ -78,6 +78,12 @@ static_library("client") { +@@ -82,6 +82,12 @@ crashpad_static_library("client") { sources += [ "crashpad_client_fuchsia.cc" ] } diff --git a/www/chromium/files/patch-third__party_crashpad_crashpad_client_crashpad__client__posix.cc b/www/chromium/files/patch-third__party_crashpad_crashpad_client_crashpad__client__posix.cc index 9cafc79f1aff..c7a724d9e594 100644 --- a/www/chromium/files/patch-third__party_crashpad_crashpad_client_crashpad__client__posix.cc +++ b/www/chromium/files/patch-third__party_crashpad_crashpad_client_crashpad__client__posix.cc @@ -1,6 +1,6 @@ ---- third_party/crashpad/crashpad/client/crashpad_client_posix.cc.orig 2019-03-17 01:47:14 UTC +--- third_party/crashpad/crashpad/client/crashpad_client_posix.cc.orig 2020-11-16 10:08:53 UTC +++ third_party/crashpad/crashpad/client/crashpad_client_posix.cc -@@ -0,0 +1,38 @@ +@@ -0,0 +1,39 @@ +// Copyright 2017 The Crashpad Authors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); @@ -18,6 +18,7 @@ +#include "client/crashpad_client.h" + +#include "base/logging.h" ++#include "base/notreached.h" + +namespace crashpad { + diff --git a/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_address__types.h b/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_address__types.h deleted file mode 100644 index ead0b25e172c..000000000000 --- a/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_address__types.h +++ /dev/null @@ -1,20 +0,0 @@ ---- third_party/crashpad/crashpad/util/misc/address_types.h.orig 2019-03-11 22:01:15 UTC -+++ third_party/crashpad/crashpad/util/misc/address_types.h -@@ -25,7 +25,7 @@ - #include <mach/mach_types.h> - #elif defined(OS_WIN) - #include "util/win/address_types.h" --#elif defined(OS_LINUX) || defined(OS_ANDROID) -+#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) - #include "util/linux/address_types.h" - #elif defined(OS_FUCHSIA) - #include <zircon/types.h> -@@ -55,7 +55,7 @@ using VMSize = mach_vm_size_t; - using VMAddress = WinVMAddress; - using VMSize = WinVMSize; - --#elif defined(OS_LINUX) || defined(OS_ANDROID) -+#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) - - using VMAddress = LinuxVMAddress; - using VMSize = LinuxVMSize; diff --git a/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_capture__context.h b/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_capture__context.h deleted file mode 100644 index f2a935ddbc0e..000000000000 --- a/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_capture__context.h +++ /dev/null @@ -1,20 +0,0 @@ ---- third_party/crashpad/crashpad/util/misc/capture_context.h.orig 2020-07-07 21:57:56 UTC -+++ third_party/crashpad/crashpad/util/misc/capture_context.h -@@ -21,7 +21,7 @@ - #include <mach/mach.h> - #elif defined(OS_WIN) - #include <windows.h> --#elif defined(OS_LINUX) || defined(OS_ANDROID) -+#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) - #include <ucontext.h> - #elif defined(OS_FUCHSIA) - #include <signal.h> -@@ -37,7 +37,7 @@ using NativeCPUContext = arm_unified_thread_state; - #endif - #elif defined(OS_WIN) - using NativeCPUContext = CONTEXT; --#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) -+#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD) - using NativeCPUContext = ucontext_t; - #endif // OS_MACOSX - diff --git a/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_metrics.cc b/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_metrics.cc deleted file mode 100644 index f1804888aee1..000000000000 --- a/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_metrics.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/crashpad/crashpad/util/misc/metrics.cc.orig 2019-03-11 22:01:15 UTC -+++ third_party/crashpad/crashpad/util/misc/metrics.cc -@@ -25,7 +25,7 @@ - #define METRICS_OS_NAME "Win" - #elif defined(OS_ANDROID) - #define METRICS_OS_NAME "Android" --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) - #define METRICS_OS_NAME "Linux" - #elif defined(OS_FUCHSIA) - #define METRICS_OS_NAME "Fuchsia" diff --git a/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_uuid.cc b/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_uuid.cc deleted file mode 100644 index d7a1ca9a0fd0..000000000000 --- a/www/chromium/files/patch-third__party_crashpad_crashpad_util_misc_uuid.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/crashpad/crashpad/util/misc/uuid.cc.orig 2019-03-11 22:01:15 UTC -+++ third_party/crashpad/crashpad/util/misc/uuid.cc -@@ -95,7 +95,7 @@ bool UUID::InitializeWithNew() { - InitializeFromBytes(uuid); - return true; - #elif defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) || \ -- defined(OS_FUCHSIA) -+ defined(OS_FUCHSIA) || defined(OS_BSD) - // Linux, Android, and Fuchsia do not provide a UUID generator in a - // widely-available system library. On Linux and Android, uuid_generate() - // from libuuid is not available everywhere. diff --git a/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_close__multiple.cc b/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_close__multiple.cc index e7dc2e3561db..d1616418f706 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,29 +1,40 @@ ---- third_party/crashpad/crashpad/util/posix/close_multiple.cc.orig 2019-03-11 22:01:15 UTC +--- third_party/crashpad/crashpad/util/posix/close_multiple.cc.orig 2020-11-13 06:37:02 UTC +++ third_party/crashpad/crashpad/util/posix/close_multiple.cc -@@ -31,7 +31,7 @@ - #include "util/file/directory_reader.h" - #include "util/misc/implicit_cast.h" - --#if defined(OS_MACOSX) -+#if defined(OS_MACOSX) || defined(OS_BSD) - #include <sys/sysctl.h> +@@ -181,11 +181,37 @@ void CloseMultipleNowOrOnExec(int fd, int preserve_fd) + } #endif -@@ -72,7 +72,7 @@ void CloseNowOrOnExec(int fd, bool ebadf_ok) { - // This is an advantage over looping over all possible file descriptors, because - // no attempt needs to be made to close file descriptors that are not open. - bool CloseMultipleNowOrOnExecUsingFDDir(int min_fd, int preserve_fd) { --#if defined(OS_MACOSX) -+#if defined(OS_MACOSX) || defined(OS_BSD) - static constexpr char kFDDir[] = "/dev/fd"; - #elif defined(OS_LINUX) || defined(OS_ANDROID) - static constexpr char kFDDir[] = "/proc/self/fd"; -@@ -146,7 +146,7 @@ void CloseMultipleNowOrOnExec(int fd, int preserve_fd) - // while the system is running, but it’s still a better upper bound than the - // current RLIMIT_NOFILE value. ++#if defined(OS_BSD) ++ // If preserve_fd is in the space to be freed, copy it down. ++ bool copied = false; ++ if (preserve_fd >= fd) { ++ if (preserve_fd > fd) { ++ int rv = dup2(preserve_fd, fd); ++ if (rv != 0) ++ PLOG(WARNING) << "dup2"; ++ copied = true; ++ } ++ fd++; ++ } ++ // Cloexec is only used for MACOS... ++ closefrom(fd); ++ // Put it back. ++ if (copied) { ++ fd--; ++ int rv = dup2(fd, preserve_fd); ++ if (rv != 0) ++ PLOG(WARNING) << "dup2"; ++ rv = IGNORE_EINTR(close(fd)); ++ if (rv != 0) ++ PLOG(WARNING) << "close"; ++ } ++#else + for (int entry_fd = fd; entry_fd < max_fd; ++entry_fd) { + if (entry_fd != preserve_fd) { + CloseNowOrOnExec(entry_fd, true); + } + } ++#endif + } --#if defined(OS_MACOSX) -+#if defined(OS_MACOSX) || defined(OS_BSD) - // See 10.11.6 xnu-3248.60.10/bsd/kern/kern_resource.c maxfilesperproc, - // referenced by dosetrlimit(). - int oid[] = {CTL_KERN, KERN_MAXFILESPERPROC}; + } // namespace crashpad diff --git a/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_drop__privileges.cc b/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_drop__privileges.cc deleted file mode 100644 index 42ba7366e3cb..000000000000 --- a/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_drop__privileges.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/crashpad/crashpad/util/posix/drop_privileges.cc.orig 2019-03-11 22:01:15 UTC -+++ third_party/crashpad/crashpad/util/posix/drop_privileges.cc -@@ -23,7 +23,7 @@ void DropPrivileges() { - gid_t gid = getgid(); - uid_t uid = getuid(); - --#if defined(OS_MACOSX) -+#if defined(OS_MACOSX) || defined(OS_BSD) - // Based on the POSIX.1-2008 2013 edition documentation for setreuid() and - // setregid(), setreuid() and setregid() alone should be sufficient to drop - // privileges. The standard specifies that the saved ID should be set to the diff --git a/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_signals.cc b/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_signals.cc index 911ec6d61ccd..ab6ae3d98470 100644 --- a/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_signals.cc +++ b/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_signals.cc @@ -1,31 +1,6 @@ ---- third_party/crashpad/crashpad/util/posix/signals.cc.orig 2019-12-16 21:51:05 UTC +--- third_party/crashpad/crashpad/util/posix/signals.cc.orig 2020-11-13 06:37:02 UTC +++ third_party/crashpad/crashpad/util/posix/signals.cc -@@ -45,10 +45,10 @@ constexpr int kCrashSignals[] = { - #if defined(SIGEMT) - SIGEMT, - #endif // defined(SIGEMT) --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - SIGXCPU, - SIGXFSZ, --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) - }; - - // These are the non-core-generating but terminating signals. -@@ -85,9 +85,9 @@ constexpr int kTerminateSignals[] = { - SIGXCPU, - SIGXFSZ, - #endif // defined(OS_MACOSX) --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - SIGIO, --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) - }; - - bool InstallHandlers(const std::vector<int>& signals, -@@ -224,8 +224,12 @@ bool Signals::WillSignalReraiseAutonomously(const sigi +@@ -228,8 +228,12 @@ bool Signals::WillSignalReraiseAutonomously(const sigi // remains. See 10.12.3 xnu-3789.41.3/bsd/kern/kern_sig.c // psignal_internal(). (code > 0 && diff --git a/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_symbolic__constants__posix.cc b/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_symbolic__constants__posix.cc deleted file mode 100644 index 63645eb0d883..000000000000 --- a/www/chromium/files/patch-third__party_crashpad_crashpad_util_posix_symbolic__constants__posix.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- third_party/crashpad/crashpad/util/posix/symbolic_constants_posix.cc.orig 2019-03-11 22:01:15 UTC -+++ third_party/crashpad/crashpad/util/posix/symbolic_constants_posix.cc -@@ -64,7 +64,7 @@ constexpr const char* kSignalNames[] = { - "INFO", - "USR1", - "USR2", --#elif defined(OS_LINUX) || defined(OS_ANDROID) -+#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) - #if defined(ARCH_CPU_MIPS_FAMILY) - "HUP", - "INT", -@@ -135,7 +135,7 @@ constexpr const char* kSignalNames[] = { - #endif // defined(ARCH_CPU_MIPS_FAMILY) - #endif - }; --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) - // NSIG is 64 to account for real-time signals. - static_assert(base::size(kSignalNames) == 32, "kSignalNames length"); - #else diff --git a/www/chromium/files/patch-third__party_crc32c_src_src_crc32c__arm64__linux__check.h b/www/chromium/files/patch-third__party_crc32c_src_src_crc32c__arm64__linux__check.h index 0dd0f21d8d58..0d39b7aac8fa 100644 --- a/www/chromium/files/patch-third__party_crc32c_src_src_crc32c__arm64__linux__check.h +++ b/www/chromium/files/patch-third__party_crc32c_src_src_crc32c__arm64__linux__check.h @@ -1,4 +1,4 @@ ---- third_party/crc32c/src/src/crc32c_arm64_linux_check.h.orig 2020-03-03 18:55:23 UTC +--- third_party/crc32c/src/src/crc32c_arm64_linux_check.h.orig 2020-11-13 06:42:14 UTC +++ third_party/crc32c/src/src/crc32c_arm64_linux_check.h @@ -7,8 +7,6 @@ #ifndef CRC32C_CRC32C_ARM_LINUX_CHECK_H_ diff --git a/www/chromium/files/patch-third__party_ffmpeg_libavutil_mem.c b/www/chromium/files/patch-third__party_ffmpeg_libavutil_mem.c index 23d1e5344a09..728c5d275bce 100644 --- a/www/chromium/files/patch-third__party_ffmpeg_libavutil_mem.c +++ b/www/chromium/files/patch-third__party_ffmpeg_libavutil_mem.c @@ -1,4 +1,4 @@ ---- third_party/ffmpeg/libavutil/mem.c.orig 2019-03-11 22:08:00 UTC +--- third_party/ffmpeg/libavutil/mem.c.orig 2020-11-13 06:42:16 UTC +++ third_party/ffmpeg/libavutil/mem.c @@ -32,9 +32,6 @@ #include <stdint.h> diff --git a/www/chromium/files/patch-third__party_googletest_src_googletest_include_gtest_internal_gtest-port.h b/www/chromium/files/patch-third__party_googletest_src_googletest_include_gtest_internal_gtest-port.h index a7505f370c19..64f7d57fc2bc 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 2020-07-13 13:11:01 UTC +--- third_party/googletest/src/googletest/include/gtest/internal/gtest-port.h.orig 2020-11-13 06:42:16 UTC +++ third_party/googletest/src/googletest/include/gtest/internal/gtest-port.h -@@ -1631,6 +1631,8 @@ class ThreadLocal : public ThreadLocalBase { +@@ -1641,6 +1641,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_)); -@@ -1647,6 +1649,7 @@ class MutexBase { +@@ -1657,6 +1659,7 @@ class MutexBase { has_owner_ = false; GTEST_CHECK_POSIX_SUCCESS_(pthread_mutex_unlock(&mutex_)); } diff --git a/www/chromium/files/patch-third__party_googletest_src_googletest_src_gtest-port.cc b/www/chromium/files/patch-third__party_googletest_src_googletest_src_gtest-port.cc index ba45bf4dc184..1123141a4172 100644 --- a/www/chromium/files/patch-third__party_googletest_src_googletest_src_gtest-port.cc +++ b/www/chromium/files/patch-third__party_googletest_src_googletest_src_gtest-port.cc @@ -1,4 +1,4 @@ ---- third_party/googletest/src/googletest/src/gtest-port.cc.orig 2020-03-16 18:42:08 UTC +--- third_party/googletest/src/googletest/src/gtest-port.cc.orig 2020-11-13 06:42:16 UTC +++ third_party/googletest/src/googletest/src/gtest-port.cc @@ -64,6 +64,11 @@ # endif diff --git a/www/chromium/files/patch-third__party_googletest_src_googletest_src_gtest.cc b/www/chromium/files/patch-third__party_googletest_src_googletest_src_gtest.cc index 54433ee2b928..cb60ddd7eabf 100644 --- a/www/chromium/files/patch-third__party_googletest_src_googletest_src_gtest.cc +++ b/www/chromium/files/patch-third__party_googletest_src_googletest_src_gtest.cc @@ -1,6 +1,6 @@ ---- third_party/googletest/src/googletest/src/gtest.cc.orig 2020-07-07 22:03:20 UTC +--- third_party/googletest/src/googletest/src/gtest.cc.orig 2020-11-13 06:42:16 UTC +++ third_party/googletest/src/googletest/src/gtest.cc -@@ -119,6 +119,7 @@ +@@ -117,6 +117,7 @@ #if GTEST_CAN_STREAM_RESULTS_ # include <arpa/inet.h> // NOLINT diff --git a/www/chromium/files/patch-third__party_harfbuzz-ng_harfbuzz.gni b/www/chromium/files/patch-third__party_harfbuzz-ng_harfbuzz.gni index eb8e42c94bca..8c06987589c9 100644 --- a/www/chromium/files/patch-third__party_harfbuzz-ng_harfbuzz.gni +++ b/www/chromium/files/patch-third__party_harfbuzz-ng_harfbuzz.gni @@ -1,4 +1,4 @@ ---- third_party/harfbuzz-ng/harfbuzz.gni.orig 2019-05-04 09:19:19 UTC +--- third_party/harfbuzz-ng/harfbuzz.gni.orig 2020-11-13 06:37:03 UTC +++ third_party/harfbuzz-ng/harfbuzz.gni @@ -3,10 +3,11 @@ # found in the LICENSE file. 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 f9943f71d1d5..d776669cf847 100644 --- a/www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc +++ b/www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc @@ -1,6 +1,6 @@ ---- third_party/leveldatabase/env_chromium.cc.orig 2020-07-07 21:58:18 UTC +--- third_party/leveldatabase/env_chromium.cc.orig 2020-11-13 06:37:03 UTC +++ third_party/leveldatabase/env_chromium.cc -@@ -36,7 +36,11 @@ +@@ -39,7 +39,11 @@ #include "third_party/leveldatabase/leveldb_chrome.h" #include "third_party/leveldatabase/leveldb_features.h" #include "third_party/leveldatabase/src/include/leveldb/options.h" diff --git a/www/chromium/files/patch-third__party_libXNVCtrl_NVCtrl.c b/www/chromium/files/patch-third__party_libXNVCtrl_NVCtrl.c index 3d2353cdedae..7b8eb0199f4c 100644 --- a/www/chromium/files/patch-third__party_libXNVCtrl_NVCtrl.c +++ b/www/chromium/files/patch-third__party_libXNVCtrl_NVCtrl.c @@ -1,4 +1,4 @@ ---- third_party/libXNVCtrl/NVCtrl.c.orig 2019-03-11 22:01:15 UTC +--- third_party/libXNVCtrl/NVCtrl.c.orig 2020-11-13 06:37:03 UTC +++ third_party/libXNVCtrl/NVCtrl.c @@ -27,10 +27,6 @@ * libXNVCtrl library properly protects the Display connection. diff --git a/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton.h b/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton.h index 0815f041a8db..41fa22d64b84 100644 --- a/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton.h +++ b/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton.h @@ -1,4 +1,4 @@ ---- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/memory/singleton.h.orig 2019-03-11 22:08:01 UTC +--- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/memory/singleton.h.orig 2020-11-13 06:42:18 UTC +++ third_party/libphonenumber/dist/cpp/src/phonenumbers/base/memory/singleton.h @@ -56,7 +56,7 @@ template <class T> boost::once_flag Singleton<T>::flag #include "phonenumbers/base/logging.h" diff --git a/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h b/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h index b09577e3c1d7..af2aa7bf521e 100644 --- a/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h +++ b/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h @@ -1,4 +1,4 @@ ---- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/synchronization/lock.h.orig 2019-10-21 19:09:13 UTC +--- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/synchronization/lock.h.orig 2020-11-13 06:42:18 UTC +++ third_party/libphonenumber/dist/cpp/src/phonenumbers/base/synchronization/lock.h @@ -63,7 +63,7 @@ class Lock { (private) // Dummy lock implementation on non-POSIX platforms. If you are running on a diff --git a/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_thread__checker.h b/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_thread__checker.h index 86849dfe63cd..76b97fb0f9ca 100644 --- a/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_thread__checker.h +++ b/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_thread__checker.h @@ -1,4 +1,4 @@ ---- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/thread_checker.h.orig 2019-03-11 22:08:01 UTC +--- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/thread_checker.h.orig 2020-11-13 06:42:18 UTC +++ third_party/libphonenumber/dist/cpp/src/phonenumbers/base/thread_checker.h @@ -23,6 +23,7 @@ // user of the library know that it can't be used in a thread-safe manner when diff --git a/www/chromium/files/patch-third__party_libpng_pnglibconf.h b/www/chromium/files/patch-third__party_libpng_pnglibconf.h index 81996a0cfa58..45b8be9cea93 100644 --- a/www/chromium/files/patch-third__party_libpng_pnglibconf.h +++ b/www/chromium/files/patch-third__party_libpng_pnglibconf.h @@ -1,4 +1,4 @@ ---- third_party/libpng/pnglibconf.h.orig 2020-03-03 18:53:28 UTC +--- third_party/libpng/pnglibconf.h.orig 2020-11-13 06:37:03 UTC +++ third_party/libpng/pnglibconf.h @@ -230,8 +230,11 @@ * This is necessary to build multiple copies of libpng. We need this while pdfium builds diff --git a/www/chromium/files/patch-third__party_libyuv_include_libyuv_row.h b/www/chromium/files/patch-third__party_libyuv_include_libyuv_row.h index 25761a9d90ec..66f4ef8af922 100644 --- a/www/chromium/files/patch-third__party_libyuv_include_libyuv_row.h +++ b/www/chromium/files/patch-third__party_libyuv_include_libyuv_row.h @@ -1,4 +1,4 @@ ---- third_party/libyuv/include/libyuv/row.h.orig 2019-03-11 22:08:01 UTC +--- third_party/libyuv/include/libyuv/row.h.orig 2020-11-13 06:42:19 UTC +++ third_party/libyuv/include/libyuv/row.h @@ -157,10 +157,14 @@ extern "C" { #define HAS_ARGBSHADEROW_SSE2 diff --git a/www/chromium/files/patch-third__party_nasm_config_config-linux.h b/www/chromium/files/patch-third__party_nasm_config_config-linux.h index 6846af2fe7c7..4f24245f31f8 100644 --- a/www/chromium/files/patch-third__party_nasm_config_config-linux.h +++ b/www/chromium/files/patch-third__party_nasm_config_config-linux.h @@ -1,6 +1,6 @@ ---- third_party/nasm/config/config-linux.h.orig 2019-04-30 22:25:54 UTC +--- third_party/nasm/config/config-linux.h.orig 2020-11-13 06:42:20 UTC +++ third_party/nasm/config/config-linux.h -@@ -117,7 +117,7 @@ +@@ -139,7 +139,7 @@ #define HAVE_ACCESS 1 /* Define to 1 if you have the `canonicalize_file_name' function. */ @@ -9,7 +9,7 @@ /* Define to 1 if you have the `cpu_to_le16' intrinsic function. */ /* #undef HAVE_CPU_TO_LE16 */ -@@ -161,7 +161,7 @@ +@@ -183,7 +183,7 @@ #define HAVE_DECL_STRSEP 1 /* Define to 1 if you have the <endian.h> header file. */ @@ -18,7 +18,16 @@ /* Define to 1 if you have the `faccessat' function. */ #define HAVE_FACCESSAT 1 -@@ -322,7 +322,7 @@ +@@ -336,7 +336,7 @@ + #define HAVE_MEMORY_H 1 + + /* Define to 1 if you have the `mempcpy' function. */ +-#define HAVE_MEMPCPY 1 ++/* #undef HAVE_MEMPCPY */ + + /* Define to 1 if you have a working `mmap' system call. */ + #define HAVE_MMAP 1 +@@ -411,7 +411,7 @@ #define HAVE_SYSCONF 1 /* Define to 1 if you have the <sys/endian.h> header file. */ diff --git a/www/chromium/files/patch-third__party_nearby_src_cpp_core__v2_internal_offline__service__controller.h b/www/chromium/files/patch-third__party_nearby_src_cpp_core__v2_internal_offline__service__controller.h new file mode 100644 index 000000000000..c1f22a922dc3 --- /dev/null +++ b/www/chromium/files/patch-third__party_nearby_src_cpp_core__v2_internal_offline__service__controller.h @@ -0,0 +1,23 @@ +--- third_party/nearby/src/cpp/core_v2/internal/offline_service_controller.h.orig 2020-11-13 06:42:20 UTC ++++ third_party/nearby/src/cpp/core_v2/internal/offline_service_controller.h +@@ -12,6 +12,20 @@ + // See the License for the specific language governing permissions and + // limitations under the License. + ++// Copyright 2020 Google LLC ++// ++// Licensed under the Apache License, Version 2.0 (the "License"); ++// you may not use this file except in compliance with the License. ++// You may obtain a copy of the License at ++// ++// https://www.apache.org/licenses/LICENSE-2.0 ++// ++// Unless required by applicable law or agreed to in writing, software ++// distributed under the License is distributed on an "AS IS" BASIS, ++// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++// See the License for the specific language governing permissions and ++// limitations under the License. ++ + #ifndef CORE_V2_INTERNAL_OFFLINE_SERVICE_CONTROLLER_H_ + #define CORE_V2_INTERNAL_OFFLINE_SERVICE_CONTROLLER_H_ + diff --git a/www/chromium/files/patch-third__party_node_node.py b/www/chromium/files/patch-third__party_node_node.py index d31ac51040e3..df3b2252ae90 100644 --- a/www/chromium/files/patch-third__party_node_node.py +++ b/www/chromium/files/patch-third__party_node_node.py @@ -1,6 +1,6 @@ ---- third_party/node/node.py.orig 2019-03-11 22:01:16 UTC +--- third_party/node/node.py.orig 2020-11-13 06:37:03 UTC +++ third_party/node/node.py -@@ -12,6 +12,7 @@ import sys +@@ -13,6 +13,7 @@ import os def GetBinaryPath(): return os_path.join(os_path.dirname(__file__), *{ 'Darwin': ('mac', 'node-darwin-x64', 'bin', 'node'), diff --git a/www/chromium/files/patch-third__party_openscreen_src_platform_impl_udp__socket__posix.cc b/www/chromium/files/patch-third__party_openscreen_src_platform_impl_udp__socket__posix.cc new file mode 100644 index 000000000000..cf120d6f8d35 --- /dev/null +++ b/www/chromium/files/patch-third__party_openscreen_src_platform_impl_udp__socket__posix.cc @@ -0,0 +1,29 @@ +--- third_party/openscreen/src/platform/impl/udp_socket_posix.cc.orig 2020-11-16 14:56:16 UTC ++++ third_party/openscreen/src/platform/impl/udp_socket_posix.cc +@@ -31,7 +31,7 @@ namespace openscreen { + namespace { + + // 64 KB is the maximum possible UDP datagram size. +-#if !defined(OS_LINUX) ++#if !defined(OS_LINUX) && !defined(OS_BSD) + constexpr int kMaxUdpBufferSize = 64 << 10; + #endif + +@@ -380,7 +380,7 @@ bool IsPacketInfo<in6_pktinfo>(cmsghdr* cmh) { + template <class SockAddrType, class PktInfoType> + ErrorOr<UdpPacket> ReceiveMessageInternal(int fd) { + int upper_bound_bytes; +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // This should return the exact size of the next message. + upper_bound_bytes = recv(fd, nullptr, 0, MSG_PEEK | MSG_TRUNC); + if (upper_bound_bytes == -1) { +@@ -408,7 +408,7 @@ ErrorOr<UdpPacket> ReceiveMessageInternal(int fd) { + + // Although we don't do anything with the control buffer, on Linux + // it is required for the message to be properly read. +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + alignas(alignof(cmsghdr)) uint8_t control_buffer[1024]; + msg.msg_control = control_buffer; + msg.msg_controllen = sizeof(control_buffer); diff --git a/www/chromium/files/patch-third__party_pdfium_core_fxcrt_cfx__datetime.cpp b/www/chromium/files/patch-third__party_pdfium_core_fxcrt_cfx__datetime.cpp index 0e9aa30717ed..a452d599f34b 100644 --- a/www/chromium/files/patch-third__party_pdfium_core_fxcrt_cfx__datetime.cpp +++ b/www/chromium/files/patch-third__party_pdfium_core_fxcrt_cfx__datetime.cpp @@ -1,11 +1,11 @@ ---- third_party/pdfium/core/fxcrt/cfx_datetime.cpp.orig 2019-07-29 13:55:20 UTC +--- third_party/pdfium/core/fxcrt/cfx_datetime.cpp.orig 2020-11-13 06:42:20 UTC +++ third_party/pdfium/core/fxcrt/cfx_datetime.cpp @@ -9,7 +9,7 @@ #include "build/build_config.h" #include "core/fxcrt/fx_system.h" --#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX) || \ -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) || \ - defined(OS_ASMJS) || defined(__wasm__) +-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ + defined(OS_APPLE) || defined(OS_ASMJS) #include <sys/time.h> #include <time.h> diff --git a/www/chromium/files/patch-third__party_pdfium_core_fxcrt_fx__system.h b/www/chromium/files/patch-third__party_pdfium_core_fxcrt_fx__system.h deleted file mode 100644 index 05d6c3e28de0..000000000000 --- a/www/chromium/files/patch-third__party_pdfium_core_fxcrt_fx__system.h +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/pdfium/core/fxcrt/fx_system.h.orig 2019-07-24 19:03:29 UTC -+++ third_party/pdfium/core/fxcrt/fx_system.h -@@ -26,7 +26,7 @@ - #define _FX_PLATFORM_ _FX_PLATFORM_WINDOWS_ - #elif defined(_WIN64) - #define _FX_PLATFORM_ _FX_PLATFORM_WINDOWS_ --#elif defined(__linux__) -+#elif defined(__linux__) || defined(__FreeBSD__) - #define _FX_PLATFORM_ _FX_PLATFORM_LINUX_ - #elif defined(__APPLE__) - #define _FX_PLATFORM_ _FX_PLATFORM_APPLE_ diff --git a/www/chromium/files/patch-third__party_pdfium_core_fxge_cfx__fontmapper.cpp b/www/chromium/files/patch-third__party_pdfium_core_fxge_cfx__fontmapper.cpp new file mode 100644 index 000000000000..ba462c25a598 --- /dev/null +++ b/www/chromium/files/patch-third__party_pdfium_core_fxge_cfx__fontmapper.cpp @@ -0,0 +1,18 @@ +--- third_party/pdfium/core/fxge/cfx_fontmapper.cpp.orig 2020-11-16 14:56:57 UTC ++++ third_party/pdfium/core/fxge/cfx_fontmapper.cpp +@@ -154,13 +154,13 @@ const AltFontFamily g_AltFontFamilies[] = { + {"ForteMT", "Forte"}, + }; + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ASMJS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ASMJS) || defined(OS_BSD) + const char kNarrowFamily[] = "LiberationSansNarrow"; + #elif defined(OS_ANDROID) + const char kNarrowFamily[] = "RobotoCondensed"; + #else + const char kNarrowFamily[] = "ArialNarrow"; +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ASMJS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ASMJS) || defined(OS_BSD) + + ByteString TT_NormalizeName(const char* family) { + ByteString norm(family); 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 index 272bf7a50bf9..a260146b74ed 100644 --- 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 @@ -1,14 +1,29 @@ ---- third_party/pdfium/core/fxge/fx_ge_linux.cpp.orig 2020-03-16 18:42:12 UTC +--- third_party/pdfium/core/fxge/fx_ge_linux.cpp.orig 2020-11-13 06:42:20 UTC +++ third_party/pdfium/core/fxge/fx_ge_linux.cpp -@@ -155,9 +155,8 @@ std::unique_ptr<SystemFontInfoIface> SystemFontInfoIfa - const char** pUserPaths) { - auto pInfo = pdfium::MakeUnique<CFX_LinuxFontInfo>(); - if (!pInfo->ParseFontCfg(pUserPaths)) { -- 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/Type1"); -+ pInfo->AddPath("/usr/local/share/fonts/TTF"); - pInfo->AddPath("/usr/local/share/fonts"); +@@ -16,7 +16,7 @@ + #include "core/fxge/systemfontinfo_iface.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 + +@@ -165,10 +165,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; } - return std::move(pInfo); diff --git a/www/chromium/files/patch-third__party_pdfium_fxjs_cjs__publicmethods.cpp b/www/chromium/files/patch-third__party_pdfium_fxjs_cjs__publicmethods.cpp index 292afa1968d0..eb0da1d442d2 100644 --- a/www/chromium/files/patch-third__party_pdfium_fxjs_cjs__publicmethods.cpp +++ b/www/chromium/files/patch-third__party_pdfium_fxjs_cjs__publicmethods.cpp @@ -1,6 +1,6 @@ ---- third_party/pdfium/fxjs/cjs_publicmethods.cpp.orig 2019-06-04 18:58:01 UTC +--- third_party/pdfium/fxjs/cjs_publicmethods.cpp.orig 2020-11-13 06:42:21 UTC +++ third_party/pdfium/fxjs/cjs_publicmethods.cpp -@@ -86,6 +86,103 @@ constexpr const wchar_t* kDateFormats[] = {L"m/d", +@@ -87,6 +87,103 @@ constexpr const wchar_t* kDateFormats[] = {L"m/d", constexpr const wchar_t* kTimeFormats[] = {L"HH:MM", L"h:MM tt", L"HH:MM:ss", L"h:MM:ss tt"}; diff --git a/www/chromium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp b/www/chromium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp index 425ec0a4bc9a..160bb3094b40 100644 --- a/www/chromium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp +++ b/www/chromium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp @@ -1,6 +1,6 @@ ---- third_party/pdfium/fxjs/fx_date_helpers.cpp.orig 2019-07-24 19:03:29 UTC +--- third_party/pdfium/fxjs/fx_date_helpers.cpp.orig 2020-11-13 06:42:21 UTC +++ third_party/pdfium/fxjs/fx_date_helpers.cpp -@@ -35,6 +35,11 @@ double GetLocalTZA() { +@@ -36,6 +36,11 @@ double GetLocalTZA() { return 0; time_t t = 0; FXSYS_time(&t); @@ -12,7 +12,7 @@ FXSYS_localtime(&t); #if defined(OS_WIN) // In gcc 'timezone' is a global variable declared in time.h. In VC++, that -@@ -43,6 +48,7 @@ double GetLocalTZA() { +@@ -44,6 +49,7 @@ double GetLocalTZA() { _get_timezone(&timezone); #endif return (double)(-(timezone * 1000)); diff --git a/www/chromium/files/patch-third__party_pdfium_xfa_fgas_font_cfx__fontsourceenum__file.cpp b/www/chromium/files/patch-third__party_pdfium_xfa_fgas_font_cfx__fontsourceenum__file.cpp deleted file mode 100644 index af4bafcfee40..000000000000 --- a/www/chromium/files/patch-third__party_pdfium_xfa_fgas_font_cfx__fontsourceenum__file.cpp +++ /dev/null @@ -1,14 +0,0 @@ ---- third_party/pdfium/xfa/fgas/font/cfx_fontsourceenum_file.cpp.orig 2019-07-24 19:03:30 UTC -+++ third_party/pdfium/xfa/fgas/font/cfx_fontsourceenum_file.cpp -@@ -16,9 +16,8 @@ constexpr char kFolderSeparator = '/'; - - constexpr const char* kFontFolders[] = { - #if _FX_PLATFORM_ == _FX_PLATFORM_LINUX_ -- "/usr/share/fonts", -- "/usr/share/X11/fonts/Type1", -- "/usr/share/X11/fonts/TTF", -+ "/usr/local/share/fonts/Type1", -+ "/usr/local/share/fonts/TTF", - "/usr/local/share/fonts", - #elif defined(OS_MACOSX) - "~/Library/Fonts", diff --git a/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_build__config.h b/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_build__config.h index 02a9c66ed8e5..58f272e9cff8 100644 --- a/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_build__config.h +++ b/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_build__config.h @@ -1,70 +1,72 @@ ---- third_party/perfetto/include/perfetto/base/build_config.h.orig 2020-03-16 18:42:11 UTC +--- third_party/perfetto/include/perfetto/base/build_config.h.orig 2020-11-13 06:42:20 UTC +++ third_party/perfetto/include/perfetto/base/build_config.h -@@ -28,6 +28,7 @@ +@@ -27,6 +27,7 @@ + #if defined(__ANDROID__) #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 1 - #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MACOSX() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0 +#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FREEBSD() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0 - #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0 - #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 0 -@@ -37,6 +38,7 @@ + #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_APPLE() 0 + #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MAC() 0 +@@ -38,6 +39,7 @@ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0 - #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MACOSX() 1 + #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_APPLE() 1 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0 +#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FREEBSD() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 0 -@@ -50,15 +52,27 @@ +@@ -54,6 +56,7 @@ + #elif defined(__linux__) #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0 - #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MACOSX() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 1 +#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FREEBSD() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0 + #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_APPLE() 0 + #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MAC() 0 +@@ -61,9 +64,21 @@ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_NACL() 0 - #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_IOS() 0 +#elif defined(__FreeBSD__) +#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0 -+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MACOSX() 0 +#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 1 +#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FREEBSD() 1 +#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0 ++#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_APPLE() 0 ++#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MAC() 0 ++#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_IOS() 0 +#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0 +#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 0 +#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_NACL() 0 -+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_IOS() 0 #elif defined(_WIN32) #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0 - #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MACOSX() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0 +#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FREEBSD() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 1 - #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0 - #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 0 -@@ -68,6 +82,7 @@ + #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_APPLE() 0 + #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MAC() 0 +@@ -74,6 +89,7 @@ + #elif defined(__EMSCRIPTEN__) #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0 - #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MACOSX() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0 +#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FREEBSD() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0 - #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 1 - #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 0 -@@ -77,6 +92,7 @@ - #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0 - #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MACOSX() 0 + #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_APPLE() 0 + #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MAC() 0 +@@ -87,6 +103,7 @@ + #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MAC() 0 + #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_IOS() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0 +#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FREEBSD() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 1 -@@ -86,6 +102,7 @@ +@@ -94,6 +111,7 @@ + #elif defined(__native_client__) #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0 - #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MACOSX() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0 +#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FREEBSD() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0 - #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0 - #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 0 + #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_APPLE() 0 + #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MAC() 0 diff --git a/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_thread__utils.h b/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_thread__utils.h index c8947d13ecbf..46479566aea1 100644 --- a/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_thread__utils.h +++ b/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_thread__utils.h @@ -1,8 +1,8 @@ ---- third_party/perfetto/include/perfetto/base/thread_utils.h.orig 2020-03-16 18:42:11 UTC +--- third_party/perfetto/include/perfetto/base/thread_utils.h.orig 2020-11-13 06:42:20 UTC +++ third_party/perfetto/include/perfetto/base/thread_utils.h -@@ -33,6 +33,9 @@ - #include <sys/types.h> - #include <unistd.h> +@@ -35,6 +35,9 @@ + #else + #include <pthread.h> #endif +#if PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD) +#include <pthread_np.h> @@ -10,7 +10,7 @@ namespace perfetto { namespace base { -@@ -41,6 +44,11 @@ namespace base { +@@ -43,6 +46,11 @@ namespace base { using PlatformThreadId = pid_t; inline PlatformThreadId GetThreadId() { return gettid(); diff --git a/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_time.h b/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_time.h index 7750793e8235..190e955e194f 100644 --- a/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_time.h +++ b/www/chromium/files/patch-third__party_perfetto_include_perfetto_base_time.h @@ -1,4 +1,4 @@ ---- third_party/perfetto/include/perfetto/base/time.h.orig 2020-03-16 18:42:11 UTC +--- third_party/perfetto/include/perfetto/base/time.h.orig 2020-11-13 06:42:20 UTC +++ third_party/perfetto/include/perfetto/base/time.h @@ -141,6 +141,9 @@ inline TimeNanos GetTimeInternalNs(clockid_t clk_id) { // Return ns from boot. Conversely to GetWallTimeNs, this clock counts also time diff --git a/www/chromium/files/patch-third__party_perfetto_include_perfetto_ext_base_event__fd.h b/www/chromium/files/patch-third__party_perfetto_include_perfetto_ext_base_event__fd.h index e49d012bec39..cd4dace05a3a 100644 --- a/www/chromium/files/patch-third__party_perfetto_include_perfetto_ext_base_event__fd.h +++ b/www/chromium/files/patch-third__party_perfetto_include_perfetto_ext_base_event__fd.h @@ -1,4 +1,4 @@ ---- third_party/perfetto/include/perfetto/ext/base/event_fd.h.orig 2019-09-16 11:03:16 UTC +--- third_party/perfetto/include/perfetto/ext/base/event_fd.h.orig 2020-11-13 06:42:20 UTC +++ third_party/perfetto/include/perfetto/ext/base/event_fd.h @@ -20,8 +20,8 @@ #include "perfetto/base/build_config.h" diff --git a/www/chromium/files/patch-third__party_perfetto_include_perfetto_ext_base_thread__utils.h b/www/chromium/files/patch-third__party_perfetto_include_perfetto_ext_base_thread__utils.h index da364c77fb7b..79fd7d022600 100644 --- a/www/chromium/files/patch-third__party_perfetto_include_perfetto_ext_base_thread__utils.h +++ b/www/chromium/files/patch-third__party_perfetto_include_perfetto_ext_base_thread__utils.h @@ -1,8 +1,8 @@ ---- third_party/perfetto/include/perfetto/ext/base/thread_utils.h.orig 2020-07-13 15:16:20 UTC +--- third_party/perfetto/include/perfetto/ext/base/thread_utils.h.orig 2020-11-13 06:42:20 UTC +++ third_party/perfetto/include/perfetto/ext/base/thread_utils.h @@ -47,6 +47,9 @@ inline bool MaybeSetThreadName(const std::string& name - #if PERFETTO_BUILDFLAG(PERFETTO_OS_MACOSX) + #if PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) return pthread_setname_np(buf) == 0; +#elif PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD) + pthread_set_name_np(pthread_self(), buf); diff --git a/www/chromium/files/patch-third__party_perfetto_src_base_subprocess.cc b/www/chromium/files/patch-third__party_perfetto_src_base_subprocess.cc index be4417cf274f..c751e7f270c5 100644 --- a/www/chromium/files/patch-third__party_perfetto_src_base_subprocess.cc +++ b/www/chromium/files/patch-third__party_perfetto_src_base_subprocess.cc @@ -1,6 +1,6 @@ ---- third_party/perfetto/src/base/subprocess.cc.orig 2020-07-07 22:03:25 UTC +--- third_party/perfetto/src/base/subprocess.cc.orig 2020-11-13 06:42:20 UTC +++ third_party/perfetto/src/base/subprocess.cc -@@ -33,8 +33,8 @@ +@@ -35,8 +35,8 @@ #include "perfetto/base/time.h" #include "perfetto/ext/base/utils.h" @@ -11,7 +11,7 @@ #include <sys/prctl.h> #endif -@@ -58,8 +58,8 @@ struct ChildProcessArgs { +@@ -60,8 +60,8 @@ struct ChildProcessArgs { // Don't add any dynamic allocation in this function. This will be invoked // under a fork(), potentially in a state where the allocator lock is held. void __attribute__((noreturn)) ChildProcess(ChildProcessArgs* args) { diff --git a/www/chromium/files/patch-third__party_perfetto_src_base_thread__task__runner.cc b/www/chromium/files/patch-third__party_perfetto_src_base_thread__task__runner.cc index 93157f580e27..3a0c3be48266 100644 --- a/www/chromium/files/patch-third__party_perfetto_src_base_thread__task__runner.cc +++ b/www/chromium/files/patch-third__party_perfetto_src_base_thread__task__runner.cc @@ -1,4 +1,4 @@ ---- third_party/perfetto/src/base/thread_task_runner.cc.orig 2020-07-07 22:03:25 UTC +--- third_party/perfetto/src/base/thread_task_runner.cc.orig 2020-11-13 06:42:20 UTC +++ third_party/perfetto/src/base/thread_task_runner.cc @@ -28,7 +28,7 @@ #include "perfetto/ext/base/thread_utils.h" diff --git a/www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc b/www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc index f14075502887..31a2b8f072dc 100644 --- a/www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc +++ b/www/chromium/files/patch-third__party_perfetto_src_base_unix__socket.cc @@ -1,15 +1,15 @@ ---- third_party/perfetto/src/base/unix_socket.cc.orig 2020-03-16 18:42:11 UTC +--- third_party/perfetto/src/base/unix_socket.cc.orig 2020-11-13 06:42:20 UTC +++ third_party/perfetto/src/base/unix_socket.cc @@ -37,7 +37,7 @@ #include "perfetto/ext/base/string_utils.h" #include "perfetto/ext/base/utils.h" --#if PERFETTO_BUILDFLAG(PERFETTO_OS_MACOSX) -+#if PERFETTO_BUILDFLAG(PERFETTO_OS_MACOSX) || PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD) +-#if PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) ++#if PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) || PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD) #include <sys/ucred.h> #endif -@@ -601,7 +601,7 @@ void UnixSocket::ReadPeerCredentials() { +@@ -625,7 +625,7 @@ void UnixSocket::ReadPeerCredentials() { if (sock_raw_.family() != SockFamily::kUnix) return; 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 db04ed1d1388..aafe26caaacb 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,9 +1,13 @@ ---- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2020-07-07 22:03:25 UTC +--- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2020-11-13 06:42:22 UTC +++ third_party/perfetto/src/tracing/core/tracing_service_impl.cc -@@ -2410,6 +2410,7 @@ void TracingServiceImpl::SnapshotClocks(std::vector<Tr +@@ -2569,8 +2569,9 @@ bool TracingServiceImpl::SnapshotClocks( - #if !PERFETTO_BUILDFLAG(PERFETTO_OS_MACOSX) && \ - !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN) && \ + TracingSession::ClockSnapshotData new_snapshot_data; + +-#if !PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) && \ +- !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN) && \ ++#if !PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) && \ ++ !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN) && \ + !PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD) && \ !PERFETTO_BUILDFLAG(PERFETTO_OS_NACL) struct { diff --git a/www/chromium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h b/www/chromium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h index 2f151107c8c2..f22a0b0c9372 100644 --- a/www/chromium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h +++ b/www/chromium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h @@ -1,4 +1,4 @@ ---- third_party/protobuf/src/google/protobuf/stubs/platform_macros.h.orig 2019-10-21 19:07:25 UTC +--- third_party/protobuf/src/google/protobuf/stubs/platform_macros.h.orig 2020-11-13 06:37:04 UTC +++ third_party/protobuf/src/google/protobuf/stubs/platform_macros.h @@ -118,7 +118,7 @@ GOOGLE_PROTOBUF_PLATFORM_ERROR diff --git a/www/chromium/files/patch-third__party_skia_src_core_SkCpu.cpp b/www/chromium/files/patch-third__party_skia_src_core_SkCpu.cpp index 4d7db67f8556..f9a6d32e6e6d 100644 --- a/www/chromium/files/patch-third__party_skia_src_core_SkCpu.cpp +++ b/www/chromium/files/patch-third__party_skia_src_core_SkCpu.cpp @@ -1,19 +1,26 @@ ---- third_party/skia/src/core/SkCpu.cpp.orig 2019-07-24 19:03:35 UTC +--- third_party/skia/src/core/SkCpu.cpp.orig 2020-11-13 06:42:23 UTC +++ third_party/skia/src/core/SkCpu.cpp -@@ -76,6 +76,8 @@ - #include <sys/auxv.h> - - static uint32_t read_cpu_features() { -+return 0; -+#if 0 - const uint32_t kHWCAP_CRC32 = (1<< 7), - kHWCAP_ASIMDHP = (1<<10); - -@@ -112,6 +114,7 @@ - } - } +@@ -72,6 +72,23 @@ return features; -+#endif } - #elif defined(SK_CPU_ARM32) && __has_include(<sys/auxv.h>) && \ ++#elif defined(SK_CPU_ARM64) && defined(__FreeBSD__) ++ #include <machine/armreg.h> ++ #ifndef ID_AA64ISAR0_CRC32_VAL ++ #define ID_AA64ISAR0_CRC32_VAL ID_AA64ISAR0_CRC32 ++ #endif ++ ++ static uint32_t read_cpu_features() { ++ uint32_t features = 0; ++ uint64_t id_aa64isar0; ++ ++ id_aa64isar0 = READ_SPECIALREG(id_aa64isar0_el1); ++ if (ID_AA64ISAR0_CRC32_VAL(id_aa64isar0) == ID_AA64ISAR0_CRC32_BASE) { ++ features |= SkCpu::CRC32; ++ } ++ return features; ++ } ++ + #elif defined(SK_CPU_ARM64) && __has_include(<sys/auxv.h>) + #include <sys/auxv.h> + diff --git a/www/chromium/files/patch-third__party_skia_src_gpu_GrAutoLocaleSetter.h b/www/chromium/files/patch-third__party_skia_src_gpu_GrAutoLocaleSetter.h index 4621798922e7..bdbf2482fbd7 100644 --- a/www/chromium/files/patch-third__party_skia_src_gpu_GrAutoLocaleSetter.h +++ b/www/chromium/files/patch-third__party_skia_src_gpu_GrAutoLocaleSetter.h @@ -1,4 +1,4 @@ ---- third_party/skia/src/gpu/GrAutoLocaleSetter.h.orig 2019-03-11 22:08:28 UTC +--- third_party/skia/src/gpu/GrAutoLocaleSetter.h.orig 2020-11-13 06:42:23 UTC +++ third_party/skia/src/gpu/GrAutoLocaleSetter.h @@ -27,7 +27,7 @@ #define HAVE_XLOCALE 0 diff --git a/www/chromium/files/patch-third__party_skia_src_images_SkJpegEncoder.cpp b/www/chromium/files/patch-third__party_skia_src_images_SkJpegEncoder.cpp index 1241cb9d733b..e57788bce433 100644 --- a/www/chromium/files/patch-third__party_skia_src_images_SkJpegEncoder.cpp +++ b/www/chromium/files/patch-third__party_skia_src_images_SkJpegEncoder.cpp @@ -1,4 +1,4 @@ ---- third_party/skia/src/images/SkJpegEncoder.cpp.orig 2019-09-09 21:57:02 UTC +--- third_party/skia/src/images/SkJpegEncoder.cpp.orig 2020-11-13 06:42:23 UTC +++ third_party/skia/src/images/SkJpegEncoder.cpp @@ -76,9 +76,14 @@ bool SkJpegEncoderMgr::setParams(const SkImageInfo& sr return (transform_scanline_proc) nullptr; diff --git a/www/chromium/files/patch-third__party_skia_src_ports_SkOSFile__stdio.cpp b/www/chromium/files/patch-third__party_skia_src_ports_SkOSFile__stdio.cpp index ce10a392a3de..3e616184fcb8 100644 --- a/www/chromium/files/patch-third__party_skia_src_ports_SkOSFile__stdio.cpp +++ b/www/chromium/files/patch-third__party_skia_src_ports_SkOSFile__stdio.cpp @@ -1,4 +1,4 @@ ---- third_party/skia/src/ports/SkOSFile_stdio.cpp.orig 2020-02-03 21:54:56 UTC +--- third_party/skia/src/ports/SkOSFile_stdio.cpp.orig 2020-11-13 06:42:23 UTC +++ third_party/skia/src/ports/SkOSFile_stdio.cpp @@ -132,7 +132,7 @@ void sk_fflush(FILE* f) { diff --git a/www/chromium/files/patch-third__party_skia_src_sksl_SkSLString.h b/www/chromium/files/patch-third__party_skia_src_sksl_SkSLString.h index a6806cbac266..5229aee8c858 100644 --- a/www/chromium/files/patch-third__party_skia_src_sksl_SkSLString.h +++ b/www/chromium/files/patch-third__party_skia_src_sksl_SkSLString.h @@ -1,4 +1,4 @@ ---- third_party/skia/src/sksl/SkSLString.h.orig 2019-12-16 21:56:18 UTC +--- third_party/skia/src/sksl/SkSLString.h.orig 2020-11-13 06:42:23 UTC +++ third_party/skia/src/sksl/SkSLString.h @@ -17,6 +17,8 @@ #include "include/core/SkString.h" diff --git a/www/chromium/files/patch-third__party_sqlite_BUILD.gn b/www/chromium/files/patch-third__party_sqlite_BUILD.gn index da1e5a9023fe..ceae677e0b66 100644 --- a/www/chromium/files/patch-third__party_sqlite_BUILD.gn +++ b/www/chromium/files/patch-third__party_sqlite_BUILD.gn @@ -1,11 +1,11 @@ ---- third_party/sqlite/BUILD.gn.orig 2020-05-13 18:40:36 UTC +--- third_party/sqlite/BUILD.gn.orig 2020-11-13 06:37:04 UTC +++ third_party/sqlite/BUILD.gn @@ -138,7 +138,7 @@ config("sqlite_warnings") { ] } } -- if (is_linux) { -+ if (is_linux && !is_bsd) { +- if (is_linux || is_chromeos) { ++ if ((is_linux || is_chromeos) && !is_bsd) { cflags += [ # SQLite doesn't believe in compiler warnings, preferring testing. # http://www.sqlite.org/faq.html#q17 diff --git a/www/chromium/files/patch-third__party_swiftshader_BUILD.gn b/www/chromium/files/patch-third__party_swiftshader_BUILD.gn index 4a8076d6686f..38a46ff2b653 100644 --- a/www/chromium/files/patch-third__party_swiftshader_BUILD.gn +++ b/www/chromium/files/patch-third__party_swiftshader_BUILD.gn @@ -1,4 +1,4 @@ ---- third_party/swiftshader/BUILD.gn.orig 2020-05-13 18:41:54 UTC +--- third_party/swiftshader/BUILD.gn.orig 2020-11-13 06:42:23 UTC +++ third_party/swiftshader/BUILD.gn @@ -138,9 +138,11 @@ config("swiftshader_config") { ldflags = [ "-Wl,--gc-sections" ] diff --git a/www/chromium/files/patch-third__party_swiftshader_src_Common_Configurator.cpp b/www/chromium/files/patch-third__party_swiftshader_src_Common_Configurator.cpp index a1e1ccf4a0f1..78f7ace6bec0 100644 --- a/www/chromium/files/patch-third__party_swiftshader_src_Common_Configurator.cpp +++ b/www/chromium/files/patch-third__party_swiftshader_src_Common_Configurator.cpp @@ -1,4 +1,4 @@ ---- third_party/swiftshader/src/Common/Configurator.cpp.orig 2019-03-11 22:08:03 UTC +--- third_party/swiftshader/src/Common/Configurator.cpp.orig 2020-11-13 06:42:23 UTC +++ third_party/swiftshader/src/Common/Configurator.cpp @@ -42,6 +42,9 @@ namespace sw diff --git a/www/chromium/files/patch-third__party_swiftshader_src_Common_MutexLock.hpp b/www/chromium/files/patch-third__party_swiftshader_src_Common_MutexLock.hpp index 96aca3af105f..770d64bb2fc3 100644 --- a/www/chromium/files/patch-third__party_swiftshader_src_Common_MutexLock.hpp +++ b/www/chromium/files/patch-third__party_swiftshader_src_Common_MutexLock.hpp @@ -1,4 +1,4 @@ ---- third_party/swiftshader/src/Common/MutexLock.hpp.orig 2019-03-11 22:08:03 UTC +--- third_party/swiftshader/src/Common/MutexLock.hpp.orig 2020-11-13 06:42:23 UTC +++ third_party/swiftshader/src/Common/MutexLock.hpp @@ -17,7 +17,7 @@ diff --git a/www/chromium/files/patch-third__party_swiftshader_src_Common_SharedLibrary.hpp b/www/chromium/files/patch-third__party_swiftshader_src_Common_SharedLibrary.hpp index fa03cd628462..544604e6a947 100644 --- a/www/chromium/files/patch-third__party_swiftshader_src_Common_SharedLibrary.hpp +++ b/www/chromium/files/patch-third__party_swiftshader_src_Common_SharedLibrary.hpp @@ -1,4 +1,4 @@ ---- third_party/swiftshader/src/Common/SharedLibrary.hpp.orig 2019-03-11 22:08:03 UTC +--- third_party/swiftshader/src/Common/SharedLibrary.hpp.orig 2020-11-13 06:42:23 UTC +++ third_party/swiftshader/src/Common/SharedLibrary.hpp @@ -97,7 +97,7 @@ void *loadLibrary(const std::string &libraryDirectory, diff --git a/www/chromium/files/patch-third__party_swiftshader_src_Main_SwiftConfig.cpp b/www/chromium/files/patch-third__party_swiftshader_src_Main_SwiftConfig.cpp index 888c476a9108..d34425f5dec5 100644 --- a/www/chromium/files/patch-third__party_swiftshader_src_Main_SwiftConfig.cpp +++ b/www/chromium/files/patch-third__party_swiftshader_src_Main_SwiftConfig.cpp @@ -1,4 +1,4 @@ ---- third_party/swiftshader/src/Main/SwiftConfig.cpp.orig 2019-09-09 21:57:01 UTC +--- third_party/swiftshader/src/Main/SwiftConfig.cpp.orig 2020-11-13 06:42:23 UTC +++ third_party/swiftshader/src/Main/SwiftConfig.cpp @@ -764,7 +764,11 @@ namespace sw struct stat status; 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 50033014a7d5..2709789b81fc 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,4 +1,4 @@ ---- third_party/swiftshader/src/OpenGL/libEGL/Display.cpp.orig 2020-05-13 18:41:54 UTC +--- third_party/swiftshader/src/OpenGL/libEGL/Display.cpp.orig 2020-11-13 06:42:23 UTC +++ third_party/swiftshader/src/OpenGL/libEGL/Display.cpp @@ -691,7 +691,7 @@ bool Display::isValidWindow(EGLNativeWindowType window return status != 0; 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 a21bb4acad17..14cef1075818 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,4 +1,4 @@ ---- third_party/swiftshader/src/OpenGL/libEGL/Surface.cpp.orig 2019-10-21 19:09:15 UTC +--- third_party/swiftshader/src/OpenGL/libEGL/Surface.cpp.orig 2020-11-13 06:42:23 UTC +++ third_party/swiftshader/src/OpenGL/libEGL/Surface.cpp @@ -362,7 +362,7 @@ bool WindowSurface::checkForResize() diff --git a/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.cpp b/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.cpp index 3ca2cc4d69af..3024a028cc2c 100644 --- a/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.cpp +++ b/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.cpp @@ -1,4 +1,4 @@ ---- third_party/swiftshader/src/OpenGL/libEGL/libEGL.cpp.orig 2020-02-03 21:54:55 UTC +--- third_party/swiftshader/src/OpenGL/libEGL/libEGL.cpp.orig 2020-11-13 06:42:23 UTC +++ third_party/swiftshader/src/OpenGL/libEGL/libEGL.cpp @@ -153,7 +153,7 @@ EGLDisplay EGLAPIENTRY GetDisplay(EGLNativeDisplayType // FIXME: Check if display_id is the default display @@ -18,7 +18,7 @@ "EGL_KHR_platform_gbm " #endif #if defined(USE_X11) -@@ -1298,7 +1298,7 @@ EGLDisplay EGLAPIENTRY GetPlatformDisplay(EGLenum plat +@@ -1307,7 +1307,7 @@ EGLDisplay EGLAPIENTRY GetPlatformDisplay(EGLenum plat { TRACE("(EGLenum platform = 0x%X, void *native_display = %p, const EGLAttrib *attrib_list = %p)", platform, native_display, attrib_list); diff --git a/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.hpp b/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.hpp index 59c1f562fb03..a448b57bbeb3 100644 --- a/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.hpp +++ b/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.hpp @@ -1,4 +1,4 @@ ---- third_party/swiftshader/src/OpenGL/libEGL/libEGL.hpp.orig 2019-03-11 22:08:03 UTC +--- third_party/swiftshader/src/OpenGL/libEGL/libEGL.hpp.orig 2020-11-13 06:42:23 UTC +++ third_party/swiftshader/src/OpenGL/libEGL/libEGL.hpp @@ -100,7 +100,7 @@ class LibEGL (private) #endif 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 index 1f68f9ed3be6..9c0b1ad7c2c9 100644 --- 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 @@ -1,4 +1,4 @@ ---- third_party/swiftshader/src/OpenGL/libGLES_CM/libGLES_CM.hpp.orig 2019-03-11 22:08:03 UTC +--- third_party/swiftshader/src/OpenGL/libGLES_CM/libGLES_CM.hpp.orig 2020-11-13 06:42:23 UTC +++ third_party/swiftshader/src/OpenGL/libGLES_CM/libGLES_CM.hpp @@ -261,7 +261,7 @@ class LibGLES_CM (private) #endif diff --git a/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libGLESv2_libGLESv2.hpp b/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libGLESv2_libGLESv2.hpp index 7a1936b0dce0..3eeb606ca5bc 100644 --- a/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libGLESv2_libGLESv2.hpp +++ b/www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libGLESv2_libGLESv2.hpp @@ -1,4 +1,4 @@ ---- third_party/swiftshader/src/OpenGL/libGLESv2/libGLESv2.hpp.orig 2019-03-11 22:08:03 UTC +--- third_party/swiftshader/src/OpenGL/libGLESv2/libGLESv2.hpp.orig 2020-11-13 06:42:23 UTC +++ third_party/swiftshader/src/OpenGL/libGLESv2/libGLESv2.hpp @@ -286,7 +286,7 @@ class LibGLESv2 (private) #endif diff --git a/www/chromium/files/patch-third__party_swiftshader_src_Reactor_Debug.cpp b/www/chromium/files/patch-third__party_swiftshader_src_Reactor_Debug.cpp index ef0f135c386b..f4f97ce44a7a 100644 --- a/www/chromium/files/patch-third__party_swiftshader_src_Reactor_Debug.cpp +++ b/www/chromium/files/patch-third__party_swiftshader_src_Reactor_Debug.cpp @@ -1,4 +1,4 @@ ---- third_party/swiftshader/src/Reactor/Debug.cpp.orig 2020-05-18 15:27:49 UTC +--- third_party/swiftshader/src/Reactor/Debug.cpp.orig 2020-11-13 06:42:23 UTC +++ third_party/swiftshader/src/Reactor/Debug.cpp @@ -23,16 +23,20 @@ # include <android/log.h> diff --git a/www/chromium/files/patch-third__party_swiftshader_src_System_Debug.cpp b/www/chromium/files/patch-third__party_swiftshader_src_System_Debug.cpp index 3695c45241bd..6dcdc9576fc3 100644 --- a/www/chromium/files/patch-third__party_swiftshader_src_System_Debug.cpp +++ b/www/chromium/files/patch-third__party_swiftshader_src_System_Debug.cpp @@ -1,4 +1,4 @@ ---- third_party/swiftshader/src/System/Debug.cpp.orig 2020-05-18 15:37:03 UTC +--- third_party/swiftshader/src/System/Debug.cpp.orig 2020-11-13 06:42:23 UTC +++ third_party/swiftshader/src/System/Debug.cpp @@ -18,16 +18,20 @@ # include <android/log.h> diff --git a/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-10.0_configs_linux_include_llvm_Config_config.h b/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-10.0_configs_linux_include_llvm_Config_config.h index 97e4151ed305..7caee2df0f56 100644 --- a/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-10.0_configs_linux_include_llvm_Config_config.h +++ b/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-10.0_configs_linux_include_llvm_Config_config.h @@ -1,4 +1,4 @@ ---- third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h.orig 2020-08-18 18:42:46 UTC +--- third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h.orig 2020-11-13 06:42:25 UTC +++ third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h @@ -9,17 +9,21 @@ diff --git a/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-10.0_configs_linux_include_llvm_Config_llvm-config.h b/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-10.0_configs_linux_include_llvm_Config_llvm-config.h deleted file mode 100644 index 772325119c9b..000000000000 --- a/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-10.0_configs_linux_include_llvm_Config_llvm-config.h +++ /dev/null @@ -1,20 +0,0 @@ ---- third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/llvm-config.h.orig 2020-08-18 18:42:46 UTC -+++ third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/llvm-config.h -@@ -35,7 +35,7 @@ - #elif defined(__arm__) - #define LLVM_DEFAULT_TARGET_TRIPLE "armv7-linux-gnueabihf" - #elif defined(__aarch64__) --#define LLVM_DEFAULT_TARGET_TRIPLE "aarch64-linux-gnu" -+#define LLVM_DEFAULT_TARGET_TRIPLE "aarch64-portbld-freebsd" - #elif defined(__mips__) - #define LLVM_DEFAULT_TARGET_TRIPLE "mipsel-linux-gnu" - #elif defined(__mips64) -@@ -60,7 +60,7 @@ - #elif defined(__arm__) - #define LLVM_HOST_TRIPLE "armv7-linux-gnueabihf" - #elif defined(__aarch64__) --#define LLVM_HOST_TRIPLE "aarch64-linux-gnu" -+#define LLVM_HOST_TRIPLE "aarch64-portbld-freebsd" - #elif defined(__mips__) - #define LLVM_HOST_TRIPLE "mipsel-linux-gnu" - #elif defined(__mips64) diff --git a/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-subzero_build_Linux_include_llvm_Config_config.h b/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-subzero_build_Linux_include_llvm_Config_config.h index d5afa9c50345..dad472040587 100644 --- a/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-subzero_build_Linux_include_llvm_Config_config.h +++ b/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-subzero_build_Linux_include_llvm_Config_config.h @@ -1,4 +1,4 @@ ---- third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h.orig 2019-03-11 22:08:30 UTC +--- third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h.orig 2020-11-13 06:42:27 UTC +++ third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h @@ -121,7 +121,7 @@ #define HAVE_LINK_H 1 diff --git a/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-subzero_lib_Support_Unix_Process.inc b/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-subzero_lib_Support_Unix_Process.inc index 28c940535747..3c3aa9332b09 100644 --- a/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-subzero_lib_Support_Unix_Process.inc +++ b/www/chromium/files/patch-third__party_swiftshader_third__party_llvm-subzero_lib_Support_Unix_Process.inc @@ -1,4 +1,4 @@ ---- third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Process.inc.orig 2019-03-11 22:08:30 UTC +--- third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Process.inc.orig 2020-11-13 06:42:27 UTC +++ third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Process.inc @@ -35,7 +35,7 @@ // DragonFlyBSD, OpenBSD, and Bitrig have deprecated <malloc.h> for diff --git a/www/chromium/files/patch-third__party_usrsctp_BUILD.gn b/www/chromium/files/patch-third__party_usrsctp_BUILD.gn index 3602a2903200..0ded75c84db4 100644 --- a/www/chromium/files/patch-third__party_usrsctp_BUILD.gn +++ b/www/chromium/files/patch-third__party_usrsctp_BUILD.gn @@ -1,20 +1,22 @@ ---- third_party/usrsctp/BUILD.gn.orig 2020-05-13 18:40:02 UTC +--- third_party/usrsctp/BUILD.gn.orig 2020-11-13 06:37:04 UTC +++ third_party/usrsctp/BUILD.gn -@@ -121,11 +121,16 @@ static_library("usrsctp") { +@@ -127,7 +127,7 @@ static_library("usrsctp") { "-UINET6", ] -- if (is_linux || is_android) { -+ if ((is_linux && !is_bsd) || is_android ) { +- if (is_linux || is_chromeos || is_android) { ++ if ((is_linux || is_chromeos || is_android) && !is_bsd) { defines += [ "__Userspace_os_Linux", "_GNU_SOURCE", - ] +@@ -137,6 +137,10 @@ static_library("usrsctp") { + "HAVE_SA_LEN", + "__APPLE_USE_RFC_2292", + "__Userspace_os_Darwin", ++ ] + } else if (is_bsd) { + defines += [ + "__Userspace_os_FreeBSD", -+ ] -+ cflags += [ "-U__FreeBSD__" ] - } else if (is_mac || is_ios) { - defines += [ - "HAVE_SA_LEN", + ] + } + diff --git a/www/chromium/files/patch-third__party_webrtc_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_BUILD.gn index 68fc351e124e..3b7bacc17086 100644 --- a/www/chromium/files/patch-third__party_webrtc_BUILD.gn +++ b/www/chromium/files/patch-third__party_webrtc_BUILD.gn @@ -1,7 +1,7 @@ ---- third_party/webrtc/BUILD.gn.orig 2020-05-13 18:41:55 UTC +--- third_party/webrtc/BUILD.gn.orig 2020-11-13 06:42:24 UTC +++ third_party/webrtc/BUILD.gn -@@ -172,6 +172,9 @@ config("common_inherited_config") { - if (is_linux) { +@@ -176,6 +176,9 @@ config("common_inherited_config") { + if (is_linux || is_chromeos) { defines += [ "WEBRTC_LINUX" ] } + if (is_bsd) { diff --git a/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn index a9fe31ec37b8..1c331b28b813 100644 --- a/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn +++ b/www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn @@ -1,11 +1,11 @@ ---- third_party/webrtc/modules/audio_device/BUILD.gn.orig 2020-03-16 18:42:14 UTC +--- third_party/webrtc/modules/audio_device/BUILD.gn.orig 2020-11-13 06:42:25 UTC +++ third_party/webrtc/modules/audio_device/BUILD.gn -@@ -259,7 +259,7 @@ rtc_library("audio_device_impl") { +@@ -263,7 +263,7 @@ rtc_library("audio_device_impl") { if (rtc_use_dummy_audio_file_devices) { defines += [ "WEBRTC_DUMMY_FILE_DEVICES" ] } else { -- if (is_linux) { -+ if (is_linux && !is_bsd) { +- if (is_linux || is_chromeos) { ++ if ((is_linux || is_chromeos) && !is_bsd) { sources += [ "linux/alsasymboltable_linux.cc", "linux/alsasymboltable_linux.h", diff --git a/www/chromium/files/patch-third__party_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc b/www/chromium/files/patch-third__party_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc index 41cae80d56bd..10fdf22c270f 100644 --- a/www/chromium/files/patch-third__party_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc +++ b/www/chromium/files/patch-third__party_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc @@ -1,4 +1,4 @@ ---- third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc.orig 2019-09-09 21:57:05 UTC +--- third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc.orig 2020-11-13 06:42:25 UTC +++ third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc @@ -13,6 +13,7 @@ #include <string.h> diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_byte__order.h b/www/chromium/files/patch-third__party_webrtc_rtc__base_byte__order.h index 0f3e3413f1ae..7c5d9d53994a 100644 --- a/www/chromium/files/patch-third__party_webrtc_rtc__base_byte__order.h +++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_byte__order.h @@ -1,4 +1,4 @@ ---- third_party/webrtc/rtc_base/byte_order.h.orig 2019-06-04 18:58:09 UTC +--- third_party/webrtc/rtc_base/byte_order.h.orig 2020-11-13 06:42:25 UTC +++ third_party/webrtc/rtc_base/byte_order.h @@ -89,7 +89,7 @@ #endif // defined(WEBRTC_ARCH_LITTLE_ENDIAN) diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_ifaddrs__converter.h b/www/chromium/files/patch-third__party_webrtc_rtc__base_ifaddrs__converter.h index b4945de800d2..d0ce5ef46b24 100644 --- a/www/chromium/files/patch-third__party_webrtc_rtc__base_ifaddrs__converter.h +++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_ifaddrs__converter.h @@ -1,4 +1,4 @@ ---- third_party/webrtc/rtc_base/ifaddrs_converter.h.orig 2019-03-11 22:08:15 UTC +--- third_party/webrtc/rtc_base/ifaddrs_converter.h.orig 2020-11-13 06:42:25 UTC +++ third_party/webrtc/rtc_base/ifaddrs_converter.h @@ -14,6 +14,8 @@ #if defined(WEBRTC_ANDROID) diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_ip__address.cc b/www/chromium/files/patch-third__party_webrtc_rtc__base_ip__address.cc index 5fe1396d3154..98e93400c1f8 100644 --- a/www/chromium/files/patch-third__party_webrtc_rtc__base_ip__address.cc +++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_ip__address.cc @@ -1,4 +1,4 @@ ---- third_party/webrtc/rtc_base/ip_address.cc.orig 2019-03-11 22:08:15 UTC +--- third_party/webrtc/rtc_base/ip_address.cc.orig 2020-11-13 06:42:25 UTC +++ third_party/webrtc/rtc_base/ip_address.cc @@ -11,6 +11,9 @@ #if defined(WEBRTC_POSIX) diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_ip__address.h b/www/chromium/files/patch-third__party_webrtc_rtc__base_ip__address.h index 3db51306bd94..c8d3d2bd737d 100644 --- a/www/chromium/files/patch-third__party_webrtc_rtc__base_ip__address.h +++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_ip__address.h @@ -1,4 +1,4 @@ ---- third_party/webrtc/rtc_base/ip_address.h.orig 2019-03-11 22:08:15 UTC +--- third_party/webrtc/rtc_base/ip_address.h.orig 2020-11-13 06:42:25 UTC +++ third_party/webrtc/rtc_base/ip_address.h @@ -17,6 +17,10 @@ #include <netinet/in.h> diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc b/www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc index 1fa940441d77..75e6aa226597 100644 --- a/www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc +++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc @@ -1,4 +1,4 @@ ---- third_party/webrtc/rtc_base/network.cc.orig 2020-07-07 22:03:28 UTC +--- third_party/webrtc/rtc_base/network.cc.orig 2020-11-13 06:42:25 UTC +++ third_party/webrtc/rtc_base/network.cc @@ -244,7 +244,12 @@ AdapterType GetAdapterTypeFromName(const char* network } diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_network.h b/www/chromium/files/patch-third__party_webrtc_rtc__base_network.h index 46d64c258e37..dab74a13f632 100644 --- a/www/chromium/files/patch-third__party_webrtc_rtc__base_network.h +++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_network.h @@ -1,8 +1,8 @@ ---- third_party/webrtc/rtc_base/network.h.orig 2019-12-16 21:56:20 UTC +--- third_party/webrtc/rtc_base/network.h.orig 2020-11-13 06:42:25 UTC +++ third_party/webrtc/rtc_base/network.h -@@ -26,6 +26,10 @@ - #include "rtc_base/system/rtc_export.h" +@@ -29,6 +29,10 @@ #include "rtc_base/third_party/sigslot/sigslot.h" + #include "rtc_base/thread_annotations.h" +#if defined(WEBRTC_BSD) +#include <sys/types.h> diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc b/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc index 7cfebcf2be77..b763da8fb6e2 100644 --- a/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc +++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc @@ -1,4 +1,4 @@ ---- third_party/webrtc/rtc_base/physical_socket_server.cc.orig 2020-07-07 22:03:28 UTC +--- third_party/webrtc/rtc_base/physical_socket_server.cc.orig 2020-11-13 06:42:25 UTC +++ third_party/webrtc/rtc_base/physical_socket_server.cc @@ -50,7 +50,7 @@ #include "rtc_base/null_socket_server.h" @@ -18,7 +18,7 @@ int64_t GetSocketRecvTimestamp(int socket) { struct timeval tv_ioctl; -@@ -291,7 +291,7 @@ int PhysicalSocket::GetOption(Option opt, int* value) +@@ -305,7 +305,7 @@ int PhysicalSocket::GetOption(Option opt, int* value) return -1; } if (opt == OPT_DONTFRAGMENT) { @@ -27,7 +27,7 @@ *value = (*value != IP_PMTUDISC_DONT) ? 1 : 0; #endif } else if (opt == OPT_DSCP) { -@@ -309,7 +309,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { +@@ -323,7 +323,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { if (TranslateOption(opt, &slevel, &sopt) == -1) return -1; if (opt == OPT_DONTFRAGMENT) { @@ -36,7 +36,7 @@ value = (value) ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT; #endif } else if (opt == OPT_DSCP) { -@@ -550,7 +550,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s +@@ -564,7 +564,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s *slevel = IPPROTO_IP; *sopt = IP_DONTFRAGMENT; break; diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.h b/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.h index 3fe92f247ce2..69e1eac521ac 100644 --- a/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.h +++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.h @@ -1,4 +1,4 @@ ---- third_party/webrtc/rtc_base/physical_socket_server.h.orig 2019-03-11 22:08:16 UTC +--- third_party/webrtc/rtc_base/physical_socket_server.h.orig 2020-11-13 06:42:25 UTC +++ third_party/webrtc/rtc_base/physical_socket_server.h @@ -11,7 +11,7 @@ #ifndef RTC_BASE_PHYSICAL_SOCKET_SERVER_H_ diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_platform__thread__types.cc b/www/chromium/files/patch-third__party_webrtc_rtc__base_platform__thread__types.cc index 9d0e6fdcc5fd..cefc8573b8a9 100644 --- a/www/chromium/files/patch-third__party_webrtc_rtc__base_platform__thread__types.cc +++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_platform__thread__types.cc @@ -1,4 +1,4 @@ ---- third_party/webrtc/rtc_base/platform_thread_types.cc.orig 2019-12-16 21:56:20 UTC +--- third_party/webrtc/rtc_base/platform_thread_types.cc.orig 2020-11-13 06:42:25 UTC +++ third_party/webrtc/rtc_base/platform_thread_types.cc @@ -11,7 +11,11 @@ #include "rtc_base/platform_thread_types.h" @@ -12,7 +12,7 @@ #include <sys/syscall.h> #endif -@@ -27,6 +31,8 @@ PlatformThreadId CurrentThreadId() { +@@ -37,6 +41,8 @@ PlatformThreadId CurrentThreadId() { return gettid(); #elif defined(WEBRTC_FUCHSIA) return zx_thread_self(); @@ -21,15 +21,15 @@ #elif defined(WEBRTC_LINUX) return syscall(__NR_gettid); #elif defined(__EMSCRIPTEN__) -@@ -57,6 +63,7 @@ bool IsThreadRefEqual(const PlatformThreadRef& a, cons +@@ -67,6 +73,7 @@ bool IsThreadRefEqual(const PlatformThreadRef& a, cons } void SetCurrentThreadName(const char* name) { +#if !defined(__FreeBSD__) #if defined(WEBRTC_WIN) - // For details see: - // https://docs.microsoft.com/en-us/visualstudio/debugger/how-to-set-a-thread-name-in-native-code -@@ -81,6 +88,7 @@ void SetCurrentThreadName(const char* name) { + // The SetThreadDescription API works even if no debugger is attached. + // The names set with this API also show up in ETW traces. Very handy. +@@ -109,6 +116,7 @@ void SetCurrentThreadName(const char* name) { prctl(PR_SET_NAME, reinterpret_cast<unsigned long>(name)); // NOLINT #elif defined(WEBRTC_MAC) || defined(WEBRTC_IOS) pthread_setname_np(name); diff --git a/www/chromium/files/patch-third__party_webrtc_rtc__base_third__party_sigslot_sigslot.h b/www/chromium/files/patch-third__party_webrtc_rtc__base_third__party_sigslot_sigslot.h index 3d7e07133d72..58076dd33689 100644 --- a/www/chromium/files/patch-third__party_webrtc_rtc__base_third__party_sigslot_sigslot.h +++ b/www/chromium/files/patch-third__party_webrtc_rtc__base_third__party_sigslot_sigslot.h @@ -1,4 +1,4 @@ ---- third_party/webrtc/rtc_base/third_party/sigslot/sigslot.h.orig 2020-03-03 18:55:31 UTC +--- third_party/webrtc/rtc_base/third_party/sigslot/sigslot.h.orig 2020-11-13 06:42:25 UTC +++ third_party/webrtc/rtc_base/third_party/sigslot/sigslot.h @@ -178,6 +178,8 @@ class multi_threaded_local { #endif // _SIGSLOT_HAS_WIN32_THREADS diff --git a/www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn b/www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn index ee279e3451ba..aaa0aa6ea5a3 100644 --- a/www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn +++ b/www/chromium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn @@ -1,8 +1,8 @@ ---- third_party/webrtc/system_wrappers/BUILD.gn.orig 2020-05-13 18:41:57 UTC +--- third_party/webrtc/system_wrappers/BUILD.gn.orig 2020-11-13 06:42:25 UTC +++ third_party/webrtc/system_wrappers/BUILD.gn -@@ -59,8 +59,6 @@ rtc_library("system_wrappers") { +@@ -62,8 +62,6 @@ rtc_library("system_wrappers") { if (!build_with_chromium) { - deps += [ ":cpu_features_linux" ] + sources += [ "source/cpu_features_linux.cc" ] } - - libs += [ "rt" ] diff --git a/www/chromium/files/patch-third__party_zlib_cpu__features.c b/www/chromium/files/patch-third__party_zlib_cpu__features.c index f64dce9f4de3..a87c2b3f7c9e 100644 --- a/www/chromium/files/patch-third__party_zlib_cpu__features.c +++ b/www/chromium/files/patch-third__party_zlib_cpu__features.c @@ -1,6 +1,6 @@ ---- third_party/zlib/cpu_features.c.orig 2020-07-07 21:58:18 UTC +--- third_party/zlib/cpu_features.c.orig 2020-11-13 06:37:04 UTC +++ third_party/zlib/cpu_features.c -@@ -25,11 +25,20 @@ int ZLIB_INTERNAL x86_cpu_enable_simd = 0; +@@ -31,11 +31,20 @@ int ZLIB_INTERNAL x86_cpu_enable_simd = 0; #ifndef CPU_NO_SIMD @@ -23,16 +23,7 @@ #include <cpu-features.h> #elif defined(ARMV8_OS_LINUX) #include <asm/hwcap.h> -@@ -50,7 +59,7 @@ int ZLIB_INTERNAL x86_cpu_enable_simd = 0; - static void _cpu_check_features(void); - #endif - --#if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_LINUX) || defined(ARMV8_OS_FUCHSIA) || defined(X86_NOT_WINDOWS) -+#if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_LINUX) || defined(ARMV8_OS_FUCHSIA) || defined(X86_NOT_WINDOWS) || defined(ARMV8_OS_FREEBSD) - static pthread_once_t cpu_check_inited_once = PTHREAD_ONCE_INIT; - void ZLIB_INTERNAL cpu_check_features(void) - { -@@ -109,6 +118,13 @@ static void _cpu_check_features(void) +@@ -123,6 +132,13 @@ static void _cpu_check_features(void) #elif defined(ARMV8_OS_WINDOWS) arm_cpu_enable_crc32 = IsProcessorFeaturePresent(PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE); arm_cpu_enable_pmull = IsProcessorFeaturePresent(PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE); diff --git a/www/chromium/files/patch-tools_gn_build_gen.py b/www/chromium/files/patch-tools_gn_build_gen.py index 1a1692b44dd7..ba5d2971b957 100644 --- a/www/chromium/files/patch-tools_gn_build_gen.py +++ b/www/chromium/files/patch-tools_gn_build_gen.py @@ -1,16 +1,16 @@ ---- tools/gn/build/gen.py.orig 2020-07-07 22:09:39 UTC +--- tools/gn/build/gen.py.orig 2020-11-13 06:49:31 UTC +++ tools/gn/build/gen.py -@@ -78,6 +78,9 @@ class Platform(object): - def is_haiku(self): - return self._platform == 'haiku' +@@ -90,6 +90,9 @@ class Platform(object): + def is_solaris(self): + return self._platform == 'solaris' + def is_freebsd(self): + return self._platform == 'freebsd' + def is_posix(self): - return self._platform in ['linux', 'freebsd', 'darwin', 'aix', 'openbsd', 'haiku'] + return self._platform in ['linux', 'freebsd', 'darwin', 'aix', 'openbsd', 'haiku', 'solaris', 'msys', 'netbsd'] -@@ -372,6 +375,11 @@ def WriteGNNinja(path, platform, host, options): +@@ -405,6 +408,11 @@ def WriteGNNinja(path, platform, host, options): elif platform.is_haiku(): cflags.append('-fPIC') cflags.extend(['-D_BSD_SOURCE']) diff --git a/www/chromium/files/patch-tools_gn_src_base_files_file__posix.cc b/www/chromium/files/patch-tools_gn_src_base_files_file__posix.cc index 26958b7bf8f1..392b067f0120 100644 --- a/www/chromium/files/patch-tools_gn_src_base_files_file__posix.cc +++ b/www/chromium/files/patch-tools_gn_src_base_files_file__posix.cc @@ -1,4 +1,4 @@ ---- tools/gn/src/base/files/file_posix.cc.orig 2020-03-16 18:48:21 UTC +--- tools/gn/src/base/files/file_posix.cc.orig 2020-11-13 06:49:31 UTC +++ tools/gn/src/base/files/file_posix.cc @@ -372,7 +372,7 @@ void File::DoInitialize(const FilePath& path, uint32_t bool File::Flush() { diff --git a/www/chromium/files/patch-tools_gn_src_base_files_file__util.h b/www/chromium/files/patch-tools_gn_src_base_files_file__util.h deleted file mode 100644 index 910d80aa09c6..000000000000 --- a/www/chromium/files/patch-tools_gn_src_base_files_file__util.h +++ /dev/null @@ -1,11 +0,0 @@ ---- tools/gn/src/base/files/file_util.h.orig 2020-03-16 18:48:21 UTC -+++ tools/gn/src/base/files/file_util.h -@@ -325,7 +325,7 @@ bool VerifyPathControlledByAdmin(const base::FilePath& - // the directory |path|, in the number of FilePath::CharType, or -1 on failure. - int GetMaximumPathComponentLength(const base::FilePath& path); - --#if defined(OS_LINUX) || defined(OS_AIX) -+#if defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) - // Broad categories of file systems as returned by statfs() on Linux. - enum FileSystemType { - FILE_SYSTEM_UNKNOWN, // statfs failed. diff --git a/www/chromium/files/patch-tools_gn_src_base_files_file__util__posix.cc b/www/chromium/files/patch-tools_gn_src_base_files_file__util__posix.cc deleted file mode 100644 index b5476cba713c..000000000000 --- a/www/chromium/files/patch-tools_gn_src_base_files_file__util__posix.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- tools/gn/src/base/files/file_util_posix.cc.orig 2020-03-16 18:48:21 UTC -+++ tools/gn/src/base/files/file_util_posix.cc -@@ -210,7 +210,7 @@ bool ReplaceFile(const FilePath& from_path, - } - - bool CreateLocalNonBlockingPipe(int fds[2]) { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - return pipe2(fds, O_CLOEXEC | O_NONBLOCK) == 0; - #else - int raw_fds[2]; diff --git a/www/chromium/files/patch-tools_gn_src_base_files_scoped__file.cc b/www/chromium/files/patch-tools_gn_src_base_files_scoped__file.cc deleted file mode 100644 index acc59789e438..000000000000 --- a/www/chromium/files/patch-tools_gn_src_base_files_scoped__file.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- tools/gn/src/base/files/scoped_file.cc.orig 2020-03-16 18:48:21 UTC -+++ tools/gn/src/base/files/scoped_file.cc -@@ -30,7 +30,7 @@ void ScopedFDCloseTraits::Free(int fd) { - // a single open directory would bypass the entire security model. - int ret = IGNORE_EINTR(close(fd)); - --#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_FUCHSIA) || \ -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_FUCHSIA) || defined(OS_BSD) || \ - defined(OS_ANDROID) - // NB: Some file descriptors can return errors from close() e.g. network - // filesystems such as NFS and Linux input devices. On Linux, macOS, and diff --git a/www/chromium/files/patch-tools_gn_src_gn_exec__process.cc b/www/chromium/files/patch-tools_gn_src_gn_exec__process.cc index 761ee60ca826..92debe676b38 100644 --- a/www/chromium/files/patch-tools_gn_src_gn_exec__process.cc +++ b/www/chromium/files/patch-tools_gn_src_gn_exec__process.cc @@ -1,4 +1,4 @@ ---- tools/gn/src/gn/exec_process.cc.orig 2020-03-16 18:48:21 UTC +--- tools/gn/src/gn/exec_process.cc.orig 2020-11-13 06:49:31 UTC +++ tools/gn/src/gn/exec_process.cc @@ -30,6 +30,10 @@ #include "base/posix/file_descriptor_shuffle.h" diff --git a/www/chromium/files/patch-tools_gn_src_gn_function__write__file__unittest.cc b/www/chromium/files/patch-tools_gn_src_gn_function__write__file__unittest.cc new file mode 100644 index 000000000000..25bd1699240d --- /dev/null +++ b/www/chromium/files/patch-tools_gn_src_gn_function__write__file__unittest.cc @@ -0,0 +1,11 @@ +--- tools/gn/src/gn/function_write_file_unittest.cc.orig 2020-11-16 14:57:45 UTC ++++ tools/gn/src/gn/function_write_file_unittest.cc +@@ -13,7 +13,7 @@ + #include "gn/test_with_scope.h" + #include "util/test/test.h" + +-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_HAIKU) || defined(OS_MSYS) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_HAIKU) || defined(OS_MSYS) || defined(OS_BSD) + #include <sys/time.h> + #endif + diff --git a/www/chromium/files/patch-tools_gn_src_gn_version.h b/www/chromium/files/patch-tools_gn_src_gn_version.h new file mode 100644 index 000000000000..5a234a3342e3 --- /dev/null +++ b/www/chromium/files/patch-tools_gn_src_gn_version.h @@ -0,0 +1,15 @@ +--- tools/gn/src/gn/version.h.orig 2020-11-25 19:13:52 UTC ++++ tools/gn/src/gn/version.h +@@ -15,9 +15,9 @@ class Version { + + static std::optional<Version> FromString(std::string s); + +- int major() const { return major_; } +- int minor() const { return minor_; } +- int patch() const { return patch_; } ++ int gmajor() const { return major_; } ++ int gminor() const { return minor_; } ++ int gpatch() const { return patch_; } + + bool operator==(const Version& other) const; + bool operator<(const Version& other) const; diff --git a/www/chromium/files/patch-tools_gn_src_util_sys__info.cc b/www/chromium/files/patch-tools_gn_src_util_sys__info.cc index 8b5fbb9cdb14..40d0a42894de 100644 --- a/www/chromium/files/patch-tools_gn_src_util_sys__info.cc +++ b/www/chromium/files/patch-tools_gn_src_util_sys__info.cc @@ -1,7 +1,7 @@ ---- tools/gn/src/util/sys_info.cc.orig 2020-03-16 18:48:21 UTC +--- tools/gn/src/util/sys_info.cc.orig 2020-11-13 06:49:31 UTC +++ tools/gn/src/util/sys_info.cc -@@ -28,6 +28,8 @@ std::string OperatingSystemArchitecture() { - arch = "x86"; +@@ -33,6 +33,8 @@ std::string OperatingSystemArchitecture() { + arch = "x86_64"; } else if (arch == "amd64") { arch = "x86_64"; + } else if (arch == "arm64") { 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 8decbb4d3af6..8aeae1aaffd8 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,8 +1,8 @@ ---- tools/json_schema_compiler/feature_compiler.py.orig 2020-07-07 21:57:58 UTC +--- tools/json_schema_compiler/feature_compiler.py.orig 2020-11-13 06:37:04 UTC +++ tools/json_schema_compiler/feature_compiler.py -@@ -236,6 +236,7 @@ FEATURE_GRAMMAR = ({ - 'enum_map': { +@@ -243,6 +243,7 @@ FEATURE_GRAMMAR = ({ 'chromeos': 'Feature::CHROMEOS_PLATFORM', + 'lacros': 'Feature::LACROS_PLATFORM', 'linux': 'Feature::LINUX_PLATFORM', + 'bsd': 'Feature::LINUX_PLATFORM', 'mac': 'Feature::MACOSX_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 054250e781d5..13e122e0ed13 100644 --- a/www/chromium/files/patch-tools_json__schema__compiler_model.py +++ b/www/chromium/files/patch-tools_json__schema__compiler_model.py @@ -1,9 +1,9 @@ ---- tools/json_schema_compiler/model.py.orig 2019-12-16 21:51:07 UTC +--- tools/json_schema_compiler/model.py.orig 2020-11-13 06:37:04 UTC +++ tools/json_schema_compiler/model.py -@@ -605,7 +605,7 @@ class Platforms(object): - """ +@@ -676,7 +676,7 @@ class Platforms(object): CHROMEOS = _PlatformInfo("chromeos") CHROMEOS_TOUCH = _PlatformInfo("chromeos_touch") + LACROS = _PlatformInfo("lacros") - LINUX = _PlatformInfo("linux") + LINUX = _PlatformInfo("bsd") MAC = _PlatformInfo("mac") 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 afd3d6b08b0d..a1248eb921ab 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,11 +1,11 @@ ---- tools/perf/chrome_telemetry_build/BUILD.gn.orig 2020-05-13 18:40:02 UTC +--- tools/perf/chrome_telemetry_build/BUILD.gn.orig 2020-11-13 06:37:04 UTC +++ tools/perf/chrome_telemetry_build/BUILD.gn -@@ -47,7 +47,7 @@ group("telemetry_chrome_test") { +@@ -43,7 +43,7 @@ group("telemetry_chrome_test") { data_deps += [ "//chrome:reorder_imports" ] } -- if (is_linux) { -+ if (is_linux && !is_bsd) { - data_deps += [ - "//third_party/breakpad:dump_syms($host_toolchain)", - "//third_party/crashpad/crashpad/tools:crashpad_database_util", +- if (is_linux || is_chromeos) { ++ if ((is_linux || is_chromeos) && !is_bsd) { + data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] + + # CrOS currently has issues with the locally compiled version of diff --git a/www/chromium/files/patch-tools_variations_fieldtrial__to__struct.py b/www/chromium/files/patch-tools_variations_fieldtrial__to__struct.py index 940d72d03d24..674b330a41b1 100644 --- a/www/chromium/files/patch-tools_variations_fieldtrial__to__struct.py +++ b/www/chromium/files/patch-tools_variations_fieldtrial__to__struct.py @@ -1,4 +1,4 @@ ---- tools/variations/fieldtrial_to_struct.py.orig 2020-03-16 18:40:14 UTC +--- tools/variations/fieldtrial_to_struct.py.orig 2020-11-13 06:37:05 UTC +++ tools/variations/fieldtrial_to_struct.py @@ -35,6 +35,7 @@ _platforms = [ 'android_weblayer', diff --git a/www/chromium/files/patch-ui_aura_test_aura__test__helper.cc b/www/chromium/files/patch-ui_aura_test_aura__test__helper.cc index 81aa2da7101a..bce728b292f7 100644 --- a/www/chromium/files/patch-ui_aura_test_aura__test__helper.cc +++ b/www/chromium/files/patch-ui_aura_test_aura__test__helper.cc @@ -1,20 +1,20 @@ ---- ui/aura/test/aura_test_helper.cc.orig 2020-07-13 10:05:19 UTC +--- ui/aura/test/aura_test_helper.cc.orig 2020-11-13 06:37:05 UTC +++ ui/aura/test/aura_test_helper.cc @@ -29,7 +29,7 @@ #include "ui/wm/core/default_activation_client.h" #include "ui/wm/core/default_screen_position_client.h" --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "ui/platform_window/common/platform_window_defaults.h" // nogncheck #endif -@@ -55,7 +55,7 @@ AuraTestHelper::AuraTestHelper(ui::ContextFactory* con +@@ -59,7 +59,7 @@ AuraTestHelper::AuraTestHelper(ui::ContextFactory* con DCHECK(!g_instance); g_instance = this; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) ui::test::EnableTestConfigForPlatformWindows(); #endif diff --git a/www/chromium/files/patch-ui_aura_test_ui__controls__ozone.cc b/www/chromium/files/patch-ui_aura_test_ui__controls__ozone.cc new file mode 100644 index 000000000000..a72018bd50b9 --- /dev/null +++ b/www/chromium/files/patch-ui_aura_test_ui__controls__ozone.cc @@ -0,0 +1,11 @@ +--- ui/aura/test/ui_controls_ozone.cc.orig 2020-11-16 14:58:19 UTC ++++ ui/aura/test/ui_controls_ozone.cc +@@ -348,7 +348,7 @@ bool UIControlsOzone::ScreenDIPToHostPixels(gfx::Point + // 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 + // UIControls to use based on IsUsingOzonePlatform feature flag. +-#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_BSD) + ui_controls::UIControlsAura* CreateUIControlsAura(WindowTreeHost* host) { + return new UIControlsOzone(host); + } diff --git a/www/chromium/files/patch-ui_base_clipboard_clipboard__constants.cc b/www/chromium/files/patch-ui_base_clipboard_clipboard__constants.cc new file mode 100644 index 000000000000..677323071e15 --- /dev/null +++ b/www/chromium/files/patch-ui_base_clipboard_clipboard__constants.cc @@ -0,0 +1,16 @@ +--- ui/base/clipboard/clipboard_constants.cc.orig 2020-11-16 14:58:44 UTC ++++ ui/base/clipboard/clipboard_constants.cc +@@ -16,11 +16,11 @@ const char kMimeTypeSvg[] = "image/svg+xml"; + const char kMimeTypeRTF[] = "text/rtf"; + const char kMimeTypePNG[] = "image/png"; + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD) + const char kMimeTypeLinuxUtf8String[] = "UTF8_STRING"; + const char kMimeTypeLinuxString[] = "STRING"; + const char kMimeTypeLinuxText[] = "TEXT"; +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD) + + #if !defined(OS_APPLE) + const char kMimeTypeWebCustomData[] = "chromium/x-web-custom-data"; diff --git a/www/chromium/files/patch-ui_base_clipboard_clipboard__constants.h b/www/chromium/files/patch-ui_base_clipboard_clipboard__constants.h new file mode 100644 index 000000000000..870b4c7a5dfb --- /dev/null +++ b/www/chromium/files/patch-ui_base_clipboard_clipboard__constants.h @@ -0,0 +1,19 @@ +--- ui/base/clipboard/clipboard_constants.h.orig 2020-11-16 14:59:02 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[]; + + // Linux-specific MIME type constants (also used in Fuchsia). +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD) + COMPONENT_EXPORT(UI_BASE_CLIPBOARD_TYPES) + extern const char kMimeTypeLinuxUtf8String[]; + COMPONENT_EXPORT(UI_BASE_CLIPBOARD_TYPES) + extern const char kMimeTypeLinuxString[]; + COMPONENT_EXPORT(UI_BASE_CLIPBOARD_TYPES) + extern const char kMimeTypeLinuxText[]; +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD) + + #if !defined(OS_APPLE) + // TODO(dcheng): This name is temporary. See crbug.com/106449. diff --git a/www/chromium/files/patch-ui_base_clipboard_clipboard__data__endpoint.h b/www/chromium/files/patch-ui_base_clipboard_clipboard__data__endpoint.h new file mode 100644 index 000000000000..cf7b9405a23b --- /dev/null +++ b/www/chromium/files/patch-ui_base_clipboard_clipboard__data__endpoint.h @@ -0,0 +1,14 @@ +--- ui/base/clipboard/clipboard_data_endpoint.h.orig 2020-11-16 14:59:26 UTC ++++ ui/base/clipboard/clipboard_data_endpoint.h +@@ -15,9 +15,9 @@ namespace ui { + // destination trying to read the clipboard data. + // Whenever a new format is supported, a new enum should be added. + enum class EndpointType { +-#if defined(OS_CHROMEOS) || (OS_LINUX) || (OS_FUCHSIA) ++#if defined(OS_CHROMEOS) || (OS_LINUX) || (OS_FUCHSIA) || defined(OS_BSD) + kGuestOs = 0, // Guest OS: PluginVM, Crostini. +-#endif // defined(OS_CHROMEOS) || (OS_LINUX) || (OS_FUCHSIA) ++#endif // defined(OS_CHROMEOS) || (OS_LINUX) || (OS_FUCHSIA) || defined(OS_BSD) + #if defined(OS_CHROMEOS) + kArc = 1, // ARC. + #endif // defined(OS_CHROMEOS) diff --git a/www/chromium/files/patch-ui_base_clipboard_clipboard__ozone.cc b/www/chromium/files/patch-ui_base_clipboard_clipboard__ozone.cc new file mode 100644 index 000000000000..0c7d671f429c --- /dev/null +++ b/www/chromium/files/patch-ui_base_clipboard_clipboard__ozone.cc @@ -0,0 +1,11 @@ +--- ui/base/clipboard/clipboard_ozone.cc.orig 2020-11-16 14:59:53 UTC ++++ ui/base/clipboard/clipboard_ozone.cc +@@ -308,7 +308,7 @@ class ClipboardOzone::AsyncClipboardOzone { + }; + + // Uses the factory in the clipboard_linux otherwise. +-#if defined(OS_CHROMEOS) || !defined(OS_LINUX) ++#if defined(OS_CHROMEOS) || (!defined(OS_LINUX) && !defined(OS_BSD)) + // Clipboard factory method. + Clipboard* Clipboard::Create() { + // linux-chromeos uses non-backed clipboard by default, but supports ozone x11 diff --git a/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc b/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc index 7ee7103042eb..421630c04387 100644 --- a/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc +++ b/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc @@ -1,20 +1,29 @@ ---- ui/base/dragdrop/os_exchange_data_provider_factory.cc.orig 2020-07-07 21:58:19 UTC +--- ui/base/dragdrop/os_exchange_data_provider_factory.cc.orig 2020-11-13 06:37:05 UTC +++ ui/base/dragdrop/os_exchange_data_provider_factory.cc -@@ -9,7 +9,7 @@ +@@ -7,7 +7,7 @@ + #include "base/notreached.h" + #include "build/build_config.h" - #if defined(USE_X11) - #include "ui/base/dragdrop/os_exchange_data_provider_x11.h" --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + #include "ui/base/dragdrop/os_exchange_data_provider_non_backed.h" + #include "ui/base/ui_base_features.h" #if defined(USE_OZONE) - #include "ui/base/dragdrop/os_exchange_data_provider_factory_ozone.h" - #endif -@@ -27,7 +27,7 @@ std::unique_ptr<OSExchangeDataProvider> - OSExchangeDataProviderFactory::CreateProvider() { - #if defined(USE_X11) - return std::make_unique<OSExchangeDataProviderX11>(); --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +@@ -26,7 +26,7 @@ namespace ui { + + namespace { + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + std::unique_ptr<OSExchangeDataProvider> CreateProviderForLinux() { #if defined(USE_OZONE) // The instance can be nullptr in tests that do not instantiate the platform, - // or on platforms that do not implement specific drag'n'drop. For them, +@@ -50,7 +50,7 @@ std::unique_ptr<OSExchangeDataProvider> CreateProvider + // static + std::unique_ptr<OSExchangeDataProvider> + OSExchangeDataProviderFactory::CreateProvider() { +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + if (features::IsUsingOzonePlatform()) + return CreateProviderForLinux(); + #if defined(USE_X11) diff --git a/www/chromium/files/patch-ui_base_ime_init_input__method__initializer.cc b/www/chromium/files/patch-ui_base_ime_init_input__method__initializer.cc index 8a1ebb0848a0..4c6a510851c8 100644 --- a/www/chromium/files/patch-ui_base_ime_init_input__method__initializer.cc +++ b/www/chromium/files/patch-ui_base_ime_init_input__method__initializer.cc @@ -1,9 +1,9 @@ ---- ui/base/ime/init/input_method_initializer.cc.orig 2020-07-07 21:58:19 UTC +--- ui/base/ime/init/input_method_initializer.cc.orig 2020-11-13 06:37:05 UTC +++ ui/base/ime/init/input_method_initializer.cc @@ -10,7 +10,7 @@ #if defined(OS_CHROMEOS) - #include "ui/base/ime/ime_bridge.h" + #include "ui/base/ime/chromeos/ime_bridge.h" -#elif defined(USE_AURA) && defined(OS_LINUX) +#elif defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD)) #include "base/check.h" 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 211e06ccf1d5..cd5442a9e5c8 100644 --- a/www/chromium/files/patch-ui_base_resource_resource__bundle.cc +++ b/www/chromium/files/patch-ui_base_resource_resource__bundle.cc @@ -1,20 +1,20 @@ ---- ui/base/resource/resource_bundle.cc.orig 2020-05-13 18:40:03 UTC +--- ui/base/resource/resource_bundle.cc.orig 2020-11-13 06:37:05 UTC +++ ui/base/resource/resource_bundle.cc -@@ -830,7 +830,7 @@ void ResourceBundle::ReloadFonts() { +@@ -844,7 +844,7 @@ void ResourceBundle::ReloadFonts() { } ScaleFactor ResourceBundle::GetMaxScaleFactor() const { --#if defined(OS_WIN) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) return max_scale_factor_; #else return GetSupportedScaleFactors().back(); -@@ -883,7 +883,7 @@ void ResourceBundle::InitSharedInstance(Delegate* dele +@@ -897,7 +897,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_MACOSX) || defined(OS_LINUX) || defined(OS_WIN) -+#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) +-#if defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ ++#if defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ + defined(OS_WIN) supported_scale_factors.push_back(SCALE_FACTOR_200P); #endif - #endif diff --git a/www/chromium/files/patch-ui_base_resource_resource__bundle__freebsd.cc b/www/chromium/files/patch-ui_base_resource_resource__bundle__freebsd.cc index ea5ade19da2e..e84aac94fe46 100644 --- a/www/chromium/files/patch-ui_base_resource_resource__bundle__freebsd.cc +++ b/www/chromium/files/patch-ui_base_resource_resource__bundle__freebsd.cc @@ -1,4 +1,4 @@ ---- ui/base/resource/resource_bundle_freebsd.cc.orig 2019-03-17 01:47:14 UTC +--- ui/base/resource/resource_bundle_freebsd.cc.orig 2020-11-16 10:08:53 UTC +++ ui/base/resource/resource_bundle_freebsd.cc @@ -0,0 +1,21 @@ +// Copyright 2017 The Chromium Authors. All rights reserved. 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 new file mode 100644 index 000000000000..721586a85508 --- /dev/null +++ b/www/chromium/files/patch-ui_base_test_skia__gold__pixel__diff.cc @@ -0,0 +1,11 @@ +--- ui/base/test/skia_gold_pixel_diff.cc.orig 2020-11-16 15:00:36 UTC ++++ ui/base/test/skia_gold_pixel_diff.cc +@@ -127,7 +127,7 @@ std::string SkiaGoldPixelDiff::GetPlatform() { + return "windows"; + #elif defined(OS_APPLE) + return "macOS"; +-#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + return "linux"; + #endif + } diff --git a/www/chromium/files/patch-ui_base_ui__base__features.cc b/www/chromium/files/patch-ui_base_ui__base__features.cc index 74f63f6db820..e3e050ba4a56 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 2020-07-07 21:58:19 UTC +--- ui/base/ui_base_features.cc.orig 2020-11-13 06:37:05 UTC +++ ui/base/ui_base_features.cc -@@ -98,7 +98,7 @@ const base::Feature kCompositorThreadedScrollbarScroll +@@ -100,7 +100,7 @@ const base::Feature kCompositorThreadedScrollbarScroll // native apps on Windows. const base::Feature kExperimentalFlingAnimation { "ExperimentalFlingAnimation", @@ -9,30 +9,30 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -130,7 +130,7 @@ const base::Feature kPrecisionTouchpadLogging{ +@@ -132,7 +132,7 @@ const base::Feature kPrecisionTouchpadLogging{ "PrecisionTouchpadLogging", base::FEATURE_DISABLED_BY_DEFAULT}; #endif // defined(OS_WIN) --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) +-#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 = { - "DirectManipulationStylus", -@@ -140,7 +140,7 @@ const base::Feature kDirectManipulationStylus = { +@@ -143,7 +143,7 @@ const base::Feature kDirectManipulationStylus = { base::FEATURE_DISABLED_BY_DEFAULT #endif }; --#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || + // defined(OS_CHROMEOS) // Enables forced colors mode for web content. - const base::Feature kForcedColors{"ForcedColors", -@@ -166,7 +166,7 @@ bool IsEyeDropperEnabled() { +@@ -182,7 +182,7 @@ bool IsCSSColorSchemeUARenderingEnabled() { // crbug.com/1012106 for the Windows launch bug, and crbug.com/1012108 for the // Mac launch bug. const base::Feature kFormControlsRefresh = {"FormControlsRefresh", -#if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) || \ - defined(OS_MACOSX) + defined(OS_APPLE) base::FEATURE_ENABLED_BY_DEFAULT #else 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 2f0d38fc356e..a51b73f52c89 100644 --- a/www/chromium/files/patch-ui_base_ui__base__features.h +++ b/www/chromium/files/patch-ui_base_ui__base__features.h @@ -1,15 +1,16 @@ ---- ui/base/ui_base_features.h.orig 2020-07-07 21:58:19 UTC +--- ui/base/ui_base_features.h.orig 2020-11-13 06:37:05 UTC +++ ui/base/ui_base_features.h -@@ -60,10 +60,10 @@ COMPONENT_EXPORT(UI_BASE_FEATURES) extern const base:: +@@ -60,11 +60,11 @@ COMPONENT_EXPORT(UI_BASE_FEATURES) extern const base:: COMPONENT_EXPORT(UI_BASE_FEATURES) bool IsUsingWMPointerForTouch(); #endif // defined(OS_WIN) --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) COMPONENT_EXPORT(UI_BASE_FEATURES) extern const base::Feature kDirectManipulationStylus; --#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || + // defined(OS_CHROMEOS) // Used to enable forced colors mode for web content. - COMPONENT_EXPORT(UI_BASE_FEATURES) extern const base::Feature kForcedColors; diff --git a/www/chromium/files/patch-ui_base_webui_web__ui__util.cc b/www/chromium/files/patch-ui_base_webui_web__ui__util.cc index 422ea71485b9..e0dc17d6ff3d 100644 --- a/www/chromium/files/patch-ui_base_webui_web__ui__util.cc +++ b/www/chromium/files/patch-ui_base_webui_web__ui__util.cc @@ -1,11 +1,20 @@ ---- ui/base/webui/web_ui_util.cc.orig 2020-03-16 18:40:15 UTC +--- ui/base/webui/web_ui_util.cc.orig 2020-11-13 06:37:05 UTC +++ ui/base/webui/web_ui_util.cc -@@ -236,7 +236,7 @@ std::string GetFontFamily() { +@@ -34,7 +34,7 @@ + #include "base/win/windows_version.h" + #endif + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + #include "ui/base/ui_base_features.h" + #endif + +@@ -232,7 +232,7 @@ std::string GetFontFamily() { // TODO(dnicoara) Remove Ozone check when PlatformFont support is introduced // into Ozone: crbug.com/320050 --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(USE_OZONE) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) && !defined(USE_OZONE) - font_family = ui::ResourceBundle::GetSharedInstance().GetFont( - ui::ResourceBundle::BaseFont).GetFontName() + ", " + font_family; - #endif +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + if (!features::IsUsingOzonePlatform()) { + font_family = ui::ResourceBundle::GetSharedInstance() + .GetFont(ui::ResourceBundle::BaseFont) diff --git a/www/chromium/files/patch-ui_base_x_x11__shm__image__pool.cc b/www/chromium/files/patch-ui_base_x_x11__shm__image__pool.cc index fa8b4ef08d78..ea5813838e61 100644 --- a/www/chromium/files/patch-ui_base_x_x11__shm__image__pool.cc +++ b/www/chromium/files/patch-ui_base_x_x11__shm__image__pool.cc @@ -1,4 +1,4 @@ ---- ui/base/x/x11_shm_image_pool.cc.orig 2020-05-13 18:40:03 UTC +--- ui/base/x/x11_shm_image_pool.cc.orig 2020-11-13 06:37:05 UTC +++ ui/base/x/x11_shm_image_pool.cc @@ -16,6 +16,7 @@ #include "base/environment.h" @@ -8,7 +8,7 @@ #include "base/threading/thread_task_runner_handle.h" #include "build/build_config.h" #include "net/base/url_util.h" -@@ -44,10 +45,14 @@ constexpr float kShmResizeShrinkThreshold = +@@ -45,10 +46,14 @@ constexpr float kShmResizeShrinkThreshold = 1.0f / (kShmResizeThreshold * kShmResizeThreshold); std::size_t MaxShmSegmentSizeImpl() { @@ -23,21 +23,3 @@ } std::size_t MaxShmSegmentSize() { -@@ -201,7 +206,7 @@ bool XShmImagePool::Resize(const gfx::Size& pixel_size - shmctl(state.shminfo_.shmid, IPC_RMID, nullptr); - return false; - } --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - // On Linux, a shmid can still be attached after IPC_RMID if otherwise - // kept alive. Detach before XShmAttach to prevent a memory leak in case - // the process dies. -@@ -211,7 +216,7 @@ bool XShmImagePool::Resize(const gfx::Size& pixel_size - if (!XShmAttach(display_, &state.shminfo_)) - return false; - state.shmem_attached_to_server_ = true; --#if !defined(OS_LINUX) -+#if (!defined(OS_LINUX) && !defined(OS_BSD)) - // The Linux-specific shmctl behavior above may not be portable, so we're - // forced to do IPC_RMID after the server has attached to the segment. - // XShmAttach is asynchronous, so we must also sync. diff --git a/www/chromium/files/patch-ui_compositor_compositor.cc b/www/chromium/files/patch-ui_compositor_compositor.cc index 0eee152db4c4..e9567833c6e0 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 2020-07-07 21:58:19 UTC +--- ui/compositor/compositor.cc.orig 2020-11-13 06:37:05 UTC +++ ui/compositor/compositor.cc -@@ -740,7 +740,7 @@ void Compositor::CancelThroughtputTracker(TrackerId tr +@@ -730,7 +730,7 @@ void Compositor::CancelThroughtputTracker(TrackerId tr throughput_tracker_map_.erase(tracker_id); } diff --git a/www/chromium/files/patch-ui_compositor_compositor.h b/www/chromium/files/patch-ui_compositor_compositor.h index b812a2cd1ddf..f6d8f5dd1f9e 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 2020-07-07 21:58:19 UTC +--- ui/compositor/compositor.h.orig 2020-11-13 06:37:05 UTC +++ ui/compositor/compositor.h -@@ -363,7 +363,7 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerT +@@ -366,7 +366,7 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerT void StopThroughtputTracker(TrackerId tracker_id) override; void CancelThroughtputTracker(TrackerId tracker_id) override; diff --git a/www/chromium/files/patch-ui_compositor_compositor__observer.h b/www/chromium/files/patch-ui_compositor_compositor__observer.h index deab6a8328f8..2cf8672f4cd6 100644 --- a/www/chromium/files/patch-ui_compositor_compositor__observer.h +++ b/www/chromium/files/patch-ui_compositor_compositor__observer.h @@ -1,4 +1,4 @@ ---- ui/compositor/compositor_observer.h.orig 2019-12-17 19:56:41 UTC +--- ui/compositor/compositor_observer.h.orig 2020-11-13 06:37:05 UTC +++ ui/compositor/compositor_observer.h @@ -42,11 +42,11 @@ class COMPOSITOR_EXPORT CompositorObserver { // Called when a child of the compositor is resizing. @@ -9,8 +9,8 @@ // Called when a swap with new size is completed. virtual void OnCompositingCompleteSwapWithNewSize(ui::Compositor* compositor, const gfx::Size& size) {} --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Called at the top of the compositor's destructor, to give observers a // chance to remove themselves. diff --git a/www/chromium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc b/www/chromium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc index 3e96b3e5b3b1..c6419d873b6a 100644 --- a/www/chromium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc +++ b/www/chromium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc @@ -1,19 +1,20 @@ ---- ui/events/devices/x11/device_data_manager_x11.cc.orig 2020-07-07 21:58:19 UTC +--- ui/events/devices/x11/device_data_manager_x11.cc.orig 2020-11-13 06:37:05 UTC +++ ui/events/devices/x11/device_data_manager_x11.cc -@@ -816,6 +816,8 @@ void DeviceDataManagerX11::SetDisabledKeyboardAllowedK +@@ -841,6 +841,9 @@ void DeviceDataManagerX11::SetDisabledKeyboardAllowedK } - void DeviceDataManagerX11::DisableDevice(int deviceid) { + void DeviceDataManagerX11::DisableDevice(x11::Input::DeviceId deviceid) { ++#if defined(OS_BSD) + NOTIMPLEMENTED(); -+#if !defined(OS_BSD) - blocked_devices_.set(deviceid, true); ++#else + blocked_devices_.set(static_cast<uint32_t>(deviceid), true); // TODO(rsadam@): Support blocking touchscreen devices. std::vector<InputDevice> keyboards = GetKeyboardDevices(); -@@ -826,6 +828,7 @@ void DeviceDataManagerX11::DisableDevice(int deviceid) +@@ -850,6 +853,7 @@ void DeviceDataManagerX11::DisableDevice(x11::Input::D keyboards.erase(it); DeviceDataManager::OnKeyboardDevicesUpdated(keyboards); } +#endif } - void DeviceDataManagerX11::EnableDevice(int deviceid) { + void DeviceDataManagerX11::EnableDevice(x11::Input::DeviceId deviceid) { diff --git a/www/chromium/files/patch-ui_events_event.cc b/www/chromium/files/patch-ui_events_event.cc new file mode 100644 index 000000000000..3407212e5e8c --- /dev/null +++ b/www/chromium/files/patch-ui_events_event.cc @@ -0,0 +1,11 @@ +--- ui/events/event.cc.orig 2020-11-16 15:03:40 UTC ++++ ui/events/event.cc +@@ -469,7 +469,7 @@ std::string LocatedEvent::ToString() const { + MouseEvent::MouseEvent(const PlatformEvent& native_event) + : LocatedEvent(native_event), + changed_button_flags_(GetChangedMouseButtonFlagsFromNative(native_event)), +-#if defined(OS_CHROMEOS) || defined(OS_LINUX) ++#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) + movement_(GetMouseMovementFromNative(native_event)), + #endif + pointer_details_(GetMousePointerDetailsFromNative(native_event)) { diff --git a/www/chromium/files/patch-ui_events_event__switches.cc b/www/chromium/files/patch-ui_events_event__switches.cc index 565f70395687..4e3c41a39acc 100644 --- a/www/chromium/files/patch-ui_events_event__switches.cc +++ b/www/chromium/files/patch-ui_events_event__switches.cc @@ -1,11 +1,11 @@ ---- ui/events/event_switches.cc.orig 2019-03-11 22:01:19 UTC +--- ui/events/event_switches.cc.orig 2020-11-13 06:37:05 UTC +++ ui/events/event_switches.cc @@ -14,7 +14,7 @@ namespace switches { const char kCompensateForUnstablePinchZoom[] = "compensate-for-unstable-pinch-zoom"; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_FREEBSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Tells chrome to interpret events from these devices as touch events. Only // available with XInput 2 (i.e. X server 1.8 or above). The id's of the // devices can be retrieved from 'xinput list'. diff --git a/www/chromium/files/patch-ui_events_event__switches.h b/www/chromium/files/patch-ui_events_event__switches.h index e7351a731084..0c7395ff85ca 100644 --- a/www/chromium/files/patch-ui_events_event__switches.h +++ b/www/chromium/files/patch-ui_events_event__switches.h @@ -1,11 +1,11 @@ ---- ui/events/event_switches.h.orig 2019-03-11 22:01:19 UTC +--- ui/events/event_switches.h.orig 2020-11-13 06:37:05 UTC +++ ui/events/event_switches.h @@ -13,7 +13,7 @@ namespace switches { EVENTS_BASE_EXPORT extern const char kCompensateForUnstablePinchZoom[]; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_FREEBSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) EVENTS_BASE_EXPORT extern const char kTouchDevices[]; EVENTS_BASE_EXPORT extern const char kPenDevices[]; #endif diff --git a/www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.cc b/www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.cc index 2bae1687515b..f9b84f85695b 100644 --- a/www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.cc +++ b/www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.cc @@ -1,11 +1,11 @@ ---- ui/events/keycodes/dom/keycode_converter.cc.orig 2020-03-16 18:40:15 UTC +--- ui/events/keycodes/dom/keycode_converter.cc.orig 2020-11-13 06:37:05 UTC +++ ui/events/keycodes/dom/keycode_converter.cc @@ -20,7 +20,7 @@ namespace { #if defined(OS_WIN) #define DOM_CODE(usb, evdev, xkb, win, mac, code, id) \ { usb, win, code } --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) ++#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #define DOM_CODE(usb, evdev, xkb, win, mac, code, id) \ { usb, xkb, code } - #elif defined(OS_MACOSX) + #elif defined(OS_APPLE) 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 new file mode 100644 index 000000000000..234080e72294 --- /dev/null +++ b/www/chromium/files/patch-ui_events_ozone_keyboard__hook__ozone.cc @@ -0,0 +1,11 @@ +--- ui/events/ozone/keyboard_hook_ozone.cc.orig 2020-11-16 15:03:56 UTC ++++ ui/events/ozone/keyboard_hook_ozone.cc +@@ -29,7 +29,7 @@ bool KeyboardHookOzone::RegisterHook() { + return true; + } + +-#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, diff --git a/www/chromium/files/patch-ui_gfx_BUILD.gn b/www/chromium/files/patch-ui_gfx_BUILD.gn index e9b8d932f94d..e81bbe71adb4 100644 --- a/www/chromium/files/patch-ui_gfx_BUILD.gn +++ b/www/chromium/files/patch-ui_gfx_BUILD.gn @@ -1,11 +1,11 @@ ---- ui/gfx/BUILD.gn.orig 2020-07-07 21:58:19 UTC +--- ui/gfx/BUILD.gn.orig 2020-11-13 06:37:06 UTC +++ ui/gfx/BUILD.gn -@@ -580,7 +580,7 @@ jumbo_source_set("memory_buffer_sources") { +@@ -572,7 +572,7 @@ source_set("memory_buffer_sources") { deps += [ "//build/config/linux/libdrm" ] } -- if (is_linux || is_android) { -+ if ((is_linux || is_android) && !is_bsd) { +- if (is_linux || is_chromeos || is_android) { ++ if ((is_linux || is_chromeos || is_android) && !is_bsd) { deps += [ "//third_party/libsync" ] } diff --git a/www/chromium/files/patch-ui_gfx_canvas__skia.cc b/www/chromium/files/patch-ui_gfx_canvas__skia.cc index 5d99916e4eb1..5dfabd901f78 100644 --- a/www/chromium/files/patch-ui_gfx_canvas__skia.cc +++ b/www/chromium/files/patch-ui_gfx_canvas__skia.cc @@ -1,11 +1,11 @@ ---- ui/gfx/canvas_skia.cc.orig 2020-02-03 21:53:13 UTC +--- ui/gfx/canvas_skia.cc.orig 2020-11-13 06:37:06 UTC +++ ui/gfx/canvas_skia.cc @@ -206,7 +206,7 @@ void Canvas::DrawStringRectWithFlags(const base::strin Range range = StripAcceleratorChars(flags, &adjusted_text); bool elide_text = ((flags & NO_ELLIPSIS) == 0); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // On Linux, eliding really means fading the end of the string. But only // for LTR text. RTL text is still elided (on the left) with "...". if (elide_text) { diff --git a/www/chromium/files/patch-ui_gfx_codec_jpeg__codec.cc b/www/chromium/files/patch-ui_gfx_codec_jpeg__codec.cc index 1bd5ac55ec9e..803d7a90485f 100644 --- a/www/chromium/files/patch-ui_gfx_codec_jpeg__codec.cc +++ b/www/chromium/files/patch-ui_gfx_codec_jpeg__codec.cc @@ -1,6 +1,6 @@ ---- ui/gfx/codec/jpeg_codec.cc.orig 2019-03-11 22:01:19 UTC +--- ui/gfx/codec/jpeg_codec.cc.orig 2020-11-13 06:37:06 UTC +++ ui/gfx/codec/jpeg_codec.cc -@@ -207,6 +207,7 @@ bool JPEGCodec::Decode(const unsigned char* input, siz +@@ -208,6 +208,7 @@ bool JPEGCodec::Decode(const unsigned char* input, siz case JCS_GRAYSCALE: case JCS_RGB: case JCS_YCbCr: @@ -8,7 +8,7 @@ // Choose an output colorspace and return if it is an unsupported one. // Same as JPEGCodec::Encode(), libjpeg-turbo supports all input formats // used by Chromium (i.e. RGBA and BGRA) and we just map the input -@@ -223,6 +224,9 @@ bool JPEGCodec::Decode(const unsigned char* input, siz +@@ -224,6 +225,9 @@ bool JPEGCodec::Decode(const unsigned char* input, siz NOTREACHED() << "Invalid pixel format"; return false; } diff --git a/www/chromium/files/patch-ui_gfx_font__fallback__linux.cc b/www/chromium/files/patch-ui_gfx_font__fallback__linux.cc index 26597a5d4cb2..d618b26e1109 100644 --- a/www/chromium/files/patch-ui_gfx_font__fallback__linux.cc +++ b/www/chromium/files/patch-ui_gfx_font__fallback__linux.cc @@ -1,4 +1,4 @@ ---- ui/gfx/font_fallback_linux.cc.orig 2019-12-16 21:51:34 UTC +--- ui/gfx/font_fallback_linux.cc.orig 2020-11-13 06:37:06 UTC +++ ui/gfx/font_fallback_linux.cc @@ -24,6 +24,10 @@ #include "ui/gfx/linux/fontconfig_util.h" diff --git a/www/chromium/files/patch-ui_gfx_font__list.cc b/www/chromium/files/patch-ui_gfx_font__list.cc index 542476a0c3e2..64348418d977 100644 --- a/www/chromium/files/patch-ui_gfx_font__list.cc +++ b/www/chromium/files/patch-ui_gfx_font__list.cc @@ -1,11 +1,11 @@ ---- ui/gfx/font_list.cc.orig 2019-03-11 22:01:19 UTC +--- ui/gfx/font_list.cc.orig 2020-11-13 06:37:06 UTC +++ ui/gfx/font_list.cc @@ -24,7 +24,7 @@ base::LazyInstance<scoped_refptr<gfx::FontListImpl>>:: bool g_default_impl_initialized = false; bool IsFontFamilyAvailable(const std::string& family, SkFontMgr* fontManager) { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) return !!fontManager->legacyMakeTypeface(family.c_str(), SkFontStyle()); #else sk_sp<SkFontStyleSet> set(fontManager->matchFamily(family.c_str())); diff --git a/www/chromium/files/patch-ui_gfx_font__names__testing.cc b/www/chromium/files/patch-ui_gfx_font__names__testing.cc index 2c268488ae30..c639ea9afff0 100644 --- a/www/chromium/files/patch-ui_gfx_font__names__testing.cc +++ b/www/chromium/files/patch-ui_gfx_font__names__testing.cc @@ -1,11 +1,11 @@ ---- ui/gfx/font_names_testing.cc.orig 2020-04-06 08:38:05 UTC +--- ui/gfx/font_names_testing.cc.orig 2020-11-13 06:37:06 UTC +++ ui/gfx/font_names_testing.cc @@ -22,7 +22,7 @@ Note that we have to support the full range from Jelly dessert. */ --#if defined(OS_LINUX) || defined(OS_FUCHSIA) -+#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD) const char kTestFontName[] = "Arimo"; #elif defined(OS_ANDROID) const char kTestFontName[] = "sans-serif"; @@ -13,8 +13,8 @@ const char kTestFontName[] = "Arial"; #endif --#if defined(OS_LINUX) || defined(OS_FUCHSIA) -+#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD) const char kSymbolFontName[] = "DejaVu Sans"; #elif defined(OS_ANDROID) const char kSymbolFontName[] = "monospace"; @@ -22,8 +22,8 @@ const char kSymbolFontName[] = "Symbol"; #endif --#if defined(OS_LINUX) || defined(OS_FUCHSIA) -+#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD) const char kCJKFontName[] = "Noto Sans CJK JP"; #elif defined(OS_ANDROID) const char kCJKFontName[] = "serif"; diff --git a/www/chromium/files/patch-ui_gfx_font__render__params.h b/www/chromium/files/patch-ui_gfx_font__render__params.h index 52f1f467375c..2a90003eb96c 100644 --- a/www/chromium/files/patch-ui_gfx_font__render__params.h +++ b/www/chromium/files/patch-ui_gfx_font__render__params.h @@ -1,11 +1,11 @@ ---- ui/gfx/font_render_params.h.orig 2020-07-07 21:57:59 UTC +--- ui/gfx/font_render_params.h.orig 2020-11-13 06:37:06 UTC +++ ui/gfx/font_render_params.h @@ -111,7 +111,7 @@ GFX_EXPORT FontRenderParams GetFontRenderParams( const FontRenderParamsQuery& query, std::string* family_out); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Clears GetFontRenderParams()'s cache. Intended to be called by tests that are // changing Fontconfig's configuration. GFX_EXPORT void ClearFontRenderParamsCacheForTest(); @@ -13,8 +13,8 @@ // Gets the device scale factor to query the FontRenderParams. GFX_EXPORT float GetFontRenderParamsDeviceScaleFactor(); --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) || \ -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) || \ - defined(OS_FUCHSIA) +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ + defined(OS_ANDROID) || defined(OS_FUCHSIA) // Sets the device scale factor for FontRenderParams to decide // if it should enable subpixel positioning. diff --git a/www/chromium/files/patch-ui_gfx_font__util.cc b/www/chromium/files/patch-ui_gfx_font__util.cc index 70270c4ee997..d22174b2ec85 100644 --- a/www/chromium/files/patch-ui_gfx_font__util.cc +++ b/www/chromium/files/patch-ui_gfx_font__util.cc @@ -1,11 +1,11 @@ ---- ui/gfx/font_util.cc.orig 2019-12-17 19:58:26 UTC +--- ui/gfx/font_util.cc.orig 2020-11-13 06:37:06 UTC +++ ui/gfx/font_util.cc @@ -6,7 +6,7 @@ #include "build/build_config.h" --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include <fontconfig/fontconfig.h> #include "ui/gfx/linux/fontconfig_util.h" #endif @@ -13,13 +13,13 @@ // background (resources have not yet been granted to cast) since it prevents // the long delay the user would have seen on first rendering. --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Ensures the config is created on this thread. FcConfig* config = GetGlobalFontConfig(); DCHECK(config); --#endif // OS_LINUX -+#endif // OS_LINUX || OS_BSD +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #if defined(OS_WIN) gfx::win::InitializeDirectWrite(); diff --git a/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.cc b/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.cc index 4a9c78512816..4ab5f32555c1 100644 --- a/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.cc +++ b/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.cc @@ -1,11 +1,11 @@ ---- ui/gfx/gpu_memory_buffer.cc.orig 2020-05-13 18:40:03 UTC +--- ui/gfx/gpu_memory_buffer.cc.orig 2020-11-13 06:37:06 UTC +++ ui/gfx/gpu_memory_buffer.cc @@ -34,7 +34,7 @@ GpuMemoryBufferHandle GpuMemoryBufferHandle::Clone() c handle.region = region.Duplicate(); handle.offset = offset; handle.stride = stride; --#if defined(OS_LINUX) || defined(OS_FUCHSIA) -+#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD) handle.native_pixmap_handle = CloneHandleForIPC(native_pixmap_handle); - #elif defined(OS_MACOSX) && !defined(OS_IOS) - NOTIMPLEMENTED(); + #elif defined(OS_MAC) + handle.mach_port = mach_port; diff --git a/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h b/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h index 356867056eff..f2596ed3a36a 100644 --- a/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h +++ b/www/chromium/files/patch-ui_gfx_gpu__memory__buffer.h @@ -1,20 +1,20 @@ ---- ui/gfx/gpu_memory_buffer.h.orig 2020-05-13 18:40:03 UTC +--- ui/gfx/gpu_memory_buffer.h.orig 2020-11-13 06:37:06 UTC +++ ui/gfx/gpu_memory_buffer.h @@ -15,7 +15,7 @@ #include "ui/gfx/geometry/rect.h" #include "ui/gfx/gfx_export.h" --#if defined(USE_OZONE) || defined(OS_LINUX) -+#if defined(USE_OZONE) || defined(OS_LINUX) || 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) #include "ui/gfx/native_pixmap_handle.h" - #elif defined(OS_MACOSX) && !defined(OS_IOS) + #elif defined(OS_MAC) #include "ui/gfx/mac/io_surface.h" @@ -69,7 +69,7 @@ struct GFX_EXPORT GpuMemoryBufferHandle { base::UnsafeSharedMemoryRegion region; uint32_t offset = 0; int32_t stride = 0; --#if defined(OS_LINUX) || defined(OS_FUCHSIA) -+#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD) NativePixmapHandle native_pixmap_handle; - #elif defined(OS_MACOSX) && !defined(OS_IOS) + #elif defined(OS_MAC) ScopedRefCountedIOSurfaceMachPort mach_port; diff --git a/www/chromium/files/patch-ui_gfx_ipc_gfx__param__traits__macros.h b/www/chromium/files/patch-ui_gfx_ipc_gfx__param__traits__macros.h index 22be111486c5..aa7f7cfbdda4 100644 --- a/www/chromium/files/patch-ui_gfx_ipc_gfx__param__traits__macros.h +++ b/www/chromium/files/patch-ui_gfx_ipc_gfx__param__traits__macros.h @@ -1,44 +1,44 @@ ---- ui/gfx/ipc/gfx_param_traits_macros.h.orig 2019-10-21 19:07:29 UTC +--- ui/gfx/ipc/gfx_param_traits_macros.h.orig 2020-11-13 06:37:06 UTC +++ ui/gfx/ipc/gfx_param_traits_macros.h @@ -18,7 +18,7 @@ #include "ui/gfx/selection_bound.h" #include "ui/gfx/swap_result.h" --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "ui/gfx/native_pixmap_handle.h" #endif -@@ -51,7 +51,7 @@ IPC_STRUCT_TRAITS_BEGIN(gfx::GpuMemoryBufferHandle) +@@ -48,7 +48,7 @@ IPC_STRUCT_TRAITS_BEGIN(gfx::GpuMemoryBufferHandle) IPC_STRUCT_TRAITS_MEMBER(region) IPC_STRUCT_TRAITS_MEMBER(offset) IPC_STRUCT_TRAITS_MEMBER(stride) --#if defined(OS_LINUX) || defined(OS_FUCHSIA) -+#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD) IPC_STRUCT_TRAITS_MEMBER(native_pixmap_handle) - #elif defined(OS_MACOSX) + #elif defined(OS_APPLE) IPC_STRUCT_TRAITS_MEMBER(mach_port) -@@ -66,12 +66,12 @@ IPC_STRUCT_TRAITS_BEGIN(gfx::GpuMemoryBufferId) +@@ -63,12 +63,12 @@ IPC_STRUCT_TRAITS_BEGIN(gfx::GpuMemoryBufferId) IPC_STRUCT_TRAITS_MEMBER(id) IPC_STRUCT_TRAITS_END() --#if defined(OS_LINUX) || defined(OS_FUCHSIA) -+#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_FUCHSIA) || defined(OS_BSD) IPC_STRUCT_TRAITS_BEGIN(gfx::NativePixmapPlane) IPC_STRUCT_TRAITS_MEMBER(stride) IPC_STRUCT_TRAITS_MEMBER(offset) IPC_STRUCT_TRAITS_MEMBER(size) --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) IPC_STRUCT_TRAITS_MEMBER(fd) #elif defined(OS_FUCHSIA) IPC_STRUCT_TRAITS_MEMBER(vmo) -@@ -80,7 +80,7 @@ IPC_STRUCT_TRAITS_END() +@@ -77,7 +77,7 @@ IPC_STRUCT_TRAITS_END() IPC_STRUCT_TRAITS_BEGIN(gfx::NativePixmapHandle) IPC_STRUCT_TRAITS_MEMBER(planes) --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) IPC_STRUCT_TRAITS_MEMBER(modifier) #endif #if defined(OS_FUCHSIA) 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 1741c4d863e8..0599e914a493 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 2020-03-16 18:40:43 UTC +--- ui/gfx/linux/client_native_pixmap_dmabuf.cc.orig 2020-11-13 06:37:06 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> -@@ -26,11 +28,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_mojom_buffer__types__mojom__traits.cc b/www/chromium/files/patch-ui_gfx_mojom_buffer__types__mojom__traits.cc index 4d7ecf6ec21a..66f3859b250c 100644 --- a/www/chromium/files/patch-ui_gfx_mojom_buffer__types__mojom__traits.cc +++ b/www/chromium/files/patch-ui_gfx_mojom_buffer__types__mojom__traits.cc @@ -1,11 +1,11 @@ ---- ui/gfx/mojom/buffer_types_mojom_traits.cc.orig 2020-05-13 18:40:03 UTC +--- ui/gfx/mojom/buffer_types_mojom_traits.cc.orig 2020-11-13 06:37:06 UTC +++ ui/gfx/mojom/buffer_types_mojom_traits.cc @@ -33,7 +33,7 @@ gfx::mojom::GpuMemoryBufferPlatformHandlePtr StructTra return gfx::mojom::GpuMemoryBufferPlatformHandle::NewSharedMemoryHandle( std::move(handle.region)); case gfx::NATIVE_PIXMAP: --#if defined(OS_LINUX) || defined(USE_OZONE) -+#if defined(OS_LINUX) || defined(OS_BSD) || defined(USE_OZONE) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(USE_OZONE) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || defined(USE_OZONE) return gfx::mojom::GpuMemoryBufferPlatformHandle::NewNativePixmapHandle( std::move(handle.native_pixmap_handle)); #else @@ -13,8 +13,8 @@ out->type = gfx::SHARED_MEMORY_BUFFER; out->region = std::move(platform_handle->get_shared_memory_handle()); return true; --#if defined(OS_LINUX) || defined(USE_OZONE) -+#if defined(OS_LINUX) || defined(OS_BSD) || defined(USE_OZONE) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(USE_OZONE) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || defined(USE_OZONE) case gfx::mojom::GpuMemoryBufferPlatformHandleDataView::Tag:: NATIVE_PIXMAP_HANDLE: out->type = gfx::NATIVE_PIXMAP; diff --git a/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc b/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc index 116dd4005c52..e836fc7386e5 100644 --- a/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc +++ b/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc @@ -1,21 +1,21 @@ ---- ui/gfx/mojom/native_handle_types_mojom_traits.cc.orig 2020-05-15 15:28:55 UTC +--- ui/gfx/mojom/native_handle_types_mojom_traits.cc.orig 2020-11-13 06:37:06 UTC +++ ui/gfx/mojom/native_handle_types_mojom_traits.cc @@ -8,15 +8,15 @@ namespace mojo { --#if defined(OS_LINUX) || defined(USE_OZONE) -+#if defined(OS_LINUX) || defined(OS_BSD) || defined(USE_OZONE) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(USE_OZONE) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || defined(USE_OZONE) mojo::PlatformHandle StructTraits< gfx::mojom::NativePixmapPlaneDataView, gfx::NativePixmapPlane>::buffer_handle(gfx::NativePixmapPlane& plane) { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) return mojo::PlatformHandle(std::move(plane.fd)); #elif defined(OS_FUCHSIA) return mojo::PlatformHandle(std::move(plane.vmo)); --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) } bool StructTraits< @@ -23,8 +23,8 @@ out->size = data.size(); mojo::PlatformHandle handle = data.TakeBufferHandle(); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) if (!handle.is_fd()) return false; out->fd = handle.TakeFD(); @@ -32,8 +32,8 @@ if (!handle.is_handle()) return false; out->vmo = zx::vmo(handle.TakeHandle()); --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) return true; } @@ -41,8 +41,8 @@ gfx::mojom::NativePixmapHandleDataView, gfx::NativePixmapHandle>::Read(gfx::mojom::NativePixmapHandleDataView data, gfx::NativePixmapHandle* out) { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) out->modifier = data.modifier(); #endif @@ -50,7 +50,7 @@ return data.ReadPlanes(&out->planes); } --#endif // defined(OS_LINUX) || defined(USE_OZONE) -+#endif // defined(OS_LINUX) || defined(OS_BSD) || defined(USE_OZONE) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(USE_OZONE) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || defined(USE_OZONE) } // namespace mojo diff --git a/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h b/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h index 7f3980dd22e3..53f92778433b 100644 --- a/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h +++ b/www/chromium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h @@ -1,18 +1,18 @@ ---- ui/gfx/mojom/native_handle_types_mojom_traits.h.orig 2020-05-15 15:29:45 UTC +--- ui/gfx/mojom/native_handle_types_mojom_traits.h.orig 2020-11-13 06:37:06 UTC +++ ui/gfx/mojom/native_handle_types_mojom_traits.h @@ -14,13 +14,13 @@ #include "mojo/public/cpp/system/platform_handle.h" #include "ui/gfx/mojom/native_handle_types.mojom-shared.h" --#if defined(OS_LINUX) || defined(USE_OZONE) -+#if defined(OS_LINUX) || defined(OS_BSD) || defined(USE_OZONE) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(USE_OZONE) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || defined(USE_OZONE) #include "ui/gfx/native_pixmap_handle.h" #endif namespace mojo { --#if defined(OS_LINUX) || defined(USE_OZONE) -+#if defined(OS_LINUX) || defined(OS_BSD) || defined(USE_OZONE) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(USE_OZONE) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || defined(USE_OZONE) template <> struct COMPONENT_EXPORT(GFX_NATIVE_HANDLE_TYPES_SHARED_MOJOM_TRAITS) StructTraits<gfx::mojom::NativePixmapPlaneDataView, @@ -20,8 +20,8 @@ return pixmap_handle.planes; } --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_BSD) || defined(OS_CHROMEOS) static uint64_t modifier(const gfx::NativePixmapHandle& pixmap_handle) { return pixmap_handle.modifier; } @@ -29,8 +29,8 @@ static bool Read(gfx::mojom::NativePixmapHandleDataView data, gfx::NativePixmapHandle* out); }; --#endif // defined(OS_LINUX) || defined(USE_OZONE) -+#endif // defined(OS_LINUX) || defined(OS_BSD) || defined(USE_OZONE) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(USE_OZONE) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || defined(USE_OZONE) } // namespace mojo diff --git a/www/chromium/files/patch-ui_gfx_native__pixmap__handle.cc b/www/chromium/files/patch-ui_gfx_native__pixmap__handle.cc index e4128cb160c5..a53271d2b50e 100644 --- a/www/chromium/files/patch-ui_gfx_native__pixmap__handle.cc +++ b/www/chromium/files/patch-ui_gfx_native__pixmap__handle.cc @@ -1,11 +1,11 @@ ---- ui/gfx/native_pixmap_handle.cc.orig 2020-07-07 21:57:59 UTC +--- ui/gfx/native_pixmap_handle.cc.orig 2020-11-13 06:37:06 UTC +++ ui/gfx/native_pixmap_handle.cc @@ -9,11 +9,15 @@ #include "base/logging.h" #include "build/build_config.h" --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include <drm_fourcc.h> #include "base/posix/eintr_wrapper.h" #endif @@ -21,8 +21,8 @@ namespace gfx { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) static_assert(NativePixmapHandle::kNoModifier == DRM_FORMAT_MOD_INVALID, "gfx::NativePixmapHandle::kNoModifier should be an alias for" "DRM_FORMAT_MOD_INVALID"); @@ -30,8 +30,8 @@ NativePixmapPlane::NativePixmapPlane(int stride, int offset, uint64_t size --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) , base::ScopedFD fd #elif defined(OS_FUCHSIA) @@ -39,8 +39,8 @@ : stride(stride), offset(offset), size(size) --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) , fd(std::move(fd)) #elif defined(OS_FUCHSIA) @@ -48,8 +48,8 @@ NativePixmapHandle CloneHandleForIPC(const NativePixmapHandle& handle) { NativePixmapHandle clone; for (auto& plane : handle.planes) { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) DCHECK(plane.fd.is_valid()); base::ScopedFD fd_dup(HANDLE_EINTR(dup(plane.fd.get()))); if (!fd_dup.is_valid()) { @@ -57,8 +57,8 @@ #endif } --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) clone.modifier = handle.modifier; #endif diff --git a/www/chromium/files/patch-ui_gfx_native__pixmap__handle.h b/www/chromium/files/patch-ui_gfx_native__pixmap__handle.h index 6306e267fbeb..ccdaf57e0e3e 100644 --- a/www/chromium/files/patch-ui_gfx_native__pixmap__handle.h +++ b/www/chromium/files/patch-ui_gfx_native__pixmap__handle.h @@ -1,11 +1,11 @@ ---- ui/gfx/native_pixmap_handle.h.orig 2019-10-21 19:07:29 UTC +--- ui/gfx/native_pixmap_handle.h.orig 2020-11-13 06:37:06 UTC +++ ui/gfx/native_pixmap_handle.h @@ -15,7 +15,7 @@ #include "build/build_config.h" #include "ui/gfx/gfx_export.h" --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "base/files/scoped_file.h" #endif @@ -13,8 +13,8 @@ NativePixmapPlane(int stride, int offset, uint64_t size --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) , base::ScopedFD fd #elif defined(OS_FUCHSIA) @@ -22,8 +22,8 @@ // This is necessary to map the buffers. uint64_t size; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // File descriptor for the underlying memory object (usually dmabuf). base::ScopedFD fd; #elif defined(OS_FUCHSIA) @@ -31,8 +31,8 @@ std::vector<NativePixmapPlane> planes; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // The modifier is retrieved from GBM library and passed to EGL driver. // Generally it's platform specific, and we don't need to modify it in // Chromium code. Also one per plane per entry. diff --git a/www/chromium/files/patch-ui_gfx_native__widget__types.h b/www/chromium/files/patch-ui_gfx_native__widget__types.h index 4525fc9ce0e2..3db003545172 100644 --- a/www/chromium/files/patch-ui_gfx_native__widget__types.h +++ b/www/chromium/files/patch-ui_gfx_native__widget__types.h @@ -1,6 +1,6 @@ ---- ui/gfx/native_widget_types.h.orig 2020-05-15 15:30:28 UTC +--- ui/gfx/native_widget_types.h.orig 2020-11-13 06:37:06 UTC +++ ui/gfx/native_widget_types.h -@@ -104,7 +104,7 @@ class ViewAndroid; +@@ -103,7 +103,7 @@ class ViewAndroid; #endif class SkBitmap; @@ -9,8 +9,8 @@ extern "C" { struct _AtkObject; typedef struct _AtkObject AtkObject; -@@ -205,7 +205,7 @@ typedef id NativeViewAccessible; - #elif defined(OS_MACOSX) +@@ -204,7 +204,7 @@ typedef id NativeViewAccessible; + #elif defined(OS_MAC) typedef NSFont* NativeFont; typedef id NativeViewAccessible; -#elif 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 1d624f958cea..7d072e40bad4 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 2020-07-07 21:58:19 UTC +--- ui/gfx/render_text.cc.orig 2020-11-13 06:37:06 UTC +++ ui/gfx/render_text.cc -@@ -1179,32 +1179,33 @@ void RenderText::SetDisplayOffset(int horizontal_offse +@@ -1191,32 +1191,33 @@ void RenderText::SetDisplayOffset(int horizontal_offse const int extra_content = GetContentWidth() - display_rect_.width(); const int cursor_width = cursor_enabled_ ? 1 : 0; diff --git a/www/chromium/files/patch-ui_gfx_x_BUILD.gn b/www/chromium/files/patch-ui_gfx_x_BUILD.gn deleted file mode 100644 index f70d74f17804..000000000000 --- a/www/chromium/files/patch-ui_gfx_x_BUILD.gn +++ /dev/null @@ -1,11 +0,0 @@ ---- ui/gfx/x/BUILD.gn.orig 2020-07-13 11:08:01 UTC -+++ ui/gfx/x/BUILD.gn -@@ -16,6 +16,8 @@ declare_args() { - if (xcbproto_path == "") { - if (use_sysroot) { - xcbproto_path = "$sysroot/usr/share/xcb" -+ } else if (is_bsd) { -+ xcbproto_path = "/usr/local/share/xcb" - } else { - xcbproto_path = "/usr/share/xcb" - } diff --git a/www/chromium/files/patch-ui_gfx_x_gen__xproto.py b/www/chromium/files/patch-ui_gfx_x_gen__xproto.py deleted file mode 100644 index 1a9d08c9d938..000000000000 --- a/www/chromium/files/patch-ui_gfx_x_gen__xproto.py +++ /dev/null @@ -1,13 +0,0 @@ ---- ui/gfx/x/gen_xproto.py.orig 2020-07-13 16:58:52 UTC -+++ ui/gfx/x/gen_xproto.py -@@ -1015,6 +1015,10 @@ def main(): - 'dist-packages') - sys.path.insert(1, path) - -+ # Workaround to use the xcb-proto package, which installs using the default python version -+ # Remove this as soon as chromium builds with python3! -+ sys.path.append(os.path.join('..', '..', '..', 'site-packages')) -+ - import xcbgen.xtypes - import xcbgen.state - diff --git a/www/chromium/files/patch-ui_gl_BUILD.gn b/www/chromium/files/patch-ui_gl_BUILD.gn index 9266552d908a..df51e69658ea 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 2020-07-07 21:58:19 UTC +--- ui/gl/BUILD.gn.orig 2020-11-13 06:37:06 UTC +++ ui/gl/BUILD.gn -@@ -229,7 +229,7 @@ jumbo_component("gl") { +@@ -225,7 +225,7 @@ component("gl") { ] } diff --git a/www/chromium/files/patch-ui_gl_generate__bindings.py b/www/chromium/files/patch-ui_gl_generate__bindings.py index 4881f35df4c7..54acbdabd02d 100644 --- a/www/chromium/files/patch-ui_gl_generate__bindings.py +++ b/www/chromium/files/patch-ui_gl_generate__bindings.py @@ -1,6 +1,6 @@ ---- ui/gl/generate_bindings.py.orig 2020-07-07 21:58:19 UTC +--- ui/gl/generate_bindings.py.orig 2020-11-13 06:37:06 UTC +++ ui/gl/generate_bindings.py -@@ -2813,6 +2813,9 @@ GLX_FUNCTIONS = [ +@@ -2836,6 +2836,9 @@ GLX_FUNCTIONS = [ 'arguments': 'Display* dpy, GLXDrawable drawable, int32_t* numerator, ' 'int32_t* denominator' }, diff --git a/www/chromium/files/patch-ui_gl_gl__bindings__api__autogen__glx.h b/www/chromium/files/patch-ui_gl_gl__bindings__api__autogen__glx.h index c51dba36aabe..f466330985b2 100644 --- a/www/chromium/files/patch-ui_gl_gl__bindings__api__autogen__glx.h +++ b/www/chromium/files/patch-ui_gl_gl__bindings__api__autogen__glx.h @@ -1,4 +1,4 @@ ---- ui/gl/gl_bindings_api_autogen_glx.h.orig 2019-03-11 22:01:19 UTC +--- ui/gl/gl_bindings_api_autogen_glx.h.orig 2020-11-13 06:37:06 UTC +++ ui/gl/gl_bindings_api_autogen_glx.h @@ -88,6 +88,7 @@ bool glXGetMscRateOMLFn(Display* dpy, GLXDrawable drawable, diff --git a/www/chromium/files/patch-ui_gl_gl__bindings__autogen__glx.cc b/www/chromium/files/patch-ui_gl_gl__bindings__autogen__glx.cc index 4aeda03a0414..fb6515b2f3d2 100644 --- a/www/chromium/files/patch-ui_gl_gl__bindings__autogen__glx.cc +++ b/www/chromium/files/patch-ui_gl_gl__bindings__autogen__glx.cc @@ -1,4 +1,4 @@ ---- ui/gl/gl_bindings_autogen_glx.cc.orig 2020-02-24 18:39:44 UTC +--- ui/gl/gl_bindings_autogen_glx.cc.orig 2020-11-13 06:37:06 UTC +++ ui/gl/gl_bindings_autogen_glx.cc @@ -115,6 +115,8 @@ void DriverGLX::InitializeExtensionBindings() { diff --git a/www/chromium/files/patch-ui_gl_gl__bindings__autogen__glx.h b/www/chromium/files/patch-ui_gl_gl__bindings__autogen__glx.h index e95b9179865e..74e201f50124 100644 --- a/www/chromium/files/patch-ui_gl_gl__bindings__autogen__glx.h +++ b/www/chromium/files/patch-ui_gl_gl__bindings__autogen__glx.h @@ -1,4 +1,4 @@ ---- ui/gl/gl_bindings_autogen_glx.h.orig 2019-03-11 22:01:19 UTC +--- ui/gl/gl_bindings_autogen_glx.h.orig 2020-11-13 06:37:06 UTC +++ ui/gl/gl_bindings_autogen_glx.h @@ -104,6 +104,8 @@ typedef bool(GL_BINDING_CALL* glXGetMscRateOMLProc)(Di GLXDrawable drawable, diff --git a/www/chromium/files/patch-ui_gl_gl__features.cc b/www/chromium/files/patch-ui_gl_gl__features.cc new file mode 100644 index 000000000000..33c34828b69f --- /dev/null +++ b/www/chromium/files/patch-ui_gl_gl__features.cc @@ -0,0 +1,11 @@ +--- ui/gl/gl_features.cc.orig 2020-11-16 15:04:56 UTC ++++ ui/gl/gl_features.cc +@@ -14,7 +14,7 @@ namespace features { + const base::Feature kDefaultPassthroughCommandDecoder{ + "DefaultPassthroughCommandDecoder", + #if defined(OS_WIN) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(CHROMECAST_BUILD)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(CHROMECAST_BUILD)) || defined(OS_BSD) + base::FEATURE_ENABLED_BY_DEFAULT + #else + base::FEATURE_DISABLED_BY_DEFAULT diff --git a/www/chromium/files/patch-ui_gl_gl__fence.cc b/www/chromium/files/patch-ui_gl_gl__fence.cc index 5ba84b4bdb36..6af87c329d85 100644 --- a/www/chromium/files/patch-ui_gl_gl__fence.cc +++ b/www/chromium/files/patch-ui_gl_gl__fence.cc @@ -1,11 +1,11 @@ ---- ui/gl/gl_fence.cc.orig 2019-03-11 22:01:19 UTC +--- ui/gl/gl_fence.cc.orig 2020-11-13 06:37:06 UTC +++ ui/gl/gl_fence.cc @@ -18,7 +18,7 @@ #include "ui/gl/gl_fence_apple.h" #endif --#if defined(USE_EGL) && defined(OS_POSIX) && !defined(OS_MACOSX) -+#if defined(USE_EGL) && defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_FREEBSD) +-#if defined(USE_EGL) && defined(OS_POSIX) && !defined(OS_APPLE) ++#if defined(USE_EGL) && defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_BSD) #define USE_GL_FENCE_ANDROID_NATIVE_FENCE_SYNC #include "ui/gl/gl_fence_android_native_fence_sync.h" #include "ui/gl/gl_surface_egl.h" diff --git a/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.cc b/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.cc index 7295d4c6df5e..c8b7505ee270 100644 --- a/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.cc +++ b/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.cc @@ -1,11 +1,11 @@ ---- ui/gl/sync_control_vsync_provider.cc.orig 2019-04-30 22:23:42 UTC +--- ui/gl/sync_control_vsync_provider.cc.orig 2020-11-13 06:37:06 UTC +++ ui/gl/sync_control_vsync_provider.cc @@ -11,7 +11,7 @@ #include "base/trace_event/trace_event.h" #include "build/build_config.h" --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // These constants define a reasonable range for a calculated refresh interval. // Calculating refreshes out of this range will be considered a fatal error. const int64_t kMinVsyncIntervalUs = base::Time::kMicrosecondsPerSecond / 400; @@ -13,8 +13,8 @@ namespace gl { SyncControlVSyncProvider::SyncControlVSyncProvider() : gfx::VSyncProvider() { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // On platforms where we can't get an accurate reading on the refresh // rate we fall back to the assumption that we're displaying 60 frames // per second. @@ -22,8 +22,8 @@ base::TimeTicks* timebase_out, base::TimeDelta* interval_out) { TRACE_EVENT0("gpu", "SyncControlVSyncProvider::GetVSyncParameters"); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // The actual clock used for the system time returned by glXGetSyncValuesOML // is unspecified. In practice, the clock used is likely to be either // CLOCK_REALTIME or CLOCK_MONOTONIC, so we compare the returned time to the @@ -31,13 +31,13 @@ return true; #else return false; --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) } bool SyncControlVSyncProvider::SupportGetVSyncParametersIfAvailable() const { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) return true; #else return false; diff --git a/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.h b/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.h index 4321d70a7288..87d79bd81bb6 100644 --- a/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.h +++ b/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.h @@ -1,16 +1,16 @@ ---- ui/gl/sync_control_vsync_provider.h.orig 2019-03-11 22:01:19 UTC +--- ui/gl/sync_control_vsync_provider.h.orig 2020-11-13 06:37:06 UTC +++ ui/gl/sync_control_vsync_provider.h @@ -26,11 +26,11 @@ class SyncControlVSyncProvider : public gfx::VSyncProv bool SupportGetVSyncParametersIfAvailable() const override; static constexpr bool IsSupported() { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) return true; #else return false; --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) } protected: @@ -18,8 +18,8 @@ virtual bool GetMscRate(int32_t* numerator, int32_t* denominator) = 0; private: --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) base::TimeTicks last_timebase_; uint64_t last_media_stream_counter_ = 0; base::TimeDelta last_good_interval_; @@ -27,8 +27,8 @@ // from configuration change (monitor reconfiguration, moving windows // between monitors, suspend and resume, etc.). base::queue<base::TimeDelta> last_computed_intervals_; --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) DISALLOW_COPY_AND_ASSIGN(SyncControlVSyncProvider); }; diff --git a/www/chromium/files/patch-ui_gtk_print__dialog__gtk.cc b/www/chromium/files/patch-ui_gtk_printing_print__dialog__gtk.cc index 8088210e0936..3d31d6cb74ba 100644 --- a/www/chromium/files/patch-ui_gtk_print__dialog__gtk.cc +++ b/www/chromium/files/patch-ui_gtk_printing_print__dialog__gtk.cc @@ -1,6 +1,6 @@ ---- ui/gtk/print_dialog_gtk.cc.orig 2020-07-07 21:58:19 UTC -+++ ui/gtk/print_dialog_gtk.cc -@@ -341,7 +341,7 @@ void PrintDialogGtk::ShowDialog( +--- ui/gtk/printing/print_dialog_gtk.cc.orig 2020-11-13 06:37:06 UTC ++++ ui/gtk/printing/print_dialog_gtk.cc +@@ -388,7 +388,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 7037f8a47604..b9850f7e4288 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 2019-12-16 21:51:34 UTC +--- ui/message_center/views/message_popup_view.cc.orig 2020-11-13 06:37:06 UTC +++ ui/message_center/views/message_popup_view.cc -@@ -101,7 +101,7 @@ void MessagePopupView::AutoCollapse() { +@@ -110,7 +110,7 @@ void MessagePopupView::AutoCollapse() { void MessagePopupView::Show() { views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP); params.z_order = ui::ZOrderLevel::kFloatingWindow; diff --git a/www/chromium/files/patch-ui_native__theme_native__theme.h b/www/chromium/files/patch-ui_native__theme_native__theme.h index 9806f7ecdeff..d3e7aae4bac2 100644 --- a/www/chromium/files/patch-ui_native__theme_native__theme.h +++ b/www/chromium/files/patch-ui_native__theme_native__theme.h @@ -1,4 +1,4 @@ ---- ui/native_theme/native_theme.h.orig 2020-05-13 18:40:37 UTC +--- ui/native_theme/native_theme.h.orig 2020-11-13 06:37:06 UTC +++ ui/native_theme/native_theme.h @@ -51,7 +51,7 @@ class NATIVE_THEME_EXPORT NativeTheme { // The part to be painted / sized. 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 15980314aa07..f2db72edfcc3 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,4 +1,4 @@ ---- ui/native_theme/native_theme_base.cc.orig 2020-07-07 21:58:19 UTC +--- ui/native_theme/native_theme_base.cc.orig 2020-11-13 06:37:06 UTC +++ ui/native_theme/native_theme_base.cc @@ -255,7 +255,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas, case kCheckbox: diff --git a/www/chromium/files/patch-ui_ozone_ozone.gni b/www/chromium/files/patch-ui_ozone_ozone.gni new file mode 100644 index 000000000000..770d40dad741 --- /dev/null +++ b/www/chromium/files/patch-ui_ozone_ozone.gni @@ -0,0 +1,12 @@ +--- ui/ozone/ozone.gni.orig 2020-11-16 15:29:43 UTC ++++ ui/ozone/ozone.gni +@@ -69,6 +69,9 @@ declare_args() { + ozone_platform = "x11" + ozone_platform_drm = true + ozone_platform_x11 = true ++ } else if (is_bsd) { ++ ozone_platform = "x11" ++ ozone_platform_x11 = true + } else if (is_desktop_linux) { + ozone_platform = "x11" + ozone_platform_wayland = true 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 78b9f0444781..b0cfc47e5fd9 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,11 +1,11 @@ ---- ui/platform_window/platform_window_init_properties.h.orig 2020-02-24 18:40:16 UTC +--- ui/platform_window/platform_window_init_properties.h.orig 2020-11-13 06:37:06 UTC +++ ui/platform_window/platform_window_init_properties.h @@ -41,7 +41,7 @@ enum class PlatformWindowOpacity { class WorkspaceExtensionDelegate; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) class X11ExtensionDelegate; #endif @@ -13,8 +13,8 @@ WorkspaceExtensionDelegate* workspace_extension_delegate = nullptr; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) bool prefer_dark_theme = false; gfx::ImageSkia* icon = nullptr; base::Optional<int> background_color; diff --git a/www/chromium/files/patch-ui_strings_app__locale__settings.grd b/www/chromium/files/patch-ui_strings_app__locale__settings.grd index ff17c71e5984..c7a618ec0438 100644 --- a/www/chromium/files/patch-ui_strings_app__locale__settings.grd +++ b/www/chromium/files/patch-ui_strings_app__locale__settings.grd @@ -1,4 +1,4 @@ ---- ui/strings/app_locale_settings.grd.orig 2020-07-07 21:57:59 UTC +--- ui/strings/app_locale_settings.grd.orig 2020-11-13 06:37:06 UTC +++ ui/strings/app_locale_settings.grd @@ -217,7 +217,7 @@ 75% diff --git a/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate__view.cc b/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate__view.cc index 3e4380cfcbf7..18108b4d64b4 100644 --- a/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate__view.cc +++ b/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate__view.cc @@ -1,11 +1,11 @@ ---- ui/views/bubble/bubble_dialog_delegate_view.cc.orig 2020-07-07 21:58:19 UTC +--- ui/views/bubble/bubble_dialog_delegate_view.cc.orig 2020-11-13 06:37:06 UTC +++ ui/views/bubble/bubble_dialog_delegate_view.cc -@@ -170,7 +170,7 @@ Widget* BubbleDialogDelegateView::CreateBubble( +@@ -319,7 +319,7 @@ Widget* BubbleDialogDelegate::CreateBubble( bubble_delegate->SetAnchorView(bubble_delegate->GetAnchorView()); Widget* bubble_widget = CreateBubbleWidget(bubble_delegate); --#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) || defined(OS_BSD) +-#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_APPLE) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_APPLE) || defined(OS_BSD) // Linux clips bubble windows that extend outside their parent window bounds. // Mac never adjusts. bubble_delegate->set_adjust_if_offscreen(false); diff --git a/www/chromium/files/patch-ui_views_controls_label.cc b/www/chromium/files/patch-ui_views_controls_label.cc index 9e8e9bd90dd6..872cc0914544 100644 --- a/www/chromium/files/patch-ui_views_controls_label.cc +++ b/www/chromium/files/patch-ui_views_controls_label.cc @@ -1,6 +1,6 @@ ---- ui/views/controls/label.cc.orig 2020-07-07 21:58:19 UTC +--- ui/views/controls/label.cc.orig 2020-11-13 06:37:06 UTC +++ ui/views/controls/label.cc -@@ -689,7 +689,7 @@ bool Label::OnMousePressed(const ui::MouseEvent& event +@@ -726,7 +726,7 @@ bool Label::OnMousePressed(const ui::MouseEvent& event GetFocusManager()->SetFocusedView(this); } @@ -9,7 +9,7 @@ if (event.IsOnlyMiddleMouseButton() && GetFocusManager() && !had_focus) GetFocusManager()->SetFocusedView(this); #endif -@@ -875,7 +875,7 @@ bool Label::PasteSelectionClipboard() { +@@ -913,7 +913,7 @@ bool Label::PasteSelectionClipboard() { } void Label::UpdateSelectionClipboard() { 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 2ff071560d33..62bc835c01ea 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 2020-07-07 21:58:19 UTC +--- ui/views/controls/textfield/textfield.cc.orig 2020-11-13 06:37:06 UTC +++ ui/views/controls/textfield/textfield.cc -@@ -64,7 +64,7 @@ +@@ -65,7 +65,7 @@ #include "base/win/win_util.h" #endif @@ -9,33 +9,33 @@ #include "ui/base/ime/linux/text_edit_command_auralinux.h" #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" #endif -@@ -185,14 +185,14 @@ ui::TextEditCommand GetCommandForKeyEvent(const ui::Ke +@@ -192,14 +192,14 @@ ui::TextEditCommand GetCommandForKeyEvent(const ui::Ke #endif return ui::TextEditCommand::DELETE_BACKWARD; } --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Only erase by line break on Linux and ChromeOS. if (shift) return ui::TextEditCommand::DELETE_TO_BEGINNING_OF_LINE; #endif return ui::TextEditCommand::DELETE_WORD_BACKWARD; case ui::VKEY_DELETE: --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Only erase by line break on Linux and ChromeOS. if (shift && control) return ui::TextEditCommand::DELETE_TO_END_OF_LINE; -@@ -260,7 +260,7 @@ bool IsControlKeyModifier(int flags) { +@@ -267,7 +267,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 --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) return flags & ui::EF_CONTROL_DOWN; #else return false; -@@ -709,7 +709,7 @@ bool Textfield::OnMousePressed(const ui::MouseEvent& e +@@ -758,7 +758,7 @@ bool Textfield::OnMousePressed(const ui::MouseEvent& e #endif } @@ -44,7 +44,7 @@ if (!handled && !had_focus && event.IsOnlyMiddleMouseButton()) RequestFocusWithPointer(ui::EventPointerType::kMouse); #endif -@@ -755,7 +755,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event +@@ -805,7 +805,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event if (!textfield) return handled; @@ -53,7 +53,7 @@ ui::TextEditKeyBindingsDelegateAuraLinux* delegate = ui::GetTextEditKeyBindingsDelegate(); std::vector<ui::TextEditCommandAuraLinux> commands; -@@ -907,7 +907,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo +@@ -957,7 +957,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo } bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) { @@ -62,7 +62,7 @@ // Skip any accelerator handling that conflicts with custom keybindings. ui::TextEditKeyBindingsDelegateAuraLinux* delegate = ui::GetTextEditKeyBindingsDelegate(); -@@ -2182,7 +2182,7 @@ bool Textfield::PasteSelectionClipboard() { +@@ -2241,7 +2241,7 @@ bool Textfield::PasteSelectionClipboard() { } void Textfield::UpdateSelectionClipboard() { diff --git a/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc b/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc index 78a010bbdc9a..4eae8ee7476f 100644 --- a/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc +++ b/www/chromium/files/patch-ui_views_corewm_tooltip__aura.cc @@ -1,4 +1,4 @@ ---- ui/views/corewm/tooltip_aura.cc.orig 2020-05-13 18:40:37 UTC +--- ui/views/corewm/tooltip_aura.cc.orig 2020-11-13 06:37:06 UTC +++ ui/views/corewm/tooltip_aura.cc @@ -46,7 +46,7 @@ constexpr int kVerticalPaddingBottom = 5; diff --git a/www/chromium/files/patch-ui_views_examples_widget__example.cc b/www/chromium/files/patch-ui_views_examples_widget__example.cc index 08d332729f6b..7f2b2ce741c3 100644 --- a/www/chromium/files/patch-ui_views_examples_widget__example.cc +++ b/www/chromium/files/patch-ui_views_examples_widget__example.cc @@ -1,11 +1,11 @@ ---- ui/views/examples/widget_example.cc.orig 2020-07-07 21:57:59 UTC +--- ui/views/examples/widget_example.cc.orig 2020-11-13 06:37:06 UTC +++ ui/views/examples/widget_example.cc -@@ -79,7 +79,7 @@ void WidgetExample::CreateExampleView(View* container) +@@ -67,7 +67,7 @@ void WidgetExample::CreateExampleView(View* container) DIALOG); BuildButton(container, GetStringUTF16(IDS_WIDGET_MODAL_BUTTON_LABEL), MODAL_DIALOG); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Windows does not support TYPE_CONTROL top-level widgets. BuildButton(container, GetStringUTF16(IDS_WIDGET_CHILD_WIDGET_BUTTON_LABEL), CHILD); diff --git a/www/chromium/files/patch-ui_views_focus_focus__manager.cc b/www/chromium/files/patch-ui_views_focus_focus__manager.cc new file mode 100644 index 000000000000..59288d3f5fd8 --- /dev/null +++ b/www/chromium/files/patch-ui_views_focus_focus__manager.cc @@ -0,0 +1,20 @@ +--- ui/views/focus/focus_manager.cc.orig 2020-11-16 15:06:05 UTC ++++ ui/views/focus/focus_manager.cc +@@ -622,7 +622,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi + if (!focus_manager->IsAcceleratorRegistered(accelerator)) + return false; + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // Processing an accelerator can delete things. Because we + // need these objects afterwards on Linux, save widget_ as weak pointer and + // save the close_on_deactivate property value of widget_delegate in a +@@ -637,7 +637,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi + const bool accelerator_processed = + focus_manager->ProcessAccelerator(accelerator); + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // Need to manually close the bubble widget on Linux. On Linux when the + // bubble is shown, the main widget remains active. Because of that when + // focus is set to the main widget to process accelerator, the main widget diff --git a/www/chromium/files/patch-ui_views_selection__controller.cc b/www/chromium/files/patch-ui_views_selection__controller.cc index 9d5f91409ead..091a9cd6fca0 100644 --- a/www/chromium/files/patch-ui_views_selection__controller.cc +++ b/www/chromium/files/patch-ui_views_selection__controller.cc @@ -1,4 +1,4 @@ ---- ui/views/selection_controller.cc.orig 2020-05-13 18:40:03 UTC +--- ui/views/selection_controller.cc.orig 2020-11-13 06:37:06 UTC +++ ui/views/selection_controller.cc @@ -23,7 +23,7 @@ SelectionController::SelectionController(SelectionCont delegate_(delegate), 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 28a000e3e6de..c3685fb3bca3 100644 --- a/www/chromium/files/patch-ui_views_style_platform__style.cc +++ b/www/chromium/files/patch-ui_views_style_platform__style.cc @@ -1,11 +1,11 @@ ---- ui/views/style/platform_style.cc.orig 2020-02-03 21:53:14 UTC +--- ui/views/style/platform_style.cc.orig 2020-11-13 06:37:06 UTC +++ ui/views/style/platform_style.cc -@@ -74,7 +74,7 @@ gfx::Range PlatformStyle::RangeToDeleteBackwards(const +@@ -75,7 +75,7 @@ gfx::Range PlatformStyle::RangeToDeleteBackwards(const + #endif // OS_APPLE - #endif // OS_MACOSX - --#if !BUILDFLAG(ENABLE_DESKTOP_AURA) || !defined(OS_LINUX) -+#if !BUILDFLAG(ENABLE_DESKTOP_AURA) || (!defined(OS_LINUX) && !defined(OS_BSD)) + #if !BUILDFLAG(ENABLE_DESKTOP_AURA) || \ +- (!defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (!defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_BSD)) // static std::unique_ptr<Border> PlatformStyle::CreateThemedLabelButtonBorder( LabelButton* button) { diff --git a/www/chromium/files/patch-ui_views_views__delegate.cc b/www/chromium/files/patch-ui_views_views__delegate.cc index 6ed6c077584f..7ea678b0740f 100644 --- a/www/chromium/files/patch-ui_views_views__delegate.cc +++ b/www/chromium/files/patch-ui_views_views__delegate.cc @@ -1,11 +1,11 @@ ---- ui/views/views_delegate.cc.orig 2020-02-03 21:53:14 UTC +--- ui/views/views_delegate.cc.orig 2020-11-13 06:37:06 UTC +++ ui/views/views_delegate.cc -@@ -85,7 +85,7 @@ HICON ViewsDelegate::GetSmallWindowIcon() const { - bool ViewsDelegate::IsWindowInMetro(gfx::NativeWindow window) const { +@@ -86,7 +86,7 @@ bool ViewsDelegate::IsWindowInMetro(gfx::NativeWindow return false; } --#elif defined(OS_LINUX) && BUILDFLAG(ENABLE_DESKTOP_AURA) -+#elif (defined(OS_LINUX) || defined(OS_BSD)) && BUILDFLAG(ENABLE_DESKTOP_AURA) + #elif BUILDFLAG(ENABLE_DESKTOP_AURA) && \ +- (defined(OS_LINUX) || defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) gfx::ImageSkia* ViewsDelegate::GetDefaultWindowIcon() const { return nullptr; } diff --git a/www/chromium/files/patch-ui_views_views__delegate.h b/www/chromium/files/patch-ui_views_views__delegate.h index c8f55070bfd4..9a1aebe4a665 100644 --- a/www/chromium/files/patch-ui_views_views__delegate.h +++ b/www/chromium/files/patch-ui_views_views__delegate.h @@ -1,11 +1,11 @@ ---- ui/views/views_delegate.h.orig 2020-05-13 18:40:03 UTC +--- ui/views/views_delegate.h.orig 2020-11-13 06:37:06 UTC +++ ui/views/views_delegate.h -@@ -133,7 +133,7 @@ class VIEWS_EXPORT ViewsDelegate { - // Returns true if the window passed in is in the Windows 8 metro +@@ -134,7 +134,7 @@ class VIEWS_EXPORT ViewsDelegate { // environment. virtual bool IsWindowInMetro(gfx::NativeWindow window) const; --#elif defined(OS_LINUX) && BUILDFLAG(ENABLE_DESKTOP_AURA) -+#elif (defined(OS_LINUX) || defined(OS_BSD)) && BUILDFLAG(ENABLE_DESKTOP_AURA) + #elif BUILDFLAG(ENABLE_DESKTOP_AURA) && \ +- (defined(OS_LINUX) || defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) virtual gfx::ImageSkia* GetDefaultWindowIcon() const; #endif diff --git a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__screen__ozone.cc b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__screen__ozone.cc new file mode 100644 index 000000000000..e01c9e732918 --- /dev/null +++ b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__screen__ozone.cc @@ -0,0 +1,11 @@ +--- ui/views/widget/desktop_aura/desktop_screen_ozone.cc.orig 2020-11-16 15:06:43 UTC ++++ ui/views/widget/desktop_aura/desktop_screen_ozone.cc +@@ -26,7 +26,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(); + } 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 a3fc5fdcfd09..d42787a5cdf1 100644 --- a/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc +++ b/www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc @@ -1,11 +1,11 @@ ---- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2020-07-07 21:58:19 UTC +--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2020-11-13 06:37:06 UTC +++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc -@@ -787,7 +787,7 @@ void DesktopWindowTreeHostPlatform::AddAdditionalInitP +@@ -791,7 +791,7 @@ void DesktopWindowTreeHostPlatform::AddAdditionalInitP // DesktopWindowTreeHost: // Linux subclasses this host and adds some Linux specific bits. --#if !defined(OS_LINUX) -+#if !defined(OS_LINUX) && !defined(OS_BSD) +-#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_BSD) // static DesktopWindowTreeHost* DesktopWindowTreeHost::Create( internal::NativeWidgetDelegate* native_widget_delegate, diff --git a/www/chromium/files/patch-ui_views_widget_native__widget__aura.cc b/www/chromium/files/patch-ui_views_widget_native__widget__aura.cc index 352aa572affe..b958b9a2072e 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,36 +1,37 @@ ---- ui/views/widget/native_widget_aura.cc.orig 2020-07-07 21:58:19 UTC +--- ui/views/widget/native_widget_aura.cc.orig 2020-11-13 06:37:06 UTC +++ ui/views/widget/native_widget_aura.cc -@@ -64,7 +64,7 @@ - #include "ui/views/widget/desktop_aura/desktop_window_tree_host_win.h" +@@ -65,7 +65,7 @@ #endif --#if BUILDFLAG(ENABLE_DESKTOP_AURA) && defined(OS_LINUX) -+#if BUILDFLAG(ENABLE_DESKTOP_AURA) && (defined(OS_LINUX) || defined(OS_BSD)) + #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 -@@ -1072,7 +1072,7 @@ void NativeWidgetAura::SetInitialFocus(ui::WindowShowS - // Widget, public: +@@ -1075,7 +1075,7 @@ void NativeWidgetAura::SetInitialFocus(ui::WindowShowS namespace { --#if BUILDFLAG(ENABLE_DESKTOP_AURA) && (defined(OS_WIN) || defined(OS_LINUX)) -+#if BUILDFLAG(ENABLE_DESKTOP_AURA) && (defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)) + #if BUILDFLAG(ENABLE_DESKTOP_AURA) && \ +- (defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)) ++ (defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) void CloseWindow(aura::Window* window) { if (window) { Widget* widget = Widget::GetWidgetForNativeView(window); -@@ -1102,13 +1102,13 @@ void Widget::CloseAllSecondaryWidgets() { - EnumThreadWindows(GetCurrentThreadId(), WindowCallbackProc, 0); +@@ -1106,14 +1106,14 @@ void Widget::CloseAllSecondaryWidgets() { #endif --#if BUILDFLAG(ENABLE_DESKTOP_AURA) && defined(OS_LINUX) -+#if BUILDFLAG(ENABLE_DESKTOP_AURA) && (defined(OS_LINUX) || defined(OS_BSD)) + #if BUILDFLAG(ENABLE_DESKTOP_AURA) && \ +- (defined(OS_LINUX) || defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) DesktopWindowTreeHostLinux::CleanUpWindowList(CloseWindow); #endif } const ui::NativeTheme* Widget::GetNativeTheme() const { --#if BUILDFLAG(ENABLE_DESKTOP_AURA) && defined(OS_LINUX) -+#if BUILDFLAG(ENABLE_DESKTOP_AURA) && (defined(OS_LINUX) || defined(OS_BSD)) + #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_window_custom__frame__view.cc b/www/chromium/files/patch-ui_views_window_custom__frame__view.cc index 548428aa5db3..7e7199e51ae5 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 2020-05-13 18:40:03 UTC +--- ui/views/window/custom_frame_view.cc.orig 2020-11-13 06:37:06 UTC +++ ui/views/window/custom_frame_view.cc -@@ -283,7 +283,7 @@ int CustomFrameView::NonClientTopBorderHeight() const +@@ -261,7 +261,7 @@ int CustomFrameView::NonClientTopBorderHeight() const int CustomFrameView::CaptionButtonY() const { // Maximized buttons start at window top so that even if their images aren't // drawn flush with the screen edge, they still obey Fitts' Law. diff --git a/www/chromium/files/patch-ui_views_window_dialog__delegate.cc b/www/chromium/files/patch-ui_views_window_dialog__delegate.cc index 10e68218b0e0..ef6a81e83df9 100644 --- a/www/chromium/files/patch-ui_views_window_dialog__delegate.cc +++ b/www/chromium/files/patch-ui_views_window_dialog__delegate.cc @@ -1,11 +1,11 @@ ---- ui/views/window/dialog_delegate.cc.orig 2020-07-07 21:58:19 UTC +--- ui/views/window/dialog_delegate.cc.orig 2020-11-13 06:37:06 UTC +++ ui/views/window/dialog_delegate.cc -@@ -62,7 +62,7 @@ Widget* DialogDelegate::CreateDialogWidget(WidgetDeleg +@@ -71,7 +71,7 @@ Widget* DialogDelegate::CreateDialogWidget( // static bool DialogDelegate::CanSupportCustomFrame(gfx::NativeView parent) { --#if defined(OS_LINUX) && BUILDFLAG(ENABLE_DESKTOP_AURA) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && BUILDFLAG(ENABLE_DESKTOP_AURA) +-#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && \ ++#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && \ + BUILDFLAG(ENABLE_DESKTOP_AURA) // The new style doesn't support unparented dialogs on Linux desktop. return parent != nullptr; - #else diff --git a/www/chromium/files/patch-ui_views_window_frame__background.cc b/www/chromium/files/patch-ui_views_window_frame__background.cc index b9c3d0d7dca7..8818c97c20dd 100644 --- a/www/chromium/files/patch-ui_views_window_frame__background.cc +++ b/www/chromium/files/patch-ui_views_window_frame__background.cc @@ -1,11 +1,11 @@ ---- ui/views/window/frame_background.cc.orig 2020-05-13 18:40:03 UTC +--- ui/views/window/frame_background.cc.orig 2020-11-13 06:37:06 UTC +++ ui/views/window/frame_background.cc @@ -99,7 +99,7 @@ void FrameBackground::PaintMaximized(gfx::Canvas* canv const View* view) const { // Fill the top with the frame color first so we have a constant background // for areas not covered by the theme image. --#if defined(OS_LINUX) && BUILDFLAG(ENABLE_DESKTOP_AURA) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && BUILDFLAG(ENABLE_DESKTOP_AURA) +-#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && \ ++#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && \ + BUILDFLAG(ENABLE_DESKTOP_AURA) auto* native_theme = view->GetNativeTheme(); ui::NativeTheme::ExtraParams params; - params.frame_top_area.use_custom_frame = use_custom_frame_; diff --git a/www/chromium/files/patch-ui_webui_resources_js_cr.js b/www/chromium/files/patch-ui_webui_resources_js_cr.js index b2339361b638..a3578b7bd798 100644 --- a/www/chromium/files/patch-ui_webui_resources_js_cr.js +++ b/www/chromium/files/patch-ui_webui_resources_js_cr.js @@ -1,4 +1,4 @@ ---- ui/webui/resources/js/cr.js.orig 2020-05-13 18:40:03 UTC +--- ui/webui/resources/js/cr.js.orig 2020-11-13 06:37:06 UTC +++ ui/webui/resources/js/cr.js @@ -430,6 +430,11 @@ var cr = cr || function(global) { get isMac() { diff --git a/www/chromium/files/patch-ui_webui_resources_js_icon.js b/www/chromium/files/patch-ui_webui_resources_js_icon.js deleted file mode 100644 index 26d3260b5cff..000000000000 --- a/www/chromium/files/patch-ui_webui_resources_js_icon.js +++ /dev/null @@ -1,11 +0,0 @@ ---- ui/webui/resources/js/icon.js.orig 2019-10-21 19:07:29 UTC -+++ ui/webui/resources/js/icon.js -@@ -16,7 +16,7 @@ cr.define('cr.icon', function() { - // supports SCALE_FACTOR_100P on all non-iOS platforms. - supportedScaleFactors.push(1); - } -- if (cr.isMac || cr.isChromeOS || cr.isWindows || cr.isLinux) { -+ if (cr.isMac || cr.isChromeOS || cr.isWindows || cr.isLinux || cr.isBSD) { - // All desktop platforms support zooming which also updates the renderer's - // device scale factors (a.k.a devicePixelRatio), and these platforms have - // high DPI assets for 2x. Let the renderer pick the closest image for diff --git a/www/chromium/files/patch-v8_BUILD.gn b/www/chromium/files/patch-v8_BUILD.gn index 582adbf52d53..0081dbc24080 100644 --- a/www/chromium/files/patch-v8_BUILD.gn +++ b/www/chromium/files/patch-v8_BUILD.gn @@ -1,30 +1,25 @@ ---- v8/BUILD.gn.orig 2020-07-07 22:03:31 UTC +--- v8/BUILD.gn.orig 2020-11-17 18:42:05 UTC +++ v8/BUILD.gn -@@ -3839,7 +3839,7 @@ v8_component("v8_libbase") { +@@ -4068,9 +4068,15 @@ v8_component("v8_libbase") { } } -- if (is_linux) { -+ if (is_linux && !is_bsd) { +- if (is_linux || is_chromeos) { ++ if (is_bsd) { sources += [ "src/base/debug/stack_trace_posix.cc", - "src/base/platform/platform-linux.cc", -@@ -3859,6 +3859,12 @@ v8_component("v8_libbase") { - "dl", - "rt", - ] -+ } else if (is_bsd) { -+ sources += [ -+ "src/base/debug/stack_trace_posix.cc", + "src/base/platform/platform-freebsd.cc", + ] + libs = [ "rt", "execinfo" ] - } else if (is_android) { - if (current_toolchain == host_toolchain) { - libs = [ -@@ -4232,6 +4238,7 @@ if (current_toolchain == v8_snapshot_toolchain) { - "src/snapshot/mksnapshot.cc", - "src/snapshot/snapshot-empty.cc", ++ } else if (is_linux || is_chromeos) { ++ sources += [ ++ "src/base/debug/stack_trace_posix.cc", + "src/base/platform/platform-linux.cc", + ] + +@@ -4476,6 +4482,7 @@ if (current_toolchain == v8_generator_toolchain) { + "src/interpreter/bytecodes.cc", + "src/interpreter/bytecodes.h", ] + libs = ["execinfo"] diff --git a/www/chromium/files/patch-v8_include_v8config.h b/www/chromium/files/patch-v8_include_v8config.h index 18b8adbb56b8..0364af55d248 100644 --- a/www/chromium/files/patch-v8_include_v8config.h +++ b/www/chromium/files/patch-v8_include_v8config.h @@ -1,6 +1,6 @@ ---- v8/include/v8config.h.orig 2020-03-03 18:55:34 UTC +--- v8/include/v8config.h.orig 2020-11-13 06:42:28 UTC +++ v8/include/v8config.h -@@ -273,7 +273,18 @@ +@@ -276,7 +276,18 @@ # define V8_HAS_ATTRIBUTE_WARN_UNUSED_RESULT \ (__has_attribute(warn_unused_result)) diff --git a/www/chromium/files/patch-v8_src_api_api.cc b/www/chromium/files/patch-v8_src_api_api.cc index ad2d9bc6e0d8..c1134e0077f3 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 2020-07-07 22:03:31 UTC +--- v8/src/api/api.cc.orig 2020-11-13 06:42:28 UTC +++ v8/src/api/api.cc -@@ -5640,7 +5640,7 @@ bool v8::V8::Initialize(const int build_config) { +@@ -5760,7 +5760,7 @@ bool v8::V8::Initialize(const int build_config) { return true; } diff --git a/www/chromium/files/patch-v8_src_base_cpu.cc b/www/chromium/files/patch-v8_src_base_cpu.cc index 7b67e85c5587..c78e6e53551d 100644 --- a/www/chromium/files/patch-v8_src_base_cpu.cc +++ b/www/chromium/files/patch-v8_src_base_cpu.cc @@ -1,6 +1,6 @@ ---- v8/src/base/cpu.cc.orig 2020-05-13 18:41:59 UTC +--- v8/src/base/cpu.cc.orig 2020-11-13 06:42:28 UTC +++ v8/src/base/cpu.cc -@@ -427,6 +427,7 @@ CPU::CPU() +@@ -534,6 +534,7 @@ CPU::CPU() #if V8_OS_LINUX @@ -8,7 +8,7 @@ CPUInfo cpu_info; // Extract implementor from the "CPU implementer" field. -@@ -460,6 +461,7 @@ CPU::CPU() +@@ -567,6 +568,7 @@ CPU::CPU() } delete[] part; } diff --git a/www/chromium/files/patch-v8_src_base_platform_platform-freebsd.cc b/www/chromium/files/patch-v8_src_base_platform_platform-freebsd.cc index 981dab7567fa..554306510ef9 100644 --- a/www/chromium/files/patch-v8_src_base_platform_platform-freebsd.cc +++ b/www/chromium/files/patch-v8_src_base_platform_platform-freebsd.cc @@ -1,4 +1,4 @@ ---- v8/src/base/platform/platform-freebsd.cc.orig 2020-07-28 10:13:42 UTC +--- v8/src/base/platform/platform-freebsd.cc.orig 2020-11-13 06:42:28 UTC +++ v8/src/base/platform/platform-freebsd.cc @@ -82,8 +82,8 @@ std::vector<OS::SharedLibraryAddress> OS::GetSharedLib lib_name = std::string(path); diff --git a/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc b/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc index 7f295631e9db..bfc10259159a 100644 --- a/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc +++ b/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc @@ -1,6 +1,6 @@ ---- v8/src/base/platform/platform-posix.cc.orig 2020-05-13 18:41:59 UTC +--- v8/src/base/platform/platform-posix.cc.orig 2020-11-13 06:42:28 UTC +++ v8/src/base/platform/platform-posix.cc -@@ -433,7 +433,7 @@ bool OS::DiscardSystemPages(void* address, size_t size +@@ -466,7 +466,7 @@ bool OS::DiscardSystemPages(void* address, size_t size // static bool OS::HasLazyCommits() { @@ -9,7 +9,7 @@ return true; #else // TODO(bbudge) Return true for all POSIX platforms. -@@ -564,6 +564,12 @@ int OS::GetCurrentThreadId() { +@@ -597,6 +597,12 @@ int OS::GetCurrentThreadId() { return static_cast<int>(syscall(__NR_gettid)); #elif V8_OS_ANDROID return static_cast<int>(gettid()); diff --git a/www/chromium/files/patch-weblayer_BUILD.gn b/www/chromium/files/patch-weblayer_BUILD.gn index 1dad413ec5ac..56363d5726ca 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 2020-07-07 21:58:19 UTC +--- weblayer/BUILD.gn.orig 2020-11-13 06:37:06 UTC +++ weblayer/BUILD.gn -@@ -511,6 +511,14 @@ source_set("weblayer_lib_base") { +@@ -671,6 +671,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 733a0acf27d1..c8f5664b18aa 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,11 +1,11 @@ ---- weblayer/app/content_main_delegate_impl.cc.orig 2020-07-07 21:58:19 UTC +--- weblayer/app/content_main_delegate_impl.cc.orig 2020-11-13 06:37:06 UTC +++ weblayer/app/content_main_delegate_impl.cc -@@ -173,7 +173,7 @@ bool ContentMainDelegateImpl::ShouldCreateFeatureList( - } +@@ -225,7 +225,7 @@ bool ContentMainDelegateImpl::ShouldCreateFeatureList( void ContentMainDelegateImpl::PreSandboxStartup() { --#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX)) -+#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)) + #if defined(ARCH_CPU_ARM_FAMILY) && \ +- (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS)) ++ (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) // Create an instance of the CPU class to parse /proc/cpuinfo and cache // cpu_brand info. base::CPU cpu_info; 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 16d8033cd983..b982662d1be4 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,7 +1,7 @@ ---- weblayer/browser/browser_main_parts_impl.cc.orig 2020-07-07 21:58:19 UTC +--- weblayer/browser/browser_main_parts_impl.cc.orig 2020-11-13 06:37:06 UTC +++ weblayer/browser/browser_main_parts_impl.cc -@@ -53,7 +53,7 @@ - #if defined(USE_AURA) && defined(USE_X11) +@@ -63,7 +63,7 @@ + #include "ui/base/ui_base_features.h" #include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck #endif -#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX) @@ -9,12 +9,12 @@ #include "ui/base/ime/init/input_method_initializer.h" #endif -@@ -128,7 +128,7 @@ int BrowserMainPartsImpl::PreEarlyInitialization() { - #if defined(USE_X11) - ui::SetDefaultX11ErrorHandlers(); +@@ -157,7 +157,7 @@ int BrowserMainPartsImpl::PreEarlyInitialization() { + if (!features::IsUsingOzonePlatform()) + ui::SetDefaultX11ErrorHandlers(); #endif --#if defined(USE_AURA) && defined(OS_LINUX) -+#if defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD)) +-#if defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_CHROMEOS)) ++#if defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) ui::InitializeInputMethodForTesting(); #endif #if defined(OS_ANDROID) 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 d55b1f819953..ec15b39b0ebd 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,15 +1,15 @@ ---- weblayer/browser/content_browser_client_impl.cc.orig 2020-07-07 21:58:19 UTC +--- weblayer/browser/content_browser_client_impl.cc.orig 2020-11-13 06:37:06 UTC +++ weblayer/browser/content_browser_client_impl.cc -@@ -102,7 +102,7 @@ - #include "weblayer/browser/safe_browsing/safe_browsing_service.h" +@@ -135,7 +135,7 @@ + #include "weblayer/browser/weblayer_factory_impl_android.h" #endif --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) #include "content/public/common/content_descriptors.h" #endif -@@ -339,7 +339,7 @@ void ContentBrowserClientImpl::ConfigureNetworkContext +@@ -382,7 +382,7 @@ void ContentBrowserClientImpl::ConfigureNetworkContext void ContentBrowserClientImpl::OnNetworkServiceCreated( network::mojom::NetworkService* network_service) { @@ -18,21 +18,3 @@ network::mojom::CryptConfigPtr config = network::mojom::CryptConfig::New(); content::GetNetworkService()->SetCryptConfig(std::move(config)); #endif -@@ -608,7 +608,7 @@ SafeBrowsingService* ContentBrowserClientImpl::GetSafe - } - #endif - --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) - void ContentBrowserClientImpl::GetAdditionalMappedFilesForChildProcess( - const base::CommandLine& command_line, - int child_process_id, -@@ -642,7 +642,7 @@ void ContentBrowserClientImpl::GetAdditionalMappedFile - mappings->Share(service_manager::kCrashDumpSignal, crash_signal_fd); - #endif // defined(OS_ANDROID) - } --#endif // defined(OS_LINUX) || defined(OS_ANDROID) -+#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) - - void ContentBrowserClientImpl::AppendExtraCommandLineSwitches( - base::CommandLine* command_line, diff --git a/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.h b/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.h index 32bb154eec2a..93c03f42ae76 100644 --- a/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.h +++ b/www/chromium/files/patch-weblayer_browser_content__browser__client__impl.h @@ -1,17 +1,17 @@ ---- weblayer/browser/content_browser_client_impl.h.orig 2020-07-07 21:58:19 UTC +--- weblayer/browser/content_browser_client_impl.h.orig 2020-11-13 06:37:06 UTC +++ weblayer/browser/content_browser_client_impl.h -@@ -101,12 +101,12 @@ class ContentBrowserClientImpl : public content::Conte +@@ -116,12 +116,12 @@ class ContentBrowserClientImpl : public content::Conte void RenderProcessWillLaunch(content::RenderProcessHost* host) override; scoped_refptr<content::QuotaPermissionContext> CreateQuotaPermissionContext() override; --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) void GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, content::PosixFileDescriptorInfo* mappings) override; --#endif // defined(OS_LINUX) || defined(OS_ANDROID) -+#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) void AppendExtraCommandLineSwitches(base::CommandLine* command_line, int child_process_id) override; #if defined(OS_ANDROID) diff --git a/www/chromium/files/patch-weblayer_browser_system__network__context__manager.cc b/www/chromium/files/patch-weblayer_browser_system__network__context__manager.cc index 41d6b5d75adf..1c120aa2f8c6 100644 --- a/www/chromium/files/patch-weblayer_browser_system__network__context__manager.cc +++ b/www/chromium/files/patch-weblayer_browser_system__network__context__manager.cc @@ -1,11 +1,15 @@ ---- weblayer/browser/system_network_context_manager.cc.orig 2020-07-07 21:58:19 UTC +--- weblayer/browser/system_network_context_manager.cc.orig 2020-11-13 06:37:06 UTC +++ weblayer/browser/system_network_context_manager.cc -@@ -64,7 +64,7 @@ void SystemNetworkContextManager::ConfigureDefaultNetw +@@ -64,10 +64,10 @@ void SystemNetworkContextManager::ConfigureDefaultNetw network::mojom::NetworkContextParams* network_context_params, const std::string& user_agent) { network_context_params->user_agent = user_agent; --#if defined(OS_LINUX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_BSD) // We're not configuring the cookie encryption on these platforms yet. network_context_params->enable_encrypted_cookies = false; - #endif +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_BSD) + } + + SystemNetworkContextManager::SystemNetworkContextManager( diff --git a/www/chromium/files/patch-weblayer_common_weblayer__paths.cc b/www/chromium/files/patch-weblayer_common_weblayer__paths.cc index 54019d8cc261..e8a034b82ec6 100644 --- a/www/chromium/files/patch-weblayer_common_weblayer__paths.cc +++ b/www/chromium/files/patch-weblayer_common_weblayer__paths.cc @@ -1,11 +1,11 @@ ---- weblayer/common/weblayer_paths.cc.orig 2020-03-16 18:40:15 UTC +--- weblayer/common/weblayer_paths.cc.orig 2020-11-13 06:37:06 UTC +++ weblayer/common/weblayer_paths.cc @@ -17,7 +17,7 @@ #if defined(OS_WIN) #include "base/base_paths_win.h" --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) ++#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "base/nix/xdg_util.h" #endif @@ -13,8 +13,8 @@ return false; *result = result->AppendASCII("weblayer"); return true; --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) ++#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) std::unique_ptr<base::Environment> env(base::Environment::Create()); base::FilePath config_dir(base::nix::GetXDGDirectory( env.get(), base::nix::kXdgConfigHomeEnvVar, base::nix::kDotConfigDir)); diff --git a/www/chromium/files/pkg-message.in b/www/chromium/files/pkg-message.in deleted file mode 100644 index 3a2117faec70..000000000000 --- a/www/chromium/files/pkg-message.in +++ /dev/null @@ -1,13 +0,0 @@ -[ -{ type: install - message: <<EOM -Chromium has a known problem of hanging tabs. The bug has been fixed -in r337328. Therefore, it is recommended to upgrade the system after -the correction date. - - # svn diff -c337328 --summarize svn://svn.freebsd.org/base - -See PR 212812 for further details. -EOM -} -] diff --git a/www/chromium/files/sndio_input.cc b/www/chromium/files/sndio_input.cc index 6c7bc8b8025b..5aed9a03b214 100644 --- a/www/chromium/files/sndio_input.cc +++ b/www/chromium/files/sndio_input.cc @@ -5,7 +5,7 @@ #include "base/bind.h" #include "base/logging.h" #include "base/macros.h" -#include "base/message_loop/message_loop.h" +#include "base/message_loop/message_pump.h" #include "media/base/audio_timestamp_helper.h" #include "media/audio/openbsd/audio_manager_openbsd.h" #include "media/audio/audio_manager.h" diff --git a/www/chromium/pkg-plist b/www/chromium/pkg-plist index b3f70a7b96a2..b524c1924790 100644 --- a/www/chromium/pkg-plist +++ b/www/chromium/pkg-plist @@ -118,17 +118,12 @@ bin/chrome %%DATADIR%%/product_logo_48.png %%DATADIR%%/protoc %%DATADIR%%/resources.pak -%%DATADIR%%/resources/inspector/.htaccess %%DATADIR%%/resources/inspector/Images/accelerometer-back.svg %%DATADIR%%/resources/inspector/Images/accelerometer-bottom.png %%DATADIR%%/resources/inspector/Images/accelerometer-front.svg %%DATADIR%%/resources/inspector/Images/accelerometer-left.png %%DATADIR%%/resources/inspector/Images/accelerometer-right.png %%DATADIR%%/resources/inspector/Images/accelerometer-top.png -%%DATADIR%%/resources/inspector/Images/breakpoint.svg -%%DATADIR%%/resources/inspector/Images/breakpoint-conditional-disabled.svg -%%DATADIR%%/resources/inspector/Images/breakpoint-conditional.svg -%%DATADIR%%/resources/inspector/Images/breakpoint-disabled.svg %%DATADIR%%/resources/inspector/Images/checkboxCheckmark.svg %%DATADIR%%/resources/inspector/Images/checker.png %%DATADIR%%/resources/inspector/Images/chevrons.svg @@ -142,11 +137,11 @@ bin/chrome %%DATADIR%%/resources/inspector/Images/cssoverview_icons_2x.png %%DATADIR%%/resources/inspector/Images/errorWave.svg %%DATADIR%%/resources/inspector/Images/ic_info_black_18dp.svg +%%DATADIR%%/resources/inspector/Images/ic_show_node_16x16.svg +%%DATADIR%%/resources/inspector/Images/ic_suggest_color.svg %%DATADIR%%/resources/inspector/Images/ic_warning_black_18dp.svg %%DATADIR%%/resources/inspector/Images/largeIcons.svg %%DATADIR%%/resources/inspector/Images/lighthouse_logo.svg -%%DATADIR%%/resources/inspector/Images/logpoint-disabled.svg -%%DATADIR%%/resources/inspector/Images/logpoint.svg %%DATADIR%%/resources/inspector/Images/mediumIcons.svg %%DATADIR%%/resources/inspector/Images/navigationControls.png %%DATADIR%%/resources/inspector/Images/navigationControls_2x.png @@ -157,12 +152,9 @@ bin/chrome %%DATADIR%%/resources/inspector/Images/profileSmallIcon.png %%DATADIR%%/resources/inspector/Images/radioDot.png %%DATADIR%%/resources/inspector/Images/radioDot-dark-theme.png -%%DATADIR%%/resources/inspector/Images/resizeDiagonal.png -%%DATADIR%%/resources/inspector/Images/resizeDiagonal_2x.png -%%DATADIR%%/resources/inspector/Images/resizeHorizontal.png -%%DATADIR%%/resources/inspector/Images/resizeHorizontal_2x.png -%%DATADIR%%/resources/inspector/Images/resizeVertical.png -%%DATADIR%%/resources/inspector/Images/resizeVertical_2x.png +%%DATADIR%%/resources/inspector/Images/resizeDiagonal.svg +%%DATADIR%%/resources/inspector/Images/resizeHorizontal.svg +%%DATADIR%%/resources/inspector/Images/resizeVertical.svg %%DATADIR%%/resources/inspector/Images/resourceCSSIcon.png %%DATADIR%%/resources/inspector/Images/resourceDocumentIcon.png %%DATADIR%%/resources/inspector/Images/resourceDocumentIconSmall.png @@ -185,355 +177,613 @@ bin/chrome %%DATADIR%%/resources/inspector/accessibility/accessibility-legacy.js %%DATADIR%%/resources/inspector/accessibility/accessibility.js %%DEBUG%%%%DATADIR%%/resources/inspector/accessibility/AccessibilityModel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/accessibility/AccessibilityModel.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/accessibility/AccessibilityNodeView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/accessibility/AccessibilityNodeView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/accessibility/AccessibilitySidebarView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/accessibility/AccessibilitySidebarView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/accessibility/AccessibilityStrings.js +%%DEBUG%%%%DATADIR%%/resources/inspector/accessibility/AccessibilityStrings.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/accessibility/AccessibilitySubPane.js +%%DEBUG%%%%DATADIR%%/resources/inspector/accessibility/AccessibilitySubPane.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/accessibility/ARIAAttributesView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/accessibility/ARIAAttributesView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/accessibility/ARIAMetadata.js +%%DEBUG%%%%DATADIR%%/resources/inspector/accessibility/ARIAMetadata.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/accessibility/AXBreadcrumbsPane.js +%%DEBUG%%%%DATADIR%%/resources/inspector/accessibility/AXBreadcrumbsPane.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/accessibility/SourceOrderView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/accessibility/SourceOrderView.js.map %%DATADIR%%/resources/inspector/accessibility_test_runner/accessibility_test_runner_module.js +%%DATADIR%%/resources/inspector/accessibility_test_runner/accessibility_test_runner.js %%DATADIR%%/resources/inspector/animation/animation_module.js %%DATADIR%%/resources/inspector/animation/animation-legacy.js %%DATADIR%%/resources/inspector/animation/animation.js %%DEBUG%%%%DATADIR%%/resources/inspector/animation/AnimationGroupPreviewUI.js +%%DEBUG%%%%DATADIR%%/resources/inspector/animation/AnimationGroupPreviewUI.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/animation/AnimationModel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/animation/AnimationModel.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/animation/AnimationScreenshotPopover.js +%%DEBUG%%%%DATADIR%%/resources/inspector/animation/AnimationScreenshotPopover.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/animation/AnimationTimeline.js +%%DEBUG%%%%DATADIR%%/resources/inspector/animation/AnimationTimeline.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/animation/AnimationUI.js +%%DEBUG%%%%DATADIR%%/resources/inspector/animation/AnimationUI.js.map %%DATADIR%%/resources/inspector/application_test_runner/application_test_runner_module.js +%%DATADIR%%/resources/inspector/application_test_runner/application_test_runner.js +%%DEBUG%%%%DATADIR%%/resources/inspector/application_test_runner/AppcacheTestRunner.js +%%DEBUG%%%%DATADIR%%/resources/inspector/application_test_runner/CacheStorageTestRunner.js +%%DEBUG%%%%DATADIR%%/resources/inspector/application_test_runner/IndexedDBTestRunner.js +%%DEBUG%%%%DATADIR%%/resources/inspector/application_test_runner/ResourcesTestRunner.js +%%DEBUG%%%%DATADIR%%/resources/inspector/application_test_runner/ResourceTreeTestRunner.js +%%DEBUG%%%%DATADIR%%/resources/inspector/application_test_runner/ServiceWorkersTestRunner.js %%DATADIR%%/resources/inspector/axe_core_test_runner/axe_core_test_runner_module.js +%%DATADIR%%/resources/inspector/axe_core_test_runner/axe_core_test_runner.js %%DATADIR%%/resources/inspector/bindings_test_runner/bindings_test_runner_module.js +%%DATADIR%%/resources/inspector/bindings_test_runner/bindings_test_runner.js +%%DEBUG%%%%DATADIR%%/resources/inspector/bindings_test_runner/AutomappingTestRunner.js +%%DEBUG%%%%DATADIR%%/resources/inspector/bindings_test_runner/BindingsTestRunner.js +%%DEBUG%%%%DATADIR%%/resources/inspector/bindings_test_runner/IsolatedFilesystemTestRunner.js +%%DEBUG%%%%DATADIR%%/resources/inspector/bindings_test_runner/OverridesTestRunner.js +%%DEBUG%%%%DATADIR%%/resources/inspector/bindings_test_runner/PersistenceTestRunner.js %%DATADIR%%/resources/inspector/bindings/bindings.js %%DATADIR%%/resources/inspector/bindings/bindings-legacy.js %%DEBUG%%%%DATADIR%%/resources/inspector/bindings/BlackboxManager.js +%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/BlackboxManager.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/bindings/BreakpointManager.js +%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/BreakpointManager.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/bindings/CompilerScriptMapping.js +%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/CompilerScriptMapping.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/bindings/ContentProviderBasedProject.js +%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/ContentProviderBasedProject.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/bindings/CSSWorkspaceBinding.js +%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/CSSWorkspaceBinding.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/bindings/DebuggerLanguagePlugins.js +%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/DebuggerLanguagePlugins.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/bindings/DebuggerWorkspaceBinding.js +%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/DebuggerWorkspaceBinding.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/bindings/DefaultScriptMapping.js +%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/DefaultScriptMapping.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/bindings/FileUtils.js +%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/FileUtils.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/bindings/LiveLocation.js +%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/LiveLocation.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/bindings/NetworkProject.js +%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/NetworkProject.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/bindings/PresentationConsoleMessageHelper.js +%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/PresentationConsoleMessageHelper.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/bindings/ResourceMapping.js +%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/ResourceMapping.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/bindings/ResourceScriptMapping.js +%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/ResourceScriptMapping.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/bindings/ResourceUtils.js +%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/ResourceUtils.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/bindings/SASSSourceMapping.js +%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/SASSSourceMapping.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/bindings/StylesSourceMapping.js +%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/StylesSourceMapping.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/bindings/TempFile.js -%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/language_plugins/CXXDWARFLanguagePlugin.js +%%DEBUG%%%%DATADIR%%/resources/inspector/bindings/TempFile.js.map %%DATADIR%%/resources/inspector/browser_debugger/browser_debugger_module.js %%DATADIR%%/resources/inspector/browser_debugger/browser_debugger-legacy.js %%DATADIR%%/resources/inspector/browser_debugger/browser_debugger.js %%DEBUG%%%%DATADIR%%/resources/inspector/browser_debugger/DOMBreakpointsSidebarPane.js +%%DEBUG%%%%DATADIR%%/resources/inspector/browser_debugger/DOMBreakpointsSidebarPane.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/browser_debugger/EventListenerBreakpointsSidebarPane.js +%%DEBUG%%%%DATADIR%%/resources/inspector/browser_debugger/EventListenerBreakpointsSidebarPane.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/browser_debugger/ObjectEventListenersSidebarPane.js +%%DEBUG%%%%DATADIR%%/resources/inspector/browser_debugger/ObjectEventListenersSidebarPane.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/browser_debugger/XHRBreakpointsSidebarPane.js +%%DEBUG%%%%DATADIR%%/resources/inspector/browser_debugger/XHRBreakpointsSidebarPane.js.map %%DATADIR%%/resources/inspector/browser_sdk/browser_sdk.js %%DATADIR%%/resources/inspector/browser_sdk/browser_sdk-legacy.js %%DEBUG%%%%DATADIR%%/resources/inspector/browser_sdk/IssuesManager.js +%%DEBUG%%%%DATADIR%%/resources/inspector/browser_sdk/IssuesManager.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/browser_sdk/LogManager.js +%%DEBUG%%%%DATADIR%%/resources/inspector/browser_sdk/LogManager.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/browser_sdk/RelatedIssue.js +%%DEBUG%%%%DATADIR%%/resources/inspector/browser_sdk/RelatedIssue.js.map %%DATADIR%%/resources/inspector/changes/changes_module.js %%DATADIR%%/resources/inspector/changes/changes-legacy.js %%DATADIR%%/resources/inspector/changes/changes.js %%DEBUG%%%%DATADIR%%/resources/inspector/changes/ChangesHighlighter.js +%%DEBUG%%%%DATADIR%%/resources/inspector/changes/ChangesHighlighter.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/changes/ChangesSidebar.js +%%DEBUG%%%%DATADIR%%/resources/inspector/changes/ChangesSidebar.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/changes/ChangesTextEditor.js +%%DEBUG%%%%DATADIR%%/resources/inspector/changes/ChangesTextEditor.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/changes/ChangesView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/changes/ChangesView.js.map +%%DATADIR%%/resources/inspector/client_variations/client_variations_module.js +%%DATADIR%%/resources/inspector/client_variations/client_variations.js %%DATADIR%%/resources/inspector/cm_headless/cm_headless.js %%DATADIR%%/resources/inspector/cm/cm_module.js -%%DEBUG%%%%DATADIR%%/resources/inspector/cm/active-line.js -%%DEBUG%%%%DATADIR%%/resources/inspector/cm/brace-fold.js -%%DEBUG%%%%DATADIR%%/resources/inspector/cm/closebrackets.js %%DATADIR%%/resources/inspector/cm/cm.js -%%DEBUG%%%%DATADIR%%/resources/inspector/cm/codemirror.js -%%DEBUG%%%%DATADIR%%/resources/inspector/cm/comment.js -%%DEBUG%%%%DATADIR%%/resources/inspector/cm/foldcode.js -%%DEBUG%%%%DATADIR%%/resources/inspector/cm/foldgutter.js -%%DEBUG%%%%DATADIR%%/resources/inspector/cm/mark-selection.js -%%DEBUG%%%%DATADIR%%/resources/inspector/cm/matchbrackets.js -%%DEBUG%%%%DATADIR%%/resources/inspector/cm/multiplex.js -%%DEBUG%%%%DATADIR%%/resources/inspector/cm/overlay.js -%%DEBUG%%%%DATADIR%%/resources/inspector/cm/simple.js %%DATADIR%%/resources/inspector/cm_modes/cm_modes_module.js %%DATADIR%%/resources/inspector/cm_modes/cm_modes.js %%DEBUG%%%%DATADIR%%/resources/inspector/cm_modes/DefaultCodeMirrorMimeMode.js +%%DEBUG%%%%DATADIR%%/resources/inspector/cm_modes/DefaultCodeMirrorMimeMode.js.map %%DATADIR%%/resources/inspector/color_picker/color_picker_module.js %%DATADIR%%/resources/inspector/color_picker/color_picker-legacy.js %%DATADIR%%/resources/inspector/color_picker/color_picker.js %%DEBUG%%%%DATADIR%%/resources/inspector/color_picker/ContrastDetails.js +%%DEBUG%%%%DATADIR%%/resources/inspector/color_picker/ContrastDetails.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/color_picker/ContrastInfo.js +%%DEBUG%%%%DATADIR%%/resources/inspector/color_picker/ContrastInfo.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/color_picker/ContrastOverlay.js +%%DEBUG%%%%DATADIR%%/resources/inspector/color_picker/ContrastOverlay.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/color_picker/Spectrum.js +%%DEBUG%%%%DATADIR%%/resources/inspector/color_picker/Spectrum.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/common/App.js +%%DEBUG%%%%DATADIR%%/resources/inspector/common/App.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/common/AppProvider.js +%%DEBUG%%%%DATADIR%%/resources/inspector/common/AppProvider.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/common/Base64.js +%%DEBUG%%%%DATADIR%%/resources/inspector/common/Base64.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/common/CharacterIdMap.js +%%DEBUG%%%%DATADIR%%/resources/inspector/common/CharacterIdMap.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/common/Color.js +%%DEBUG%%%%DATADIR%%/resources/inspector/common/Color.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/common/ColorUtils.js +%%DEBUG%%%%DATADIR%%/resources/inspector/common/ColorUtils.js.map %%DATADIR%%/resources/inspector/common/common.js %%DATADIR%%/resources/inspector/common/common-legacy.js %%DEBUG%%%%DATADIR%%/resources/inspector/common/Console.js +%%DEBUG%%%%DATADIR%%/resources/inspector/common/Console.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/common/Debouncer.js +%%DEBUG%%%%DATADIR%%/resources/inspector/common/Debouncer.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/common/EventTarget.js +%%DEBUG%%%%DATADIR%%/resources/inspector/common/EventTarget.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/common/JavaScriptMetaData.js +%%DEBUG%%%%DATADIR%%/resources/inspector/common/JavaScriptMetaData.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/common/Lazy.js +%%DEBUG%%%%DATADIR%%/resources/inspector/common/Lazy.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/common/Linkifier.js +%%DEBUG%%%%DATADIR%%/resources/inspector/common/Linkifier.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/common/Object.js +%%DEBUG%%%%DATADIR%%/resources/inspector/common/Object.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/common/ParsedURL.js +%%DEBUG%%%%DATADIR%%/resources/inspector/common/ParsedURL.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/common/Progress.js +%%DEBUG%%%%DATADIR%%/resources/inspector/common/Progress.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/common/QueryParamHandler.js +%%DEBUG%%%%DATADIR%%/resources/inspector/common/QueryParamHandler.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/common/ResourceType.js +%%DEBUG%%%%DATADIR%%/resources/inspector/common/ResourceType.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/common/Revealer.js +%%DEBUG%%%%DATADIR%%/resources/inspector/common/Revealer.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/common/Runnable.js +%%DEBUG%%%%DATADIR%%/resources/inspector/common/Runnable.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/common/SegmentedRange.js +%%DEBUG%%%%DATADIR%%/resources/inspector/common/SegmentedRange.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/common/Settings.js +%%DEBUG%%%%DATADIR%%/resources/inspector/common/Settings.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/common/StringOutputStream.js +%%DEBUG%%%%DATADIR%%/resources/inspector/common/StringOutputStream.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/common/TextDictionary.js +%%DEBUG%%%%DATADIR%%/resources/inspector/common/TextDictionary.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/common/Throttler.js +%%DEBUG%%%%DATADIR%%/resources/inspector/common/Throttler.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/common/Trie.js +%%DEBUG%%%%DATADIR%%/resources/inspector/common/Trie.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/common/WasmDisassembly.js +%%DEBUG%%%%DATADIR%%/resources/inspector/common/WasmDisassembly.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/common/Worker.js +%%DEBUG%%%%DATADIR%%/resources/inspector/common/Worker.js.map +%%DATADIR%%/resources/inspector/component_helpers/component_helpers.js %%DATADIR%%/resources/inspector/components/components.js %%DATADIR%%/resources/inspector/components/components-legacy.js -%%DEBUG%%%%DATADIR%%/resources/inspector/components/DockController.js %%DEBUG%%%%DATADIR%%/resources/inspector/components/ImagePreview.js +%%DEBUG%%%%DATADIR%%/resources/inspector/components/ImagePreview.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/components/JSPresentationUtils.js +%%DEBUG%%%%DATADIR%%/resources/inspector/components/JSPresentationUtils.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/components/Linkifier.js +%%DEBUG%%%%DATADIR%%/resources/inspector/components/Linkifier.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/components/Reload.js +%%DEBUG%%%%DATADIR%%/resources/inspector/components/Reload.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/components/TargetDetachedDialog.js +%%DEBUG%%%%DATADIR%%/resources/inspector/components/TargetDetachedDialog.js.map %%DATADIR%%/resources/inspector/console_counters/console_counters.js %%DATADIR%%/resources/inspector/console_counters/console_counters-legacy.js %%DEBUG%%%%DATADIR%%/resources/inspector/console_counters/WarningErrorCounter.js +%%DEBUG%%%%DATADIR%%/resources/inspector/console_counters/WarningErrorCounter.js.map %%DATADIR%%/resources/inspector/console/console_module.js %%DATADIR%%/resources/inspector/console/console-legacy.js %%DATADIR%%/resources/inspector/console/console.js %%DEBUG%%%%DATADIR%%/resources/inspector/console/ConsoleContextSelector.js +%%DEBUG%%%%DATADIR%%/resources/inspector/console/ConsoleContextSelector.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/console/ConsoleFilter.js +%%DEBUG%%%%DATADIR%%/resources/inspector/console/ConsoleFilter.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/console/ConsolePanel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/console/ConsolePanel.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/console/ConsolePinPane.js +%%DEBUG%%%%DATADIR%%/resources/inspector/console/ConsolePinPane.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/console/ConsolePrompt.js +%%DEBUG%%%%DATADIR%%/resources/inspector/console/ConsolePrompt.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/console/ConsoleSidebar.js +%%DEBUG%%%%DATADIR%%/resources/inspector/console/ConsoleSidebar.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/console/ConsoleView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/console/ConsoleView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/console/ConsoleViewMessage.js +%%DEBUG%%%%DATADIR%%/resources/inspector/console/ConsoleViewMessage.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/console/ConsoleViewport.js +%%DEBUG%%%%DATADIR%%/resources/inspector/console/ConsoleViewport.js.map %%DATADIR%%/resources/inspector/console_test_runner/console_test_runner_module.js +%%DATADIR%%/resources/inspector/console_test_runner/console_test_runner.js %%DATADIR%%/resources/inspector/cookie_table/cookie_table_module.js %%DATADIR%%/resources/inspector/cookie_table/cookie_table-legacy.js %%DATADIR%%/resources/inspector/cookie_table/cookie_table.js %%DEBUG%%%%DATADIR%%/resources/inspector/cookie_table/CookiesTable.js +%%DEBUG%%%%DATADIR%%/resources/inspector/cookie_table/CookiesTable.js.map %%DATADIR%%/resources/inspector/coverage/coverage_module.js %%DATADIR%%/resources/inspector/coverage/coverage-legacy.js %%DATADIR%%/resources/inspector/coverage/coverage.js %%DEBUG%%%%DATADIR%%/resources/inspector/coverage/CoverageDecorationManager.js +%%DEBUG%%%%DATADIR%%/resources/inspector/coverage/CoverageDecorationManager.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/coverage/CoverageListView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/coverage/CoverageListView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/coverage/CoverageModel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/coverage/CoverageModel.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/coverage/CoverageView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/coverage/CoverageView.js.map %%DATADIR%%/resources/inspector/coverage_test_runner/coverage_test_runner_module.js +%%DATADIR%%/resources/inspector/coverage_test_runner/coverage_test_runner.js %%DATADIR%%/resources/inspector/cpu_profiler_test_runner/cpu_profiler_test_runner_module.js +%%DATADIR%%/resources/inspector/cpu_profiler_test_runner/cpu_profiler_test_runner.js %%DATADIR%%/resources/inspector/css_overview/css_overview_module.js %%DATADIR%%/resources/inspector/css_overview/css_overview-legacy.js %%DATADIR%%/resources/inspector/css_overview/css_overview.js %%DEBUG%%%%DATADIR%%/resources/inspector/css_overview/CSSOverviewCompletedView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/css_overview/CSSOverviewCompletedView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/css_overview/CSSOverviewController.js +%%DEBUG%%%%DATADIR%%/resources/inspector/css_overview/CSSOverviewController.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/css_overview/CSSOverviewModel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/css_overview/CSSOverviewModel.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/css_overview/CSSOverviewPanel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/css_overview/CSSOverviewPanel.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/css_overview/CSSOverviewProcessingView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/css_overview/CSSOverviewProcessingView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/css_overview/CSSOverviewSidebarPanel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/css_overview/CSSOverviewSidebarPanel.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/css_overview/CSSOverviewStartView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/css_overview/CSSOverviewStartView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/css_overview/CSSOverviewUnusedDeclarations.js -%%DATADIR%%/resources/inspector/dagre_layout/dagre_layout_module.js +%%DEBUG%%%%DATADIR%%/resources/inspector/css_overview/CSSOverviewUnusedDeclarations.js.map %%DATADIR%%/resources/inspector/data_grid/data_grid_module.js %%DATADIR%%/resources/inspector/data_grid/data_grid-legacy.js %%DATADIR%%/resources/inspector/data_grid/data_grid.js %%DEBUG%%%%DATADIR%%/resources/inspector/data_grid/DataGrid.js +%%DEBUG%%%%DATADIR%%/resources/inspector/data_grid/DataGrid.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/data_grid/ShowMoreDataGridNode.js +%%DEBUG%%%%DATADIR%%/resources/inspector/data_grid/ShowMoreDataGridNode.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/data_grid/SortableDataGrid.js +%%DEBUG%%%%DATADIR%%/resources/inspector/data_grid/SortableDataGrid.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/data_grid/ViewportDataGrid.js +%%DEBUG%%%%DATADIR%%/resources/inspector/data_grid/ViewportDataGrid.js.map %%DATADIR%%/resources/inspector/data_grid_test_runner/data_grid_test_runner_module.js +%%DATADIR%%/resources/inspector/data_grid_test_runner/data_grid_test_runner.js +%%DATADIR%%/resources/inspector/developer_resources/developer_resources_module.js +%%DATADIR%%/resources/inspector/developer_resources/developer_resources-legacy.js +%%DATADIR%%/resources/inspector/developer_resources/developer_resources.js +%%DEBUG%%%%DATADIR%%/resources/inspector/developer_resources/DeveloperResourcesListView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/developer_resources/DeveloperResourcesListView.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/developer_resources/DeveloperResourcesView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/developer_resources/DeveloperResourcesView.js.map %%DATADIR%%/resources/inspector/device_mode_test_runner/device_mode_test_runner_module.js +%%DATADIR%%/resources/inspector/device_mode_test_runner/device_mode_test_runner.js %%DATADIR%%/resources/inspector/devices/devices_module.js %%DATADIR%%/resources/inspector/devices/devices.js %%DEBUG%%%%DATADIR%%/resources/inspector/devices/DevicesView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/devices/DevicesView.js.map %%DATADIR%%/resources/inspector/devtools_app.html %%DATADIR%%/resources/inspector/devtools_app.js %%DATADIR%%/resources/inspector/devtools_compatibility.js %%DATADIR%%/resources/inspector/devtools_extension_api.js %%DEBUG%%%%DATADIR%%/resources/inspector/diff/diff_match_patch.js +%%DEBUG%%%%DATADIR%%/resources/inspector/diff/diff_match_patch.js.map %%DATADIR%%/resources/inspector/diff/diff_module.js %%DATADIR%%/resources/inspector/diff/diff-legacy.js %%DATADIR%%/resources/inspector/diff/diff.js %%DEBUG%%%%DATADIR%%/resources/inspector/diff/DiffWrapper.js +%%DEBUG%%%%DATADIR%%/resources/inspector/diff/DiffWrapper.js.map %%DATADIR%%/resources/inspector/dom_extension/dom_extension.js %%DEBUG%%%%DATADIR%%/resources/inspector/dom_extension/DOMExtension.js +%%DEBUG%%%%DATADIR%%/resources/inspector/dom_extension/DOMExtension.js.map %%DATADIR%%/resources/inspector/elements/elements_module.js %%DATADIR%%/resources/inspector/elements/elements-legacy.js %%DATADIR%%/resources/inspector/elements/elements.js %%DEBUG%%%%DATADIR%%/resources/inspector/elements/Adorner.js +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/Adorner.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/elements/ClassesPaneWidget.js +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ClassesPaneWidget.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/elements/ColorSwatchPopoverIcon.js +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ColorSwatchPopoverIcon.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/elements/ComputedStyleModel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ComputedStyleModel.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ComputedStyleProperty_bridge.js +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ComputedStyleProperty_bridge.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ComputedStyleProperty.js +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ComputedStyleProperty.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ComputedStyleTrace_bridge.js +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ComputedStyleTrace_bridge.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ComputedStyleTrace.js +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ComputedStyleTrace.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/elements/ComputedStyleWidget.js +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ComputedStyleWidget.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/elements/DOMLinkifier.js +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/DOMLinkifier.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/elements/DOMPath.js +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/DOMPath.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementsBreadcrumbs_bridge.js +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementsBreadcrumbs_bridge.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementsBreadcrumbs.js +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementsBreadcrumbs.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementsBreadcrumbsUtils.js +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementsBreadcrumbsUtils.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementsPanel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementsPanel.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementsPanelLink_bridge.js +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementsPanelLink_bridge.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementsPanelLink.js +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementsPanelLink.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementsSidebarPane.js +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementsSidebarPane.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementStatePaneWidget.js +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementStatePaneWidget.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementsTreeElement.js +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementsTreeElement.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementsTreeElementHighlighter.js +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementsTreeElementHighlighter.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementsTreeOutline.js +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ElementsTreeOutline.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/elements/EventListenersWidget.js +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/EventListenersWidget.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/elements/ImagePreviewPopover.js +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/ImagePreviewPopover.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/elements/InspectElementModeController.js +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/InspectElementModeController.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/LayoutPane_bridge.js +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/LayoutPane_bridge.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/LayoutPane.js +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/LayoutPane.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/LayoutPaneUtils.js +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/LayoutPaneUtils.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/LayoutSidebarPane.js +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/LayoutSidebarPane.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/elements/MarkerDecorator.js +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/MarkerDecorator.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/elements/MetricsSidebarPane.js +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/MetricsSidebarPane.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/elements/NodeStackTraceWidget.js +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/NodeStackTraceWidget.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/NodeText.js +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/NodeText.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/elements/PlatformFontsWidget.js +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/PlatformFontsWidget.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/elements/PropertiesWidget.js +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/PropertiesWidget.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/PropertyNameCategories.js +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/PropertyNameCategories.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/elements/StylePropertyHighlighter.js +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/StylePropertyHighlighter.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/elements/StylePropertyTreeElement.js +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/StylePropertyTreeElement.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/elements/StylesSidebarPane.js +%%DEBUG%%%%DATADIR%%/resources/inspector/elements/StylesSidebarPane.js.map %%DATADIR%%/resources/inspector/elements_test_runner/elements_test_runner_module.js -%%DATADIR%%/resources/inspector/emulated_devices/MotoG4-landscape.svg -%%DATADIR%%/resources/inspector/emulated_devices/MotoG4-portrait.svg -%%DATADIR%%/resources/inspector/emulated_devices/Nexus5X-landscape.svg -%%DATADIR%%/resources/inspector/emulated_devices/Nexus5X-portrait.svg -%%DATADIR%%/resources/inspector/emulated_devices/Nexus6P-landscape.svg -%%DATADIR%%/resources/inspector/emulated_devices/Nexus6P-portrait.svg +%%DATADIR%%/resources/inspector/elements_test_runner/elements_test_runner.js +%%DEBUG%%%%DATADIR%%/resources/inspector/elements_test_runner/EditDOMTestRunner.js +%%DEBUG%%%%DATADIR%%/resources/inspector/elements_test_runner/ElementsPanelShadowSelectionOnRefreshTestRunner.js +%%DEBUG%%%%DATADIR%%/resources/inspector/elements_test_runner/ElementsTestRunner.js +%%DEBUG%%%%DATADIR%%/resources/inspector/elements_test_runner/SetOuterHTMLTestRunner.js +%%DEBUG%%%%DATADIR%%/resources/inspector/elements_test_runner/StylesUpdateLinksTestRunner.js %%DATADIR%%/resources/inspector/emulated_devices/emulated_devices_module.js -%%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-horizontal-default-1x.png -%%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-horizontal-default-2x.png -%%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-horizontal-keyboard-1x.png -%%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-horizontal-keyboard-2x.png -%%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-horizontal-navigation-1x.png -%%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-horizontal-navigation-2x.png -%%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-vertical-default-1x.png -%%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-vertical-default-2x.png -%%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-vertical-keyboard-1x.png -%%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-vertical-keyboard-2x.png -%%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-vertical-navigation-1x.png -%%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-vertical-navigation-2x.png -%%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5x-horizontal-default-1x.png -%%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5x-horizontal-default-2x.png -%%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5x-horizontal-keyboard-1x.png -%%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5x-horizontal-keyboard-2x.png -%%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5x-horizontal-navigation-1x.png -%%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5x-horizontal-navigation-2x.png -%%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5x-vertical-default-1x.png -%%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5x-vertical-default-2x.png -%%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5x-vertical-keyboard-1x.png -%%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5x-vertical-keyboard-2x.png -%%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5x-vertical-navigation-1x.png -%%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5x-vertical-navigation-2x.png -%%DATADIR%%/resources/inspector/emulated_devices/iPad-landscape.svg -%%DATADIR%%/resources/inspector/emulated_devices/iPad-portrait.svg -%%DATADIR%%/resources/inspector/emulated_devices/iPhone5-landscape.svg -%%DATADIR%%/resources/inspector/emulated_devices/iPhone5-portrait.svg -%%DATADIR%%/resources/inspector/emulated_devices/iPhone6-landscape.svg -%%DATADIR%%/resources/inspector/emulated_devices/iPhone6-portrait.svg -%%DATADIR%%/resources/inspector/emulated_devices/iPhone6Plus-landscape.svg -%%DATADIR%%/resources/inspector/emulated_devices/iPhone6Plus-portrait.svg +%%DATADIR%%/resources/inspector/emulated_devices/optimized/google-nexus-5-horizontal-default-1x.avif +%%DATADIR%%/resources/inspector/emulated_devices/optimized/google-nexus-5-horizontal-default-2x.avif +%%DATADIR%%/resources/inspector/emulated_devices/optimized/google-nexus-5-horizontal-keyboard-1x.avif +%%DATADIR%%/resources/inspector/emulated_devices/optimized/google-nexus-5-horizontal-keyboard-2x.avif +%%DATADIR%%/resources/inspector/emulated_devices/optimized/google-nexus-5-horizontal-navigation-1x.avif +%%DATADIR%%/resources/inspector/emulated_devices/optimized/google-nexus-5-horizontal-navigation-2x.avif +%%DATADIR%%/resources/inspector/emulated_devices/optimized/google-nexus-5-vertical-default-1x.avif +%%DATADIR%%/resources/inspector/emulated_devices/optimized/google-nexus-5-vertical-default-2x.avif +%%DATADIR%%/resources/inspector/emulated_devices/optimized/google-nexus-5-vertical-keyboard-1x.avif +%%DATADIR%%/resources/inspector/emulated_devices/optimized/google-nexus-5-vertical-keyboard-2x.avif +%%DATADIR%%/resources/inspector/emulated_devices/optimized/google-nexus-5-vertical-navigation-1x.avif +%%DATADIR%%/resources/inspector/emulated_devices/optimized/google-nexus-5-vertical-navigation-2x.avif +%%DATADIR%%/resources/inspector/emulated_devices/optimized/google-nexus-5x-horizontal-default-1x.avif +%%DATADIR%%/resources/inspector/emulated_devices/optimized/google-nexus-5x-horizontal-default-2x.avif +%%DATADIR%%/resources/inspector/emulated_devices/optimized/google-nexus-5x-horizontal-keyboard-1x.avif +%%DATADIR%%/resources/inspector/emulated_devices/optimized/google-nexus-5x-horizontal-keyboard-2x.avif +%%DATADIR%%/resources/inspector/emulated_devices/optimized/google-nexus-5x-horizontal-navigation-1x.avif +%%DATADIR%%/resources/inspector/emulated_devices/optimized/google-nexus-5x-horizontal-navigation-2x.avif +%%DATADIR%%/resources/inspector/emulated_devices/optimized/google-nexus-5x-vertical-default-1x.avif +%%DATADIR%%/resources/inspector/emulated_devices/optimized/google-nexus-5x-vertical-default-2x.avif +%%DATADIR%%/resources/inspector/emulated_devices/optimized/google-nexus-5x-vertical-keyboard-1x.avif +%%DATADIR%%/resources/inspector/emulated_devices/optimized/google-nexus-5x-vertical-keyboard-2x.avif +%%DATADIR%%/resources/inspector/emulated_devices/optimized/google-nexus-5x-vertical-navigation-1x.avif +%%DATADIR%%/resources/inspector/emulated_devices/optimized/google-nexus-5x-vertical-navigation-2x.avif +%%DATADIR%%/resources/inspector/emulated_devices/optimized/iPad-landscape.avif +%%DATADIR%%/resources/inspector/emulated_devices/optimized/iPad-portrait.avif +%%DATADIR%%/resources/inspector/emulated_devices/optimized/iPhone5-landscape.avif +%%DATADIR%%/resources/inspector/emulated_devices/optimized/iPhone5-portrait.avif +%%DATADIR%%/resources/inspector/emulated_devices/optimized/iPhone6-landscape.avif +%%DATADIR%%/resources/inspector/emulated_devices/optimized/iPhone6-portrait.avif +%%DATADIR%%/resources/inspector/emulated_devices/optimized/iPhone6Plus-landscape.avif +%%DATADIR%%/resources/inspector/emulated_devices/optimized/iPhone6Plus-portrait.avif +%%DATADIR%%/resources/inspector/emulated_devices/optimized/MotoG4-landscape.avif +%%DATADIR%%/resources/inspector/emulated_devices/optimized/MotoG4-portrait.avif +%%DATADIR%%/resources/inspector/emulated_devices/optimized/Nexus5X-landscape.avif +%%DATADIR%%/resources/inspector/emulated_devices/optimized/Nexus5X-portrait.avif +%%DATADIR%%/resources/inspector/emulated_devices/optimized/Nexus6P-landscape.avif +%%DATADIR%%/resources/inspector/emulated_devices/optimized/Nexus6P-portrait.avif %%DEBUG%%%%DATADIR%%/resources/inspector/emulation/AdvancedApp.js +%%DEBUG%%%%DATADIR%%/resources/inspector/emulation/AdvancedApp.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/emulation/DeviceModeModel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/emulation/DeviceModeModel.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/emulation/DeviceModeToolbar.js +%%DEBUG%%%%DATADIR%%/resources/inspector/emulation/DeviceModeToolbar.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/emulation/DeviceModeView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/emulation/DeviceModeView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/emulation/DeviceModeWrapper.js +%%DEBUG%%%%DATADIR%%/resources/inspector/emulation/DeviceModeWrapper.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/emulation/DevicesSettingsTab.js +%%DEBUG%%%%DATADIR%%/resources/inspector/emulation/DevicesSettingsTab.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/emulation/EmulatedDevices.js +%%DEBUG%%%%DATADIR%%/resources/inspector/emulation/EmulatedDevices.js.map %%DATADIR%%/resources/inspector/emulation/emulation-legacy.js %%DATADIR%%/resources/inspector/emulation/emulation.js %%DEBUG%%%%DATADIR%%/resources/inspector/emulation/InspectedPagePlaceholder.js +%%DEBUG%%%%DATADIR%%/resources/inspector/emulation/InspectedPagePlaceholder.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/emulation/LocationsSettingsTab.js +%%DEBUG%%%%DATADIR%%/resources/inspector/emulation/LocationsSettingsTab.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/emulation/MediaQueryInspector.js +%%DEBUG%%%%DATADIR%%/resources/inspector/emulation/MediaQueryInspector.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/emulation/SensorsView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/emulation/SensorsView.js.map %%DATADIR%%/resources/inspector/event_listeners/event_listeners_module.js %%DATADIR%%/resources/inspector/event_listeners/event_listeners-legacy.js %%DATADIR%%/resources/inspector/event_listeners/event_listeners.js %%DEBUG%%%%DATADIR%%/resources/inspector/event_listeners/EventListenersUtils.js +%%DEBUG%%%%DATADIR%%/resources/inspector/event_listeners/EventListenersUtils.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/event_listeners/EventListenersView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/event_listeners/EventListenersView.js.map %%DATADIR%%/resources/inspector/extensions_test_runner/extensions_test_runner_module.js +%%DATADIR%%/resources/inspector/extensions_test_runner/extensions_test_runner.js +%%DEBUG%%%%DATADIR%%/resources/inspector/extensions_test_runner/ExtensionsNetworkTestRunner.js +%%DEBUG%%%%DATADIR%%/resources/inspector/extensions_test_runner/ExtensionsTestRunner.js %%DEBUG%%%%DATADIR%%/resources/inspector/extensions/ExtensionAPI.js +%%DEBUG%%%%DATADIR%%/resources/inspector/extensions/ExtensionAPI.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/extensions/ExtensionPanel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/extensions/ExtensionPanel.js.map %%DATADIR%%/resources/inspector/extensions/extensions-legacy.js %%DATADIR%%/resources/inspector/extensions/extensions.js %%DEBUG%%%%DATADIR%%/resources/inspector/extensions/ExtensionServer.js +%%DEBUG%%%%DATADIR%%/resources/inspector/extensions/ExtensionServer.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/extensions/ExtensionTraceProvider.js +%%DEBUG%%%%DATADIR%%/resources/inspector/extensions/ExtensionTraceProvider.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/extensions/ExtensionView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/extensions/ExtensionView.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/extensions/LanguageExtensionEndpoint.js +%%DEBUG%%%%DATADIR%%/resources/inspector/extensions/LanguageExtensionEndpoint.js.map %%DATADIR%%/resources/inspector/formatter_worker_entrypoint.js -%%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/acorn/acorn_loose.js %%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/AcornTokenizer.js +%%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/AcornTokenizer.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/CSSFormatter.js +%%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/CSSFormatter.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/CSSRuleParser.js +%%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/CSSRuleParser.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/ESTreeWalker.js +%%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/ESTreeWalker.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/FormattedContentBuilder.js +%%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/FormattedContentBuilder.js.map %%DATADIR%%/resources/inspector/formatter_worker/formatter_worker.js -%%DATADIR%%/resources/inspector/formatter_worker/formatter_worker-legacy.js %%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/FormatterWorker.js +%%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/FormatterWorker.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/HTMLFormatter.js +%%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/HTMLFormatter.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/IdentityFormatter.js +%%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/IdentityFormatter.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/JavaScriptFormatter.js +%%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/JavaScriptFormatter.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/JavaScriptOutline.js -%%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/RelaxedJSONParser.js +%%DEBUG%%%%DATADIR%%/resources/inspector/formatter_worker/JavaScriptOutline.js.map %%DATADIR%%/resources/inspector/formatter/formatter_module.js %%DATADIR%%/resources/inspector/formatter/formatter-legacy.js %%DATADIR%%/resources/inspector/formatter/formatter.js %%DEBUG%%%%DATADIR%%/resources/inspector/formatter/FormatterWorkerPool.js +%%DEBUG%%%%DATADIR%%/resources/inspector/formatter/FormatterWorkerPool.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/formatter/ScriptFormatter.js +%%DEBUG%%%%DATADIR%%/resources/inspector/formatter/ScriptFormatter.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/formatter/SourceFormatter.js +%%DEBUG%%%%DATADIR%%/resources/inspector/formatter/SourceFormatter.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/generated/ARIAProperties.js +%%DEBUG%%%%DATADIR%%/resources/inspector/generated/ARIAProperties.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/generated/InspectorBackendCommands.js +%%DEBUG%%%%DATADIR%%/resources/inspector/generated/InspectorBackendCommands.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/generated/SupportedCSSProperties.js +%%DEBUG%%%%DATADIR%%/resources/inspector/generated/SupportedCSSProperties.js.map %%DATADIR%%/resources/inspector/har_importer/har_importer_module.js %%DATADIR%%/resources/inspector/har_importer/har_importer-legacy.js %%DATADIR%%/resources/inspector/har_importer/har_importer.js %%DEBUG%%%%DATADIR%%/resources/inspector/har_importer/HARFormat.js +%%DEBUG%%%%DATADIR%%/resources/inspector/har_importer/HARFormat.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/har_importer/HARImporter.js +%%DEBUG%%%%DATADIR%%/resources/inspector/har_importer/HARImporter.js.map +%%DATADIR%%/resources/inspector/heap_profiler_test_runner/heap_profiler_test_runner.js %%DATADIR%%/resources/inspector/heap_profiler_test_runner/heap_profiler_test_runner_module.js %%DATADIR%%/resources/inspector/heap_snapshot_model/heap_snapshot_model_module.js %%DATADIR%%/resources/inspector/heap_snapshot_model/heap_snapshot_model-legacy.js %%DATADIR%%/resources/inspector/heap_snapshot_model/heap_snapshot_model.js %%DEBUG%%%%DATADIR%%/resources/inspector/heap_snapshot_model/HeapSnapshotModel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/heap_snapshot_model/HeapSnapshotModel.js.map %%DATADIR%%/resources/inspector/heap_snapshot_worker_entrypoint.js %%DEBUG%%%%DATADIR%%/resources/inspector/heap_snapshot_worker/AllocationProfile.js +%%DEBUG%%%%DATADIR%%/resources/inspector/heap_snapshot_worker/AllocationProfile.js.map %%DATADIR%%/resources/inspector/heap_snapshot_worker/heap_snapshot_worker_module.js %%DATADIR%%/resources/inspector/heap_snapshot_worker/heap_snapshot_worker-legacy.js %%DATADIR%%/resources/inspector/heap_snapshot_worker/heap_snapshot_worker.js %%DEBUG%%%%DATADIR%%/resources/inspector/heap_snapshot_worker/HeapSnapshot.js +%%DEBUG%%%%DATADIR%%/resources/inspector/heap_snapshot_worker/HeapSnapshot.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/heap_snapshot_worker/HeapSnapshotLoader.js +%%DEBUG%%%%DATADIR%%/resources/inspector/heap_snapshot_worker/HeapSnapshotLoader.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/heap_snapshot_worker/HeapSnapshotWorker.js +%%DEBUG%%%%DATADIR%%/resources/inspector/heap_snapshot_worker/HeapSnapshotWorker.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/heap_snapshot_worker/HeapSnapshotWorkerDispatcher.js +%%DEBUG%%%%DATADIR%%/resources/inspector/heap_snapshot_worker/HeapSnapshotWorkerDispatcher.js.map %%DATADIR%%/resources/inspector/help/help_module.js %%DATADIR%%/resources/inspector/help/help-legacy.js %%DATADIR%%/resources/inspector/help/help.js %%DEBUG%%%%DATADIR%%/resources/inspector/help/HelpImpl.js +%%DEBUG%%%%DATADIR%%/resources/inspector/help/HelpImpl.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/help/ReleaseNoteText.js +%%DEBUG%%%%DATADIR%%/resources/inspector/help/ReleaseNoteText.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/help/ReleaseNoteView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/help/ReleaseNoteView.js.map %%DATADIR%%/resources/inspector/host/host.js %%DATADIR%%/resources/inspector/host/host-legacy.js %%DEBUG%%%%DATADIR%%/resources/inspector/host/InspectorFrontendHost.js +%%DEBUG%%%%DATADIR%%/resources/inspector/host/InspectorFrontendHost.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/host/InspectorFrontendHostAPI.js +%%DEBUG%%%%DATADIR%%/resources/inspector/host/InspectorFrontendHostAPI.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/host/Platform.js +%%DEBUG%%%%DATADIR%%/resources/inspector/host/Platform.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/host/ResourceLoader.js +%%DEBUG%%%%DATADIR%%/resources/inspector/host/ResourceLoader.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/host/UserMetrics.js +%%DEBUG%%%%DATADIR%%/resources/inspector/host/UserMetrics.js.map +%%DATADIR%%/resources/inspector/i18n/i18n_locales-tsconfig.json +%%DATADIR%%/resources/inspector/i18n/i18n.js +%%DEBUG%%%%DATADIR%%/resources/inspector/i18n/i18nImpl.js +%%DEBUG%%%%DATADIR%%/resources/inspector/i18n/i18nImpl.js.map +%%DATADIR%%/resources/inspector/i18n/locales/en-US.json %%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/BezierEditor.js +%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/BezierEditor.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/BezierUI.js +%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/BezierUI.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/ColorSwatch.js +%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/ColorSwatch.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/CSSShadowEditor.js +%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/CSSShadowEditor.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/CSSShadowModel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/CSSShadowModel.js.map %%DATADIR%%/resources/inspector/inline_editor/inline_editor_module.js %%DATADIR%%/resources/inspector/inline_editor/inline_editor-legacy.js %%DATADIR%%/resources/inspector/inline_editor/inline_editor.js %%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/SwatchPopoverHelper.js +%%DEBUG%%%%DATADIR%%/resources/inspector/inline_editor/SwatchPopoverHelper.js.map %%DATADIR%%/resources/inspector/input/input_module.js %%DATADIR%%/resources/inspector/input/input-legacy.js %%DATADIR%%/resources/inspector/input/input.js %%DEBUG%%%%DATADIR%%/resources/inspector/input/InputModel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/input/InputModel.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/input/InputTimeline.js +%%DEBUG%%%%DATADIR%%/resources/inspector/input/InputTimeline.js.map %%DATADIR%%/resources/inspector/inspector_main/inspector_main.js %%DATADIR%%/resources/inspector/inspector_main/inspector_main-legacy.js %%DEBUG%%%%DATADIR%%/resources/inspector/inspector_main/InspectorMain.js +%%DEBUG%%%%DATADIR%%/resources/inspector/inspector_main/InspectorMain.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/inspector_main/RenderingOptions.js +%%DEBUG%%%%DATADIR%%/resources/inspector/inspector_main/RenderingOptions.js.map %%DATADIR%%/resources/inspector/inspector.html %%DATADIR%%/resources/inspector/inspector.js %%DATADIR%%/resources/inspector/integration_test_runner.html @@ -542,400 +792,800 @@ bin/chrome %%DATADIR%%/resources/inspector/issues/issues-legacy.js %%DATADIR%%/resources/inspector/issues/issues.js %%DEBUG%%%%DATADIR%%/resources/inspector/issues/IssueAggregator.js +%%DEBUG%%%%DATADIR%%/resources/inspector/issues/IssueAggregator.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/issues/IssueRevealer.js +%%DEBUG%%%%DATADIR%%/resources/inspector/issues/IssueRevealer.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/issues/IssuesPane.js +%%DEBUG%%%%DATADIR%%/resources/inspector/issues/IssuesPane.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/issues/MarkdownIssueDescription.js +%%DEBUG%%%%DATADIR%%/resources/inspector/issues/MarkdownIssueDescription.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/issues/MarkdownView_bridge.js +%%DEBUG%%%%DATADIR%%/resources/inspector/issues/MarkdownView_bridge.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/issues/MarkdownView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/issues/MarkdownView.js.map %%DATADIR%%/resources/inspector/javascript_metadata/javascript_metadata_module.js %%DATADIR%%/resources/inspector/javascript_metadata/javascript_metadata-legacy.js %%DATADIR%%/resources/inspector/javascript_metadata/javascript_metadata.js %%DEBUG%%%%DATADIR%%/resources/inspector/javascript_metadata/JavaScriptMetadata.js +%%DEBUG%%%%DATADIR%%/resources/inspector/javascript_metadata/JavaScriptMetadata.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/javascript_metadata/NativeFunctions.js +%%DEBUG%%%%DATADIR%%/resources/inspector/javascript_metadata/NativeFunctions.js.map %%DATADIR%%/resources/inspector/js_app.html %%DATADIR%%/resources/inspector/js_app.js %%DATADIR%%/resources/inspector/js_main/js_main.js %%DATADIR%%/resources/inspector/js_main/js_main-legacy.js %%DEBUG%%%%DATADIR%%/resources/inspector/js_main/JsMain.js +%%DEBUG%%%%DATADIR%%/resources/inspector/js_main/JsMain.js.map %%DATADIR%%/resources/inspector/js_profiler/js_profiler_module.js %%DATADIR%%/resources/inspector/layer_viewer/layer_viewer_module.js %%DATADIR%%/resources/inspector/layer_viewer/layer_viewer-legacy.js %%DATADIR%%/resources/inspector/layer_viewer/layer_viewer.js %%DEBUG%%%%DATADIR%%/resources/inspector/layer_viewer/LayerDetailsView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/layer_viewer/LayerDetailsView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/layer_viewer/Layers3DView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/layer_viewer/Layers3DView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/layer_viewer/LayerTreeOutline.js +%%DEBUG%%%%DATADIR%%/resources/inspector/layer_viewer/LayerTreeOutline.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/layer_viewer/LayerViewHost.js +%%DEBUG%%%%DATADIR%%/resources/inspector/layer_viewer/LayerViewHost.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/layer_viewer/PaintProfilerView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/layer_viewer/PaintProfilerView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/layer_viewer/TransformController.js +%%DEBUG%%%%DATADIR%%/resources/inspector/layer_viewer/TransformController.js.map %%DATADIR%%/resources/inspector/layers/layers_module.js %%DATADIR%%/resources/inspector/layers/layers-legacy.js %%DATADIR%%/resources/inspector/layers/layers.js %%DEBUG%%%%DATADIR%%/resources/inspector/layers/LayerPaintProfilerView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/layers/LayerPaintProfilerView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/layers/LayersPanel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/layers/LayersPanel.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/layers/LayerTreeModel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/layers/LayerTreeModel.js.map %%DATADIR%%/resources/inspector/layers_test_runner/layers_test_runner_module.js +%%DATADIR%%/resources/inspector/layers_test_runner/layers_test_runner.js %%DATADIR%%/resources/inspector/lighthouse_test_runner/lighthouse_test_runner_module.js +%%DATADIR%%/resources/inspector/lighthouse_test_runner/lighthouse_test_runner.js %%DATADIR%%/resources/inspector/lighthouse_worker.js -%%DATADIR%%/resources/inspector/lighthouse_worker/lighthouse_worker_module.js +%%DATADIR%%/resources/inspector/lighthouse_worker/lighthouse_worker.js +%%DEBUG%%%%DATADIR%%/resources/inspector/lighthouse_worker/LighthouseService.js %%DATADIR%%/resources/inspector/lighthouse/lighthouse_module.js %%DATADIR%%/resources/inspector/lighthouse/lighthouse-legacy.js %%DATADIR%%/resources/inspector/lighthouse/lighthouse.js %%DEBUG%%%%DATADIR%%/resources/inspector/lighthouse/LighthouseController.js +%%DEBUG%%%%DATADIR%%/resources/inspector/lighthouse/LighthouseController.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/lighthouse/LighthousePanel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/lighthouse/LighthousePanel.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/lighthouse/LighthouseProtocolService.js +%%DEBUG%%%%DATADIR%%/resources/inspector/lighthouse/LighthouseProtocolService.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/lighthouse/LighthouseReportRenderer.js +%%DEBUG%%%%DATADIR%%/resources/inspector/lighthouse/LighthouseReportRenderer.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/lighthouse/LighthouseReportSelector.js +%%DEBUG%%%%DATADIR%%/resources/inspector/lighthouse/LighthouseReportSelector.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/lighthouse/LighthouseStartView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/lighthouse/LighthouseStartView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/lighthouse/LighthouseStatusView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/lighthouse/LighthouseStatusView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/lighthouse/RadioSetting.js +%%DEBUG%%%%DATADIR%%/resources/inspector/lighthouse/RadioSetting.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/main/ExecutionContextSelector.js +%%DEBUG%%%%DATADIR%%/resources/inspector/main/ExecutionContextSelector.js.map %%DATADIR%%/resources/inspector/main/main-legacy.js %%DATADIR%%/resources/inspector/main/main.js %%DEBUG%%%%DATADIR%%/resources/inspector/main/MainImpl.js +%%DEBUG%%%%DATADIR%%/resources/inspector/main/MainImpl.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/main/SimpleApp.js +%%DEBUG%%%%DATADIR%%/resources/inspector/main/SimpleApp.js.map +%%DATADIR%%/resources/inspector/marked/marked_module.js +%%DATADIR%%/resources/inspector/marked/marked.js %%DATADIR%%/resources/inspector/media/media.js %%DATADIR%%/resources/inspector/media/media-legacy.js %%DATADIR%%/resources/inspector/media/media_module.js -%%DEBUG%%%%DATADIR%%/resources/inspector/media/ChevronTabbedPanel.js %%DEBUG%%%%DATADIR%%/resources/inspector/media/EventDisplayTable.js +%%DEBUG%%%%DATADIR%%/resources/inspector/media/EventDisplayTable.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/media/EventTimelineView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/media/EventTimelineView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/media/MainView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/media/MainView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/media/MediaModel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/media/MediaModel.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/media/PlayerDetailView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/media/PlayerDetailView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/media/PlayerListView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/media/PlayerListView.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/media/PlayerMessagesView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/media/PlayerMessagesView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/media/PlayerPropertiesView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/media/PlayerPropertiesView.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/media/TickingFlameChart.js +%%DEBUG%%%%DATADIR%%/resources/inspector/media/TickingFlameChart.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/media/TickingFlameChartHelpers.js +%%DEBUG%%%%DATADIR%%/resources/inspector/media/TickingFlameChartHelpers.js.map %%DATADIR%%/resources/inspector/mobile_throttling/mobile_throttling.js %%DATADIR%%/resources/inspector/mobile_throttling/mobile_throttling-legacy.js %%DEBUG%%%%DATADIR%%/resources/inspector/mobile_throttling/MobileThrottlingSelector.js +%%DEBUG%%%%DATADIR%%/resources/inspector/mobile_throttling/MobileThrottlingSelector.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/mobile_throttling/NetworkPanelIndicator.js +%%DEBUG%%%%DATADIR%%/resources/inspector/mobile_throttling/NetworkPanelIndicator.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/mobile_throttling/NetworkThrottlingSelector.js +%%DEBUG%%%%DATADIR%%/resources/inspector/mobile_throttling/NetworkThrottlingSelector.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/mobile_throttling/ThrottlingManager.js +%%DEBUG%%%%DATADIR%%/resources/inspector/mobile_throttling/ThrottlingManager.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/mobile_throttling/ThrottlingPresets.js +%%DEBUG%%%%DATADIR%%/resources/inspector/mobile_throttling/ThrottlingPresets.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/mobile_throttling/ThrottlingSettingsTab.js +%%DEBUG%%%%DATADIR%%/resources/inspector/mobile_throttling/ThrottlingSettingsTab.js.map %%DATADIR%%/resources/inspector/ndb_app.html %%DATADIR%%/resources/inspector/ndb_app.js %%DATADIR%%/resources/inspector/network/network_module.js %%DATADIR%%/resources/inspector/network/network-legacy.js %%DATADIR%%/resources/inspector/network/network.js %%DEBUG%%%%DATADIR%%/resources/inspector/network/BinaryResourceView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/network/BinaryResourceView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/network/BlockedURLsPane.js +%%DEBUG%%%%DATADIR%%/resources/inspector/network/BlockedURLsPane.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/network/EventSourceMessagesView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/network/EventSourceMessagesView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/network/HARWriter.js +%%DEBUG%%%%DATADIR%%/resources/inspector/network/HARWriter.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkConfigView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkConfigView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkDataGridNode.js +%%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkDataGridNode.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkFrameGrouper.js +%%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkFrameGrouper.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkItemView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkItemView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkLogView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkLogView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkLogViewColumns.js +%%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkLogViewColumns.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkManageCustomHeadersView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkManageCustomHeadersView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkOverview.js +%%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkOverview.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkPanel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkPanel.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkSearchScope.js +%%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkSearchScope.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkTimeCalculator.js +%%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkTimeCalculator.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkWaterfallColumn.js +%%DEBUG%%%%DATADIR%%/resources/inspector/network/NetworkWaterfallColumn.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/network/RequestCookiesView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/network/RequestCookiesView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/network/RequestHeadersView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/network/RequestHeadersView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/network/RequestHTMLView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/network/RequestHTMLView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/network/RequestInitiatorView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/network/RequestInitiatorView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/network/RequestPreviewView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/network/RequestPreviewView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/network/RequestResponseView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/network/RequestResponseView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/network/RequestTimingView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/network/RequestTimingView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/network/ResourceWebSocketFrameView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/network/ResourceWebSocketFrameView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/network/SignedExchangeInfoView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/network/SignedExchangeInfoView.js.map %%DATADIR%%/resources/inspector/network_test_runner/network_test_runner_module.js +%%DATADIR%%/resources/inspector/network_test_runner/network_test_runner.js %%DATADIR%%/resources/inspector/node_app.html %%DATADIR%%/resources/inspector/node_app.js %%DATADIR%%/resources/inspector/node_debugger/node_debugger_module.js %%DATADIR%%/resources/inspector/node_main/node_main-legacy.js %%DATADIR%%/resources/inspector/node_main/node_main.js %%DEBUG%%%%DATADIR%%/resources/inspector/node_main/NodeConnectionsPanel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/node_main/NodeConnectionsPanel.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/node_main/NodeMain.js +%%DEBUG%%%%DATADIR%%/resources/inspector/node_main/NodeMain.js.map %%DATADIR%%/resources/inspector/object_ui/object_ui_module.js %%DATADIR%%/resources/inspector/object_ui/object_ui-legacy.js %%DATADIR%%/resources/inspector/object_ui/object_ui.js %%DEBUG%%%%DATADIR%%/resources/inspector/object_ui/CustomPreviewComponent.js +%%DEBUG%%%%DATADIR%%/resources/inspector/object_ui/CustomPreviewComponent.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/object_ui/JavaScriptAutocomplete.js +%%DEBUG%%%%DATADIR%%/resources/inspector/object_ui/JavaScriptAutocomplete.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/object_ui/ObjectPopoverHelper.js +%%DEBUG%%%%DATADIR%%/resources/inspector/object_ui/ObjectPopoverHelper.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/object_ui/ObjectPropertiesSection.js +%%DEBUG%%%%DATADIR%%/resources/inspector/object_ui/ObjectPropertiesSection.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/object_ui/RemoteObjectPreviewFormatter.js +%%DEBUG%%%%DATADIR%%/resources/inspector/object_ui/RemoteObjectPreviewFormatter.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/object_ui/JavaScriptREPL.js +%%DEBUG%%%%DATADIR%%/resources/inspector/object_ui/JavaScriptREPL.js.map %%DATADIR%%/resources/inspector/perf_ui/perf_ui_module.js %%DATADIR%%/resources/inspector/perf_ui/perf_ui-legacy.js %%DATADIR%%/resources/inspector/perf_ui/perf_ui.js %%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/ChartViewport.js +%%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/ChartViewport.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/FilmStripView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/FilmStripView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/FlameChart.js +%%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/FlameChart.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/GCActionDelegate.js +%%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/GCActionDelegate.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/LineLevelProfile.js +%%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/LineLevelProfile.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/LiveHeapProfile.js +%%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/LiveHeapProfile.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/NetworkPriorities.js +%%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/NetworkPriorities.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/OverviewGrid.js +%%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/OverviewGrid.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/PieChart_bridge.js +%%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/PieChart_bridge.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/PieChart.js +%%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/PieChart.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/TimelineGrid.js +%%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/TimelineGrid.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/TimelineOverviewPane.js +%%DEBUG%%%%DATADIR%%/resources/inspector/perf_ui/TimelineOverviewPane.js.map %%DATADIR%%/resources/inspector/performance_monitor/performance_monitor_module.js %%DATADIR%%/resources/inspector/performance_monitor/performance_monitor-legacy.js %%DATADIR%%/resources/inspector/performance_monitor/performance_monitor.js %%DEBUG%%%%DATADIR%%/resources/inspector/performance_monitor/PerformanceMonitor.js +%%DEBUG%%%%DATADIR%%/resources/inspector/performance_monitor/PerformanceMonitor.js.map %%DATADIR%%/resources/inspector/performance_test_runner/performance_test_runner_module.js +%%DATADIR%%/resources/inspector/performance_test_runner/performance_test_runner.js +%%DEBUG%%%%DATADIR%%/resources/inspector/performance_test_runner/TimelineDataTestRunner.js +%%DEBUG%%%%DATADIR%%/resources/inspector/performance_test_runner/TimelineTestRunner.js %%DEBUG%%%%DATADIR%%/resources/inspector/persistence/Automapping.js +%%DEBUG%%%%DATADIR%%/resources/inspector/persistence/Automapping.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/persistence/EditFileSystemView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/persistence/EditFileSystemView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/persistence/FileSystemWorkspaceBinding.js +%%DEBUG%%%%DATADIR%%/resources/inspector/persistence/FileSystemWorkspaceBinding.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/persistence/IsolatedFileSystem.js +%%DEBUG%%%%DATADIR%%/resources/inspector/persistence/IsolatedFileSystem.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/persistence/IsolatedFileSystemManager.js +%%DEBUG%%%%DATADIR%%/resources/inspector/persistence/IsolatedFileSystemManager.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/persistence/NetworkPersistenceManager.js +%%DEBUG%%%%DATADIR%%/resources/inspector/persistence/NetworkPersistenceManager.js.map %%DATADIR%%/resources/inspector/persistence/persistence.js %%DATADIR%%/resources/inspector/persistence/persistence-legacy.js %%DEBUG%%%%DATADIR%%/resources/inspector/persistence/PersistenceActions.js +%%DEBUG%%%%DATADIR%%/resources/inspector/persistence/PersistenceActions.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/persistence/PersistenceImpl.js +%%DEBUG%%%%DATADIR%%/resources/inspector/persistence/PersistenceImpl.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/persistence/PersistenceUtils.js +%%DEBUG%%%%DATADIR%%/resources/inspector/persistence/PersistenceUtils.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/persistence/PlatformFileSystem.js +%%DEBUG%%%%DATADIR%%/resources/inspector/persistence/PlatformFileSystem.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/persistence/WorkspaceSettingsTab.js +%%DEBUG%%%%DATADIR%%/resources/inspector/persistence/WorkspaceSettingsTab.js.map %%DATADIR%%/resources/inspector/platform/platform.js %%DEBUG%%%%DATADIR%%/resources/inspector/platform/array-utilities.js +%%DEBUG%%%%DATADIR%%/resources/inspector/platform/array-utilities.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/platform/date-utilities.js +%%DEBUG%%%%DATADIR%%/resources/inspector/platform/date-utilities.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/platform/number-utilities.js +%%DEBUG%%%%DATADIR%%/resources/inspector/platform/number-utilities.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/platform/utilities.js +%%DEBUG%%%%DATADIR%%/resources/inspector/platform/utilities.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/platform/set-utilities.js +%%DEBUG%%%%DATADIR%%/resources/inspector/platform/set-utilities.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/platform/string-utilities.js +%%DEBUG%%%%DATADIR%%/resources/inspector/platform/string-utilities.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/platform/UIString.js +%%DEBUG%%%%DATADIR%%/resources/inspector/platform/UIString.js.map %%DATADIR%%/resources/inspector/profiler/profiler_module.js %%DATADIR%%/resources/inspector/profiler/profiler-legacy.js %%DATADIR%%/resources/inspector/profiler/profiler.js %%DEBUG%%%%DATADIR%%/resources/inspector/profiler/BottomUpProfileDataGrid.js +%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/BottomUpProfileDataGrid.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/profiler/ChildrenProvider.js +%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/ChildrenProvider.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/profiler/CPUProfileFlameChart.js +%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/CPUProfileFlameChart.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/profiler/CPUProfileView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/CPUProfileView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/profiler/HeapProfilerPanel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/HeapProfilerPanel.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/profiler/HeapProfileView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/HeapProfileView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/profiler/HeapSnapshotDataGrids.js +%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/HeapSnapshotDataGrids.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/profiler/HeapSnapshotGridNodes.js +%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/HeapSnapshotGridNodes.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/profiler/HeapSnapshotProxy.js +%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/HeapSnapshotProxy.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/profiler/HeapSnapshotView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/HeapSnapshotView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/profiler/HeapTimelineOverview.js +%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/HeapTimelineOverview.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/profiler/IsolateSelector.js +%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/IsolateSelector.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/profiler/LiveHeapProfileView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/LiveHeapProfileView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/profiler/ProfileDataGrid.js +%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/ProfileDataGrid.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/profiler/ProfileHeader.js +%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/ProfileHeader.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/profiler/ProfileLauncherView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/ProfileLauncherView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/profiler/ProfileSidebarTreeElement.js +%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/ProfileSidebarTreeElement.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/profiler/ProfilesPanel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/ProfilesPanel.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/profiler/ProfileTypeRegistry.js +%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/ProfileTypeRegistry.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/profiler/ProfileView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/ProfileView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/profiler/TopDownProfileDataGrid.js +%%DEBUG%%%%DATADIR%%/resources/inspector/profiler/TopDownProfileDataGrid.js.map %%DATADIR%%/resources/inspector/protocol_monitor/protocol_monitor_module.js %%DATADIR%%/resources/inspector/protocol_monitor/protocol_monitor-legacy.js %%DATADIR%%/resources/inspector/protocol_monitor/protocol_monitor.js %%DEBUG%%%%DATADIR%%/resources/inspector/protocol_monitor/ProtocolMonitor.js +%%DEBUG%%%%DATADIR%%/resources/inspector/protocol_monitor/ProtocolMonitor.js.map %%DATADIR%%/resources/inspector/protocol_client/protocol_client-legacy.js %%DATADIR%%/resources/inspector/protocol_client/protocol_client.js %%DEBUG%%%%DATADIR%%/resources/inspector/protocol_client/InspectorBackend.js +%%DEBUG%%%%DATADIR%%/resources/inspector/protocol_client/InspectorBackend.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/protocol_client/NodeURL.js +%%DEBUG%%%%DATADIR%%/resources/inspector/protocol_client/NodeURL.js.map %%DATADIR%%/resources/inspector/quick_open/quick_open_module.js %%DATADIR%%/resources/inspector/quick_open/quick_open-legacy.js %%DATADIR%%/resources/inspector/quick_open/quick_open.js %%DEBUG%%%%DATADIR%%/resources/inspector/quick_open/CommandMenu.js +%%DEBUG%%%%DATADIR%%/resources/inspector/quick_open/CommandMenu.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/quick_open/FilteredListWidget.js +%%DEBUG%%%%DATADIR%%/resources/inspector/quick_open/FilteredListWidget.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/quick_open/HelpQuickOpen.js +%%DEBUG%%%%DATADIR%%/resources/inspector/quick_open/HelpQuickOpen.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/quick_open/QuickInput.js +%%DEBUG%%%%DATADIR%%/resources/inspector/quick_open/QuickInput.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/quick_open/QuickOpen.js +%%DEBUG%%%%DATADIR%%/resources/inspector/quick_open/QuickOpen.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/quick_open/QuickPick.js +%%DEBUG%%%%DATADIR%%/resources/inspector/quick_open/QuickPick.js.map %%DATADIR%%/resources/inspector/resources/resources_module.js %%DATADIR%%/resources/inspector/resources/resources-legacy.js %%DATADIR%%/resources/inspector/resources/resources.js %%DEBUG%%%%DATADIR%%/resources/inspector/resources/ApplicationCacheItemsView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/resources/ApplicationCacheItemsView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/resources/ApplicationCacheModel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/resources/ApplicationCacheModel.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/resources/ApplicationPanelSidebar.js +%%DEBUG%%%%DATADIR%%/resources/inspector/resources/ApplicationPanelSidebar.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/resources/AppManifestView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/resources/AppManifestView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/resources/BackgroundServiceModel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/resources/BackgroundServiceModel.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/resources/BackgroundServiceView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/resources/BackgroundServiceView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/resources/ClearStorageView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/resources/ClearStorageView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/resources/CookieItemsView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/resources/CookieItemsView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/resources/DatabaseModel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/resources/DatabaseModel.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/resources/DatabaseQueryView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/resources/DatabaseQueryView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/resources/DatabaseTableView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/resources/DatabaseTableView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/resources/DOMStorageItemsView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/resources/DOMStorageItemsView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/resources/DOMStorageModel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/resources/DOMStorageModel.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/resources/FrameDetailsView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/resources/FrameDetailsView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/resources/IndexedDBModel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/resources/IndexedDBModel.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/resources/IndexedDBViews.js +%%DEBUG%%%%DATADIR%%/resources/inspector/resources/IndexedDBViews.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/resources/ResourcesPanel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/resources/ResourcesPanel.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/resources/ServiceWorkerCacheViews.js +%%DEBUG%%%%DATADIR%%/resources/inspector/resources/ServiceWorkerCacheViews.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/resources/ServiceWorkersView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/resources/ServiceWorkersView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/resources/StorageItemsView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/resources/StorageItemsView.js.map %%DATADIR%%/resources/inspector/root.js %%DATADIR%%/resources/inspector/root/root-legacy.js %%DATADIR%%/resources/inspector/root/root.js %%DEBUG%%%%DATADIR%%/resources/inspector/root/Runtime.js +%%DEBUG%%%%DATADIR%%/resources/inspector/root/Runtime.js.map %%DATADIR%%/resources/inspector/RuntimeInstantiator.js %%DEBUG%%%%DATADIR%%/resources/inspector/screencast/InputModel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/screencast/InputModel.js.map %%DATADIR%%/resources/inspector/screencast/screencast.js %%DATADIR%%/resources/inspector/screencast/screencast-legacy.js %%DEBUG%%%%DATADIR%%/resources/inspector/screencast/ScreencastApp.js +%%DEBUG%%%%DATADIR%%/resources/inspector/screencast/ScreencastApp.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/screencast/ScreencastView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/screencast/ScreencastView.js.map %%DATADIR%%/resources/inspector/sdk_test_runner/sdk_test_runner_module.js +%%DATADIR%%/resources/inspector/sdk_test_runner/sdk_test_runner.js %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ChildTargetManager.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ChildTargetManager.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CompilerSourceMappingContentProvider.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CompilerSourceMappingContentProvider.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/Connections.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/Connections.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ConsoleModel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ConsoleModel.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ContentSecurityPolicyIssue.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ContentSecurityPolicyIssue.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/Cookie.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/Cookie.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CookieModel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CookieModel.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CookieParser.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CookieParser.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CPUProfileDataModel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CPUProfileDataModel.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CPUProfilerModel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CPUProfilerModel.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CrossOriginEmbedderPolicyIssue.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CrossOriginEmbedderPolicyIssue.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CSSFontFace.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CSSFontFace.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CSSMatchedStyles.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CSSMatchedStyles.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CSSMedia.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CSSMedia.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CSSMetadata.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CSSMetadata.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CSSModel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CSSModel.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CSSProperty.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CSSProperty.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CSSPropertyParser.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CSSPropertyParser.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CSSRule.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CSSRule.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CSSStyleDeclaration.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CSSStyleDeclaration.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CSSStyleSheetHeader.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/CSSStyleSheetHeader.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/DebuggerModel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/DebuggerModel.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/DOMDebuggerModel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/DOMDebuggerModel.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/DOMModel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/DOMModel.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/EmulationModel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/EmulationModel.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/FilmStripModel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/FilmStripModel.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/FrameAssociated.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/FrameAssociated.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/FrameManager.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/FrameManager.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/HARLog.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/HARLog.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/HeapProfilerModel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/HeapProfilerModel.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/HeavyAdIssue.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/HeavyAdIssue.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/IOModel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/IOModel.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/IsolateManager.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/IsolateManager.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/Issue.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/Issue.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/IssuesModel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/IssuesModel.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/LayerTreeBase.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/LayerTreeBase.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/LogModel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/LogModel.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/MixedContentIssue.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/MixedContentIssue.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/NetworkLog.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/NetworkLog.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/NetworkManager.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/NetworkManager.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/NetworkRequest.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/NetworkRequest.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/OverlayModel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/OverlayModel.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/PageResourceLoader.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/PageResourceLoader.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/PaintProfiler.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/PaintProfiler.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/PerformanceMetricsModel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/PerformanceMetricsModel.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ProfileTreeModel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ProfileTreeModel.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/RemoteObject.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/RemoteObject.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/Resource.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/Resource.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ResourceTreeModel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ResourceTreeModel.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/RuntimeModel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/RuntimeModel.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/SameSiteCookieIssue.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/SameSiteCookieIssue.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ScreenCaptureModel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ScreenCaptureModel.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/Script.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/Script.js.map %%DATADIR%%/resources/inspector/sdk/sdk.js %%DATADIR%%/resources/inspector/sdk/sdk-legacy.js %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/SDKModel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/SDKModel.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/SecurityOriginManager.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/SecurityOriginManager.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ServerTiming.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ServerTiming.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ServiceWorkerCacheModel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ServiceWorkerCacheModel.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ServiceWorkerManager.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/ServiceWorkerManager.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/SourceMap.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/SourceMap.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/SourceMapManager.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/SourceMapManager.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/TracingManager.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/TracingManager.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/TracingModel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/TracingModel.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/WebAuthnModel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/WebAuthnModel.js.map %%DATADIR%%/resources/inspector/sdk/wasm_source_map/pkg/wasm_source_map_bg.wasm +%%DATADIR%%/resources/inspector/sdk/wasm_source_map/pkg/wasm_source_map.d.ts %%DEBUG%%%%DATADIR%%/resources/inspector/sdk/wasm_source_map/pkg/wasm_source_map.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sdk/wasm_source_map/wasm_source_map-tsconfig.json %%DATADIR%%/resources/inspector/search/search_module.js %%DATADIR%%/resources/inspector/search/search-legacy.js %%DATADIR%%/resources/inspector/search/search.js %%DEBUG%%%%DATADIR%%/resources/inspector/search/SearchConfig.js +%%DEBUG%%%%DATADIR%%/resources/inspector/search/SearchConfig.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/search/SearchResultsPane.js +%%DEBUG%%%%DATADIR%%/resources/inspector/search/SearchResultsPane.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/search/SearchView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/search/SearchView.js.map %%DATADIR%%/resources/inspector/security/security_module.js %%DATADIR%%/resources/inspector/security/security-legacy.js %%DATADIR%%/resources/inspector/security/security.js %%DEBUG%%%%DATADIR%%/resources/inspector/security/SecurityModel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/security/SecurityModel.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/security/SecurityPanel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/security/SecurityPanel.js.map %%DATADIR%%/resources/inspector/security_test_runner/security_test_runner_module.js +%%DATADIR%%/resources/inspector/security_test_runner/security_test_runner.js %%DEBUG%%%%DATADIR%%/resources/inspector/services/ServiceManager.js +%%DEBUG%%%%DATADIR%%/resources/inspector/services/ServiceManager.js.map %%DATADIR%%/resources/inspector/services/services.js %%DATADIR%%/resources/inspector/services/services-legacy.js %%DATADIR%%/resources/inspector/settings/settings_module.js %%DATADIR%%/resources/inspector/settings/settings-legacy.js %%DATADIR%%/resources/inspector/settings/settings.js %%DEBUG%%%%DATADIR%%/resources/inspector/settings/FrameworkBlackboxSettingsTab.js +%%DEBUG%%%%DATADIR%%/resources/inspector/settings/FrameworkBlackboxSettingsTab.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/settings/KeybindsSettingsTab.js +%%DEBUG%%%%DATADIR%%/resources/inspector/settings/KeybindsSettingsTab.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/settings/SettingsScreen.js +%%DEBUG%%%%DATADIR%%/resources/inspector/settings/SettingsScreen.js.map %%DATADIR%%/resources/inspector/shell.js %%DATADIR%%/resources/inspector/snippets/snippets_module.js %%DATADIR%%/resources/inspector/snippets/snippets-legacy.js %%DATADIR%%/resources/inspector/snippets/snippets.js %%DEBUG%%%%DATADIR%%/resources/inspector/snippets/ScriptSnippetFileSystem.js +%%DEBUG%%%%DATADIR%%/resources/inspector/snippets/ScriptSnippetFileSystem.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/snippets/SnippetsQuickOpen.js +%%DEBUG%%%%DATADIR%%/resources/inspector/snippets/SnippetsQuickOpen.js.map %%DATADIR%%/resources/inspector/source_frame/source_frame_module.js %%DATADIR%%/resources/inspector/source_frame/source_frame-legacy.js %%DATADIR%%/resources/inspector/source_frame/source_frame.js %%DEBUG%%%%DATADIR%%/resources/inspector/source_frame/BinaryResourceViewFactory.js +%%DEBUG%%%%DATADIR%%/resources/inspector/source_frame/BinaryResourceViewFactory.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/source_frame/FontView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/source_frame/FontView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/source_frame/ImageView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/source_frame/ImageView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/source_frame/JSONView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/source_frame/JSONView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/source_frame/PreviewFactory.js +%%DEBUG%%%%DATADIR%%/resources/inspector/source_frame/PreviewFactory.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/source_frame/ResourceSourceFrame.js +%%DEBUG%%%%DATADIR%%/resources/inspector/source_frame/ResourceSourceFrame.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/source_frame/SourceCodeDiff.js +%%DEBUG%%%%DATADIR%%/resources/inspector/source_frame/SourceCodeDiff.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/source_frame/SourceFrame.js +%%DEBUG%%%%DATADIR%%/resources/inspector/source_frame/SourceFrame.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/source_frame/SourcesTextEditor.js +%%DEBUG%%%%DATADIR%%/resources/inspector/source_frame/SourcesTextEditor.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/source_frame/XMLView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/source_frame/XMLView.js.map %%DATADIR%%/resources/inspector/sources/sources_module.js %%DATADIR%%/resources/inspector/sources/sources-legacy.js %%DATADIR%%/resources/inspector/sources/sources.js %%DEBUG%%%%DATADIR%%/resources/inspector/sources/AddSourceMapURLDialog.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sources/AddSourceMapURLDialog.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sources/BreakpointEditDialog.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sources/BreakpointEditDialog.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sources/CallStackSidebarPane.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sources/CallStackSidebarPane.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sources/CoveragePlugin.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sources/CoveragePlugin.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sources/CSSPlugin.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sources/CSSPlugin.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sources/DebuggerPausedMessage.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sources/DebuggerPausedMessage.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sources/DebuggerPlugin.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sources/DebuggerPlugin.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sources/EditingLocationHistoryManager.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sources/EditingLocationHistoryManager.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sources/FilePathScoreFunction.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sources/FilePathScoreFunction.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sources/FilteredUISourceCodeListProvider.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sources/FilteredUISourceCodeListProvider.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sources/GoToLineQuickOpen.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sources/GoToLineQuickOpen.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sources/GutterDiffPlugin.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sources/GutterDiffPlugin.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sources/InplaceFormatterEditorAction.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sources/InplaceFormatterEditorAction.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sources/JavaScriptBreakpointsSidebarPane.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sources/JavaScriptBreakpointsSidebarPane.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sources/JavaScriptCompilerPlugin.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sources/JavaScriptCompilerPlugin.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sources/NavigatorView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sources/NavigatorView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sources/OpenFileQuickOpen.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sources/OpenFileQuickOpen.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sources/OutlineQuickOpen.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sources/OutlineQuickOpen.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sources/Plugin.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sources/Plugin.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sources/ScopeChainSidebarPane.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sources/ScopeChainSidebarPane.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sources/ScriptFormatterEditorAction.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sources/ScriptFormatterEditorAction.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sources/ScriptOriginPlugin.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sources/ScriptOriginPlugin.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sources/SearchSourcesView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sources/SearchSourcesView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sources/SimpleHistoryManager.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sources/SimpleHistoryManager.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sources/SnippetsPlugin.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sources/SnippetsPlugin.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sources/SourceMapNamesResolver.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sources/SourceMapNamesResolver.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sources/SourcesNavigator.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sources/SourcesNavigator.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sources/SourcesPanel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sources/SourcesPanel.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sources/SourcesSearchScope.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sources/SourcesSearchScope.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sources/SourcesView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sources/SourcesView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sources/TabbedEditorContainer.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sources/TabbedEditorContainer.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sources/ThreadsSidebarPane.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sources/ThreadsSidebarPane.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sources/UISourceCodeFrame.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sources/UISourceCodeFrame.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/sources/WatchExpressionsSidebarPane.js +%%DEBUG%%%%DATADIR%%/resources/inspector/sources/WatchExpressionsSidebarPane.js.map %%DATADIR%%/resources/inspector/sources_test_runner/sources_test_runner_module.js +%%DATADIR%%/resources/inspector/sources_test_runner/sources_test_runner.js +%%DATADIR%%/resources/inspector/sources_test_runner/AutocompleteTestRunner.js +%%DATADIR%%/resources/inspector/sources_test_runner/DebuggerTestRunner.js +%%DATADIR%%/resources/inspector/sources_test_runner/EditorTestRunner.js +%%DATADIR%%/resources/inspector/sources_test_runner/LiveEditTestRunner.js +%%DATADIR%%/resources/inspector/sources_test_runner/SearchTestRunner.js +%%DATADIR%%/resources/inspector/sources_test_runner/SourcesTestRunner.js %%DATADIR%%/resources/inspector/test_runner/test_runner.js %%DEBUG%%%%DATADIR%%/resources/inspector/test_runner/TestRunner.js +%%DEBUG%%%%DATADIR%%/resources/inspector/test_runner/TestRunner.js.map %%DATADIR%%/resources/inspector/text_editor/text_editor_module.js %%DEBUG%%%%DATADIR%%/resources/inspector/text_editor/CodeMirrorTextEditor.js +%%DEBUG%%%%DATADIR%%/resources/inspector/text_editor/CodeMirrorTextEditor.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/text_editor/CodeMirrorUtils.js +%%DEBUG%%%%DATADIR%%/resources/inspector/text_editor/CodeMirrorUtils.js.map %%DATADIR%%/resources/inspector/text_editor/text_editor.js %%DATADIR%%/resources/inspector/text_editor/text_editor-legacy.js %%DEBUG%%%%DATADIR%%/resources/inspector/text_editor/TextEditorAutocompleteController.js +%%DEBUG%%%%DATADIR%%/resources/inspector/text_editor/TextEditorAutocompleteController.js.map %%DATADIR%%/resources/inspector/text_utils/text_utils.js %%DATADIR%%/resources/inspector/text_utils/text_utils-legacy.js %%DEBUG%%%%DATADIR%%/resources/inspector/text_utils/ContentProvider.js +%%DEBUG%%%%DATADIR%%/resources/inspector/text_utils/ContentProvider.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/text_utils/StaticContentProvider.js +%%DEBUG%%%%DATADIR%%/resources/inspector/text_utils/StaticContentProvider.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/text_utils/Text.js +%%DEBUG%%%%DATADIR%%/resources/inspector/text_utils/Text.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/text_utils/TextCursor.js +%%DEBUG%%%%DATADIR%%/resources/inspector/text_utils/TextCursor.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/text_utils/TextRange.js +%%DEBUG%%%%DATADIR%%/resources/inspector/text_utils/TextRange.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/text_utils/TextUtils.js -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/acorn/package/dist/acorn.js +%%DEBUG%%%%DATADIR%%/resources/inspector/text_utils/TextUtils.js.map +%%DATADIR%%/resources/inspector/theme_support/theme_support.js +%%DEBUG%%%%DATADIR%%/resources/inspector/theme_support/theme_support_impl.js +%%DEBUG%%%%DATADIR%%/resources/inspector/theme_support/theme_support_impl.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/acorn-logical-assignment/acorn-logical-assignment-tsconfig.json +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/acorn-logical-assignment/package/dist/acorn-logical-assignment.mjs +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/acorn-logical-assignment/package/dist/acorn-logical-assignment.mjs.d.ts +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/acorn-logical-assignment/package/dist/acorn-logical-assignment.mjs.map +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/acorn-loose/acorn-loose-tsconfig.json +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/acorn-loose/package/dist/acorn-loose.d.ts +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/acorn-loose/package/dist/acorn-loose.mjs +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/acorn-numeric-separator/acorn-numeric-separator-tsconfig.json +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/acorn-numeric-separator/package/dist/acorn-numeric-separator.mjs +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/acorn-numeric-separator/package/dist/acorn-numeric-separator.mjs.d.ts +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/acorn-numeric-separator/package/dist/acorn-numeric-separator.mjs.map +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/acorn/acorn-tsconfig.json +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/acorn/acorn.js +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/acorn/package/dist/acorn.d.ts +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/acorn/package/dist/acorn.mjs +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/acorn/package/dist/acorn.mjs.d.ts +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/acorn/package/dist/acorn.mjs.map +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/axe-core/axe.js +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/chromium/chromium-tsconfig.json +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/chromium/client-variations/ClientVariations.d.ts +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/chromium/client-variations/ClientVariations.js +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/codemirror-tsconfig.json +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/addon/comment/comment.d.ts +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/addon/comment/comment.js +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/addon/edit/closebrackets.d.ts +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/addon/edit/closebrackets.js +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/addon/edit/matchbrackets.d.ts +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/addon/edit/matchbrackets.js +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/addon/fold/brace-fold.d.ts +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/addon/fold/brace-fold.js +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/addon/fold/foldcode.d.ts +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/addon/fold/foldcode.js +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/addon/fold/foldgutter.d.ts +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/addon/fold/foldgutter.js +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/addon/mode/multiplex.d.ts +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/addon/mode/multiplex.js +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/addon/mode/overlay.d.ts +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/addon/mode/overlay.js +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/addon/mode/simple.d.ts +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/addon/mode/simple.js +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/addon/runmode/runmode-standalone.d.ts %%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/addon/runmode/runmode-standalone.js +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/addon/selection/active-line.d.ts +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/addon/selection/active-line.js +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/addon/selection/mark-selection.d.ts +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/addon/selection/mark-selection.js +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/lib/codemirror.d.ts +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/lib/codemirror.js +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/clike/clike.d.ts %%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/clike/clike.js +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/clojure/clojure.d.ts %%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/clojure/clojure.js +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/coffeescript/coffeescript.d.ts %%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/coffeescript/coffeescript.js +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/css/css.d.ts %%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/css/css.js +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/htmlembedded/htmlembedded.d.ts %%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/htmlembedded/htmlembedded.js +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/htmlmixed/htmlmixed.d.ts %%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/htmlmixed/htmlmixed.js +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/javascript/javascript.d.ts %%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/javascript/javascript.js +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/jsx/jsx.d.ts %%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/jsx/jsx.js +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/livescript/livescript.d.ts %%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/livescript/livescript.js +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/markdown/markdown.d.ts %%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/markdown/markdown.js +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/php/php.d.ts %%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/php/php.js +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/python/python.d.ts %%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/python/python.js +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/shell/shell.d.ts %%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/shell/shell.js +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/wast/wast.d.ts %%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/wast/wast.js +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/xml/xml.d.ts %%DEBUG%%%%DATADIR%%/resources/inspector/third_party/codemirror/package/mode/xml/xml.js +%%DATADIR%%/resources/inspector/third_party/i18n/bundle-tsconfig.json +%%DATADIR%%/resources/inspector/third_party/i18n/i18n.d.ts +%%DATADIR%%/resources/inspector/third_party/i18n/i18n.js +%%DATADIR%%/resources/inspector/third_party/lighthouse/lighthouse-dt-bundle.d.ts +%%DATADIR%%/resources/inspector/third_party/lighthouse/lighthouse-dt-bundle.js +%%DATADIR%%/resources/inspector/third_party/lighthouse/lighthouse-tsconfig.json %%DATADIR%%/resources/inspector/third_party/lighthouse/locales/ar-XB.json %%DATADIR%%/resources/inspector/third_party/lighthouse/locales/ar.json %%DATADIR%%/resources/inspector/third_party/lighthouse/locales/bg.json @@ -984,146 +1634,477 @@ bin/chrome %%DATADIR%%/resources/inspector/third_party/lighthouse/locales/zh-HK.json %%DATADIR%%/resources/inspector/third_party/lighthouse/locales/zh-TW.json %%DATADIR%%/resources/inspector/third_party/lighthouse/locales/zh.json +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/lighthouse/report-assets/report-generator.d.ts %%DEBUG%%%%DATADIR%%/resources/inspector/third_party/lighthouse/report-assets/report-generator.js +%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/lighthouse/report-assets/report.d.ts %%DEBUG%%%%DATADIR%%/resources/inspector/third_party/lighthouse/report-assets/report.js -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/wasmparser/WasmDis.js -%%DEBUG%%%%DATADIR%%/resources/inspector/third_party/wasmparser/WasmParser.js +%%DATADIR%%/resources/inspector/third_party/lit-html/lit-html-tsconfig.json +%%DATADIR%%/resources/inspector/third_party/lit-html/lit-html.js +%%DATADIR%%/resources/inspector/third_party/lit-html/package/directives/class-map.d.ts +%%DATADIR%%/resources/inspector/third_party/lit-html/package/directives/class-map.js +%%DATADIR%%/resources/inspector/third_party/lit-html/package/directives/class-map.js.map +%%DATADIR%%/resources/inspector/third_party/lit-html/package/directives/if-defined.d.ts +%%DATADIR%%/resources/inspector/third_party/lit-html/package/directives/if-defined.js +%%DATADIR%%/resources/inspector/third_party/lit-html/package/directives/if-defined.js.map +%%DATADIR%%/resources/inspector/third_party/lit-html/package/directives/live.d.ts +%%DATADIR%%/resources/inspector/third_party/lit-html/package/directives/live.js +%%DATADIR%%/resources/inspector/third_party/lit-html/package/directives/live.js.map +%%DATADIR%%/resources/inspector/third_party/lit-html/package/directives/style-map.d.ts +%%DATADIR%%/resources/inspector/third_party/lit-html/package/directives/style-map.js +%%DATADIR%%/resources/inspector/third_party/lit-html/package/directives/style-map.js.map +%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/default-template-processor.d.ts +%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/default-template-processor.js +%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/default-template-processor.js.map +%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/directive.d.ts +%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/directive.js +%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/directive.js.map +%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/dom.d.ts +%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/dom.js +%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/dom.js.map +%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/part.d.ts +%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/part.js +%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/part.js.map +%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/parts.d.ts +%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/parts.js +%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/parts.js.map +%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/render.d.ts +%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/render.js +%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/render.js.map +%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/template-factory.d.ts +%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/template-factory.js +%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/template-factory.js.map +%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/template-instance.d.ts +%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/template-instance.js +%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/template-instance.js.map +%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/template-result.d.ts +%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/template-result.js +%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/template-result.js.map +%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/template.d.ts +%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/template.js +%%DATADIR%%/resources/inspector/third_party/lit-html/package/lib/template.js.map +%%DATADIR%%/resources/inspector/third_party/lit-html/package/lit-html.d.ts +%%DATADIR%%/resources/inspector/third_party/lit-html/package/lit-html.js +%%DATADIR%%/resources/inspector/third_party/lit-html/package/lit-html.js.map +%%DATADIR%%/resources/inspector/third_party/marked/marked-tsconfig.json +%%DATADIR%%/resources/inspector/third_party/marked/package/lib/marked.esm.d.ts +%%DATADIR%%/resources/inspector/third_party/marked/package/lib/marked.esm.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/api-docs-entry.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/api-docs-entry.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/api-docs-entry.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Accessibility.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Accessibility.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Accessibility.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/assert.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/assert.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/assert.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Browser.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Browser.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Browser.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Connection.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Connection.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Connection.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/ConnectionTransport.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/ConnectionTransport.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/ConnectionTransport.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/ConsoleMessage.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/ConsoleMessage.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/ConsoleMessage.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Coverage.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Coverage.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Coverage.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Debug.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Debug.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Debug.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/DeviceDescriptors.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/DeviceDescriptors.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/DeviceDescriptors.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Dialog.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Dialog.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Dialog.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/DOMWorld.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/DOMWorld.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/DOMWorld.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/EmulationManager.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/EmulationManager.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/EmulationManager.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Errors.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Errors.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Errors.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/EvalTypes.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/EvalTypes.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/EvalTypes.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/EventEmitter.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/EventEmitter.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/EventEmitter.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Events.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Events.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Events.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/ExecutionContext.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/ExecutionContext.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/ExecutionContext.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/FileChooser.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/FileChooser.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/FileChooser.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/FrameManager.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/FrameManager.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/FrameManager.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/helper.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/helper.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/helper.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/HTTPRequest.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/HTTPRequest.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/HTTPRequest.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/HTTPResponse.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/HTTPResponse.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/HTTPResponse.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Input.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Input.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Input.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/JSHandle.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/JSHandle.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/JSHandle.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/LifecycleWatcher.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/LifecycleWatcher.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/LifecycleWatcher.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/NetworkManager.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/NetworkManager.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/NetworkManager.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Page.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Page.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Page.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/PDFOptions.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/PDFOptions.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/PDFOptions.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Puppeteer.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Puppeteer.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Puppeteer.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/PuppeteerViewport.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/PuppeteerViewport.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/PuppeteerViewport.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/QueryHandler.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/QueryHandler.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/QueryHandler.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/SecurityDetails.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/SecurityDetails.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/SecurityDetails.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Target.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Target.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Target.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/TimeoutSettings.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/TimeoutSettings.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/TimeoutSettings.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Tracing.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Tracing.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/Tracing.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/USKeyboardLayout.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/USKeyboardLayout.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/USKeyboardLayout.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/WebSocketTransport.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/WebSocketTransport.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/WebSocketTransport.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/WebWorker.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/WebWorker.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/common/WebWorker.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/environment.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/environment.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/environment.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/index-core.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/index-core.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/index-core.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/index.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/index.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/index.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/initialize.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/initialize.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/initialize.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/node/BrowserFetcher.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/node/BrowserFetcher.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/node/BrowserFetcher.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/node/BrowserRunner.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/node/BrowserRunner.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/node/BrowserRunner.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/node/Launcher.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/node/Launcher.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/node/Launcher.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/node/LaunchOptions.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/node/LaunchOptions.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/node/LaunchOptions.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/node/PipeTransport.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/node/PipeTransport.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/node/PipeTransport.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/revisions.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/revisions.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/puppeteer/revisions.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/vendor/mitt/src/index.d.ts +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/vendor/mitt/src/index.d.ts.map +%%DATADIR%%/resources/inspector/third_party/puppeteer/package/lib/esm/vendor/mitt/src/index.js +%%DATADIR%%/resources/inspector/third_party/puppeteer/puppeteer-tsconfig.json +%%DATADIR%%/resources/inspector/third_party/puppeteer/puppeteer.js +%%DATADIR%%/resources/inspector/third_party/wasmparser/package/dist/esm/WasmDis.js +%%DATADIR%%/resources/inspector/third_party/wasmparser/package/dist/esm/WasmParser.js +%%DATADIR%%/resources/inspector/third_party/wasmparser/wasmparser-tsconfig.json %%DATADIR%%/resources/inspector/timeline_model/timeline_model_module.js %%DATADIR%%/resources/inspector/timeline_model/timeline_model-legacy.js %%DATADIR%%/resources/inspector/timeline_model/timeline_model.js %%DEBUG%%%%DATADIR%%/resources/inspector/timeline_model/TimelineFrameModel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/timeline_model/TimelineFrameModel.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/timeline_model/TimelineIRModel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/timeline_model/TimelineIRModel.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/timeline_model/TimelineJSProfile.js +%%DEBUG%%%%DATADIR%%/resources/inspector/timeline_model/TimelineJSProfile.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/timeline_model/TimelineModel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/timeline_model/TimelineModel.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/timeline_model/TimelineModelFilter.js +%%DEBUG%%%%DATADIR%%/resources/inspector/timeline_model/TimelineModelFilter.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/timeline_model/TimelineProfileTree.js +%%DEBUG%%%%DATADIR%%/resources/inspector/timeline_model/TimelineProfileTree.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/timeline_model/TracingLayerTree.js +%%DEBUG%%%%DATADIR%%/resources/inspector/timeline_model/TracingLayerTree.js.map %%DATADIR%%/resources/inspector/timeline/timeline_module.js %%DATADIR%%/resources/inspector/timeline/timeline-legacy.js %%DATADIR%%/resources/inspector/timeline/timeline.js %%DEBUG%%%%DATADIR%%/resources/inspector/timeline/CLSLinkifier.js +%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/CLSLinkifier.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/timeline/CountersGraph.js +%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/CountersGraph.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/timeline/EventsTimelineTreeView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/EventsTimelineTreeView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/timeline/ExtensionTracingSession.js +%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/ExtensionTracingSession.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/timeline/PerformanceModel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/PerformanceModel.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineController.js +%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineController.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineDetailsView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineDetailsView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineEventOverview.js +%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineEventOverview.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineFilters.js +%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineFilters.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineFlameChartDataProvider.js +%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineFlameChartDataProvider.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineFlameChartNetworkDataProvider.js +%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineFlameChartNetworkDataProvider.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineFlameChartView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineFlameChartView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineHistoryManager.js +%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineHistoryManager.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineLayersView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineLayersView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineLoader.js +%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineLoader.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelinePaintProfilerView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelinePaintProfilerView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelinePanel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelinePanel.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineTreeView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineTreeView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineUIUtils.js +%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/TimelineUIUtils.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/timeline/UIDevtoolsController.js +%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/UIDevtoolsController.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/timeline/UIDevtoolsUtils.js +%%DEBUG%%%%DATADIR%%/resources/inspector/timeline/UIDevtoolsUtils.js.map %%DATADIR%%/resources/inspector/toolbox_bootstrap/toolbox_bootstrap.js %%DATADIR%%/resources/inspector/toolbox.html %%DATADIR%%/resources/inspector/toolbox.js %%DEBUG%%%%DATADIR%%/resources/inspector/ui/Action.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/Action.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/ActionDelegate.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ActionDelegate.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/ActionRegistry.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ActionRegistry.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/ARIAUtils.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ARIAUtils.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/Context.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/Context.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/ContextFlavorListener.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ContextFlavorListener.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/ContextMenu.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ContextMenu.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/Dialog.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/Dialog.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/DockController.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/DockController.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/DropTarget.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/DropTarget.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/EmptyWidget.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/EmptyWidget.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/FilterBar.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/FilterBar.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/FilterSuggestionBuilder.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/FilterSuggestionBuilder.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/ForwardedInputEventHandler.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ForwardedInputEventHandler.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/Fragment.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/Fragment.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/Geometry.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/Geometry.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/GlassPane.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/GlassPane.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/HistoryInput.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/HistoryInput.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/Icon.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/Icon.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/Infobar.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/Infobar.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/InplaceEditor.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/InplaceEditor.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/InspectorView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/InspectorView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/KeyboardShortcut.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/KeyboardShortcut.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/ListControl.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ListControl.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/ListModel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ListModel.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/ListWidget.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ListWidget.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/Panel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/Panel.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/PopoverHelper.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/PopoverHelper.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/ProgressIndicator.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ProgressIndicator.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/RemoteDebuggingTerminatedScreen.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/RemoteDebuggingTerminatedScreen.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/ReportView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ReportView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/ResizerWidget.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ResizerWidget.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/RootView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/RootView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/SearchableView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/SearchableView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/SegmentedButton.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/SegmentedButton.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/SettingsUI.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/SettingsUI.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/ShortcutRegistry.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ShortcutRegistry.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/ShortcutsScreen.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ShortcutsScreen.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/SoftContextMenu.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/SoftContextMenu.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/SoftDropDown.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/SoftDropDown.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/SplitWidget.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/SplitWidget.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/SuggestBox.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/SuggestBox.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/SyntaxHighlighter.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/SyntaxHighlighter.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/TabbedPane.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/TabbedPane.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/TargetCrashedScreen.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/TargetCrashedScreen.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/TextEditor.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/TextEditor.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/TextPrompt.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/TextPrompt.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/ThrottledWidget.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ThrottledWidget.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/Toolbar.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/Toolbar.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/Tooltip.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/Tooltip.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/Treeoutline.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/Treeoutline.js.map %%DATADIR%%/resources/inspector/ui/ui.js %%DATADIR%%/resources/inspector/ui/ui-legacy.js %%DEBUG%%%%DATADIR%%/resources/inspector/ui/UIUtils.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/UIUtils.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/View.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/View.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/ViewManager.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ViewManager.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/Widget.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/Widget.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/XElement.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/XElement.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/XLink.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/XLink.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/XWidget.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/XWidget.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/ZoomManager.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/ZoomManager.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/utils/append-style.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/utils/append-style.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/utils/create-shadow-root-with-core-styles.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/utils/create-shadow-root-with-core-styles.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/utils/focus-changed.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/utils/focus-changed.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/utils/inject-core-styles.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/utils/inject-core-styles.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/utils/measured-scrollbar-width.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/utils/measured-scrollbar-width.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/utils/register-custom-element.js +%%DEBUG%%%%DATADIR%%/resources/inspector/ui/utils/register-custom-element.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/ui/utils/utils.js %%DATADIR%%/resources/inspector/wasmparser_worker_entrypoint.js %%DATADIR%%/resources/inspector/wasmparser_worker/wasmparser_worker.js %%DEBUG%%%%DATADIR%%/resources/inspector/wasmparser_worker/WasmParserWorker.js +%%DEBUG%%%%DATADIR%%/resources/inspector/wasmparser_worker/WasmParserWorker.js.map %%DATADIR%%/resources/inspector/web_audio/web_audio_module.js %%DATADIR%%/resources/inspector/web_audio/web_audio-legacy.js %%DATADIR%%/resources/inspector/web_audio/web_audio.js +%%DATADIR%%/resources/inspector/webauthn/webauthn-legacy.js +%%DATADIR%%/resources/inspector/webauthn/webauthn.js +%%DATADIR%%/resources/inspector/webauthn/webauthn_module.js +%%DEBUG%%%%DATADIR%%/resources/inspector/webauthn/WebauthnPane.js +%%DEBUG%%%%DATADIR%%/resources/inspector/webauthn/WebauthnPane.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/AudioContextContentBuilder.js +%%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/AudioContextContentBuilder.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/AudioContextSelector.js +%%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/AudioContextSelector.js.map +%%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/graph_visualizer.js %%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/EdgeView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/EdgeView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/GraphManager.js +%%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/GraphManager.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/GraphStyle.js +%%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/GraphStyle.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/GraphView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/GraphView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/NodeRendererUtility.js +%%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/NodeRendererUtility.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/NodeView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/NodeView.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/WebAudioModel.js +%%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/WebAudioModel.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/WebAudioView.js +%%DEBUG%%%%DATADIR%%/resources/inspector/web_audio/WebAudioView.js.map %%DATADIR%%/resources/inspector/worker_app.html %%DATADIR%%/resources/inspector/worker_app.js %%DATADIR%%/resources/inspector/worker_main/worker_main-legacy.js %%DATADIR%%/resources/inspector/worker_main/worker_main.js %%DEBUG%%%%DATADIR%%/resources/inspector/worker_main/WorkerMain.js +%%DEBUG%%%%DATADIR%%/resources/inspector/worker_main/WorkerMain.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/worker_service/ServiceDispatcher.js +%%DEBUG%%%%DATADIR%%/resources/inspector/worker_service/ServiceDispatcher.js.map %%DATADIR%%/resources/inspector/worker_service/worker_service.js %%DATADIR%%/resources/inspector/workspace_diff/workspace_diff_module.js %%DATADIR%%/resources/inspector/workspace_diff/workspace_diff-legacy.js %%DATADIR%%/resources/inspector/workspace_diff/workspace_diff.js %%DEBUG%%%%DATADIR%%/resources/inspector/workspace_diff/WorkspaceDiff.js +%%DEBUG%%%%DATADIR%%/resources/inspector/workspace_diff/WorkspaceDiff.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/workspace/FileManager.js +%%DEBUG%%%%DATADIR%%/resources/inspector/workspace/FileManager.js.map %%DEBUG%%%%DATADIR%%/resources/inspector/workspace/UISourceCode.js +%%DEBUG%%%%DATADIR%%/resources/inspector/workspace/UISourceCode.js.map %%DATADIR%%/resources/inspector/workspace/workspace.js %%DATADIR%%/resources/inspector/workspace/workspace-legacy.js %%DEBUG%%%%DATADIR%%/resources/inspector/workspace/WorkspaceImpl.js +%%DEBUG%%%%DATADIR%%/resources/inspector/workspace/WorkspaceImpl.js.map +%%DATADIR%%/resources/inspector_overlay/common.css +%%DATADIR%%/resources/inspector_overlay/inspector_overlay_resources.grd +%%DATADIR%%/resources/inspector_overlay/tool_distances.js +%%DATADIR%%/resources/inspector_overlay/tool_highlight.js +%%DATADIR%%/resources/inspector_overlay/tool_highlight_grid.js +%%DATADIR%%/resources/inspector_overlay/tool_paused.js +%%DATADIR%%/resources/inspector_overlay/tool_screenshot.js +%%DATADIR%%/resources/inspector_overlay/tool_source_order.js +%%DATADIR%%/resources/inspector_overlay/tool_viewport_size.js %%DATADIR%%/snapshot_blob.bin %%NOT_AARCH64%%%%DATADIR%%/libvk_swiftshader.so %%NOT_AARCH64%%%%DATADIR%%/swiftshader/libEGL.so |