diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2021-04-06 08:40:01 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2021-04-06 08:46:52 +0000 |
| commit | 1227b53ed1c53ea13efeac2bfe3fae5532c529ec (patch) | |
| tree | 551daaabc2287f94c3b2d7b59c0cc2a235156540 | |
| parent | a8416100c4e9b0dd5090c78d09ef6a94293b3c02 (diff) | |
| download | ports-1227b53ed1c53ea13efeac2bfe3fae5532c529ec.tar.gz ports-1227b53ed1c53ea13efeac2bfe3fae5532c529ec.zip | |
www/chromium: update to 89.0.4389.114
Submitted by: Matthias Wolf via github
Security: https://www.vuxml.org/freebsd/bddadaa4-9227-11eb-99c5-e09467587c17.html
944 files changed, 4635 insertions, 3410 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile index abcfdbbb72ea..9f713534e2df 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -1,8 +1,8 @@ # Created by: Florent Thoumie <flz@FreeBSD.org> -# $FreeBSD$ +# $FreeBSD: head/www/chromium/Makefile 563913 2021-02-03 19:46:35Z sunpoet $ PORTNAME= chromium -PORTVERSION= 88.0.4324.182 +PORTVERSION= 89.0.4389.114 CATEGORIES= www java MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ LOCAL/rene/chromium/:fonts @@ -60,12 +60,13 @@ LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-atk \ libnss3.so:security/nss \ libexpat.so:textproc/expat2 \ libfontconfig.so:x11-fonts/fontconfig \ - libxkbcommon.so:x11/libxkbcommon + libxkbcommon.so:x11/libxkbcommon \ + libxshmfence.so:x11/libxshmfence RUN_DEPENDS= xdg-open:devel/xdg-utils \ noto-basic>0:x11-fonts/noto-basic -USES= bison cpe desktop-file-utils dos2unix gl gnome jpeg localbase:ldflags \ +USES= bison compiler:c++17-lang cpe desktop-file-utils dos2unix gl gnome jpeg localbase:ldflags \ ninja perl5 pkgconfig python:2.7,build shebangfix tar:xz xorg MAKE_ARGS= -C out/${BUILDTYPE} @@ -121,9 +122,8 @@ GN_BOOTSTRAP_FLAGS= --no-clean --no-rebuild --skip-generate-buildfiles # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys . # Note: these are for FreeBSD use ONLY. For your own distribution, # please get your own set of keys. -GN_ARGS+= google_api_key="AIzaSyBsp9n41JLW8jCokwn7vhoaMejDFRd1mp8" \ - google_default_client_id="996322985003.apps.googleusercontent.com" \ - google_default_client_secret="IR1za9-1VK0zZ0f_O8MVFicn" +GN_ARGS+= google_api_key="AIzaSyBsp9n41JLW8jCokwn7vhoaMejDFRd1mp8" + SUB_FILES= chromium-browser.desktop chrome SUB_LIST+= COMMENT="${COMMENT}" @@ -199,16 +199,17 @@ TEST_DISTFILES= ${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX} \ test_fonts-85${EXTRACT_SUFX}:fonts .include <bsd.port.options.mk> +.include <bsd.port.pre.mk> .if ${PORT_OPTIONS:MHEIMDAL_BASE} && !exists(/usr/lib/libkrb5.so) IGNORE= you have selected HEIMDAL_BASE but do not have Heimdal installed in base .endif -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1300000 +.if ${COMPILER_VERSION} < 120 EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-build_config_compiler_pgo_pgo.gni .if ${PORT_OPTIONS:MLTO} -BROKEN+= does not build with LTO on FreeBSD < 13, needs LLVM 11+ +BROKEN+= does not build with LTO needs LLVM 12+ .endif .endif @@ -344,6 +345,8 @@ do-install: post-install-DEBUG-on: ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/*.so \ ${STAGEDIR}${DATADIR} + ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libvulkan.so.1 \ + ${STAGEDIR}${DATADIR} ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/character_data_generator \ ${STAGEDIR}${DATADIR} @@ -351,4 +354,4 @@ post-install-DRIVER-on: ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chromedriver \ ${STAGEDIR}${PREFIX}/bin -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/www/chromium/Makefile.tests b/www/chromium/Makefile.tests index 23e30f89a6ff..1d616c040c8a 100644 --- a/www/chromium/Makefile.tests +++ b/www/chromium/Makefile.tests @@ -1,4 +1,4 @@ -# $FreeBSD$ +# $FreeBSD: head/www/chromium/Makefile.tests 489612 2019-01-07 19:47:18Z cpm $ TEST_TARGETS= base_unittests \ chromedriver_unittests \ crypto_unittests \ diff --git a/www/chromium/distinfo b/www/chromium/distinfo index 1638a35aaf5d..8323d953f6dc 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1613565416 -SHA256 (chromium-88.0.4324.182.tar.xz) = 30411fc3ec2d33df4c5cad41f21affa3823c80f7dbd394f6d68f9a1e81015b81 -SIZE (chromium-88.0.4324.182.tar.xz) = 857221352 -SHA256 (chromium-88.0.4324.182-testdata.tar.xz) = 305c105341b67249ea640e341dcf3b1f534c597a84550ea38d2e1e47b3fd84c6 -SIZE (chromium-88.0.4324.182-testdata.tar.xz) = 257484896 +TIMESTAMP = 1617179966 +SHA256 (chromium-89.0.4389.114.tar.xz) = f2f0abe9697a220a8545df74d832c6c8d85a4fb11845e7e398752d746e72ed00 +SIZE (chromium-89.0.4389.114.tar.xz) = 890898912 +SHA256 (chromium-89.0.4389.114-testdata.tar.xz) = 42d108ab42c81ce42973ec9ccac951237d29089c850738eeeea770ced3293bc6 +SIZE (chromium-89.0.4389.114-testdata.tar.xz) = 257717396 SHA256 (test_fonts-85.tar.xz) = f22b61b3639acb147c98ec2e2305d8b96f0b55c8c74c40e2ea696402fae8cef9 SIZE (test_fonts-85.tar.xz) = 9511984 diff --git a/www/chromium/files/audio_manager_openbsd.cc b/www/chromium/files/audio_manager_openbsd.cc index ee293b9d3791..0521930829df 100644 --- a/www/chromium/files/audio_manager_openbsd.cc +++ b/www/chromium/files/audio_manager_openbsd.cc @@ -80,7 +80,7 @@ AudioManagerOpenBSD::AudioManagerOpenBSD(std::unique_ptr<AudioThread> audio_thre AudioLogFactory* audio_log_factory) : AudioManagerBase(std::move(audio_thread), audio_log_factory) { - DLOG(WARNING) << "AudioManagerOpenBSD"; + DLOG(INFO) << "AudioManagerOpenBSD"; SetMaxOutputStreamsAllowed(kMaxOutputStreams); } @@ -147,14 +147,14 @@ AudioParameters AudioManagerOpenBSD::GetPreferredOutputStreamParameters( AudioInputStream* AudioManagerOpenBSD::MakeInputStream( const AudioParameters& params) { - DLOG(WARNING) << "MakeInputStream"; + DLOG(INFO) << "MakeInputStream"; return new SndioAudioInputStream(this, AudioDeviceDescription::kDefaultDeviceId, params); } AudioOutputStream* AudioManagerOpenBSD::MakeOutputStream( const AudioParameters& params) { - DLOG(WARNING) << "MakeOutputStream"; + DLOG(INFO) << "MakeOutputStream"; return new SndioAudioOutputStream(params, this); } #endif @@ -162,7 +162,7 @@ AudioOutputStream* AudioManagerOpenBSD::MakeOutputStream( std::unique_ptr<media::AudioManager> CreateAudioManager( std::unique_ptr<AudioThread> audio_thread, AudioLogFactory* audio_log_factory) { - DLOG(WARNING) << "CreateAudioManager"; + DLOG(INFO) << "CreateAudioManager"; #if defined(USE_SNDIO) UMA_HISTOGRAM_ENUMERATION("Media.OpenBSDAudioIO", kSndio, kAudioIOMax + 1); return std::make_unique<AudioManagerOpenBSD>(std::move(audio_thread), diff --git a/www/chromium/files/extra-patch-build_config_compiler_pgo_pgo.gni b/www/chromium/files/extra-patch-build_config_compiler_pgo_pgo.gni index 1d59abc70dd1..4c4f7d1439f3 100644 --- a/www/chromium/files/extra-patch-build_config_compiler_pgo_pgo.gni +++ b/www/chromium/files/extra-patch-build_config_compiler_pgo_pgo.gni @@ -1,11 +1,11 @@ ---- build/config/compiler/pgo/pgo.gni.orig 2021-01-18 21:28:45 UTC +--- build/config/compiler/pgo/pgo.gni.orig 2021-03-12 23:57:15 UTC +++ build/config/compiler/pgo/pgo.gni -@@ -13,7 +13,7 @@ declare_args() { - # 2 : Used during the PGO (optimization) phase. - chrome_pgo_phase = 0 - if (is_official_build && -- (is_win || is_mac || (is_linux && !chromeos_is_browser_only && !is_chromecast))) { -+ (is_win || is_mac || (is_linux && !chromeos_is_browser_only && !is_chromecast && !is_bsd))) { +@@ -16,7 +16,7 @@ declare_args() { + # TODO(crbug.com/1052397): Remove chromeos_is_browser_only once + # target_os switch for lacros-chrome is completed. + (is_win || is_mac || +- (is_linux && !chromeos_is_browser_only && !is_chromecast))) { ++ (is_linux && !chromeos_is_browser_only && !is_chromecast && !is_bsd))) { chrome_pgo_phase = 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 fa954c72a7b2..500335ed930c 100644 --- a/www/chromium/files/patch-3p-pdfium_3p_base_allocator_partition__allocator_page__allocator__internals__posix.h +++ b/www/chromium/files/patch-3p-pdfium_3p_base_allocator_partition__allocator_page__allocator__internals__posix.h @@ -1,4 +1,4 @@ ---- third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2021-01-18 21:31:51 UTC +--- third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2021-03-13 00:03:39 UTC +++ third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h @@ -16,7 +16,7 @@ #if defined(OS_ANDROID) diff --git a/www/chromium/files/patch-BUILD.gn b/www/chromium/files/patch-BUILD.gn index 65c3f3f33fb6..7c65f0418c97 100644 --- a/www/chromium/files/patch-BUILD.gn +++ b/www/chromium/files/patch-BUILD.gn @@ -1,6 +1,6 @@ ---- BUILD.gn.orig 2021-01-18 21:28:44 UTC +--- BUILD.gn.orig 2021-03-12 23:57:14 UTC +++ BUILD.gn -@@ -424,7 +424,7 @@ group("gn_all") { +@@ -421,7 +421,7 @@ group("gn_all") { ] } @@ -9,7 +9,7 @@ deps += [ "//third_party/breakpad:breakpad_unittests", "//third_party/breakpad:core-2-minidump", -@@ -467,8 +467,6 @@ group("gn_all") { +@@ -464,8 +464,6 @@ group("gn_all") { "//net:disk_cache_memory_test", "//net:quic_client", "//net:quic_server", @@ -18,7 +18,7 @@ "//testing:empty_main", ] -@@ -523,10 +521,6 @@ group("gn_all") { +@@ -520,10 +518,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", -@@ -586,10 +580,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) { -@@ -667,7 +657,7 @@ group("gn_all") { +@@ -663,7 +653,7 @@ group("gn_all") { host_os == "win") { deps += [ "//chrome/test/mini_installer:mini_installer_tests" ] } @@ -49,7 +49,7 @@ deps += [ "//third_party/breakpad:symupload($host_toolchain)" ] } -@@ -682,7 +672,7 @@ group("gn_all") { +@@ -678,7 +668,7 @@ group("gn_all") { } } @@ -58,7 +58,7 @@ deps += [ "//third_party/crashpad/crashpad:crashpad_tests", "//third_party/crashpad/crashpad/handler:crashpad_handler", -@@ -802,7 +792,6 @@ group("gn_all") { +@@ -790,7 +780,6 @@ group("gn_all") { "//chrome/browser/vr:vr_common_perftests", "//chrome/browser/vr:vr_common_unittests", "//chrome/browser/vr:vr_pixeltests", @@ -66,7 +66,7 @@ ] if (is_android) { deps += [ "//chrome/browser/android/vr:vr_android_unittests" ] -@@ -1090,7 +1079,7 @@ if (!is_ios) { +@@ -1081,7 +1070,7 @@ if (!is_ios) { data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ] } @@ -75,7 +75,7 @@ data_deps += [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } -@@ -1099,7 +1088,7 @@ if (!is_ios) { +@@ -1090,7 +1079,7 @@ if (!is_ios) { data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } @@ -84,7 +84,7 @@ data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } -@@ -1320,9 +1309,6 @@ group("chromium_builder_perf") { +@@ -1315,9 +1304,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 7ae6215349f4..6ce01dd474f5 100644 --- a/www/chromium/files/patch-apps_app__restore__service__browsertest.cc +++ b/www/chromium/files/patch-apps_app__restore__service__browsertest.cc @@ -1,4 +1,4 @@ ---- apps/app_restore_service_browsertest.cc.orig 2020-11-13 06:36:34 UTC +--- apps/app_restore_service_browsertest.cc.orig 2021-03-12 23:57:14 UTC +++ apps/app_restore_service_browsertest.cc @@ -148,7 +148,7 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, FileAcc } 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 3d880b5a714d..62d53b5ad9df 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 2021-01-18 21:28:44 UTC +--- apps/ui/views/app_window_frame_view.cc.orig 2021-03-12 23:57:14 UTC +++ apps/ui/views/app_window_frame_view.cc -@@ -139,7 +139,7 @@ gfx::Rect AppWindowFrameView::GetWindowBoundsForClient +@@ -137,7 +137,7 @@ gfx::Rect AppWindowFrameView::GetWindowBoundsForClient gfx::Rect window_bounds = client_bounds; // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. 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 181a4bb22687..ec171e5a8388 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 2021-01-18 21:28:44 UTC +--- ash/display/mirror_window_controller.cc.orig 2021-03-12 23:57:14 UTC +++ ash/display/mirror_window_controller.cc @@ -286,7 +286,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 c5c95ee51939..9f17ec075005 100644 --- a/www/chromium/files/patch-base_BUILD.gn +++ b/www/chromium/files/patch-base_BUILD.gn @@ -1,6 +1,6 @@ ---- base/BUILD.gn.orig 2021-01-18 21:28:44 UTC +--- base/BUILD.gn.orig 2021-03-12 23:57:15 UTC +++ base/BUILD.gn -@@ -873,7 +873,7 @@ component("base") { +@@ -885,7 +885,7 @@ component("base") { "timer/hi_res_timer_manager_posix.cc", ] @@ -9,7 +9,7 @@ sources += [ "cpu_affinity_posix.cc", "cpu_affinity_posix.h", -@@ -884,6 +884,11 @@ component("base") { +@@ -896,6 +896,11 @@ component("base") { "profiler/thread_delegate_posix.h", ] } @@ -21,7 +21,7 @@ } if (is_win) { -@@ -1293,7 +1298,7 @@ component("base") { +@@ -1301,7 +1306,7 @@ component("base") { # building inside the cros_sdk environment - use host_toolchain as a # more robust check for this. if (!use_sysroot && @@ -30,7 +30,7 @@ host_toolchain != "//build/toolchain/cros:host") { libs += [ "atomic" ] } -@@ -1343,7 +1348,7 @@ component("base") { +@@ -1351,7 +1356,7 @@ component("base") { "allocator/allocator_shim_default_dispatch_to_mac_zoned_malloc.cc", ] } @@ -39,7 +39,7 @@ sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ] } if (is_win) { -@@ -1969,6 +1974,34 @@ component("base") { +@@ -1978,6 +1983,34 @@ component("base") { } } @@ -54,9 +54,9 @@ + "system/sys_info_linux.cc" + ] + sources += [ ++ "files/file_path_watcher_freebsd.cc", + "files/file_path_watcher_kqueue.cc", + "files/file_path_watcher_kqueue.h", -+ "files/file_path_watcher_stub.cc", + "process/memory_stubs.cc", + "process/process_handle_freebsd.cc", + "process/process_iterator_freebsd.cc", @@ -74,21 +74,21 @@ # iOS if (is_ios) { sources -= [ -@@ -3111,7 +3144,7 @@ test("base_unittests") { +@@ -3130,7 +3163,7 @@ if (build_base_unittests) { + } } - } -- if (is_linux || is_chromeos) { -+ if ((is_linux || is_chromeos) && !is_bsd) { - sources += [ "debug/proc_maps_linux_unittest.cc" ] - } +- if (is_linux || is_chromeos) { ++ if ((is_linux || is_chromeos) && !is_bsd) { + sources += [ "debug/proc_maps_linux_unittest.cc" ] + } -@@ -3152,7 +3185,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", +@@ -3171,7 +3204,7 @@ if (build_base_unittests) { + "posix/unix_domain_socket_unittest.cc", + "task/thread_pool/task_tracker_posix_unittest.cc", + ] +- if (!is_nacl && !is_apple) { ++ if (!is_nacl && !is_apple && !is_bsd) { + sources += [ + "cpu_affinity_posix_unittest.cc", + "profiler/stack_copier_signal_unittest.cc", diff --git a/www/chromium/files/patch-base_allocator_allocator.gni b/www/chromium/files/patch-base_allocator_allocator.gni new file mode 100644 index 000000000000..7db05a57f80a --- /dev/null +++ b/www/chromium/files/patch-base_allocator_allocator.gni @@ -0,0 +1,11 @@ +--- base/allocator/allocator.gni.orig 2021-03-12 23:57:15 UTC ++++ base/allocator/allocator.gni +@@ -58,7 +58,7 @@ declare_args() { + # not, and redesign or remove the flag accordingly. We may want to assert a + # possible conflict between |use_allocator = "partition"| and + # |use_partition_alloc = true| rather than prioritizing use_partition_alloc. +- use_partition_alloc = !is_ios # Never use PartitionAlloc on iOS. ++ use_partition_alloc = !is_ios # Never use PartitionAlloc on iOS. + } + + if (!use_partition_alloc && use_allocator == "partition") { diff --git a/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc b/www/chromium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc index d8774004de47..be08a20e6d43 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-11-13 06:36:34 UTC +--- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig 2021-03-12 23:57:15 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 b5135ca51e2c..8a09d9647589 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 2021-01-18 21:28:44 UTC +--- base/allocator/allocator_shim_override_libc_symbols.h.orig 2021-03-12 23:57:15 UTC +++ base/allocator/allocator_shim_override_libc_symbols.h @@ -16,6 +16,10 @@ #include <malloc.h> 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 9a0e6af659a2..2c53c24036be 100644 --- a/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc +++ b/www/chromium/files/patch-base_allocator_allocator__shim__unittest.cc @@ -1,6 +1,6 @@ ---- base/allocator/allocator_shim_unittest.cc.orig 2021-01-18 21:28:44 UTC +--- base/allocator/allocator_shim_unittest.cc.orig 2021-03-12 23:57:15 UTC +++ base/allocator/allocator_shim_unittest.cc -@@ -367,7 +367,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) { +@@ -369,7 +369,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) { #endif // !OS_WIN @@ -9,7 +9,7 @@ void* memalign_ptr = memalign(128, 53); ASSERT_NE(nullptr, memalign_ptr); ASSERT_EQ(0u, reinterpret_cast<uintptr_t>(memalign_ptr) % 128); -@@ -383,7 +383,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) { +@@ -385,7 +385,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) { ASSERT_GE(aligned_allocs_intercepted_by_size[kPageSize], 1u); #endif // !defined(OS_ANDROID) @@ -18,7 +18,7 @@ // See allocator_shim_override_glibc_weak_symbols.h for why we intercept // internal libc symbols. -@@ -410,7 +410,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) { +@@ -412,7 +412,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) { free(zero_alloc_ptr); ASSERT_GE(frees_intercepted_by_addr[Hash(zero_alloc_ptr)], 1u); @@ -27,7 +27,7 @@ free(memalign_ptr); ASSERT_GE(frees_intercepted_by_addr[Hash(memalign_ptr)], 1u); -@@ -419,7 +419,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) { +@@ -421,7 +421,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) { ASSERT_GE(frees_intercepted_by_addr[Hash(pvalloc_ptr)], 1u); #endif // !defined(OS_ANDROID) @@ -36,7 +36,7 @@ #if !defined(OS_WIN) free(posix_memalign_ptr); -@@ -595,7 +595,7 @@ static size_t GetUsableSize(void* ptr) { +@@ -614,7 +614,7 @@ static size_t GetUsableSize(void* ptr) { static size_t GetUsableSize(void* ptr) { return malloc_size(ptr); } diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_address__pool__manager.cc b/www/chromium/files/patch-base_allocator_partition__allocator_address__pool__manager.cc new file mode 100644 index 000000000000..bbee8be9a54c --- /dev/null +++ b/www/chromium/files/patch-base_allocator_partition__allocator_address__pool__manager.cc @@ -0,0 +1,31 @@ +--- base/allocator/partition_allocator/address_pool_manager.cc.orig 2021-03-12 23:57:15 UTC ++++ base/allocator/partition_allocator/address_pool_manager.cc +@@ -8,6 +8,13 @@ + #include <sys/mman.h> + #endif + ++#if defined(OS_FREEBSD) ++#include <sys/mman.h> ++#include <fcntl.h> ++ ++#include "base/posix/eintr_wrapper.h" ++#endif ++ + #include <algorithm> + #include <limits> + +@@ -50,6 +57,14 @@ void DecommitPages(void* address, size_t size) { + void* ptr = mmap(address, size, PROT_NONE, + MAP_FIXED | MAP_ANONYMOUS | MAP_PRIVATE, -1, 0); + PA_CHECK(ptr == address); ++#elif defined(OS_FREEBSD) ++ int fd = HANDLE_EINTR(open("/dev/zero", O_RDONLY)); ++ PA_CHECK(fd != -1); ++ ++ void *ptr = mmap(address, size, PROT_NONE, ++ MAP_FIXED | MAP_PRIVATE, fd, 0); ++ PA_PCHECK(ptr == address); ++ HANDLE_EINTR(close(fd)); + #else + DecommitSystemPages(address, size, PageUpdatePermissions); + #endif diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h index e4554498dec5..07f3a708203a 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,6 +1,6 @@ ---- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2021-01-18 21:28:44 UTC +--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2021-03-12 23:57:15 UTC +++ base/allocator/partition_allocator/page_allocator_internals_posix.h -@@ -26,7 +26,7 @@ +@@ -27,12 +27,16 @@ #if defined(OS_ANDROID) #include <sys/prctl.h> #endif @@ -9,3 +9,50 @@ #include <sys/resource.h> #include <algorithm> + #endif + ++#if defined(OS_FREEBSD) ++#include <fcntl.h> ++#endif ++ + #include "base/allocator/partition_allocator/page_allocator.h" + + #ifndef MAP_ANONYMOUS +@@ -168,12 +172,19 @@ void* SystemAllocPagesInternal(void* hint, + PA_DCHECK(PageTag::kFirst <= page_tag); + PA_DCHECK(PageTag::kLast >= page_tag); + int fd = VM_MAKE_TAG(static_cast<int>(page_tag)); ++#elif defined(OS_FREEBSD) ++ int fd = HANDLE_EINTR(open("/dev/zero", O_RDWR | O_CLOEXEC)); ++ PA_PCHECK(fd != -1); + #else + int fd = -1; + #endif + + int access_flag = GetAccessFlags(accessibility); ++#if defined(OS_FREEBSD) ++ int map_flags = MAP_PRIVATE; ++#else + int map_flags = MAP_ANONYMOUS | MAP_PRIVATE; ++#endif + + #if defined(OS_APPLE) + // On macOS 10.14 and higher, executables that are code signed with the +@@ -200,6 +211,8 @@ void* SystemAllocPagesInternal(void* hint, + prctl(PR_SET_VMA, PR_SET_VMA_ANON_NAME, ret, length, + PageTagToName(page_tag)); + } ++#elif defined(OS_FREEBSD) ++ HANDLE_EINTR(close(fd)); + #endif + + return ret; +@@ -294,6 +307,8 @@ void DiscardSystemPagesInternal(void* address, size_t + ret = madvise(address, length, MADV_DONTNEED); + } + PA_PCHECK(ret == 0); ++#elif defined(OS_FREEBSD) ++ PA_PCHECK(0 == madvise(address, length, MADV_FREE)); + #else + // We have experimented with other flags, but with suboptimal results. + // diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.cc b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.cc index 06b2673bf136..22f583a2730f 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.cc +++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.cc @@ -1,12 +1,15 @@ ---- base/allocator/partition_allocator/partition_alloc.cc.orig 2021-01-18 21:28:44 UTC +--- base/allocator/partition_allocator/partition_alloc.cc.orig 2021-03-12 23:57:15 UTC +++ base/allocator/partition_allocator/partition_alloc.cc -@@ -65,6 +65,9 @@ void PartitionAllocGlobalInit(OomFunction on_out_of_me +@@ -56,7 +56,12 @@ void PartitionAllocGlobalInit(OomFunction on_out_of_me + "maximum direct mapped allocation"); + // Check that some of our zanier calculations worked out as expected. - #if ENABLE_TAG_FOR_MTE_CHECKED_PTR - static_assert(kSmallestBucket >= kAlignment, "generic smallest bucket"); -+#elif defined(__i386__) && defined(OS_FREEBSD) ++#if defined(__i386__) && defined(OS_FREEBSD) + // alignof(std::max_align_t) is only 4 on FreeBSD/i386 + static_assert(kSmallestBucket >= kAlignment, "generic smallest bucket"); - #else ++#else static_assert(kSmallestBucket == kAlignment, "generic smallest bucket"); - #endif ++#endif + static_assert(kMaxBucketed == 983040, "generic max bucketed"); + STATIC_ASSERT_OR_PA_CHECK( + MaxSystemPagesPerSlotSpan() < (1 << 8), 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 4b234571f964..560073192bba 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,26 +1,20 @@ ---- base/allocator/partition_allocator/partition_alloc_unittest.cc.orig 2021-01-18 21:28:44 UTC +--- base/allocator/partition_allocator/partition_alloc_unittest.cc.orig 2021-03-12 23:57:15 UTC +++ base/allocator/partition_allocator/partition_alloc_unittest.cc -@@ -366,9 +366,13 @@ void FreeFullSlotSpan(PartitionRoot<base::internal::Th - } - } +@@ -1588,7 +1588,7 @@ TEST_F(PartitionAllocTest, LostFreeSlotSpansBug) { + // cause flake. + #if !defined(OS_WIN) && \ + (!defined(ARCH_CPU_64_BITS) || \ +- (defined(OS_POSIX) && !(defined(OS_APPLE) || defined(OS_ANDROID)))) ++ (defined(OS_POSIX) && !(defined(OS_APPLE) || defined(OS_ANDROID) || 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, SystemPageSize(), &ret)); - return in_core == (ret & 1); + // The following four tests wrap a called function in an expect death statement + // to perform their test, because they are non-hermetic. Specifically they are +@@ -1634,7 +1634,7 @@ TEST_F(PartitionAllocDeathTest, RepeatedTryReallocRetu } -@@ -377,7 +381,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: + #endif // !defined(ARCH_CPU_64_BITS) || (defined(OS_POSIX) && +- // !(defined(OS_APPLE) || defined(OS_ANDROID))) ++ // !(defined(OS_APPLE) || defined(OS_ANDROID) || defined(OS_BSD))) + + // Make sure that malloc(-1) dies. + // In the past, we had an integer overflow that would alias malloc(-1) to diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__bucket.cc b/www/chromium/files/patch-base_allocator_partition__allocator_partition__bucket.cc new file mode 100644 index 000000000000..fb0dfd2b0719 --- /dev/null +++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__bucket.cc @@ -0,0 +1,36 @@ +--- base/allocator/partition_allocator/partition_bucket.cc.orig 2021-03-23 17:09:47 UTC ++++ base/allocator/partition_allocator/partition_bucket.cc +@@ -66,27 +66,33 @@ PartitionDirectMap(PartitionRoot<thread_safe>* root, i + metadata->extent.root = root; + // The new structures are all located inside a fresh system page so they + // will all be zeroed out. These DCHECKs are for documentation. ++#if !defined(OS_FREEBSD) + PA_DCHECK(!metadata->extent.super_page_base); + PA_DCHECK(!metadata->extent.super_pages_end); + PA_DCHECK(!metadata->extent.next); ++#endif + PA_DCHECK(PartitionPage<thread_safe>::FromPointerNoAlignmentCheck(slot) == + &metadata->page); + + auto* page = &metadata->page; ++#if !defined(OS_FREEBSD) + PA_DCHECK(!page->slot_span_metadata_offset); + PA_DCHECK(!page->slot_span_metadata.next_slot_span); + PA_DCHECK(!page->slot_span_metadata.num_allocated_slots); + PA_DCHECK(!page->slot_span_metadata.num_unprovisioned_slots); + PA_DCHECK(!page->slot_span_metadata.empty_cache_index); ++#endif + page->slot_span_metadata.bucket = &metadata->bucket; + auto* next_entry = new (slot) PartitionFreelistEntry(); + page->slot_span_metadata.SetFreelistHead(next_entry); + ++#if !defined(OS_FREEBSD) + PA_DCHECK(!metadata->bucket.active_slot_spans_head); + PA_DCHECK(!metadata->bucket.empty_slot_spans_head); + PA_DCHECK(!metadata->bucket.decommitted_slot_spans_head); + PA_DCHECK(!metadata->bucket.num_system_pages_per_slot_span); + PA_DCHECK(!metadata->bucket.num_full_slot_spans); ++#endif + metadata->bucket.slot_size = slot_size; + + auto* map_extent = &metadata->direct_map_extent; diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_spinning__mutex.cc b/www/chromium/files/patch-base_allocator_partition__allocator_spinning__mutex.cc new file mode 100644 index 000000000000..2f293398e253 --- /dev/null +++ b/www/chromium/files/patch-base_allocator_partition__allocator_spinning__mutex.cc @@ -0,0 +1,49 @@ +--- base/allocator/partition_allocator/spinning_mutex.cc.orig 2021-03-12 23:57:15 UTC ++++ base/allocator/partition_allocator/spinning_mutex.cc +@@ -16,9 +16,16 @@ + #include <unistd.h> + #endif // defined(PA_HAS_LINUX_KERNEL) + ++#if defined(PA_HAS_FREEBSD_KERNEL) ++#include <errno.h> ++#include <sys/types.h> ++#include <sys/thr.h> ++#include <sys/umtx.h> ++#endif // defined(PA_HAS_FREEBSD_KERNEL) ++ + namespace base { + namespace internal { +-#if defined(PA_HAS_LINUX_KERNEL) ++#if defined(PA_HAS_LINUX_KERNEL) || defined(PA_HAS_FREEBSD_KERNEL) + + void SpinningMutex::FutexWait() { + // Save and restore errno. +@@ -42,8 +49,13 @@ void SpinningMutex::FutexWait() { + // |kLockedContended| anymore. Note that even without spurious wakeups, the + // value of |state_| is not guaranteed when this returns, as another thread + // may get the lock before we get to run. ++#if defined(PA_HAS_LINUX_KERNEL) + int err = syscall(SYS_futex, &state_, FUTEX_WAIT | FUTEX_PRIVATE_FLAG, + kLockedContended, nullptr, nullptr, 0); ++#elif defined(PA_HAS_FREEBSD_KERNEL) ++ int err = _umtx_op(&state_, UMTX_OP_WAIT_UINT_PRIVATE, ++ kLockedContended, nullptr, nullptr); ++#endif + + if (err) { + // These are programming error, check them. +@@ -55,8 +67,14 @@ void SpinningMutex::FutexWait() { + + void SpinningMutex::FutexWake() { + int saved_errno = errno; ++#if defined(PA_HAS_LINUX_KERNEL) + long retval = syscall(SYS_futex, &state_, FUTEX_WAKE | FUTEX_PRIVATE_FLAG, + 1 /* wake up a single waiter */, nullptr, nullptr, 0); ++#elif defined(PA_HAS_FREEBSD_KERNEL) ++ long retval = _umtx_op(&state_, UMTX_OP_WAKE_PRIVATE, ++ 1 /* wake up a single waiter */, nullptr, nullptr); ++#endif ++ + PA_CHECK(retval != -1); + errno = saved_errno; + } diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_spinning__mutex.h b/www/chromium/files/patch-base_allocator_partition__allocator_spinning__mutex.h new file mode 100644 index 000000000000..344913dd5056 --- /dev/null +++ b/www/chromium/files/patch-base_allocator_partition__allocator_spinning__mutex.h @@ -0,0 +1,33 @@ +--- base/allocator/partition_allocator/spinning_mutex.h.orig 2021-03-12 23:57:15 UTC ++++ base/allocator/partition_allocator/spinning_mutex.h +@@ -22,7 +22,11 @@ + #define PA_HAS_LINUX_KERNEL + #endif + +-#if defined(PA_HAS_LINUX_KERNEL) || defined(OS_WIN) ++#if defined(OS_FREEBSD) ++#define PA_HAS_FREEBSD_KERNEL ++#endif ++ ++#if defined(PA_HAS_LINUX_KERNEL) || defined(PA_HAS_FREEBSD_KERNEL) || defined(OS_WIN) + #define PA_HAS_SPINNING_MUTEX + #endif + +@@ -66,7 +70,7 @@ class LOCKABLE BASE_EXPORT SpinningMutex { + // as the slow path has better characteristics than SpinLocks's. + static constexpr int kSpinCount = 1000; + +-#if defined(PA_HAS_LINUX_KERNEL) ++#if defined(PA_HAS_LINUX_KERNEL) || defined(PA_HAS_FREEBSD_KERNEL) + void FutexWait(); + void FutexWake(); + +@@ -111,7 +115,7 @@ ALWAYS_INLINE void SpinningMutex::Acquire() { + + inline constexpr SpinningMutex::SpinningMutex() = default; + +-#if defined(PA_HAS_LINUX_KERNEL) ++#if defined(PA_HAS_LINUX_KERNEL) || defined(PA_HAS_FREEBSD_KERNEL) + + ALWAYS_INLINE bool SpinningMutex::Try() { + int expected = kUnlocked; diff --git a/www/chromium/files/patch-base_base__switches.cc b/www/chromium/files/patch-base_base__switches.cc index 629e1c6e6a11..7f700892a8e1 100644 --- a/www/chromium/files/patch-base_base__switches.cc +++ b/www/chromium/files/patch-base_base__switches.cc @@ -1,15 +1,17 @@ ---- base/base_switches.cc.orig 2020-11-13 06:36:34 UTC +--- base/base_switches.cc.orig 2021-03-12 23:57:15 UTC +++ base/base_switches.cc -@@ -117,7 +117,7 @@ const char kDisableHighResTimer[] = "disable-highres-t - const char kDisableUsbKeyboardDetect[] = "disable-usb-keyboard-detect"; - #endif +@@ -120,8 +120,8 @@ const char kDisableUsbKeyboardDetect[] = "disable --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_LACROS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_LACROS)) || defined(OS_BSD) + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ +- !BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_BSD) || (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ ++ !BUILDFLAG(IS_CHROMEOS_LACROS)) // 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 -@@ -152,7 +152,7 @@ const char kForceFieldTrialParams[] = "force-fieldtria +@@ -156,7 +156,7 @@ const char kForceFieldTrialParams[] = "force-fieldtria #endif diff --git a/www/chromium/files/patch-base_base__switches.h b/www/chromium/files/patch-base_base__switches.h index e251bbebd896..c3627665a8a3 100644 --- a/www/chromium/files/patch-base_base__switches.h +++ b/www/chromium/files/patch-base_base__switches.h @@ -1,15 +1,17 @@ ---- base/base_switches.h.orig 2020-11-13 06:36:34 UTC +--- base/base_switches.h.orig 2021-03-12 23:57:15 UTC +++ base/base_switches.h -@@ -39,7 +39,7 @@ extern const char kDisableHighResTimer[]; - extern const char kDisableUsbKeyboardDetect[]; - #endif +@@ -41,8 +41,8 @@ extern const char kDisableUsbKeyboardDetect[]; --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_LACROS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_LACROS)) || defined(OS_BSD) + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ +- !BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_BSD) || (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ ++ !BUILDFLAG(IS_CHROMEOS_LACROS)) extern const char kDisableDevShmUsage[]; #endif -@@ -55,7 +55,7 @@ extern const char kEnableIdleTracing[]; +@@ -58,7 +58,7 @@ extern const char kEnableIdleTracing[]; extern const char kForceFieldTrialParams[]; #endif diff --git a/www/chromium/files/patch-base_cpu.cc b/www/chromium/files/patch-base_cpu.cc index 747ffeeecfa4..c1e85a57c187 100644 --- a/www/chromium/files/patch-base_cpu.cc +++ b/www/chromium/files/patch-base_cpu.cc @@ -1,4 +1,4 @@ ---- base/cpu.cc.orig 2021-01-18 21:28:44 UTC +--- base/cpu.cc.orig 2021-03-12 23:57:15 UTC +++ base/cpu.cc @@ -16,7 +16,7 @@ @@ -9,9 +9,9 @@ defined(OS_AIX) #include "base/containers/flat_set.h" #include "base/files/file_util.h" -@@ -182,6 +182,14 @@ std::string* CpuInfoBrand() { +@@ -212,6 +212,14 @@ const ProcCpuInfo& ParseProcCpu() { - return brand; + return *info; } +#elif defined(OS_BSD) +std::string* CpuInfoBrand() { @@ -24,12 +24,12 @@ #endif // defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || // defined(OS_LINUX) || defined(OS_CHROMEOS)) -@@ -305,7 +313,7 @@ void CPU::Initialize() { - } - } - #elif defined(ARCH_CPU_ARM_FAMILY) --#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(); +@@ -348,6 +356,8 @@ void CPU::Initialize() { + has_bti_ = hwcap2 & HWCAP2_BTI; + #endif + ++#elif defined(OS_BSD) ++ cpu_brand_ = *CpuInfoBrand(); #elif defined(OS_WIN) // Windows makes high-resolution thread timing information available in + // user-space. diff --git a/www/chromium/files/patch-base_cpu.h b/www/chromium/files/patch-base_cpu.h index 76db98bf057a..3a2ac0b71e70 100644 --- a/www/chromium/files/patch-base_cpu.h +++ b/www/chromium/files/patch-base_cpu.h @@ -1,6 +1,6 @@ ---- base/cpu.h.orig 2020-11-16 17:24:49 UTC +--- base/cpu.h.orig 2021-03-12 23:57:15 UTC +++ base/cpu.h -@@ -73,7 +73,7 @@ class BASE_EXPORT CPU final { +@@ -84,7 +84,7 @@ class BASE_EXPORT CPU final { IntelMicroArchitecture GetIntelMicroArchitecture() const; const std::string& cpu_brand() const { return cpu_brand_; } @@ -9,7 +9,7 @@ defined(OS_AIX) enum class CoreType { kUnknown = 0, -@@ -124,7 +124,7 @@ class BASE_EXPORT CPU final { +@@ -135,7 +135,7 @@ class BASE_EXPORT CPU final { // cpuidle driver. using CoreIdleTimes = std::vector<TimeDelta>; static bool GetCumulativeCoreIdleTimes(CoreIdleTimes&); diff --git a/www/chromium/files/patch-base_debug_debugger__posix.cc b/www/chromium/files/patch-base_debug_debugger__posix.cc index 56b47676b47f..e2dd3991b967 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-11-13 06:36:34 UTC +--- base/debug/debugger_posix.cc.orig 2021-03-12 23:57:15 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 b89af4f16bf9..aa96ca6baa55 100644 --- a/www/chromium/files/patch-base_debug_elf__reader.cc +++ b/www/chromium/files/patch-base_debug_elf__reader.cc @@ -1,4 +1,4 @@ ---- base/debug/elf_reader.cc.orig 2020-11-13 06:36:34 UTC +--- base/debug/elf_reader.cc.orig 2021-03-12 23:57:15 UTC +++ base/debug/elf_reader.cc @@ -38,7 +38,9 @@ using Nhdr = Elf64_Nhdr; using Word = Elf64_Word; 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 71602a3cfa56..5f4e50d83152 100644 --- a/www/chromium/files/patch-base_debug_proc__maps__linux.cc +++ b/www/chromium/files/patch-base_debug_proc__maps__linux.cc @@ -1,6 +1,6 @@ ---- base/debug/proc_maps_linux.cc.orig 2020-11-13 06:36:34 UTC +--- base/debug/proc_maps_linux.cc.orig 2021-03-12 23:57:15 UTC +++ base/debug/proc_maps_linux.cc -@@ -13,7 +13,7 @@ +@@ -13,13 +13,18 @@ #include "base/strings/string_split.h" #include "build/build_config.h" @@ -9,7 +9,6 @@ #include <inttypes.h> #endif -@@ -29,6 +29,11 @@ namespace base { namespace debug { @@ -21,7 +20,7 @@ // Scans |proc_maps| starting from |pos| returning true if the gate VMA was // found, otherwise returns false. static bool ContainsGateVMA(std::string* proc_maps, size_t pos) { -@@ -44,15 +49,16 @@ static bool ContainsGateVMA(std::string* proc_maps, si +@@ -35,15 +40,16 @@ static bool ContainsGateVMA(std::string* proc_maps, si return false; #endif } @@ -40,7 +39,7 @@ return false; } proc_maps->clear(); -@@ -66,7 +72,7 @@ bool ReadProcMaps(std::string* proc_maps) { +@@ -57,7 +63,7 @@ bool ReadProcMaps(std::string* proc_maps) { ssize_t bytes_read = HANDLE_EINTR(read(fd.get(), buffer, kReadSize)); if (bytes_read < 0) { @@ -49,7 +48,7 @@ proc_maps->clear(); return false; } -@@ -77,6 +83,7 @@ bool ReadProcMaps(std::string* proc_maps) { +@@ -68,6 +74,7 @@ bool ReadProcMaps(std::string* proc_maps) { if (bytes_read == 0) break; @@ -57,7 +56,7 @@ // The gate VMA is handled as a special case after seq_file has finished // iterating through all entries in the virtual memory table. // -@@ -87,6 +94,7 @@ bool ReadProcMaps(std::string* proc_maps) { +@@ -78,6 +85,7 @@ bool ReadProcMaps(std::string* proc_maps) { // Avoid this by searching for the gate VMA and breaking early. if (ContainsGateVMA(proc_maps, pos)) break; @@ -65,17 +64,18 @@ } return true; -@@ -115,10 +123,32 @@ bool ParseProcMaps(const std::string& input, +@@ -105,11 +113,32 @@ bool ParseProcMaps(const std::string& input, + MappedMemoryRegion region; const char* line = lines[i].c_str(); - char permissions[5] = {'\0'}; // Ensure NUL-terminated string. +- char permissions[5] = {'\0'}; // Ensure NUL-terminated string. ++ char permissions[6] = {'\0'}; // Ensure NUL-terminated string. + int path_index = 0; + +#if defined(OS_BSD) + if (lines[i].empty()) + continue; + -+ + char cow; + + // Format: @@ -83,7 +83,7 @@ + // start end resident private_resident obj perms ref_count shadow_count flags cow needs_copy type fullpath cred ruid + // 0x200000 0x202000 2 6 0xfffff80005be9000 r-- 3 1 0x1000 COW NC vnode /bin/cat NCH -1 + // -+ if (sscanf(line, "%" SCNxPTR " %" SCNxPTR " %*ld %*ld %*llx %3c %*d %*d %*x %c%*s %*s %*s %n", ++ if (sscanf(line, "%" SCNxPTR " %" SCNxPTR " %*ld %*ld %*[^ ] %5[^ ] %*d %*d %*x %c%*s %*s %*s %n", + ®ion.start, ®ion.end, permissions, &cow, &path_index) < 4) { + DPLOG(WARNING) << "sscanf failed for line: " << line; + return false; @@ -99,7 +99,7 @@ // Sample format from man 5 proc: // -@@ -134,6 +164,7 @@ bool ParseProcMaps(const std::string& input, +@@ -125,6 +154,7 @@ bool ParseProcMaps(const std::string& input, DPLOG(WARNING) << "sscanf failed for line: " << line; return false; } @@ -107,7 +107,7 @@ region.permissions = 0; -@@ -152,14 +183,31 @@ bool ParseProcMaps(const std::string& input, +@@ -143,14 +173,31 @@ bool ParseProcMaps(const std::string& input, else if (permissions[2] != '-') return false; diff --git a/www/chromium/files/patch-base_debug_stack__trace.cc b/www/chromium/files/patch-base_debug_stack__trace.cc index 39376795491e..f1f952c8aa0d 100644 --- a/www/chromium/files/patch-base_debug_stack__trace.cc +++ b/www/chromium/files/patch-base_debug_stack__trace.cc @@ -1,4 +1,4 @@ ---- base/debug/stack_trace.cc.orig 2020-11-13 06:36:34 UTC +--- base/debug/stack_trace.cc.orig 2021-03-12 23:57:15 UTC +++ base/debug/stack_trace.cc @@ -15,7 +15,7 @@ diff --git a/www/chromium/files/patch-base_debug_stack__trace.h b/www/chromium/files/patch-base_debug_stack__trace.h index 4900241415b6..00dd078e8065 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 2020-11-13 06:36:34 UTC +--- base/debug/stack_trace.h.orig 2021-03-12 23:57:15 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 962c7386eaee..3522bc090ee2 100644 --- a/www/chromium/files/patch-base_debug_stack__trace__posix.cc +++ b/www/chromium/files/patch-base_debug_stack__trace__posix.cc @@ -1,4 +1,4 @@ ---- base/debug/stack_trace_posix.cc.orig 2021-01-18 21:28:44 UTC +--- base/debug/stack_trace_posix.cc.orig 2021-03-12 23:57:15 UTC +++ base/debug/stack_trace_posix.cc @@ -35,7 +35,7 @@ #include <AvailabilityMacros.h> @@ -9,7 +9,29 @@ #include "base/debug/proc_maps_linux.h" #endif -@@ -696,7 +696,11 @@ class SandboxSymbolizeHelper { +@@ -659,13 +659,21 @@ class SandboxSymbolizeHelper { + // Reads /proc/self/maps. + std::string contents; + if (!ReadProcMaps(&contents)) { ++#if defined(OS_BSD) ++ LOG(ERROR) << "Failed to read /proc/curproc/map"; ++#else + LOG(ERROR) << "Failed to read /proc/self/maps"; ++#endif + return false; + } + + // Parses /proc/self/maps. + if (!ParseProcMaps(contents, ®ions_)) { ++#if defined(OS_BSD) ++ LOG(ERROR) << "Failed to parse the contents of /proc/curproc/map"; ++#else + LOG(ERROR) << "Failed to parse the contents of /proc/self/maps"; ++#endif + return false; + } + +@@ -696,7 +704,11 @@ class SandboxSymbolizeHelper { // Skip regions with empty file names. continue; } diff --git a/www/chromium/files/patch-base_debug_stack__trace__unittest.cc b/www/chromium/files/patch-base_debug_stack__trace__unittest.cc index bdbdb57fe408..908692edeb5b 100644 --- a/www/chromium/files/patch-base_debug_stack__trace__unittest.cc +++ b/www/chromium/files/patch-base_debug_stack__trace__unittest.cc @@ -1,4 +1,4 @@ ---- base/debug/stack_trace_unittest.cc.orig 2020-11-13 06:36:34 UTC +--- base/debug/stack_trace_unittest.cc.orig 2021-03-12 23:57:15 UTC +++ base/debug/stack_trace_unittest.cc @@ -88,6 +88,7 @@ TEST_F(StackTraceTest, OutputToStream) { std::string::npos) @@ -29,3 +29,12 @@ // The test is used for manual testing, e.g., to see the raw output. TEST_F(StackTraceTest, DebugOutputToStream) { +@@ -361,7 +363,7 @@ TEST_F(StackTraceTest, MAYBE_TraceStackFramePointers) + // sometimes we read fp / pc from the place that previously held + // uninitialized value. + // TODO(crbug.com/1132511): Enable this test on Fuchsia. +-#if defined(MEMORY_SANITIZER) || defined(OS_FUCHSIA) ++#if defined(MEMORY_SANITIZER) || defined(OS_FUCHSIA) || defined(OS_BSD) + #define MAYBE_TraceStackFramePointersFromBuffer \ + DISABLED_TraceStackFramePointersFromBuffer + #else 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 ca4d131daf7c..ff04f093e49a 100644 --- a/www/chromium/files/patch-base_files_file__path__unittest.cc +++ b/www/chromium/files/patch-base_files_file__path__unittest.cc @@ -1,4 +1,4 @@ ---- base/files/file_path_unittest.cc.orig 2020-11-13 06:36:34 UTC +--- base/files/file_path_unittest.cc.orig 2021-03-12 23:57:15 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" }, diff --git a/www/chromium/files/patch-base_files_file__path__watcher__freebsd.cc b/www/chromium/files/patch-base_files_file__path__watcher__freebsd.cc new file mode 100644 index 000000000000..238272c3d48e --- /dev/null +++ b/www/chromium/files/patch-base_files_file__path__watcher__freebsd.cc @@ -0,0 +1,64 @@ +--- base/files/file_path_watcher_freebsd.cc.orig 2021-03-15 11:01:22 UTC ++++ base/files/file_path_watcher_freebsd.cc +@@ -0,0 +1,61 @@ ++// 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. ++ ++// This file exists for Unix systems which don't have the inotify headers, and ++// thus cannot build file_watcher_inotify.cc ++ ++#include <memory> ++ ++#include "base/files/file_path_watcher.h" ++#include "base/files/file_path_watcher_kqueue.h" ++ ++#include "base/memory/ptr_util.h" ++#include "build/build_config.h" ++ ++namespace base { ++ ++namespace { ++ ++class FilePathWatcherImpl : public FilePathWatcher::PlatformDelegate { ++ public: ++ FilePathWatcherImpl() = default; ++ FilePathWatcherImpl(const FilePathWatcherImpl&) = delete; ++ FilePathWatcherImpl& operator=(const FilePathWatcherImpl&) = delete; ++ ~FilePathWatcherImpl() override = default; ++ ++ bool Watch(const FilePath& path, ++ Type type, ++ const FilePathWatcher::Callback& callback) override { ++ DCHECK(!impl_.get()); ++ ++ if (type == Type::kRecursive) { ++ return false; ++ } else { ++ impl_ = std::make_unique<FilePathWatcherKQueue>(); ++ } ++ ++ DCHECK(impl_.get()); ++ ++ return impl_->Watch(path, type, callback); ++ } ++ ++ void Cancel() override { ++ if (impl_.get()) ++ impl_->Cancel(); ++ ++ set_cancelled(); ++ } ++ ++ private: ++ std::unique_ptr<PlatformDelegate> impl_; ++}; ++ ++} // namespace ++ ++FilePathWatcher::FilePathWatcher() { ++ sequence_checker_.DetachFromSequence(); ++ impl_ = std::make_unique<FilePathWatcherImpl>(); ++} ++ ++} // namespace base 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 949735362ed9..61baa1ecef2d 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 2020-11-13 06:36:34 UTC +--- base/files/file_path_watcher_kqueue.h.orig 2021-03-12 23:57:15 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 deleted file mode 100644 index c8a9a0b452d8..000000000000 --- a/www/chromium/files/patch-base_files_file__path__watcher__stub.cc +++ /dev/null @@ -1,53 +0,0 @@ ---- base/files/file_path_watcher_stub.cc.orig 2021-01-18 21:28:44 UTC -+++ base/files/file_path_watcher_stub.cc -@@ -1,14 +1,15 @@ --// Copyright (c) 2012 The Chromium Authors. All rights reserved. -+// Copyright 2014 The Chromium Authors. All rights reserved. - // Use of this source code is governed by a BSD-style license that can be - // found in the LICENSE file. - --// This file exists for Unix systems which don't have the inotify headers, and --// thus cannot build file_watcher_inotify.cc - --#include "base/files/file_path_watcher.h" -+#include <memory> - -+#include "base/files/file_path_watcher.h" -+#include "base/files/file_path_watcher_kqueue.h" - #include "base/macros.h" - #include "base/memory/ptr_util.h" -+#include "build/build_config.h" - - namespace base { - -@@ -22,12 +23,29 @@ class FilePathWatcherImpl : public FilePathWatcher::Pl - bool Watch(const FilePath& path, - Type type, - const FilePathWatcher::Callback& callback) override { -+#if defined(OS_BSD) -+ DCHECK(!impl_.get()); -+ if (type == Type::kRecursive) { -+ return false; -+ } else { -+ impl_ = std::make_unique<FilePathWatcherKQueue>(); -+ } -+ DCHECK(impl_.get()); -+ return impl_->Watch(path, type, callback); -+#else - return false; -+#endif - } - -- void Cancel() override {} -+ void Cancel() override { -+ if (impl_.get()) -+ impl_->Cancel(); -+ set_cancelled(); -+ } - - private: -+ std::unique_ptr<PlatformDelegate> impl_; -+ - DISALLOW_COPY_AND_ASSIGN(FilePathWatcherImpl); - }; - 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 0bf19b3df280..0de14fe28938 100644 --- a/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc +++ b/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc @@ -1,6 +1,6 @@ ---- base/files/file_path_watcher_unittest.cc.orig 2021-01-18 21:28:44 UTC +--- base/files/file_path_watcher_unittest.cc.orig 2021-03-12 23:57:15 UTC +++ base/files/file_path_watcher_unittest.cc -@@ -438,12 +438,12 @@ TEST_F(FilePathWatcherTest, WatchDirectory) { +@@ -444,12 +444,12 @@ TEST_F(FilePathWatcherTest, WatchDirectory) { VLOG(1) << "Waiting for file1 creation"; ASSERT_TRUE(WaitForEvents()); @@ -15,16 +15,7 @@ ASSERT_TRUE(base::DeleteFile(file1)); VLOG(1) << "Waiting for file1 deletion"; -@@ -650,7 +650,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) { -@@ -816,7 +816,7 @@ TEST_F(FilePathWatcherTest, LinkedDirectoryPart3) { +@@ -822,7 +822,7 @@ TEST_F(FilePathWatcherTest, LinkedDirectoryPart3) { ASSERT_TRUE(WaitForEvents()); } @@ -33,7 +24,7 @@ enum Permission { Read, -@@ -824,7 +824,7 @@ enum Permission { +@@ -830,7 +830,7 @@ enum Permission { Execute }; @@ -42,7 +33,7 @@ bool ChangeFilePermissions(const FilePath& path, Permission perm, bool allow) { struct stat stat_buf; -@@ -853,9 +853,9 @@ bool ChangeFilePermissions(const FilePath& path, Permi +@@ -859,9 +859,9 @@ bool ChangeFilePermissions(const FilePath& path, Permi } return chmod(path.value().c_str(), stat_buf.st_mode) == 0; } @@ -54,7 +45,7 @@ // Linux implementation of FilePathWatcher doesn't catch attribute changes. // http://crbug.com/78043 // Windows implementation of FilePathWatcher catches attribute changes that -@@ -891,7 +891,7 @@ TEST_F(FilePathWatcherTest, DirAttributesChanged) { +@@ -897,7 +897,7 @@ TEST_F(FilePathWatcherTest, DirAttributesChanged) { ASSERT_TRUE(ChangeFilePermissions(test_dir1, Execute, true)); } diff --git a/www/chromium/files/patch-base_files_file__util.h b/www/chromium/files/patch-base_files_file__util.h index 9d65358e9cf3..ff39cb3060bf 100644 --- a/www/chromium/files/patch-base_files_file__util.h +++ b/www/chromium/files/patch-base_files_file__util.h @@ -1,6 +1,6 @@ ---- base/files/file_util.h.orig 2021-01-18 21:28:44 UTC +--- base/files/file_util.h.orig 2021-03-12 23:57:15 UTC +++ base/files/file_util.h -@@ -278,14 +278,14 @@ BASE_EXPORT bool SetPosixFilePermissions(const FilePat +@@ -284,14 +284,14 @@ BASE_EXPORT bool SetPosixFilePermissions(const FilePat BASE_EXPORT bool ExecutableExistsInPath(Environment* env, const FilePath::StringType& executable); @@ -17,7 +17,7 @@ #endif // OS_POSIX -@@ -597,7 +597,7 @@ BASE_EXPORT bool VerifyPathControlledByAdmin(const bas +@@ -603,7 +603,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); 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 53e25ed562e5..d906280bcf53 100644 --- a/www/chromium/files/patch-base_files_file__util__posix.cc +++ b/www/chromium/files/patch-base_files_file__util__posix.cc @@ -1,6 +1,6 @@ ---- base/files/file_util_posix.cc.orig 2021-01-18 21:28:44 UTC +--- base/files/file_util_posix.cc.orig 2021-03-12 23:57:15 UTC +++ base/files/file_util_posix.cc -@@ -406,7 +406,7 @@ bool CreatePipe(ScopedFD* read_fd, ScopedFD* write_fd, +@@ -380,7 +380,7 @@ bool CreatePipe(ScopedFD* read_fd, ScopedFD* write_fd, } bool CreateLocalNonBlockingPipe(int fds[2]) { @@ -9,7 +9,7 @@ return pipe2(fds, O_CLOEXEC | O_NONBLOCK) == 0; #else int raw_fds[2]; -@@ -953,8 +953,12 @@ bool AllocateFileRegion(File* file, int64_t offset, si +@@ -927,8 +927,12 @@ bool AllocateFileRegion(File* file, int64_t offset, si // space. It can fail because the filesystem doesn't support it. In that case, // use the manual method below. @@ -23,7 +23,25 @@ return true; DPLOG(ERROR) << "fallocate"; #elif defined(OS_APPLE) -@@ -1178,7 +1182,7 @@ PrefetchResult PreReadFile(const FilePath& file_path, +@@ -1098,7 +1102,7 @@ int GetMaximumPathComponentLength(const FilePath& path + #if !defined(OS_ANDROID) + // This is implemented in file_util_android.cc for that platform. + bool GetShmemTempDir(bool executable, FilePath* path) { +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) || defined(OS_BSD) + bool disable_dev_shm = false; + #if !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_CHROMEOS_LACROS) + disable_dev_shm = CommandLine::ForCurrentProcess()->HasSwitch( +@@ -1114,7 +1118,7 @@ bool GetShmemTempDir(bool executable, FilePath* path) + *path = FilePath("/dev/shm"); + return true; + } +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) || defined(OS_BSD) + return GetTempDir(path); + } + #endif // !defined(OS_ANDROID) +@@ -1152,7 +1156,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. @@ -32,7 +50,7 @@ (defined(OS_ANDROID) && __ANDROID_API__ >= 21) File file(file_path, File::FLAG_OPEN | File::FLAG_READ); if (!file.IsValid()) -@@ -1214,7 +1218,7 @@ PrefetchResult PreReadFile(const FilePath& file_path, +@@ -1188,7 +1192,7 @@ PrefetchResult PreReadFile(const FilePath& file_path, return internal::PreReadFileSlow(file_path, max_bytes) ? PrefetchResult{PrefetchResultCode::kSlowSuccess} : PrefetchResult{PrefetchResultCode::kSlowFailed}; @@ -41,7 +59,7 @@ // __ANDROID_API__ >= 21) } -@@ -1249,7 +1253,7 @@ bool MoveUnsafe(const FilePath& from_path, const FileP +@@ -1223,7 +1227,7 @@ bool MoveUnsafe(const FilePath& from_path, const FileP #endif // !defined(OS_NACL_NONSFI) @@ -50,7 +68,7 @@ BASE_EXPORT bool IsPathExecutable(const FilePath& path) { bool result = false; FilePath tmp_file_path; -@@ -1270,6 +1274,6 @@ BASE_EXPORT bool IsPathExecutable(const FilePath& path +@@ -1244,6 +1248,6 @@ BASE_EXPORT bool IsPathExecutable(const FilePath& path } return result; } diff --git a/www/chromium/files/patch-base_files_file__util__unittest.cc b/www/chromium/files/patch-base_files_file__util__unittest.cc index 5c955c9a7f2f..b9f003815230 100644 --- a/www/chromium/files/patch-base_files_file__util__unittest.cc +++ b/www/chromium/files/patch-base_files_file__util__unittest.cc @@ -1,4 +1,4 @@ ---- base/files/file_util_unittest.cc.orig 2021-01-18 21:28:44 UTC +--- base/files/file_util_unittest.cc.orig 2021-03-12 23:57:15 UTC +++ base/files/file_util_unittest.cc @@ -1638,7 +1638,7 @@ TEST_F(FileUtilTest, DeleteDirRecursiveWithOpenFile) { #endif diff --git a/www/chromium/files/patch-base_files_scoped__file.cc b/www/chromium/files/patch-base_files_scoped__file.cc index 16f73156a2bc..b6c65b08e0f5 100644 --- a/www/chromium/files/patch-base_files_scoped__file.cc +++ b/www/chromium/files/patch-base_files_scoped__file.cc @@ -1,4 +1,4 @@ ---- base/files/scoped_file.cc.orig 2020-11-13 06:36:34 UTC +--- base/files/scoped_file.cc.orig 2021-03-12 23:57:15 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. diff --git a/www/chromium/files/patch-base_i18n_icu__util.cc b/www/chromium/files/patch-base_i18n_icu__util.cc index 1503462f073b..42e2785b6749 100644 --- a/www/chromium/files/patch-base_i18n_icu__util.cc +++ b/www/chromium/files/patch-base_i18n_icu__util.cc @@ -1,4 +1,4 @@ ---- base/i18n/icu_util.cc.orig 2021-01-18 21:28:44 UTC +--- base/i18n/icu_util.cc.orig 2021-03-12 23:57:15 UTC +++ base/i18n/icu_util.cc @@ -48,7 +48,7 @@ #include "third_party/icu/source/common/unicode/unistr.h" diff --git a/www/chromium/files/patch-base_linux__util.cc b/www/chromium/files/patch-base_linux__util.cc index 4bbbf448b605..8be465fb7750 100644 --- a/www/chromium/files/patch-base_linux__util.cc +++ b/www/chromium/files/patch-base_linux__util.cc @@ -1,4 +1,4 @@ ---- base/linux_util.cc.orig 2020-11-13 06:36:34 UTC +--- base/linux_util.cc.orig 2021-03-12 23:57:15 UTC +++ base/linux_util.cc @@ -15,6 +15,7 @@ @@ -8,7 +8,7 @@ #include "base/files/dir_reader_posix.h" #include "base/files/file_util.h" -@@ -78,6 +79,9 @@ class DistroNameGetter { +@@ -79,6 +80,9 @@ class DistroNameGetter { public: DistroNameGetter() { static const char* const kFilesToCheck[] = {"/etc/os-release", @@ -18,7 +18,7 @@ "/usr/lib/os-release"}; for (const char* file : kFilesToCheck) { if (ReadDistroFromOSReleaseFile(file)) -@@ -134,6 +138,9 @@ void SetLinuxDistro(const std::string& distro) { +@@ -135,6 +139,9 @@ void SetLinuxDistro(const std::string& distro) { } bool GetThreadsForProcess(pid_t pid, std::vector<pid_t>* tids) { @@ -28,7 +28,7 @@ // 25 > strlen("/proc//task") + strlen(std::to_string(INT_MAX)) + 1 = 22 char buf[25]; strings::SafeSPrintf(buf, "/proc/%d/task", pid); -@@ -153,6 +160,7 @@ bool GetThreadsForProcess(pid_t pid, std::vector<pid_t +@@ -154,6 +161,7 @@ bool GetThreadsForProcess(pid_t pid, std::vector<pid_t } return true; diff --git a/www/chromium/files/patch-base_location__unittest.cc b/www/chromium/files/patch-base_location__unittest.cc index 72a479368ddb..77e2ed901f46 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-11-13 06:36:34 UTC +--- base/location_unittest.cc.orig 2021-03-12 23:57:15 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 d7b25141cc08..37ae1188ea72 100644 --- a/www/chromium/files/patch-base_logging__unittest.cc +++ b/www/chromium/files/patch-base_logging__unittest.cc @@ -1,6 +1,6 @@ ---- base/logging_unittest.cc.orig 2020-11-13 06:36:34 UTC +--- base/logging_unittest.cc.orig 2021-03-12 23:57:15 UTC +++ base/logging_unittest.cc -@@ -29,7 +29,7 @@ +@@ -30,7 +30,7 @@ #include "base/posix/eintr_wrapper.h" #endif // OS_POSIX @@ -9,7 +9,7 @@ #include <ucontext.h> #endif -@@ -559,7 +559,7 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo +@@ -560,7 +560,7 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo // need the arch-specific boilerplate below, which is inspired by breakpad. // At the same time, on OSX, ucontext.h is deprecated but si_addr works fine. uintptr_t crash_addr = 0; diff --git a/www/chromium/files/patch-base_memory_discardable__memory.cc b/www/chromium/files/patch-base_memory_discardable__memory.cc index 77084937a2c5..b656c7deb12d 100644 --- a/www/chromium/files/patch-base_memory_discardable__memory.cc +++ b/www/chromium/files/patch-base_memory_discardable__memory.cc @@ -1,4 +1,4 @@ ---- base/memory/discardable_memory.cc.orig 2020-11-13 06:36:34 UTC +--- base/memory/discardable_memory.cc.orig 2021-03-12 23:57:15 UTC +++ base/memory/discardable_memory.cc @@ -23,7 +23,7 @@ const base::Feature kMadvFreeDiscardableMemory{ "MadvFreeDiscardableMemory", base::FEATURE_DISABLED_BY_DEFAULT}; 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 bf535550931b..349698009629 100644 --- a/www/chromium/files/patch-base_memory_discardable__memory__internal.h +++ b/www/chromium/files/patch-base_memory_discardable__memory__internal.h @@ -1,4 +1,4 @@ ---- base/memory/discardable_memory_internal.h.orig 2020-11-13 06:36:34 UTC +--- base/memory/discardable_memory_internal.h.orig 2021-03-12 23:57:15 UTC +++ base/memory/discardable_memory_internal.h @@ -10,7 +10,7 @@ #include "base/metrics/field_trial_params.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 82feab1e734f..a8fad1c516da 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,4 +1,4 @@ ---- base/memory/madv_free_discardable_memory_posix.cc.orig 2020-11-13 06:36:34 UTC +--- base/memory/madv_free_discardable_memory_posix.cc.orig 2021-03-12 23:57:15 UTC +++ base/memory/madv_free_discardable_memory_posix.cc @@ -292,7 +292,7 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT 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 abcb85a3f032..20585a18c5b1 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,4 +1,4 @@ ---- base/memory/platform_shared_memory_region.h.orig 2020-11-13 06:36:34 UTC +--- base/memory/platform_shared_memory_region.h.orig 2021-03-12 23:57:15 UTC +++ base/memory/platform_shared_memory_region.h @@ -27,7 +27,7 @@ #include "base/files/scoped_file.h" 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 0ad1585fc316..1348b041f980 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,6 +1,18 @@ ---- base/memory/platform_shared_memory_region_posix.cc.orig 2020-11-13 06:36:34 UTC +--- base/memory/platform_shared_memory_region_posix.cc.orig 2021-03-12 23:57:15 UTC +++ base/memory/platform_shared_memory_region_posix.cc -@@ -70,7 +70,7 @@ FDPair ScopedFDPair::get() const { +@@ -23,7 +23,11 @@ struct ScopedPathUnlinkerTraits { + static const FilePath* InvalidValue() { return nullptr; } + + static void Free(const FilePath* path) { ++#if defined(OS_BSD) ++ if (shm_unlink(path->value().c_str())) ++#else + if (unlink(path->value().c_str())) ++#endif + PLOG(WARNING) << "unlink"; + } + }; +@@ -70,7 +74,7 @@ FDPair ScopedFDPair::get() const { return {fd.get(), readonly_fd.get()}; } @@ -9,7 +21,7 @@ // static ScopedFD PlatformSharedMemoryRegion::ExecutableRegion::CreateFD(size_t size) { PlatformSharedMemoryRegion region = -@@ -79,7 +79,7 @@ ScopedFD PlatformSharedMemoryRegion::ExecutableRegion: +@@ -79,7 +83,7 @@ ScopedFD PlatformSharedMemoryRegion::ExecutableRegion: return region.PassPlatformHandle().fd; return ScopedFD(); } @@ -18,7 +30,7 @@ // static PlatformSharedMemoryRegion PlatformSharedMemoryRegion::Take( -@@ -204,7 +204,7 @@ bool PlatformSharedMemoryRegion::MapAtInternal(off_t o +@@ -204,7 +208,7 @@ bool PlatformSharedMemoryRegion::MapAtInternal(off_t o // static PlatformSharedMemoryRegion PlatformSharedMemoryRegion::Create(Mode mode, size_t size @@ -27,12 +39,62 @@ , bool executable #endif -@@ -233,7 +233,7 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion: - // flag. - FilePath directory; - if (!GetShmemTempDir( --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - executable, - #else - false /* executable */, +@@ -242,6 +246,22 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion: + return {}; + } + ++#if defined(OS_BSD) ++ UnguessableToken token = UnguessableToken::Create(); ++ FilePath path = directory.Append(token.ToString()); ++ ScopedFD fd{HANDLE_EINTR(shm_open(path.value().c_str(), O_CREAT | O_RDWR, 0700))}; ++ File shm_file(fd.release()); ++ ++ if (!shm_file.IsValid()) { ++ PLOG(ERROR) << "Creating shared memory failed"; ++ return {}; ++ } ++ ++ if (HANDLE_EINTR(ftruncate(shm_file.GetPlatformFile(), size)) == -1) { ++ PLOG(ERROR) << "Failed to extend shared memory object to size " << size; ++ return {}; ++ } ++#else + FilePath path; + ScopedFD fd = CreateAndOpenFdForTemporaryFileInDir(directory, &path); + File shm_file(fd.release()); +@@ -258,6 +278,7 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion: + } + return {}; + } ++#endif // OS_BSD + + // Deleting the file prevents anyone else from mapping it in (making it + // private), and prevents the need for cleanup (once the last fd is +@@ -267,7 +288,11 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion: + ScopedFD readonly_fd; + if (mode == Mode::kWritable) { + // Also open as readonly so that we can ConvertToReadOnly(). ++#if defined(OS_BSD) ++ readonly_fd.reset(HANDLE_EINTR(shm_open(path.value().c_str(), O_RDONLY, 0400))); ++#else + readonly_fd.reset(HANDLE_EINTR(open(path.value().c_str(), O_RDONLY))); ++#endif + if (!readonly_fd.is_valid()) { + DPLOG(ERROR) << "open(\"" << path.value() << "\", O_RDONLY) failed"; + return {}; +@@ -298,9 +323,15 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion: + } + } + ++#if defined(OS_BSD) + return PlatformSharedMemoryRegion( + {ScopedFD(shm_file.TakePlatformFile()), std::move(readonly_fd)}, mode, ++ size, token); ++#else ++ return PlatformSharedMemoryRegion( ++ {ScopedFD(shm_file.TakePlatformFile()), std::move(readonly_fd)}, mode, + size, UnguessableToken::Create()); ++#endif // OS_BSD + #endif // !defined(OS_NACL) + } + 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 1a73cb134a5c..e7b126ff9181 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-11-13 06:36:34 UTC +--- base/memory/shared_memory_region_unittest.cc.orig 2021-03-12 23:57:15 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 index a52248fa1ebc..6e3de9a10129 100644 --- a/www/chromium/files/patch-base_message__loop_message__pump__glib.cc +++ b/www/chromium/files/patch-base_message__loop_message__pump__glib.cc @@ -1,4 +1,4 @@ ---- base/message_loop/message_pump_glib.cc.orig 2020-11-20 15:15:51 UTC +--- base/message_loop/message_pump_glib.cc.orig 2021-03-12 23:57:15 UTC +++ base/message_loop/message_pump_glib.cc @@ -8,6 +8,11 @@ #include <glib.h> diff --git a/www/chromium/files/patch-base_native__library__posix.cc b/www/chromium/files/patch-base_native__library__posix.cc index a01e74227fa9..d414a8d50f6b 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 2020-11-13 06:36:34 UTC +--- base/native_library_posix.cc.orig 2021-03-12 23:57:15 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 51a1badf2d5b..a0e426036038 100644 --- a/www/chromium/files/patch-base_native__library__unittest.cc +++ b/www/chromium/files/patch-base_native__library__unittest.cc @@ -1,4 +1,4 @@ ---- base/native_library_unittest.cc.orig 2020-11-13 06:36:34 UTC +--- base/native_library_unittest.cc.orig 2021-03-12 23:57:15 UTC +++ base/native_library_unittest.cc @@ -118,7 +118,7 @@ TEST(NativeLibraryTest, LoadLibrary) { // Android dlopen() requires further investigation, as it might vary across 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 c6b968c45687..7776c0cc6b0e 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,4 +1,4 @@ ---- base/numerics/safe_math_shared_impl.h.orig 2020-11-13 06:36:34 UTC +--- base/numerics/safe_math_shared_impl.h.orig 2021-03-12 23:57:15 UTC +++ base/numerics/safe_math_shared_impl.h @@ -24,8 +24,7 @@ // Where available use builtin math overflow support on Clang and GCC. diff --git a/www/chromium/files/patch-base_path__service__unittest.cc b/www/chromium/files/patch-base_path__service__unittest.cc index de693d8b3e30..236be0173e7d 100644 --- a/www/chromium/files/patch-base_path__service__unittest.cc +++ b/www/chromium/files/patch-base_path__service__unittest.cc @@ -1,4 +1,4 @@ ---- base/path_service_unittest.cc.orig 2020-11-13 06:36:34 UTC +--- base/path_service_unittest.cc.orig 2021-03-12 23:57:15 UTC +++ base/path_service_unittest.cc @@ -38,7 +38,7 @@ bool ReturnsValidPath(int dir_type) { if (dir_type == DIR_CACHE) 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 c18e8b24aff5..64e3f2168c3c 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 2020-11-13 06:36:34 UTC +--- base/posix/can_lower_nice_to.cc.orig 2021-03-12 23:57:15 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 ab63f30e73d6..7d9441824666 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 2020-11-13 06:36:34 UTC +--- base/posix/unix_domain_socket.cc.orig 2021-03-12 23:57:15 UTC +++ base/posix/unix_domain_socket.cc @@ -5,7 +5,10 @@ #include "base/posix/unix_domain_socket.h" 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 31ec32ebcdd9..b3944551d784 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 2020-11-13 06:36:34 UTC +--- base/posix/unix_domain_socket_unittest.cc.orig 2021-03-12 23:57:15 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 78ad2a755e47..f8e0799d3d6a 100644 --- a/www/chromium/files/patch-base_process_internal__linux.cc +++ b/www/chromium/files/patch-base_process_internal__linux.cc @@ -1,4 +1,4 @@ ---- base/process/internal_linux.cc.orig 2020-11-13 06:36:34 UTC +--- base/process/internal_linux.cc.orig 2021-03-12 23:57:15 UTC +++ base/process/internal_linux.cc @@ -30,7 +30,11 @@ namespace internal { diff --git a/www/chromium/files/patch-base_process_internal__linux.h b/www/chromium/files/patch-base_process_internal__linux.h index 94e172d31aa3..b8a5fa684b9c 100644 --- a/www/chromium/files/patch-base_process_internal__linux.h +++ b/www/chromium/files/patch-base_process_internal__linux.h @@ -1,4 +1,4 @@ ---- base/process/internal_linux.h.orig 2020-11-13 06:36:34 UTC +--- base/process/internal_linux.h.orig 2021-03-12 23:57:15 UTC +++ base/process/internal_linux.h @@ -18,6 +18,8 @@ #include "base/strings/string_number_conversions.h" diff --git a/www/chromium/files/patch-base_process_kill.h b/www/chromium/files/patch-base_process_kill.h index 81a2d28914ee..197258681b45 100644 --- a/www/chromium/files/patch-base_process_kill.h +++ b/www/chromium/files/patch-base_process_kill.h @@ -1,4 +1,4 @@ ---- base/process/kill.h.orig 2020-11-13 06:36:34 UTC +--- base/process/kill.h.orig 2021-03-12 23:57:15 UTC +++ base/process/kill.h @@ -113,11 +113,11 @@ BASE_EXPORT TerminationStatus GetTerminationStatus(Pro BASE_EXPORT TerminationStatus GetKnownDeadTerminationStatus( diff --git a/www/chromium/files/patch-base_process_kill__posix.cc b/www/chromium/files/patch-base_process_kill__posix.cc index 975a055cb51a..71f59db89ba7 100644 --- a/www/chromium/files/patch-base_process_kill__posix.cc +++ b/www/chromium/files/patch-base_process_kill__posix.cc @@ -1,4 +1,4 @@ ---- base/process/kill_posix.cc.orig 2020-11-13 06:36:34 UTC +--- base/process/kill_posix.cc.orig 2021-03-12 23:57:15 UTC +++ base/process/kill_posix.cc @@ -160,7 +160,7 @@ void EnsureProcessTerminated(Process process) { 0, new BackgroundReaper(std::move(process), TimeDelta::FromSeconds(2))); diff --git a/www/chromium/files/patch-base_process_launch.cc b/www/chromium/files/patch-base_process_launch.cc index 02727ceffbb8..3abc9079ab29 100644 --- a/www/chromium/files/patch-base_process_launch.cc +++ b/www/chromium/files/patch-base_process_launch.cc @@ -1,4 +1,4 @@ ---- base/process/launch.cc.orig 2020-11-13 06:36:34 UTC +--- base/process/launch.cc.orig 2021-03-12 23:57:15 UTC +++ base/process/launch.cc @@ -15,7 +15,7 @@ LaunchOptions::~LaunchOptions() = default; diff --git a/www/chromium/files/patch-base_process_launch.h b/www/chromium/files/patch-base_process_launch.h index 67808bf9ee1e..84f428750a77 100644 --- a/www/chromium/files/patch-base_process_launch.h +++ b/www/chromium/files/patch-base_process_launch.h @@ -1,6 +1,6 @@ ---- base/process/launch.h.orig 2020-11-13 06:36:34 UTC +--- base/process/launch.h.orig 2021-03-12 23:57:15 UTC +++ base/process/launch.h -@@ -180,7 +180,7 @@ struct BASE_EXPORT LaunchOptions { +@@ -182,7 +182,7 @@ struct BASE_EXPORT LaunchOptions { bool clear_environment = false; #endif // OS_WIN || OS_POSIX || OS_FUCHSIA @@ -9,7 +9,7 @@ // If non-zero, start the process using clone(), using flags as provided. // Unlike in clone, clone_flags may not contain a custom termination signal // that is sent to the parent when the child dies. The termination signal will -@@ -193,7 +193,7 @@ struct BASE_EXPORT LaunchOptions { +@@ -195,7 +195,7 @@ struct BASE_EXPORT LaunchOptions { // Sets parent process death signal to SIGKILL. bool kill_on_parent_death = false; @@ -18,7 +18,7 @@ #if defined(OS_MAC) // Mach ports that will be accessible to the child process. These are not -@@ -408,7 +408,7 @@ BASE_EXPORT void RaiseProcessToHighPriority(); +@@ -410,7 +410,7 @@ BASE_EXPORT void RaiseProcessToHighPriority(); // binary. This should not be called in production/released code. BASE_EXPORT LaunchOptions LaunchOptionsForTest(); diff --git a/www/chromium/files/patch-base_process_launch__posix.cc b/www/chromium/files/patch-base_process_launch__posix.cc index 3fea66d7bfda..b55eb2ddc7f7 100644 --- a/www/chromium/files/patch-base_process_launch__posix.cc +++ b/www/chromium/files/patch-base_process_launch__posix.cc @@ -1,6 +1,13 @@ ---- base/process/launch_posix.cc.orig 2020-11-13 06:36:34 UTC +--- base/process/launch_posix.cc.orig 2021-03-12 23:57:15 UTC +++ base/process/launch_posix.cc -@@ -65,6 +65,7 @@ +@@ -59,12 +59,14 @@ + #if defined(OS_FREEBSD) + #include <sys/event.h> + #include <sys/ucontext.h> ++#include <sys/procctl.h> + #endif + + #if defined(OS_APPLE) #error "macOS should use launch_mac.cc" #endif @@ -8,7 +15,7 @@ extern char** environ; namespace base { -@@ -228,6 +229,28 @@ void CloseSuperfluousFds(const base::InjectiveMultimap +@@ -221,6 +223,28 @@ void CloseSuperfluousFds(const base::InjectiveMultimap DirReaderPosix fd_dir(kFDDir); if (!fd_dir.IsValid()) { // Fallback case: Try every possible fd. @@ -37,3 +44,37 @@ for (size_t i = 0; i < max_fds; ++i) { const int fd = static_cast<int>(i); if (fd == STDIN_FILENO || fd == STDOUT_FILENO || fd == STDERR_FILENO) +@@ -444,22 +468,32 @@ Process LaunchProcess(const std::vector<std::string>& + + // Set NO_NEW_PRIVS by default. Since NO_NEW_PRIVS only exists in kernel + // 3.5+, do not check the return value of prctl here. +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) || defined(OS_FREEBSD) + #ifndef PR_SET_NO_NEW_PRIVS + #define PR_SET_NO_NEW_PRIVS 38 + #endif ++#if !defined(OS_FREEBSD) + if (!options.allow_new_privs) { + if (prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0) && errno != EINVAL) { + // Only log if the error is not EINVAL (i.e. not supported). + RAW_LOG(FATAL, "prctl(PR_SET_NO_NEW_PRIVS) failed"); + } + } ++#endif + + if (options.kill_on_parent_death) { ++#if defined(OS_FREEBSD) ++ int procctl_value = SIGKILL; ++ if (procctl(P_PID, 0, PROC_PDEATHSIG_CTL, &procctl_value)) { ++ RAW_LOG(ERROR, "procctl(PROC_PDEATHSIG_CTL) failed"); ++ _exit(127); ++ } ++#else + if (prctl(PR_SET_PDEATHSIG, SIGKILL) != 0) { + RAW_LOG(ERROR, "prctl(PR_SET_PDEATHSIG) failed"); + _exit(127); + } ++#endif + } + #endif + diff --git a/www/chromium/files/patch-base_process_memory.cc b/www/chromium/files/patch-base_process_memory.cc index 5b6243421fee..9427d265694f 100644 --- a/www/chromium/files/patch-base_process_memory.cc +++ b/www/chromium/files/patch-base_process_memory.cc @@ -1,4 +1,4 @@ ---- base/process/memory.cc.orig 2020-11-13 06:36:34 UTC +--- base/process/memory.cc.orig 2021-03-12 23:57:15 UTC +++ base/process/memory.cc @@ -55,7 +55,7 @@ NOINLINE void OnNoMemoryInternal(size_t size) { } // namespace internal diff --git a/www/chromium/files/patch-base_process_memory.h b/www/chromium/files/patch-base_process_memory.h index 203ced37f125..ce431beeb301 100644 --- a/www/chromium/files/patch-base_process_memory.h +++ b/www/chromium/files/patch-base_process_memory.h @@ -1,4 +1,4 @@ ---- base/process/memory.h.orig 2020-11-13 06:36:34 UTC +--- base/process/memory.h.orig 2021-03-12 23:57:15 UTC +++ base/process/memory.h @@ -24,7 +24,7 @@ BASE_EXPORT void EnableTerminationOnOutOfMemory(); // Crash reporting classifies such crashes as OOM. diff --git a/www/chromium/files/patch-base_process_memory__unittest.cc b/www/chromium/files/patch-base_process_memory__unittest.cc index f219ce1737a7..ebd8ce1dc915 100644 --- a/www/chromium/files/patch-base_process_memory__unittest.cc +++ b/www/chromium/files/patch-base_process_memory__unittest.cc @@ -1,4 +1,4 @@ ---- base/process/memory_unittest.cc.orig 2020-11-13 06:36:34 UTC +--- base/process/memory_unittest.cc.orig 2021-03-12 23:57:15 UTC +++ base/process/memory_unittest.cc @@ -38,6 +38,8 @@ #if defined(OS_LINUX) || defined(OS_CHROMEOS) diff --git a/www/chromium/files/patch-base_process_process__handle.cc b/www/chromium/files/patch-base_process_process__handle.cc index 6b50c9ec1e52..28e99ae6c9d4 100644 --- a/www/chromium/files/patch-base_process_process__handle.cc +++ b/www/chromium/files/patch-base_process_process__handle.cc @@ -1,4 +1,4 @@ ---- base/process/process_handle.cc.orig 2020-11-13 06:36:34 UTC +--- base/process/process_handle.cc.orig 2021-03-12 23:57:15 UTC +++ base/process/process_handle.cc @@ -30,7 +30,7 @@ UniqueProcId GetUniqueIdForProcess() { : UniqueProcId(GetCurrentProcId()); diff --git a/www/chromium/files/patch-base_process_process__handle.h b/www/chromium/files/patch-base_process_process__handle.h index e323278cceb9..18238683a05f 100644 --- a/www/chromium/files/patch-base_process_process__handle.h +++ b/www/chromium/files/patch-base_process_process__handle.h @@ -1,4 +1,4 @@ ---- base/process/process_handle.h.orig 2020-11-13 06:36:34 UTC +--- base/process/process_handle.h.orig 2021-03-12 23:57:15 UTC +++ base/process/process_handle.h @@ -103,7 +103,7 @@ BASE_EXPORT ProcessId GetCurrentProcId(); // processes may be reused. 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 911926ae9833..76936bbfe294 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 2020-11-13 06:36:34 UTC +--- base/process/process_handle_freebsd.cc.orig 2021-03-12 23:57:15 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 3e6bae041cb9..a85419c8c54d 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 2021-01-18 21:28:45 UTC +--- base/process/process_iterator_freebsd.cc.orig 2021-03-12 23:57:15 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 1d8cfc75e2a1..a0a20c0f87a3 100644 --- a/www/chromium/files/patch-base_process_process__linux.cc +++ b/www/chromium/files/patch-base_process_process__linux.cc @@ -1,4 +1,4 @@ ---- base/process/process_linux.cc.orig 2020-11-13 06:36:34 UTC +--- base/process/process_linux.cc.orig 2021-03-12 23:57:15 UTC +++ base/process/process_linux.cc @@ -24,7 +24,9 @@ namespace base { @@ -8,7 +8,7 @@ const int kForegroundPriority = 0; +#endif - #if defined(OS_CHROMEOS) || BUILDFLAG(IS_LACROS) + #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) // We are more aggressive in our lowering of background process priority @@ -69,7 +71,7 @@ struct CGroups { return groups; @@ -17,7 +17,7 @@ -#else +#elif !defined(OS_BSD) const int kBackgroundPriority = 5; - #endif // defined(OS_CHROMEOS) || BUILDFLAG(IS_LACROS) + #endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) @@ -96,13 +98,18 @@ Time Process::CreationTime() const { if (!start_ticks) @@ -37,12 +37,12 @@ +#if !defined(OS_BSD) // static bool Process::CanBackgroundProcesses() { - #if defined(OS_CHROMEOS) || BUILDFLAG(IS_LACROS) + #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) @@ -154,6 +161,7 @@ bool Process::SetProcessBackgrounded(bool background) DPCHECK(result == 0); return result == 0; } +#endif // !defined(OS_BSD) - #if defined(OS_CHROMEOS) || BUILDFLAG(IS_LACROS) + #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_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 7712b3ca8733..b1789fe4854a 100644 --- a/www/chromium/files/patch-base_process_process__metrics.cc +++ b/www/chromium/files/patch-base_process_process__metrics.cc @@ -1,6 +1,6 @@ ---- base/process/process_metrics.cc.orig 2020-11-13 06:36:34 UTC +--- base/process/process_metrics.cc.orig 2021-03-12 23:57:15 UTC +++ base/process/process_metrics.cc -@@ -49,7 +49,7 @@ SystemMetrics SystemMetrics::Sample() { +@@ -50,7 +50,7 @@ SystemMetrics SystemMetrics::Sample() { SystemMetrics system_metrics; system_metrics.committed_memory_ = GetSystemCommitCharge(); @@ -9,7 +9,7 @@ GetSystemMemoryInfo(&system_metrics.memory_info_); GetVmStatInfo(&system_metrics.vmstat_info_); GetSystemDiskInfo(&system_metrics.disk_info_); -@@ -68,7 +68,7 @@ std::unique_ptr<Value> SystemMetrics::ToValue() const +@@ -69,7 +69,7 @@ std::unique_ptr<Value> SystemMetrics::ToValue() const std::unique_ptr<DictionaryValue> res(new DictionaryValue()); res->SetIntKey("committed_memory", static_cast<int>(committed_memory_)); @@ -18,7 +18,7 @@ std::unique_ptr<DictionaryValue> meminfo = memory_info_.ToValue(); std::unique_ptr<DictionaryValue> vmstat = vmstat_info_.ToValue(); meminfo->MergeDictionary(vmstat.get()); -@@ -119,7 +119,7 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage( +@@ -120,7 +120,7 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage( } #endif @@ -27,7 +27,7 @@ defined(OS_AIX) int ProcessMetrics::CalculateIdleWakeupsPerSecond( uint64_t absolute_idle_wakeups) { -@@ -132,7 +132,7 @@ int ProcessMetrics::GetIdleWakeupsPerSecond() { +@@ -133,7 +133,7 @@ int ProcessMetrics::GetIdleWakeupsPerSecond() { NOTIMPLEMENTED(); // http://crbug.com/120488 return 0; } diff --git a/www/chromium/files/patch-base_process_process__metrics.h b/www/chromium/files/patch-base_process_process__metrics.h index bfd237e3f277..cfbd2005c4ad 100644 --- a/www/chromium/files/patch-base_process_process__metrics.h +++ b/www/chromium/files/patch-base_process_process__metrics.h @@ -1,4 +1,4 @@ ---- base/process/process_metrics.h.orig 2020-11-13 06:36:34 UTC +--- base/process/process_metrics.h.orig 2021-03-12 23:57:15 UTC +++ base/process/process_metrics.h @@ -47,7 +47,7 @@ namespace base { // Full declaration is in process_metrics_iocounters.h. @@ -128,7 +128,7 @@ +#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || // defined(OS_AIX) defined(OS_FUCHSIA) - #if defined(OS_CHROMEOS) || BUILDFLAG(IS_LACROS) + #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) @@ -406,11 +406,11 @@ struct BASE_EXPORT SystemMemoryInfoKB { // Exposed for memory debugging widget. BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoKB* meminfo); @@ -151,7 +151,7 @@ +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) || // defined(OS_AIX) - #if defined(OS_CHROMEOS) || BUILDFLAG(IS_LACROS) + #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) @@ -597,7 +597,7 @@ class BASE_EXPORT SystemMetrics { FRIEND_TEST_ALL_PREFIXES(SystemMetricsTest, SystemMetrics); 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 524b56b16e85..f6df9a5b3396 100644 --- a/www/chromium/files/patch-base_process_process__metrics__freebsd.cc +++ b/www/chromium/files/patch-base_process_process__metrics__freebsd.cc @@ -1,4 +1,4 @@ ---- base/process/process_metrics_freebsd.cc.orig 2020-11-13 06:36:34 UTC +--- base/process/process_metrics_freebsd.cc.orig 2021-03-12 23:57:15 UTC +++ base/process/process_metrics_freebsd.cc @@ -3,8 +3,10 @@ // found in the LICENSE file. 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 46408ab62d44..69540cbc8d25 100644 --- a/www/chromium/files/patch-base_process_process__metrics__posix.cc +++ b/www/chromium/files/patch-base_process_process__metrics__posix.cc @@ -1,4 +1,4 @@ ---- base/process/process_metrics_posix.cc.orig 2020-11-13 06:36:34 UTC +--- base/process/process_metrics_posix.cc.orig 2021-03-12 23:57:15 UTC +++ base/process/process_metrics_posix.cc @@ -20,6 +20,8 @@ diff --git a/www/chromium/files/patch-base_process_process__unittest.cc b/www/chromium/files/patch-base_process_process__unittest.cc index 4054f8582e62..e2c0cca7cdd6 100644 --- a/www/chromium/files/patch-base_process_process__unittest.cc +++ b/www/chromium/files/patch-base_process_process__unittest.cc @@ -1,6 +1,6 @@ ---- base/process/process_unittest.cc.orig 2020-11-13 06:36:34 UTC +--- base/process/process_unittest.cc.orig 2021-03-12 23:57:15 UTC +++ base/process/process_unittest.cc -@@ -153,7 +153,7 @@ TEST_F(ProcessTest, CreationTimeOtherProcess) { +@@ -138,7 +138,7 @@ TEST_F(ProcessTest, CreationTimeOtherProcess) { // was spawned and a time recorded after it was spawned. However, since the // base::Time and process creation clocks don't match, tolerate some error. constexpr base::TimeDelta kTolerance = 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 6fba502213d2..0b9f07e4fac8 100644 --- a/www/chromium/files/patch-base_process_process__util__unittest.cc +++ b/www/chromium/files/patch-base_process_process__util__unittest.cc @@ -1,4 +1,4 @@ ---- base/process/process_util_unittest.cc.orig 2021-01-18 21:28:45 UTC +--- base/process/process_util_unittest.cc.orig 2021-03-12 23:57:15 UTC +++ base/process/process_util_unittest.cc @@ -1308,11 +1308,11 @@ std::string TestLaunchProcess(const CommandLine& cmdli options.fds_to_remap.emplace_back(fds[1], STDOUT_FILENO); diff --git a/www/chromium/files/patch-base_profiler_register__context.h b/www/chromium/files/patch-base_profiler_register__context.h index 79ee85b05e84..20c522c39c13 100644 --- a/www/chromium/files/patch-base_profiler_register__context.h +++ b/www/chromium/files/patch-base_profiler_register__context.h @@ -1,4 +1,4 @@ ---- base/profiler/register_context.h.orig 2020-11-13 06:36:34 UTC +--- base/profiler/register_context.h.orig 2021-03-12 23:57:15 UTC +++ base/profiler/register_context.h @@ -17,7 +17,7 @@ #include <windows.h> 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 ec7f92d52984..cb734b35baa1 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,4 +1,4 @@ ---- base/profiler/sampling_profiler_thread_token.cc.orig 2020-11-13 06:36:34 UTC +--- base/profiler/sampling_profiler_thread_token.cc.orig 2021-03-12 23:57:15 UTC +++ base/profiler/sampling_profiler_thread_token.cc @@ -7,7 +7,7 @@ namespace base { 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 c36c1078ab26..6a8db9bde841 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,4 +1,4 @@ ---- base/profiler/sampling_profiler_thread_token.h.orig 2020-11-13 06:36:34 UTC +--- base/profiler/sampling_profiler_thread_token.h.orig 2021-03-12 23:57:15 UTC +++ base/profiler/sampling_profiler_thread_token.h @@ -9,7 +9,7 @@ #include "base/threading/platform_thread.h" 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 47eefaa173d1..0e9a2eb0fe93 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-11-13 06:36:34 UTC +--- base/profiler/stack_copier_signal.cc.orig 2021-03-12 23:57:15 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> -@@ -34,8 +41,13 @@ class AsyncSafeWaitableEvent { +@@ -35,8 +42,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) -@@ -45,8 +57,12 @@ class AsyncSafeWaitableEvent { +@@ -46,8 +58,12 @@ class AsyncSafeWaitableEvent { void Signal() { futex_.store(1, std::memory_order_release); @@ -42,7 +42,7 @@ } private: -@@ -216,11 +232,18 @@ bool StackCopierSignal::CopyStack(StackBuffer* stack_b +@@ -221,11 +237,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 29ebf0d0b33e..3f2832f89006 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,4 +1,4 @@ ---- base/profiler/stack_sampling_profiler_test_util.cc.orig 2020-11-13 06:36:34 UTC +--- base/profiler/stack_sampling_profiler_test_util.cc.orig 2021-03-12 23:57:15 UTC +++ base/profiler/stack_sampling_profiler_test_util.cc @@ -32,7 +32,7 @@ // Fortunately, it provides _alloca, which functions identically. 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 5f14491af9cc..643ce4378303 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,4 +1,4 @@ ---- base/profiler/stack_sampling_profiler_unittest.cc.orig 2020-11-13 06:36:34 UTC +--- base/profiler/stack_sampling_profiler_unittest.cc.orig 2021-03-12 23:57:15 UTC +++ base/profiler/stack_sampling_profiler_unittest.cc @@ -42,7 +42,7 @@ #include <intrin.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 849d40187045..e98382c18800 100644 --- a/www/chromium/files/patch-base_profiler_thread__delegate__posix.cc +++ b/www/chromium/files/patch-base_profiler_thread__delegate__posix.cc @@ -1,4 +1,4 @@ ---- base/profiler/thread_delegate_posix.cc.orig 2020-11-13 06:36:34 UTC +--- base/profiler/thread_delegate_posix.cc.orig 2021-03-12 23:57:15 UTC +++ base/profiler/thread_delegate_posix.cc @@ -12,6 +12,9 @@ #include "base/profiler/thread_delegate_posix.h" 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 63a4e3b68dd8..c194af3d33d5 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,4 +1,4 @@ ---- base/sampling_heap_profiler/sampling_heap_profiler.cc.orig 2020-11-13 06:36:34 UTC +--- base/sampling_heap_profiler/sampling_heap_profiler.cc.orig 2021-03-12 23:57:15 UTC +++ base/sampling_heap_profiler/sampling_heap_profiler.cc @@ -30,6 +30,10 @@ #include <sys/prctl.h> diff --git a/www/chromium/files/patch-base_security__unittest.cc b/www/chromium/files/patch-base_security__unittest.cc index 132ea807512e..91d05f550115 100644 --- a/www/chromium/files/patch-base_security__unittest.cc +++ b/www/chromium/files/patch-base_security__unittest.cc @@ -1,4 +1,4 @@ ---- base/security_unittest.cc.orig 2020-11-13 06:36:34 UTC +--- base/security_unittest.cc.orig 2021-03-12 23:57:15 UTC +++ base/security_unittest.cc @@ -61,7 +61,7 @@ NOINLINE Type HideValueFromCompiler(volatile Type valu void OverflowTestsSoftExpectTrue(bool overflow_detected) { diff --git a/www/chromium/files/patch-base_strings_sys__string__conversions__unittest.cc b/www/chromium/files/patch-base_strings_sys__string__conversions__unittest.cc index c05afd11e6c2..f1d7377c58d2 100644 --- a/www/chromium/files/patch-base_strings_sys__string__conversions__unittest.cc +++ b/www/chromium/files/patch-base_strings_sys__string__conversions__unittest.cc @@ -1,4 +1,4 @@ ---- base/strings/sys_string_conversions_unittest.cc.orig 2020-11-16 14:00:26 UTC +--- base/strings/sys_string_conversions_unittest.cc.orig 2021-03-12 23:57:15 UTC +++ base/strings/sys_string_conversions_unittest.cc @@ -76,7 +76,7 @@ TEST(SysStrings, SysUTF8ToWide) { } diff --git a/www/chromium/files/patch-base_synchronization_lock__impl.h b/www/chromium/files/patch-base_synchronization_lock__impl.h index ba9ba2a6221b..08323a1eeeee 100644 --- a/www/chromium/files/patch-base_synchronization_lock__impl.h +++ b/www/chromium/files/patch-base_synchronization_lock__impl.h @@ -1,4 +1,4 @@ ---- base/synchronization/lock_impl.h.orig 2020-11-13 06:36:34 UTC +--- base/synchronization/lock_impl.h.orig 2021-03-12 23:57:15 UTC +++ base/synchronization/lock_impl.h @@ -105,6 +105,8 @@ void LockImpl::Unlock() { } diff --git a/www/chromium/files/patch-base_syslog__logging.cc b/www/chromium/files/patch-base_syslog__logging.cc index 6df3281f7cf2..3c3a7a71f3f6 100644 --- a/www/chromium/files/patch-base_syslog__logging.cc +++ b/www/chromium/files/patch-base_syslog__logging.cc @@ -1,4 +1,4 @@ ---- base/syslog_logging.cc.orig 2020-11-13 06:36:34 UTC +--- base/syslog_logging.cc.orig 2021-03-12 23:57:15 UTC +++ base/syslog_logging.cc @@ -13,7 +13,7 @@ #include "base/strings/string_util.h" diff --git a/www/chromium/files/patch-base_system_sys__info.cc b/www/chromium/files/patch-base_system_sys__info.cc index f5ba828fa6e0..6567dc430f4e 100644 --- a/www/chromium/files/patch-base_system_sys__info.cc +++ b/www/chromium/files/patch-base_system_sys__info.cc @@ -1,7 +1,7 @@ ---- base/system/sys_info.cc.orig 2020-11-13 06:36:34 UTC +--- base/system/sys_info.cc.orig 2021-03-12 23:57:15 UTC +++ base/system/sys_info.cc -@@ -104,7 +104,7 @@ void SysInfo::GetHardwareInfo(base::OnceCallback<void( - #elif defined(OS_ANDROID) || defined(OS_APPLE) +@@ -94,7 +94,7 @@ void SysInfo::GetHardwareInfo(base::OnceCallback<void( + #if defined(OS_WIN) || defined(OS_ANDROID) || defined(OS_APPLE) base::ThreadPool::PostTaskAndReplyWithResult( FROM_HERE, {}, base::BindOnce(&GetHardwareInfoSync), std::move(callback)); -#elif defined(OS_LINUX) || defined(OS_CHROMEOS) diff --git a/www/chromium/files/patch-base_system_sys__info.h b/www/chromium/files/patch-base_system_sys__info.h index 9cfe26c9f8cb..16d9092bc224 100644 --- a/www/chromium/files/patch-base_system_sys__info.h +++ b/www/chromium/files/patch-base_system_sys__info.h @@ -1,6 +1,6 @@ ---- base/system/sys_info.h.orig 2021-01-18 21:28:45 UTC +--- base/system/sys_info.h.orig 2021-03-12 23:57:15 UTC +++ base/system/sys_info.h -@@ -208,6 +208,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,7 +9,7 @@ private: FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory); FRIEND_TEST_ALL_PREFIXES(debug::SystemMetricsTest, ParseMeminfo); -@@ -217,7 +219,7 @@ class BASE_EXPORT SysInfo { +@@ -211,7 +213,7 @@ class BASE_EXPORT SysInfo { static bool IsLowEndDeviceImpl(); static HardwareInfo GetHardwareInfoSync(); 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 7bacdbf34b96..d9d7666229a7 100644 --- a/www/chromium/files/patch-base_system_sys__info__freebsd.cc +++ b/www/chromium/files/patch-base_system_sys__info__freebsd.cc @@ -1,4 +1,4 @@ ---- base/system/sys_info_freebsd.cc.orig 2020-11-13 06:36:34 UTC +--- base/system/sys_info_freebsd.cc.orig 2021-03-12 23:57:15 UTC +++ base/system/sys_info_freebsd.cc @@ -9,30 +9,95 @@ #include <sys/sysctl.h> 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 87f69159c3cd..4f5d25393487 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,18 @@ ---- base/system/sys_info_posix.cc.orig 2020-11-13 06:36:34 UTC +--- base/system/sys_info_posix.cc.orig 2021-03-12 23:57:15 UTC +++ base/system/sys_info_posix.cc -@@ -223,6 +223,8 @@ std::string SysInfo::OperatingSystemArchitecture() { +@@ -25,6 +25,11 @@ + #if defined(OS_ANDROID) + #include <sys/vfs.h> + #define statvfs statfs // Android uses a statvfs-like statfs struct and call. ++#elif defined(OS_BSD) ++#include <sys/param.h> ++#include <sys/mount.h> ++#define statvfs statfs ++#define f_frsize f_bsize + #else + #include <sys/statvfs.h> + #endif +@@ -224,6 +229,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 index 02bec6b99962..75ea1a02ee4e 100644 --- a/www/chromium/files/patch-base_system_sys__info__unittest.cc +++ b/www/chromium/files/patch-base_system_sys__info__unittest.cc @@ -1,6 +1,6 @@ ---- base/system/sys_info_unittest.cc.orig 2021-01-18 21:28:45 UTC +--- base/system/sys_info_unittest.cc.orig 2021-03-12 23:57:15 UTC +++ base/system/sys_info_unittest.cc -@@ -50,13 +50,13 @@ TEST_F(SysInfoTest, AmountOfMem) { +@@ -62,13 +62,13 @@ TEST_F(SysInfoTest, AmountOfMem) { EXPECT_GE(SysInfo::AmountOfVirtualMemory(), 0); } @@ -17,16 +17,16 @@ TEST_F(SysInfoTest, MAYBE_AmountOfAvailablePhysicalMemory) { // Note: info is in _K_bytes. SystemMemoryInfoKB info; -@@ -87,7 +87,7 @@ TEST_F(SysInfoTest, MAYBE_AmountOfAvailablePhysicalMem +@@ -99,7 +99,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) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) TEST_F(SysInfoTest, AmountOfFreeDiskSpace) { // We aren't actually testing that it's correct, just that it's sane. -@@ -137,7 +137,7 @@ TEST_F(SysInfoTest, NestedVolumesAmountOfTotalDiskSpac +@@ -149,7 +149,7 @@ TEST_F(SysInfoTest, NestedVolumesAmountOfTotalDiskSpac } #endif // defined(OS_FUCHSIA) @@ -35,7 +35,7 @@ defined(OS_CHROMEOS) || defined(OS_FUCHSIA) TEST_F(SysInfoTest, OperatingSystemVersionNumbers) { int32_t os_major_version = -1; -@@ -198,7 +198,7 @@ TEST_F(SysInfoTest, GetHardwareInfo) { +@@ -210,7 +210,7 @@ TEST_F(SysInfoTest, GetHardwareInfo) { EXPECT_TRUE(IsStringUTF8(hardware_info->model)); bool empty_result_expected = #if defined(OS_ANDROID) || defined(OS_APPLE) || defined(OS_WIN) || \ diff --git a/www/chromium/files/patch-base_task_thread__pool_environment__config__unittest.cc b/www/chromium/files/patch-base_task_thread__pool_environment__config__unittest.cc index 2b31585fd9f1..32c3cb7fe7bc 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,4 +1,4 @@ ---- base/task/thread_pool/environment_config_unittest.cc.orig 2020-11-13 06:36:34 UTC +--- base/task/thread_pool/environment_config_unittest.cc.orig 2021-03-12 23:57:15 UTC +++ base/task/thread_pool/environment_config_unittest.cc @@ -14,7 +14,7 @@ namespace internal { TEST(ThreadPoolEnvironmentConfig, CanUseBackgroundPriorityForWorker) { diff --git a/www/chromium/files/patch-base_test_BUILD.gn b/www/chromium/files/patch-base_test_BUILD.gn index 84cc7d20576b..77c53a07d8d9 100644 --- a/www/chromium/files/patch-base_test_BUILD.gn +++ b/www/chromium/files/patch-base_test_BUILD.gn @@ -1,6 +1,6 @@ ---- base/test/BUILD.gn.orig 2021-01-18 21:28:45 UTC +--- base/test/BUILD.gn.orig 2021-03-12 23:57:15 UTC +++ base/test/BUILD.gn -@@ -416,7 +416,11 @@ if (is_linux || is_chromeos) { +@@ -428,7 +428,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 356c0291d387..a383ea3c7641 100644 --- a/www/chromium/files/patch-base_test_launcher_test__launcher.cc +++ b/www/chromium/files/patch-base_test_launcher_test__launcher.cc @@ -1,6 +1,6 @@ ---- base/test/launcher/test_launcher.cc.orig 2021-01-18 21:28:45 UTC +--- base/test/launcher/test_launcher.cc.orig 2021-03-12 23:57:15 UTC +++ base/test/launcher/test_launcher.cc -@@ -57,6 +57,7 @@ +@@ -58,6 +58,7 @@ #include "testing/gtest/include/gtest/gtest.h" #if defined(OS_POSIX) @@ -8,7 +8,7 @@ #include <fcntl.h> #include "base/files/file_descriptor_watcher_posix.h" -@@ -598,7 +599,7 @@ ChildProcessResults DoLaunchChildTestProcess( +@@ -599,7 +600,7 @@ ChildProcessResults DoLaunchChildTestProcess( #if !defined(OS_FUCHSIA) options.new_process_group = true; #endif @@ -17,7 +17,7 @@ options.kill_on_parent_death = true; #endif -@@ -1515,7 +1516,7 @@ bool TestLauncher::Init(CommandLine* command_line) { +@@ -1516,7 +1517,7 @@ bool TestLauncher::Init(CommandLine* command_line) { results_tracker_.AddGlobalTag("OS_IOS"); #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 07fa4b159c80..137f48dbf98e 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,4 +1,4 @@ ---- base/test/test_file_util_posix.cc.orig 2020-11-13 06:36:34 UTC +--- base/test/test_file_util_posix.cc.orig 2021-03-12 23:57:15 UTC +++ base/test/test_file_util_posix.cc @@ -87,7 +87,7 @@ void SyncPageCacheToDisk() { sync(); diff --git a/www/chromium/files/patch-base_test_test__suite.cc b/www/chromium/files/patch-base_test_test__suite.cc index b9f1034ae5ac..c4d114600fe2 100644 --- a/www/chromium/files/patch-base_test_test__suite.cc +++ b/www/chromium/files/patch-base_test_test__suite.cc @@ -1,4 +1,4 @@ ---- base/test/test_suite.cc.orig 2020-11-13 06:36:34 UTC +--- base/test/test_suite.cc.orig 2021-03-12 23:57:15 UTC +++ base/test/test_suite.cc @@ -66,7 +66,7 @@ #include "base/test/test_support_android.h" 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 b7bd8c4fd45a..5ef582ab80d9 100644 --- a/www/chromium/files/patch-base_third__party_libevent_BUILD.gn +++ b/www/chromium/files/patch-base_third__party_libevent_BUILD.gn @@ -1,4 +1,4 @@ ---- base/third_party/libevent/BUILD.gn.orig 2020-11-13 06:36:34 UTC +--- base/third_party/libevent/BUILD.gn.orig 2021-03-12 23:57:15 UTC +++ base/third_party/libevent/BUILD.gn @@ -43,13 +43,20 @@ static_library("libevent") { "mac/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 a75b61323372..ec417fb772f6 100644 --- a/www/chromium/files/patch-base_threading_platform__thread.h +++ b/www/chromium/files/patch-base_threading_platform__thread.h @@ -1,6 +1,6 @@ ---- base/threading/platform_thread.h.orig 2020-11-13 06:36:34 UTC +--- base/threading/platform_thread.h.orig 2021-03-12 23:57:15 UTC +++ base/threading/platform_thread.h -@@ -230,7 +230,7 @@ class BASE_EXPORT PlatformThread { +@@ -231,7 +231,7 @@ class BASE_EXPORT PlatformThread { // Returns a realtime period provided by |delegate|. static TimeDelta GetRealtimePeriod(Delegate* delegate); diff --git a/www/chromium/files/patch-base_threading_platform__thread__internal__posix.h b/www/chromium/files/patch-base_threading_platform__thread__internal__posix.h index 5bcd713380b3..1d75cd4cd16d 100644 --- a/www/chromium/files/patch-base_threading_platform__thread__internal__posix.h +++ b/www/chromium/files/patch-base_threading_platform__thread__internal__posix.h @@ -1,4 +1,4 @@ ---- base/threading/platform_thread_internal_posix.h.orig 2020-11-16 17:28:09 UTC +--- base/threading/platform_thread_internal_posix.h.orig 2021-03-12 23:57:15 UTC +++ base/threading/platform_thread_internal_posix.h @@ -47,13 +47,13 @@ bool SetCurrentThreadPriorityForPlatform(ThreadPriorit // of CanIncreaseThreadPriority(). 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 ffb57676d50a..354fb7c81799 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 2020-11-13 06:36:34 UTC +--- base/threading/platform_thread_linux.cc.orig 2021-03-12 23:57:15 UTC +++ base/threading/platform_thread_linux.cc -@@ -24,7 +24,9 @@ +@@ -27,7 +27,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> -@@ -264,7 +266,7 @@ const ThreadPriorityToNiceValuePair kThreadPriorityToN +@@ -298,7 +300,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; -@@ -314,7 +316,7 @@ Optional<ThreadPriority> GetCurrentThreadPriorityForPl +@@ -348,7 +350,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 459b2c3b0328..6df053313128 100644 --- a/www/chromium/files/patch-base_threading_platform__thread__posix.cc +++ b/www/chromium/files/patch-base_threading_platform__thread__posix.cc @@ -1,4 +1,4 @@ ---- base/threading/platform_thread_posix.cc.orig 2020-11-13 06:36:34 UTC +--- base/threading/platform_thread_posix.cc.orig 2021-03-12 23:57:15 UTC +++ base/threading/platform_thread_posix.cc @@ -32,6 +32,10 @@ #include <sys/syscall.h> @@ -18,14 +18,14 @@ -#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 + // Store the thread ids in local storage since calling the SWI can be // 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) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) } // namespace 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 975180f95adb..8f58f5244228 100644 --- a/www/chromium/files/patch-base_threading_platform__thread__unittest.cc +++ b/www/chromium/files/patch-base_threading_platform__thread__unittest.cc @@ -1,4 +1,4 @@ ---- base/threading/platform_thread_unittest.cc.orig 2021-01-18 21:28:45 UTC +--- base/threading/platform_thread_unittest.cc.orig 2021-03-12 23:57:15 UTC +++ base/threading/platform_thread_unittest.cc @@ -312,7 +312,7 @@ TEST(PlatformThreadTest, // and hardcodes what we know. Please inform scheduler-dev@chromium.org if this 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 755f30ed7957..7a59470f065d 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-11-13 06:36:34 UTC +--- base/threading/scoped_blocking_call_unittest.cc.orig 2021-03-12 23:57:15 UTC +++ base/threading/scoped_blocking_call_unittest.cc @@ -273,7 +273,7 @@ TEST_F(ScopedBlockingCallIOJankMonitoringTest, ManyInA } 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 de0f014549d6..009859798e28 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-11-13 06:36:34 UTC +--- base/threading/thread_task_runner_handle.cc.orig 2021-03-12 23:57:15 UTC +++ base/threading/thread_task_runner_handle.cc @@ -8,6 +8,7 @@ #include <utility> @@ -8,19 +8,19 @@ #include "base/check_op.h" #include "base/lazy_instance.h" #include "base/run_loop.h" -@@ -38,6 +39,7 @@ bool ThreadTaskRunnerHandle::IsSet() { - return !!thread_task_runner_tls.Pointer()->Get(); +@@ -33,6 +34,7 @@ const scoped_refptr<SingleThreadTaskRunner>& ThreadTas + return current->task_runner_; } +#if defined(OS_BSD) // static - ScopedClosureRunner ThreadTaskRunnerHandle::OverrideForTesting( - scoped_refptr<SingleThreadTaskRunner> overriding_task_runner) { -@@ -82,6 +84,7 @@ ScopedClosureRunner ThreadTaskRunnerHandle::OverrideFo - base::Unretained(ttrh->task_runner_.get()), - std::move(no_running_during_override))); + bool ThreadTaskRunnerHandle::IsSet() { + return !!thread_task_runner_tls.Pointer()->Get(); +@@ -80,6 +82,7 @@ ThreadTaskRunnerHandleOverride::ThreadTaskRunnerHandle + if (!allow_nested_runloop) + no_running_during_override_.emplace(); } +#endif - ThreadTaskRunnerHandle::ThreadTaskRunnerHandle( - scoped_refptr<SingleThreadTaskRunner> task_runner) + ThreadTaskRunnerHandleOverride::~ThreadTaskRunnerHandleOverride() { + if (task_runner_to_restore_) { diff --git a/www/chromium/files/patch-base_time_time__unittest.cc b/www/chromium/files/patch-base_time_time__unittest.cc index 7aa69a9a96ed..c0cabcc11f62 100644 --- a/www/chromium/files/patch-base_time_time__unittest.cc +++ b/www/chromium/files/patch-base_time_time__unittest.cc @@ -1,4 +1,4 @@ ---- base/time/time_unittest.cc.orig 2020-11-16 17:58:27 UTC +--- base/time/time_unittest.cc.orig 2021-03-12 23:57:15 UTC +++ base/time/time_unittest.cc @@ -1969,6 +1969,7 @@ TEST(TimeDelta, Overflows) { EXPECT_TRUE((kLargeDelta / 0.5).is_max()); diff --git a/www/chromium/files/patch-base_trace__event_heap__profiler__allocation__context__tracker.cc b/www/chromium/files/patch-base_trace__event_heap__profiler__allocation__context__tracker.cc new file mode 100644 index 000000000000..08477d7b3b80 --- /dev/null +++ b/www/chromium/files/patch-base_trace__event_heap__profiler__allocation__context__tracker.cc @@ -0,0 +1,38 @@ +--- base/trace_event/heap_profiler_allocation_context_tracker.cc.orig 2021-03-12 23:57:15 UTC ++++ base/trace_event/heap_profiler_allocation_context_tracker.cc +@@ -30,6 +30,10 @@ + #include <sys/prctl.h> + #endif + ++#if defined(OS_BSD) ++#include <pthread_np.h> ++#endif ++ + namespace base { + namespace trace_event { + +@@ -61,13 +65,23 @@ ThreadLocalStorage::Slot& AllocationContextTrackerTLS( + // with id. This function intentionally leaks the allocated strings since they + // are used to tag allocations even after the thread dies. + const char* GetAndLeakThreadName() { +- char name[16]; ++#if defined(OS_BSD) ++ constexpr size_t kBufferLen = 64; ++#else ++ constexpr size_t kBufferLen = 16; ++#endif ++ char name[kBufferLen]; + #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) + // If the thread name is not set, try to get it from prctl. Thread name might + // not be set in cases where the thread started before heap profiling was + // enabled. + int err = prctl(PR_GET_NAME, name); + if (!err) { ++ return strdup(name); ++ } ++#elif defined(OS_BSD) && __FreeBSD__ >= 12 ++ pthread_get_name_np(pthread_self(), name, kBufferLen); ++ if (*name != '\0') { + return strdup(name); + } + #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) 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 c38c4a9ad7d3..afbf97a668d0 100644 --- a/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc +++ b/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc @@ -1,4 +1,4 @@ ---- base/trace_event/malloc_dump_provider.cc.orig 2021-01-18 21:28:45 UTC +--- base/trace_event/malloc_dump_provider.cc.orig 2021-03-12 23:57:15 UTC +++ base/trace_event/malloc_dump_provider.cc @@ -17,6 +17,8 @@ @@ -9,7 +9,7 @@ #else #include <malloc.h> #endif -@@ -163,6 +165,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump +@@ -184,6 +186,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump } #elif defined(OS_FUCHSIA) // TODO(fuchsia): Port, see https://crbug.com/706592. 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 39523ac96cf1..a6931d12baf3 100644 --- a/www/chromium/files/patch-base_trace__event_process__memory__dump.cc +++ b/www/chromium/files/patch-base_trace__event_process__memory__dump.cc @@ -1,6 +1,6 @@ ---- base/trace_event/process_memory_dump.cc.orig 2021-01-18 21:28:45 UTC +--- base/trace_event/process_memory_dump.cc.orig 2021-03-12 23:57:15 UTC +++ base/trace_event/process_memory_dump.cc -@@ -100,7 +100,7 @@ size_t ProcessMemoryDump::CountResidentBytes(void* sta +@@ -101,7 +101,7 @@ base::Optional<size_t> ProcessMemoryDump::CountResiden #if defined(OS_WIN) std::unique_ptr<PSAPI_WORKING_SET_EX_INFORMATION[]> vec( new PSAPI_WORKING_SET_EX_INFORMATION[max_vec_size]); diff --git a/www/chromium/files/patch-base_trace__event_process__memory__dump.h b/www/chromium/files/patch-base_trace__event_process__memory__dump.h deleted file mode 100644 index dea3b589c4d3..000000000000 --- a/www/chromium/files/patch-base_trace__event_process__memory__dump.h +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 @@ - - // Define COUNT_RESIDENT_BYTES_SUPPORTED if platform supports counting of the - // resident memory. --#if !defined(OS_NACL) -+#if !defined(OS_NACL) && !defined(OS_BSD) - #define COUNT_RESIDENT_BYTES_SUPPORTED - #endif - 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 index 6f4603a02a7e..a7a50b33f4cd 100644 --- 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 @@ -1,20 +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.orig 2021-03-12 23:57:15 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" +@@ -17,7 +17,7 @@ #include "base/win/windows_version.h" --#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) #include "base/util/memory_pressure/system_memory_pressure_evaluator_linux.h" #endif -@@ -45,7 +45,7 @@ SystemMemoryPressureEvaluator::CreateDefaultSystemEval - evaluator->CreateOSSignalPressureEvaluator(monitor->CreateVoter()); - } +@@ -50,7 +50,7 @@ SystemMemoryPressureEvaluator::CreateDefaultSystemEval return evaluator; --#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) 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 7ea45f213a28..516a836ec2a5 100644 --- a/www/chromium/files/patch-build_config_BUILD.gn +++ b/www/chromium/files/patch-build_config_BUILD.gn @@ -1,4 +1,4 @@ ---- build/config/BUILD.gn.orig 2021-01-18 21:28:45 UTC +--- build/config/BUILD.gn.orig 2021-03-12 23:57:15 UTC +++ build/config/BUILD.gn @@ -232,9 +232,7 @@ config("default_libs") { ] @@ -10,7 +10,7 @@ ] } } -@@ -317,7 +315,7 @@ config("executable_config") { +@@ -313,7 +311,7 @@ config("executable_config") { "//build/config/ios:ios_dynamic_flags", "//build/config/ios:ios_executable_flags", ] diff --git a/www/chromium/files/patch-build_config_BUILDCONFIG.gn b/www/chromium/files/patch-build_config_BUILDCONFIG.gn index e013fead44a4..e434d1df8b05 100644 --- a/www/chromium/files/patch-build_config_BUILDCONFIG.gn +++ b/www/chromium/files/patch-build_config_BUILDCONFIG.gn @@ -1,6 +1,6 @@ ---- build/config/BUILDCONFIG.gn.orig 2021-01-18 21:28:45 UTC +--- build/config/BUILDCONFIG.gn.orig 2021-03-12 23:57:15 UTC +++ build/config/BUILDCONFIG.gn -@@ -183,8 +183,8 @@ if (host_toolchain == "") { +@@ -194,8 +194,8 @@ if (host_toolchain == "") { # TODO(dpranke): Add some sort of assert here that verifies that # no toolchain omitted host_toolchain from its toolchain_args(). @@ -11,7 +11,7 @@ host_toolchain = "//build/toolchain/linux:clang_$host_cpu" } else if (is_clang) { host_toolchain = "//build/toolchain/linux:clang_$host_cpu" -@@ -221,7 +221,7 @@ if (target_os == "android") { +@@ -232,7 +232,7 @@ if (target_os == "android") { assert(host_os == "linux" || host_os == "mac", "Android builds are only supported on Linux and Mac hosts.") _default_toolchain = "//build/toolchain/android:android_clang_$target_cpu" @@ -20,7 +20,7 @@ # See comments in build/toolchain/cros/BUILD.gn about board compiles. if (is_clang) { _default_toolchain = "//build/toolchain/linux:clang_$target_cpu" -@@ -282,10 +282,11 @@ if (custom_toolchain != "") { +@@ -293,10 +293,11 @@ if (custom_toolchain != "") { # current_os value directly. is_android = current_os == "android" diff --git a/www/chromium/files/patch-build_config_compiler_BUILD.gn b/www/chromium/files/patch-build_config_compiler_BUILD.gn index 285441131a4a..2a92a5062dd3 100644 --- a/www/chromium/files/patch-build_config_compiler_BUILD.gn +++ b/www/chromium/files/patch-build_config_compiler_BUILD.gn @@ -1,6 +1,6 @@ ---- build/config/compiler/BUILD.gn.orig 2021-01-18 21:28:45 UTC +--- build/config/compiler/BUILD.gn.orig 2021-03-12 23:57:15 UTC +++ build/config/compiler/BUILD.gn -@@ -129,7 +129,7 @@ declare_args() { +@@ -132,7 +132,7 @@ declare_args() { # # TODO(crbug.com/977230): Enabling this when 'use_xcode_clang' is true may # call an old clang that doesn't support auto-init. @@ -9,7 +9,7 @@ # This argument is to control whether enabling text section splitting in the # final binary. When enabled, the separated text sections with prefix -@@ -291,7 +291,7 @@ config("compiler") { +@@ -316,7 +316,7 @@ config("compiler") { } # Linker warnings. @@ -18,7 +18,7 @@ ldflags += [ "-Wl,--fatal-warnings" ] } if (fatal_linker_warnings && is_apple) { -@@ -387,7 +387,7 @@ config("compiler") { +@@ -411,7 +411,7 @@ config("compiler") { # Compiler instrumentation can introduce dependencies in DSOs to symbols in # the executable they are loaded into, so they are unresolved at link-time. @@ -27,7 +27,7 @@ ldflags += [ "-Wl,-z,defs", "-Wl,--as-needed", -@@ -478,7 +478,7 @@ config("compiler") { +@@ -501,7 +501,7 @@ config("compiler") { ldflags += [ "-Wl,-z,keep-text-section-prefix" ] } @@ -36,7 +36,7 @@ cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ] cflags += [ -@@ -777,7 +777,7 @@ config("compiler_cpu_abi") { +@@ -796,7 +796,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" ] } -@@ -1127,7 +1127,7 @@ config("compiler_deterministic") { +@@ -1146,7 +1146,7 @@ config("compiler_deterministic") { "-Xclang", ".", ] @@ -54,7 +54,7 @@ # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167) asmflags = [ "-Wa,-fdebug-compilation-dir,." ] } -@@ -1510,7 +1510,7 @@ config("default_warnings") { +@@ -1529,7 +1529,7 @@ config("default_warnings") { cflags += [ "-Wno-nonportable-include-path" ] } @@ -63,7 +63,26 @@ # Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not # recognize. cflags += [ -@@ -1685,7 +1685,7 @@ config("no_chromium_code") { +@@ -1570,6 +1570,18 @@ config("default_warnings") { + cflags += [ "-Wno-max-tokens" ] + } + } ++ ++ if (is_clang && is_bsd) { ++ cflags += [ ++ "-Wno-ignored-pragma-optimize", ++ "-Wno-implicit-int-float-conversion", ++ "-Wno-final-dtor-non-final-class", ++ "-Wno-builtin-assume-aligned-alignment", ++ "-Wno-deprecated-copy", ++ "-Wno-thread-safety-analysis", ++ "-Wno-thread-safety-attributes", ++ ] ++ } + } + } + } +@@ -1699,7 +1711,7 @@ config("no_chromium_code") { # suppressing them individually, we just blanket suppress them here. "-Wno-unused-variable", ] @@ -72,16 +91,16 @@ cflags += [ # TODO(https://crbug.com/1031169): Clean up and enable. "-Wno-misleading-indentation", -@@ -1763,7 +1763,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_apple) || is_fuchsia) { -+ if ((is_posix && !is_nacl && !is_apple && !is_bsd) || is_fuchsia) { +@@ -1777,7 +1789,7 @@ config("export_dynamic") { + config("thin_archive") { + # The macOS and iOS default linker ld64 does not support reading thin + # archives. +- if ((is_posix && !is_nacl && (!is_apple || use_lld)) || is_fuchsia) { ++ if ((is_posix && !is_nacl && (!is_apple || use_lld) && !is_bsd) || is_fuchsia) { arflags = [ "-T" ] } else if (is_win && use_lld) { arflags = [ "/llvmlibthin" ] -@@ -2317,7 +2317,7 @@ config("symbols") { +@@ -2318,7 +2330,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) { @@ -90,7 +109,7 @@ } # TODO(https://crbug.com/1050118): Investigate missing debug info on mac. -@@ -2349,7 +2349,7 @@ config("symbols") { +@@ -2350,7 +2362,7 @@ config("symbols") { # DWARF info may be corrupt; offsets in a range list entry are in different # sections" there. Maybe just a bug in nacl_switch_32.S. if (!is_apple && !is_nacl && current_cpu != "x86" && diff --git a/www/chromium/files/patch-build_config_compiler_compiler.gni b/www/chromium/files/patch-build_config_compiler_compiler.gni index 01a145600471..712d36e592b0 100644 --- a/www/chromium/files/patch-build_config_compiler_compiler.gni +++ b/www/chromium/files/patch-build_config_compiler_compiler.gni @@ -1,11 +1,11 @@ ---- build/config/compiler/compiler.gni.orig 2021-01-18 21:28:45 UTC +--- build/config/compiler/compiler.gni.orig 2021-03-12 23:57:15 UTC +++ build/config/compiler/compiler.gni -@@ -196,7 +196,7 @@ declare_args() { +@@ -201,7 +201,7 @@ declare_args() { + declare_args() { # Whether to use the gold linker from binutils instead of lld or bfd. - use_gold = -- !use_lld && !(is_chromecast && is_linux && -+ !is_bsd && !use_lld && !(is_chromecast && is_linux && - (current_cpu == "arm" || current_cpu == "mipsel")) && - ((is_linux && (current_cpu == "x64" || current_cpu == "x86" || - current_cpu == "arm" || current_cpu == "arm64" || +- use_gold = !use_lld && !(is_chromecast && is_linux && ++ use_gold = !is_bsd && !use_lld && !(is_chromecast && is_linux && + (current_cpu == "arm" || current_cpu == "mipsel")) && + (((is_linux || is_chromeos_lacros) && + (current_cpu == "x64" || current_cpu == "x86" || diff --git a/www/chromium/files/patch-build_config_features.gni b/www/chromium/files/patch-build_config_features.gni index 247dd9c8c76f..a40d39ee555d 100644 --- a/www/chromium/files/patch-build_config_features.gni +++ b/www/chromium/files/patch-build_config_features.gni @@ -1,4 +1,4 @@ ---- build/config/features.gni.orig 2020-11-13 06:36:34 UTC +--- build/config/features.gni.orig 2021-03-12 23:57:15 UTC +++ build/config/features.gni @@ -26,7 +26,7 @@ declare_args() { proprietary_codecs = is_chrome_branded || 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 6431f9760dd8..b0cafcefb260 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 2020-11-13 06:36:34 UTC +--- build/config/freetype/freetype.gni.orig 2021-03-19 11:22:27 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 bc9748b2552c..3b27fbfea43e 100644 --- a/www/chromium/files/patch-build_config_linux_BUILD.gn +++ b/www/chromium/files/patch-build_config_linux_BUILD.gn @@ -1,8 +1,8 @@ ---- build/config/linux/BUILD.gn.orig 2020-11-13 06:36:34 UTC +--- build/config/linux/BUILD.gn.orig 2021-03-12 23:57:15 UTC +++ build/config/linux/BUILD.gn -@@ -30,7 +30,7 @@ config("runtime_library") { +@@ -32,7 +32,7 @@ config("runtime_library") { - if ((!(is_chromeos || chromeos_is_browser_only) || + if ((!(is_chromeos_ash || is_chromeos_lacros) || default_toolchain != "//build/toolchain/cros:target") && - (!use_custom_libcxx || current_cpu == "mipsel")) { + (!use_custom_libcxx || current_cpu == "mipsel") && !is_bsd) { 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 3ac955321e36..aa7ca0f75d5b 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 2020-11-13 06:36:34 UTC +--- build/config/linux/pkg-config.py.orig 2021-03-12 23:57:15 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_ozone.gni b/www/chromium/files/patch-build_config_ozone.gni index d49986fdb240..add2a94c9b2b 100644 --- a/www/chromium/files/patch-build_config_ozone.gni +++ b/www/chromium/files/patch-build_config_ozone.gni @@ -1,12 +1,12 @@ ---- build/config/ozone.gni.orig 2021-01-18 21:28:45 UTC +--- build/config/ozone.gni.orig 2021-03-12 23:57:15 UTC +++ build/config/ozone.gni -@@ -69,6 +69,9 @@ declare_args() { +@@ -70,6 +70,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_linux) { + } else if (is_linux || is_chromeos_lacros) { ozone_platform = "x11" ozone_platform_wayland = true diff --git a/www/chromium/files/patch-build_config_sysroot.gni b/www/chromium/files/patch-build_config_sysroot.gni index 9e340d8b8801..65b672a9c63e 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-11-13 06:36:34 UTC +--- build/config/sysroot.gni.orig 2021-03-12 23:57:15 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 9d0ebae9f514..84b6ece317b6 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 2020-11-13 06:36:34 UTC +--- build/detect_host_arch.py.orig 2021-03-12 23:57:15 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 bf433af332eb..c56ad6ea285f 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 2020-11-13 06:36:34 UTC +--- build/gn_run_binary.py.orig 2021-03-12 23:57:15 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 d4b5568948cc..8e4f0f67de55 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 2020-11-13 06:36:34 UTC +--- build/linux/chrome.map.orig 2021-03-12 23:57:15 UTC +++ build/linux/chrome.map @@ -1,4 +1,7 @@ { @@ -19,10 +19,10 @@ # Memory allocation symbols. We want chrome and any libraries to # share the same heap, so it is correct to export these symbols. calloc; -@@ -81,7 +88,4 @@ global: - localtime64; - localtime64_r; +@@ -83,7 +90,4 @@ global: localtime_r; + + v8dbg_*; - -local: - *; diff --git a/www/chromium/files/patch-build_linux_libpci_BUILD.gn b/www/chromium/files/patch-build_linux_libpci_BUILD.gn index aae9271ac587..e0f1b0b5e658 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 2020-11-13 06:36:34 UTC +--- build/linux/libpci/BUILD.gn.orig 2021-03-12 23:57:15 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 cc33eba51a20..e164aa294eb4 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 2020-11-16 10:04:40 UTC +--- build/linux/unbundle/libusb.gn.orig 2021-03-15 11:01:22 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 ba6689409b13..e49e1e7edfd8 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 2020-11-13 06:36:34 UTC +--- build/linux/unbundle/replace_gn_files.py.orig 2021-03-12 23:57:15 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 5ee773afacd4..e4843269c23a 100644 --- a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni +++ b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni @@ -1,6 +1,6 @@ ---- build/toolchain/gcc_toolchain.gni.orig 2021-01-18 21:28:45 UTC +--- build/toolchain/gcc_toolchain.gni.orig 2021-03-12 23:57:15 UTC +++ build/toolchain/gcc_toolchain.gni -@@ -50,6 +50,11 @@ if (enable_resource_allowlist_generation) { +@@ -51,6 +51,11 @@ if (enable_resource_allowlist_generation) { "enable_resource_allowlist_generation=true does not work for target_os=$target_os") } @@ -12,7 +12,7 @@ # This template defines a toolchain for something that works like gcc # (including clang). # -@@ -626,13 +631,23 @@ template("clang_toolchain") { +@@ -639,13 +644,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 fe86ac61f4b5..c886e27c241f 100644 --- a/www/chromium/files/patch-build_toolchain_get__concurrent__links.py +++ b/www/chromium/files/patch-build_toolchain_get__concurrent__links.py @@ -1,4 +1,4 @@ ---- build/toolchain/get_concurrent_links.py.orig 2020-11-13 06:36:34 UTC +--- build/toolchain/get_concurrent_links.py.orig 2021-03-12 23:57:15 UTC +++ build/toolchain/get_concurrent_links.py @@ -53,6 +53,14 @@ def _GetTotalMemoryInBytes(): return int(subprocess.check_output(['sysctl', '-n', 'hw.memsize'])) diff --git a/www/chromium/files/patch-build_toolchain_linux_BUILD.gn b/www/chromium/files/patch-build_toolchain_linux_BUILD.gn index d979167d0891..cf2cfe07758f 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 2021-01-18 21:28:45 UTC +--- build/toolchain/linux/BUILD.gn.orig 2021-03-12 23:57:15 UTC +++ build/toolchain/linux/BUILD.gn @@ -23,7 +23,6 @@ clang_toolchain("clang_arm") { } diff --git a/www/chromium/files/patch-cc_BUILD.gn b/www/chromium/files/patch-cc_BUILD.gn index f2fa2bb72414..fa5dd4befc5d 100644 --- a/www/chromium/files/patch-cc_BUILD.gn +++ b/www/chromium/files/patch-cc_BUILD.gn @@ -1,6 +1,6 @@ ---- cc/BUILD.gn.orig 2021-01-18 21:28:45 UTC +--- cc/BUILD.gn.orig 2021-03-12 23:57:15 UTC +++ cc/BUILD.gn -@@ -620,7 +620,7 @@ cc_test_static_library("test_support") { +@@ -633,7 +633,7 @@ cc_test_static_library("test_support") { if (enable_vulkan) { deps += [ "//gpu/vulkan/init" ] } @@ -9,7 +9,7 @@ data_deps = [ "//third_party/mesa_headers" ] } } -@@ -832,7 +832,6 @@ cc_test("cc_unittests") { +@@ -848,7 +848,6 @@ cc_test("cc_unittests") { ] data_deps = [ "//testing/buildbot/filters:cc_unittests_filters", diff --git a/www/chromium/files/patch-cc_layers_scrollbar__layer__impl__base.cc b/www/chromium/files/patch-cc_layers_scrollbar__layer__impl__base.cc index 9ecfbba672a6..95fb45333324 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-11-13 06:36:34 UTC +--- cc/layers/scrollbar_layer_impl_base.cc.orig 2021-03-12 23:57:15 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 fa16b79f9b18..8f25479fa63f 100644 --- a/www/chromium/files/patch-cc_test_layer__tree__test.cc +++ b/www/chromium/files/patch-cc_test_layer__tree__test.cc @@ -1,6 +1,6 @@ ---- cc/test/layer_tree_test.cc.orig 2021-01-18 21:28:45 UTC +--- cc/test/layer_tree_test.cc.orig 2021-03-12 23:57:15 UTC +++ cc/test/layer_tree_test.cc -@@ -676,7 +676,7 @@ LayerTreeTest::LayerTreeTest(viz::RendererType rendere +@@ -673,7 +673,7 @@ LayerTreeTest::LayerTreeTest(viz::RendererType rendere init_vulkan = true; } else if (renderer_type_ == viz::RendererType::kSkiaDawn) { scoped_feature_list_.InitAndEnableFeature(features::kSkiaDawn); diff --git a/www/chromium/files/patch-cc_test_pixel__test.cc b/www/chromium/files/patch-cc_test_pixel__test.cc index 432cdf4546a4..279686d88712 100644 --- a/www/chromium/files/patch-cc_test_pixel__test.cc +++ b/www/chromium/files/patch-cc_test_pixel__test.cc @@ -1,4 +1,4 @@ ---- cc/test/pixel_test.cc.orig 2020-11-13 06:36:34 UTC +--- cc/test/pixel_test.cc.orig 2021-03-12 23:57:15 UTC +++ cc/test/pixel_test.cc @@ -69,7 +69,7 @@ PixelTest::PixelTest(GraphicsBackend backend) init_vulkan = true; 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 ac015f4ea0f3..9665897d0736 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-11-13 06:36:34 UTC +--- cc/trees/frame_rate_estimator.cc.orig 2021-03-12 23:57:15 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 59dd074602c3..c3572792efbe 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 2021-01-18 21:28:45 UTC +--- cc/trees/property_tree.cc.orig 2021-03-12 23:57:15 UTC +++ cc/trees/property_tree.cc -@@ -1295,13 +1295,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro +@@ -1300,13 +1300,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 index 58f9f142dd90..a3a298b884ac 100644 --- a/www/chromium/files/patch-chrome_BUILD.gn +++ b/www/chromium/files/patch-chrome_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/BUILD.gn.orig 2021-01-18 21:28:45 UTC +--- chrome/BUILD.gn.orig 2021-03-12 23:57:15 UTC +++ chrome/BUILD.gn -@@ -1227,6 +1227,10 @@ group("browser_dependencies") { +@@ -1243,6 +1243,10 @@ group("browser_dependencies") { public_deps += [ "//chromeos/lacros" ] } @@ -8,6 +8,6 @@ + public_deps -= [ "//components/crash/core/app" ] + } + - if (is_chromeos) { + if (is_chromeos_ash) { 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 7fb979ceda4b..84e99450b90e 100644 --- a/www/chromium/files/patch-chrome_app_BUILD.gn +++ b/www/chromium/files/patch-chrome_app_BUILD.gn @@ -1,4 +1,4 @@ ---- chrome/app/BUILD.gn.orig 2021-01-18 21:28:46 UTC +--- chrome/app/BUILD.gn.orig 2021-03-12 23:57:16 UTC +++ chrome/app/BUILD.gn @@ -143,7 +143,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 f7cf60b9affa..8e1c8d63efa2 100644 --- a/www/chromium/files/patch-chrome_app_chrome__command__ids.h +++ b/www/chromium/files/patch-chrome_app_chrome__command__ids.h @@ -1,11 +1,11 @@ ---- chrome/app/chrome_command_ids.h.orig 2020-11-13 06:36:35 UTC +--- chrome/app/chrome_command_ids.h.orig 2021-03-12 23:57:16 UTC +++ chrome/app/chrome_command_ids.h -@@ -61,7 +61,7 @@ - #define IDC_ALL_WINDOWS_FRONT 34048 +@@ -64,7 +64,7 @@ #define IDC_NAME_WINDOW 34049 --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch of lacros-chrome is complete. +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) #define IDC_USE_SYSTEM_TITLE_BAR 34051 #define IDC_RESTORE_WINDOW 34052 #endif diff --git a/www/chromium/files/patch-chrome_app_chrome__main.cc b/www/chromium/files/patch-chrome_app_chrome__main.cc index a5a64acdbed4..0bf1ec5473f5 100644 --- a/www/chromium/files/patch-chrome_app_chrome__main.cc +++ b/www/chromium/files/patch-chrome_app_chrome__main.cc @@ -1,6 +1,6 @@ ---- chrome/app/chrome_main.cc.orig 2021-01-18 21:28:46 UTC +--- chrome/app/chrome_main.cc.orig 2021-03-12 23:57:16 UTC +++ chrome/app/chrome_main.cc -@@ -119,12 +119,12 @@ int ChromeMain(int argc, const char** argv) { +@@ -130,12 +130,12 @@ int ChromeMain(int argc, const char** argv) { MainThreadStackSamplingProfiler scoped_sampling_profiler; // Chrome-specific process modes. 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 0fafceb8d9ce..faa92dea9bb5 100644 --- a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc +++ b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2021-01-18 21:28:46 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2021-03-12 23:57:16 UTC +++ chrome/app/chrome_main_delegate.cc -@@ -148,12 +148,12 @@ +@@ -149,12 +149,12 @@ #include "v8/include/v8.h" #endif @@ -15,7 +15,7 @@ #include "chrome/browser/policy/policy_path_parser.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -259,7 +259,7 @@ void SetUpExtendedCrashReporting(bool is_browser_proce +@@ -260,7 +260,7 @@ void SetUpExtendedCrashReporting(bool is_browser_proce #endif // defined(OS_WIN) @@ -24,7 +24,7 @@ void AdjustLinuxOOMScore(const std::string& process_type) { int score = -1; -@@ -294,13 +294,13 @@ void AdjustLinuxOOMScore(const std::string& process_ty +@@ -295,7 +295,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty if (score > -1) base::AdjustOOMScore(base::GetCurrentProcId(), score); } @@ -33,32 +33,25 @@ // 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) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - // The zygote process opens the resources for the renderers. - process_type == switches::kZygoteProcess || - #endif -@@ -338,7 +338,7 @@ bool HandleVersionSwitches(const base::CommandLine& co - return false; - } +@@ -341,7 +341,7 @@ bool HandleVersionSwitches(const base::CommandLine& co --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) // 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) || -@@ -348,7 +348,7 @@ void HandleHelpSwitches(const base::CommandLine& comma +@@ -351,7 +351,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) +-#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) #if !defined(OS_MAC) && !defined(OS_ANDROID) void SIGTERMProfilingShutdown(int signal) { -@@ -402,7 +402,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -405,7 +405,7 @@ void InitializeUserDataDir(base::CommandLine* command_ std::string process_type = command_line->GetSwitchValueASCII(switches::kProcessType); @@ -67,7 +60,7 @@ // On Linux, Chrome does not support running multiple copies under different // DISPLAYs, so the profile directory can be specified in the environment to // support the virtual desktop use-case. -@@ -414,7 +414,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -417,7 +417,7 @@ void InitializeUserDataDir(base::CommandLine* command_ user_data_dir = base::FilePath::FromUTF8Unsafe(user_data_dir_string); } } @@ -76,16 +69,16 @@ #if defined(OS_MAC) policy::path_parser::CheckUserDataDirPolicy(&user_data_dir); #endif // OS_MAC -@@ -486,7 +486,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat +@@ -488,7 +488,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat + startup_metric_utils::RecordApplicationStartTime(now); #endif - #if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || \ -- defined(OS_CHROMEOS) -+ defined(OS_CHROMEOS) || 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) // Record the startup process creation time on supported platforms. On Android // this is recorded in ChromeMainDelegateAndroid. - startup_metric_utils::RecordStartupProcessCreationTime( -@@ -709,7 +709,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -723,7 +723,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi v8_crashpad_support::SetUp(); #endif @@ -94,16 +87,16 @@ if (!crash_reporter::IsCrashpadEnabled()) { breakpad::SetFirstChanceExceptionHandler(v8::TryHandleWebAssemblyTrapPosix); } -@@ -720,7 +720,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi - *exit_code = 0; - return true; // Got a --version switch; exit with a success error code. +@@ -736,7 +736,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi } --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) // This will directly exit if the user asked for help. HandleHelpSwitches(command_line); #endif -@@ -928,7 +928,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -945,7 +945,7 @@ void ChromeMainDelegate::PreSandboxStartup() { crash_reporter::InitializeCrashKeys(); @@ -112,7 +105,7 @@ ChromeCrashReporterClient::Create(); #endif -@@ -941,7 +941,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -958,7 +958,7 @@ void ChromeMainDelegate::PreSandboxStartup() { child_process_logging::Init(); #endif #if defined(ARCH_CPU_ARM_FAMILY) && \ @@ -121,7 +114,7 @@ // Create an instance of the CPU class to parse /proc/cpuinfo and cache // cpu_brand info. base::CPU cpu_info; -@@ -1058,7 +1058,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1075,7 +1075,7 @@ void ChromeMainDelegate::PreSandboxStartup() { locale; } @@ -130,7 +123,7 @@ // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess) { #if defined(OS_ANDROID) -@@ -1079,7 +1079,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1096,7 +1096,7 @@ void ChromeMainDelegate::PreSandboxStartup() { } #endif // defined(OS_ANDROID) } @@ -139,7 +132,7 @@ #if defined(OS_ANDROID) CHECK_EQ(base::android::GetLibraryProcessType(), -@@ -1099,7 +1099,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1116,7 +1116,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. @@ -148,7 +141,7 @@ AdjustLinuxOOMScore(process_type); #endif #if defined(OS_WIN) -@@ -1141,7 +1141,7 @@ int ChromeMainDelegate::RunProcess( +@@ -1158,7 +1158,7 @@ int ChromeMainDelegate::RunProcess( // This entry is not needed on Linux, where the NaCl loader // process is launched via nacl_helper instead. @@ -157,7 +150,7 @@ {switches::kNaClLoaderProcess, NaClMain}, #else {"<invalid>", nullptr}, // To avoid constant array of size 0 -@@ -1169,7 +1169,7 @@ void ChromeMainDelegate::ProcessExiting(const std::str +@@ -1186,7 +1186,7 @@ void ChromeMainDelegate::ProcessExiting(const std::str #endif // !defined(OS_ANDROID) } @@ -165,8 +158,8 @@ +#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) void ChromeMainDelegate::ZygoteStarting( std::vector<std::unique_ptr<content::ZygoteForkDelegate>>* delegates) { - #if defined(OS_CHROMEOS) -@@ -1206,7 +1206,7 @@ void ChromeMainDelegate::ZygoteForked() { + #if BUILDFLAG(IS_CHROMEOS_ASH) +@@ -1223,7 +1223,7 @@ void ChromeMainDelegate::ZygoteForked() { crash_keys::SetCrashKeysFromCommandLine(*command_line); } diff --git a/www/chromium/files/patch-chrome_app_chromium__strings.grd b/www/chromium/files/patch-chrome_app_chromium__strings.grd index bdca535dc0f3..79ef78560180 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-11-13 06:36:35 UTC +--- chrome/app/chromium_strings.grd.orig 2021-03-12 23:57:16 UTC +++ chrome/app/chromium_strings.grd -@@ -698,7 +698,7 @@ Chromium is unable to recover your settings. +@@ -716,7 +716,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> -@@ -809,7 +809,7 @@ Chromium is unable to recover your settings. +@@ -839,7 +839,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> -@@ -1028,7 +1028,7 @@ Chromium is unable to recover your settings. +@@ -1058,7 +1058,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 e5745e5079f8..44276de08dce 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 2021-01-18 21:28:46 UTC +--- chrome/app/generated_resources.grd.orig 2021-03-12 23:57:16 UTC +++ chrome/app/generated_resources.grd -@@ -5263,7 +5263,7 @@ Keep your key file in a safe place. You will need it t +@@ -5255,7 +5255,7 @@ Keep your key file in a safe place. You will need it t </if> <!-- chrome://browser-switch strings --> @@ -9,21 +9,21 @@ <message name="IDS_ABOUT_BROWSER_SWITCH_TITLE" desc="about:browser-switch page title"> Legacy Browser Support </message> -@@ -7269,7 +7269,7 @@ the Bookmarks menu."> +@@ -7305,7 +7305,7 @@ Keep your key file in a safe place. You will need it t Google Pay </message> -- <if expr="is_linux and not chromeos"> -+ <if expr="is_posix and not chromeos"> +- <if expr="is_linux and not chromeos and not lacros"> ++ <if expr="is_posix and not chromeos and not lacros"> <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> -@@ -8257,7 +8257,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -8296,7 +8296,7 @@ Please help our engineers fix this problem. Tell us wh Set as default </message> -- <if expr="is_linux and not chromeos"> -+ <if expr="is_posix and not chromeos"> +- <if expr="is_linux and not chromeos and not lacros"> ++ <if expr="is_posix and not chromeos and not lacros"> <message name="IDS_MINIMIZE_WINDOW_MENU" desc="The Linux browser window menu item text for minimizing the window."> Minimize </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 28217b08089e..64089b9cd81c 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-11-13 06:36:35 UTC +--- chrome/app/google_chrome_strings.grd.orig 2021-03-12 23:57:16 UTC +++ chrome/app/google_chrome_strings.grd -@@ -705,7 +705,7 @@ Google Chrome is unable to recover your settings. +@@ -723,7 +723,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> -@@ -816,7 +816,7 @@ Google Chrome is unable to recover your settings. +@@ -846,7 +846,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> -@@ -1042,7 +1042,7 @@ Google Chrome is unable to recover your settings. +@@ -1072,7 +1072,7 @@ Google Chrome is unable to recover your settings. </message> <!-- Plugin Placeholders --> diff --git a/www/chromium/files/patch-chrome_app_profiles__strings.grdp b/www/chromium/files/patch-chrome_app_profiles__strings.grdp index a4943a16b491..99d7594ad959 100644 --- a/www/chromium/files/patch-chrome_app_profiles__strings.grdp +++ b/www/chromium/files/patch-chrome_app_profiles__strings.grdp @@ -1,4 +1,4 @@ ---- chrome/app/profiles_strings.grdp.orig 2021-01-20 14:08:57 UTC +--- chrome/app/profiles_strings.grdp.orig 2021-03-12 23:57:16 UTC +++ chrome/app/profiles_strings.grdp @@ -87,7 +87,7 @@ Add Profile... diff --git a/www/chromium/files/patch-chrome_app_settings__strings.grdp b/www/chromium/files/patch-chrome_app_settings__strings.grdp index 0df7e092f2ce..323a398dbcf5 100644 --- a/www/chromium/files/patch-chrome_app_settings__strings.grdp +++ b/www/chromium/files/patch-chrome_app_settings__strings.grdp @@ -1,20 +1,20 @@ ---- chrome/app/settings_strings.grdp.orig 2020-11-13 06:36:36 UTC +--- chrome/app/settings_strings.grdp.orig 2021-03-12 23:57:17 UTC +++ chrome/app/settings_strings.grdp -@@ -110,7 +110,7 @@ +@@ -117,7 +117,7 @@ Theme </message> </if> -- <if expr="is_linux and not chromeos"> -+ <if expr="is_posix and not chromeos"> +- <if expr="is_linux and not chromeos and not lacros"> ++ <if expr="is_posix and not chromeos and not lacros"> <message name="IDS_SETTINGS_SYSTEM_THEME" desc="Text of the label describing the system (GTK+) browser theme on Linux"> GTK+ </message> -@@ -124,7 +124,7 @@ +@@ -131,7 +131,7 @@ Use Classic </message> </if> -- <if expr="not is_linux or chromeos"> -+ <if expr="not is_posix or chromeos"> +- <if expr="not is_linux or chromeos or lacros"> ++ <if expr="not is_posix or chromeos or lacros"> <message name="IDS_SETTINGS_RESET_TO_DEFAULT_THEME" desc="Name of the control which resets the browser theme back to the default theme."> Reset to default </message> diff --git a/www/chromium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc b/www/chromium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc index be7ad2247838..669e2bacbb7d 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 2020-11-13 06:36:36 UTC +--- chrome/app/shutdown_signal_handlers_posix.cc.orig 2021-03-12 23:57:17 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 875a420e4354..04cf7d9e24f7 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-11-13 06:36:36 UTC +--- chrome/app/theme/chrome_unscaled_resources.grd.orig 2021-03-12 23:57:17 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 cf59148f8edb..a5f75e71519e 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 2020-11-13 06:36:36 UTC +--- chrome/app/theme/theme_resources.grd.orig 2021-03-12 23:57:17 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 aa17c38055a6..5cf14a0f2114 100644 --- a/www/chromium/files/patch-chrome_browser_BUILD.gn +++ b/www/chromium/files/patch-chrome_browser_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/browser/BUILD.gn.orig 2021-01-18 21:28:49 UTC +--- chrome/browser/BUILD.gn.orig 2021-03-12 23:57:17 UTC +++ chrome/browser/BUILD.gn -@@ -5161,7 +5161,7 @@ static_library("browser") { +@@ -5277,7 +5277,7 @@ static_library("browser") { ] } diff --git a/www/chromium/files/patch-chrome_browser_about__flags.cc b/www/chromium/files/patch-chrome_browser_about__flags.cc index fb03e7cab0b9..15cee06705af 100644 --- a/www/chromium/files/patch-chrome_browser_about__flags.cc +++ b/www/chromium/files/patch-chrome_browser_about__flags.cc @@ -1,6 +1,6 @@ ---- chrome/browser/about_flags.cc.orig 2021-01-18 21:28:49 UTC +--- chrome/browser/about_flags.cc.orig 2021-03-12 23:57:17 UTC +++ chrome/browser/about_flags.cc -@@ -188,7 +188,7 @@ +@@ -191,7 +191,7 @@ #include "ui/gl/gl_switches.h" #include "ui/native_theme/native_theme_features.h" @@ -9,7 +9,7 @@ #include "base/allocator/buildflags.h" #endif -@@ -886,7 +886,7 @@ const FeatureEntry::Choice kMemlogSamplingRateChoices[ +@@ -918,7 +918,7 @@ const FeatureEntry::Choice kMemlogSamplingRateChoices[ heap_profiling::kMemlogSamplingRate5MB}, }; @@ -18,7 +18,7 @@ defined(OS_WIN) const FeatureEntry::FeatureParam kOmniboxDocumentProviderServerScoring[] = { {"DocumentUseServerScore", "true"}, -@@ -1236,7 +1236,7 @@ const FeatureEntry::FeatureVariation kOmniboxBookmarkP +@@ -1268,7 +1268,7 @@ const FeatureEntry::FeatureVariation kOmniboxBookmarkP }, }; @@ -27,43 +27,43 @@ // defined(OS_WIN) const FeatureEntry::FeatureVariation -@@ -2869,7 +2869,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3009,7 +3009,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(ash::features::kSystemTrayMicGainSetting)}, - #endif // OS_CHROMEOS + #endif // BUILDFLAG(IS_CHROMEOS_ASH) --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)) || defined(OS_BSD) +-#if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && !defined(OS_ANDROID) ++#if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) && !defined(OS_ANDROID) { "enable-accelerated-video-decode", flag_descriptions::kAcceleratedVideoDecodeName, -@@ -2885,7 +2885,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3025,7 +3025,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) +-#endif // (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && ++#endif // (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) && + // !defined(OS_ANDROID) { "disable-accelerated-video-encode", - flag_descriptions::kAcceleratedVideoEncodeName, -@@ -3208,7 +3208,7 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kEnableOfflinePreviewsDescription, kOsAndroid, - FEATURE_VALUE_TYPE(previews::features::kOfflinePreviews)}, - #endif // OS_ANDROID +@@ -3367,7 +3367,7 @@ const FeatureEntry kFeatureEntries[] = { + {"enable-login-detection", flag_descriptions::kEnableLoginDetectionName, + flag_descriptions::kEnableLoginDetectionDescription, kOsAll, + FEATURE_VALUE_TYPE(login_detection::kLoginDetection)}, -#if defined(OS_CHROMEOS) || defined(OS_LINUX) +#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) {"enable-save-data", flag_descriptions::kEnableSaveDataName, flag_descriptions::kEnableSaveDataDescription, kOsCrOS | kOsLinux, SINGLE_VALUE_TYPE( -@@ -3222,7 +3222,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3381,7 +3381,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kEnableNavigationPredictorRendererWarmupName, flag_descriptions::kEnableNavigationPredictorRendererWarmupDescription, kOsAll, FEATURE_VALUE_TYPE(features::kNavigationPredictorRendererWarmup)}, --#endif // OS_CHROMEOS || OS_LINUX -+#endif // OS_CHROMEOS || OS_LINUX || OS_BSD +-#endif // BUILDFLAG(IS_CHROMEOS_ASH) || OS_LINUX ++#endif // BUILDFLAG(IS_CHROMEOS_ASH) || OS_LINUX || defined(OS_BSD) {"enable-preconnect-to-search", flag_descriptions::kEnablePreconnectToSearchName, flag_descriptions::kEnablePreconnectToSearchDescription, kOsAll, -@@ -3977,7 +3977,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4173,7 +4173,7 @@ const FeatureEntry kFeatureEntries[] = { kOsAll, FEATURE_VALUE_TYPE(omnibox::kOmniboxTrendingZeroPrefixSuggestionsOnNTP)}, @@ -72,16 +72,16 @@ defined(OS_WIN) {"omnibox-experimental-keyword-mode", flag_descriptions::kOmniboxExperimentalKeywordModeName, -@@ -4054,7 +4054,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_WITH_PARAMS_VALUE_TYPE(omnibox::kBookmarkPaths, - kOmniboxBookmarkPathsVariations, - "OmniboxBundledExperimentV1")}, +@@ -4254,7 +4254,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kOmniboxDisableCGIParamMatchingName, + flag_descriptions::kOmniboxDisableCGIParamMatchingDescription, kOsDesktop, + FEATURE_VALUE_TYPE(omnibox::kDisableCGIParamMatching)}, -#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", -@@ -4344,14 +4344,14 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4563,14 +4563,14 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kClickToOpenPDFDescription, kOsAll, FEATURE_VALUE_TYPE(features::kClickToOpenPDFPlaceholder)}, @@ -98,7 +98,7 @@ // defined(OS_CHROMEOS) #if !defined(OS_ANDROID) -@@ -5043,7 +5043,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5258,7 +5258,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(kClickToCallUI)}, #endif // BUILDFLAG(ENABLE_CLICK_TO_CALL) @@ -107,7 +107,7 @@ defined(OS_CHROMEOS) {"remote-copy-receiver", flag_descriptions::kRemoteCopyReceiverName, flag_descriptions::kRemoteCopyReceiverDescription, kOsDesktop, -@@ -5060,7 +5060,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5275,7 +5275,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kRemoteCopyProgressNotificationName, flag_descriptions::kRemoteCopyProgressNotificationDescription, kOsDesktop, FEATURE_VALUE_TYPE(kRemoteCopyProgressNotification)}, @@ -116,7 +116,7 @@ // defined(OS_CHROMEOS) {"restrict-gamepad-access", flag_descriptions::kRestrictGamepadAccessName, -@@ -5643,7 +5643,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5852,7 +5852,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kMouseSubframeNoImplicitCaptureDescription, kOsAll, FEATURE_VALUE_TYPE(features::kMouseSubframeNoImplicitCapture)}, @@ -125,7 +125,7 @@ defined(OS_CHROMEOS) {"global-media-controls", flag_descriptions::kGlobalMediaControlsName, flag_descriptions::kGlobalMediaControlsDescription, -@@ -5684,7 +5684,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5893,7 +5893,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kGlobalMediaControlsOverlayControlsDescription, kOsWin | kOsMac | kOsLinux, FEATURE_VALUE_TYPE(media::kGlobalMediaControlsOverlayControls)}, @@ -134,16 +134,16 @@ // defined(OS_CHROMEOS) #if BUILDFLAG(ENABLE_SPELLCHECK) && defined(OS_WIN) -@@ -5861,7 +5861,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE( - password_manager::features::kEnablePasswordsAccountStorage)}, +@@ -6072,7 +6072,7 @@ const FeatureEntry kFeatureEntries[] = { + kPasswordsAccountStorageVariations, + "ButterForPasswords")}, -#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) {"passwords-account-storage-iph", flag_descriptions::kEnablePasswordsAccountStorageIPHName, -@@ -5869,7 +5869,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6080,7 +6080,7 @@ const FeatureEntry kFeatureEntries[] = { kOsWin | kOsMac | kOsLinux, FEATURE_VALUE_TYPE( feature_engagement::kIPHPasswordsAccountStorageFeature)}, @@ -152,7 +152,7 @@ // defined(OS_CHROMEOS) {"autofill-always-return-cloud-tokenized-card", -@@ -6602,7 +6602,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6794,7 +6794,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(ash::features::kEnhancedDeskAnimations)}, #endif @@ -161,20 +161,20 @@ defined(OS_CHROMEOS) {"enable-oop-print-drivers", flag_descriptions::kEnableOopPrintDriversName, flag_descriptions::kEnableOopPrintDriversDescription, kOsDesktop, -@@ -6636,14 +6636,14 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(features::kMuteNotificationsDuringScreenShare)}, - #endif // !defined(OS_ANDROID) +@@ -6833,14 +6833,14 @@ const FeatureEntry kFeatureEntries[] = { --#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || \ -+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) || \ + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ ++#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) || \ defined(OS_MAC) {"enable-ephemeral-guest-profiles-on-desktop", flag_descriptions::kEnableEphemeralGuestProfilesOnDesktopName, flag_descriptions::kEnableEphemeralGuestProfilesOnDesktopDescription, kOsWin | kOsLinux | kOsMac, FEATURE_VALUE_TYPE(features::kEnableEphemeralGuestProfilesOnDesktop)}, --#endif // defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || -+#endif // defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) || - // defined(OS_MAC) +-#endif // defined(OS_WIN) || (defined(OS_LINUX) || ++#endif // defined(OS_WIN) || (defined(OS_LINUX) || defined(OS_BSD) || + // BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_MAC) #if defined(OS_ANDROID) 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 22cb8782590f..07af7718ddbe 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,15 +1,15 @@ ---- chrome/browser/after_startup_task_utils.cc.orig 2020-11-13 06:36:36 UTC +--- chrome/browser/after_startup_task_utils.cc.orig 2021-03-12 23:57:17 UTC +++ chrome/browser/after_startup_task_utils.cc -@@ -32,7 +32,7 @@ - #include "chrome/browser/ui/tabs/tab_strip_model.h" - #endif +@@ -35,7 +35,7 @@ --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) #include "ui/views/linux_ui/linux_ui.h" #endif -@@ -119,7 +119,7 @@ void QueueTask(std::unique_ptr<AfterStartupTask> queue +@@ -122,7 +122,7 @@ void QueueTask(std::unique_ptr<AfterStartupTask> queue void SetBrowserStartupIsComplete() { DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -18,7 +18,7 @@ defined(OS_CHROMEOS) // Process::Current().CreationTime() is not available on all platforms. const base::Time process_creation_time = -@@ -128,7 +128,7 @@ void SetBrowserStartupIsComplete() { +@@ -131,7 +131,7 @@ void SetBrowserStartupIsComplete() { UMA_HISTOGRAM_LONG_TIMES("Startup.AfterStartupTaskDelayedUntilTime", base::Time::Now() - process_creation_time); } @@ -27,12 +27,12 @@ // defined(OS_CHROMEOS) UMA_HISTOGRAM_COUNTS_10000("Startup.AfterStartupTaskCount", g_after_startup_tasks.Get().size()); -@@ -138,7 +138,7 @@ void SetBrowserStartupIsComplete() { - g_after_startup_tasks.Get().clear(); - g_after_startup_tasks.Get().shrink_to_fit(); +@@ -143,7 +143,7 @@ void SetBrowserStartupIsComplete() { --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) // Make sure we complete the startup notification sequence, or launchers will // get confused by not receiving the expected message from the main process. views::LinuxUI* linux_ui = views::LinuxUI::instance(); diff --git a/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_media__galleries_media__galleries__apitest.cc b/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_media__galleries_media__galleries__apitest.cc new file mode 100644 index 000000000000..7360aeda73c0 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_media__galleries_media__galleries__apitest.cc @@ -0,0 +1,20 @@ +--- chrome/browser/apps/platform_apps/api/media_galleries/media_galleries_apitest.cc.orig 2021-03-12 23:57:17 UTC ++++ chrome/browser/apps/platform_apps/api/media_galleries/media_galleries_apitest.cc +@@ -294,7 +294,7 @@ IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppPpapiT + + // Test is flaky, it fails on certain bots, namely WinXP Tests(1) and Linux + // (dbg)(1)(32). See crbug.com/354425. +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + #define MAYBE_MediaGalleriesNoAccess DISABLED_MediaGalleriesNoAccess + #else + #define MAYBE_MediaGalleriesNoAccess MediaGalleriesNoAccess +@@ -332,7 +332,7 @@ IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppBrowse + + // Test is flaky, it fails on certain bots, namely WinXP Tests(1) and Linux + // (dbg)(1)(32). See crbug.com/354425. +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + #define MAYBE_MediaGalleriesCopyTo DISABLED_MediaGalleriesCopyTo + #else + #define MAYBE_MediaGalleriesCopyTo MediaGalleriesCopyTo diff --git a/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_media__galleries_media__galleries__watch__apitest.cc b/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_media__galleries_media__galleries__watch__apitest.cc new file mode 100644 index 000000000000..03e99a4b1f8c --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_media__galleries_media__galleries__watch__apitest.cc @@ -0,0 +1,11 @@ +--- chrome/browser/apps/platform_apps/api/media_galleries/media_galleries_watch_apitest.cc.orig 2021-03-12 23:57:17 UTC ++++ chrome/browser/apps/platform_apps/api/media_galleries/media_galleries_watch_apitest.cc +@@ -224,7 +224,7 @@ IN_PROC_BROWSER_TEST_F(MediaGalleriesGalleryWatchApiTe + // Test is flaky on windows and linux: crbug.com/1150017. + // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is + // complete. +-#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) + #define MAYBE_RemoveListenerAndModifyGallery \ + DISABLED_RemoveListenerAndModifyGallery + #else 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 b87d7fc20313..8f5d4515a675 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 2020-11-13 06:36:36 UTC +--- chrome/browser/apps/platform_apps/api/music_manager_private/device_id_linux.cc.orig 2021-03-12 23:57:17 UTC +++ chrome/browser/apps/platform_apps/api/music_manager_private/device_id_linux.cc @@ -4,6 +4,11 @@ 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 47359ed2aa2e..1fcfaa6ec285 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,4 +1,4 @@ ---- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig 2021-01-18 21:28:49 UTC +--- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig 2021-03-12 23:57:17 UTC +++ chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc @@ -87,7 +87,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForSch return metrics::OmniboxInputType::QUERY; 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 13bd7d24719b..3ef4068aa5dd 100644 --- a/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc +++ b/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/background/background_mode_manager.cc.orig 2021-01-18 21:28:49 UTC +--- chrome/browser/background/background_mode_manager.cc.orig 2021-03-12 23:57:17 UTC +++ chrome/browser/background/background_mode_manager.cc -@@ -850,7 +850,7 @@ gfx::ImageSkia GetStatusTrayIcon() { +@@ -873,7 +873,7 @@ gfx::ImageSkia GetStatusTrayIcon() { return gfx::ImageSkia(); return family->CreateExact(size).AsImageSkia(); 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 484ab71421b7..12fbf70b31a1 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,4 +1,4 @@ ---- chrome/browser/background/background_mode_optimizer.cc.orig 2020-11-13 06:36:36 UTC +--- chrome/browser/background/background_mode_optimizer.cc.orig 2021-03-12 23:57:17 UTC +++ chrome/browser/background/background_mode_optimizer.cc @@ -30,10 +30,10 @@ std::unique_ptr<BackgroundModeOptimizer> BackgroundMod switches::kKeepAliveForTest)) diff --git a/www/chromium/files/patch-chrome_browser_browser__resources.grd b/www/chromium/files/patch-chrome_browser_browser__resources.grd index 45fb9150fab2..08b5e8f551fd 100644 --- a/www/chromium/files/patch-chrome_browser_browser__resources.grd +++ b/www/chromium/files/patch-chrome_browser_browser__resources.grd @@ -1,6 +1,6 @@ ---- chrome/browser/browser_resources.grd.orig 2021-01-18 21:28:49 UTC +--- chrome/browser/browser_resources.grd.orig 2021-03-12 23:57:17 UTC +++ chrome/browser/browser_resources.grd -@@ -78,7 +78,7 @@ +@@ -89,7 +89,7 @@ <include name="IDR_DISCARDS_SITE_DATA_MOJOM_WEBUI_JS" file="${root_gen_dir}\mojom-webui\chrome\browser\ui\webui\discards\site_data.mojom-webui.js" use_base_dir="false" type="BINDATA" /> <include name="IDR_DISCARDS_SORTED_TABLE_BEHAVIOR_JS" file="resources\discards\sorted_table_behavior.js" type="BINDATA" /> </if> 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 d6f8b88eb625..be2b16e342f9 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,15 +1,15 @@ ---- chrome/browser/chrome_browser_interface_binders.cc.orig 2021-01-18 21:28:49 UTC +--- chrome/browser/chrome_browser_interface_binders.cc.orig 2021-03-12 23:57:17 UTC +++ chrome/browser/chrome_browser_interface_binders.cc -@@ -135,7 +135,7 @@ - #include "media/mojo/mojom/speech_recognition_service.mojom.h" - #endif +@@ -138,7 +138,7 @@ + #include "mojo/public/cpp/bindings/self_owned_receiver.h" + #endif // defined(OS_ANDROID) -#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) #include "chrome/browser/ui/webui/discards/discards.mojom.h" #include "chrome/browser/ui/webui/discards/discards_ui.h" -@@ -775,7 +775,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -835,7 +835,7 @@ void PopulateChromeWebUIFrameBinders( } #endif diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc index 34b9ba7f1f22..ace685c2ed75 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc @@ -1,15 +1,15 @@ ---- chrome/browser/chrome_browser_main.cc.orig 2021-01-18 21:28:49 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2021-03-12 23:57:17 UTC +++ chrome/browser/chrome_browser_main.cc -@@ -247,7 +247,7 @@ - #endif // defined(OS_WIN) - +@@ -251,7 +251,7 @@ + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. #if defined(OS_WIN) || defined(OS_MAC) || \ -- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) +- (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++ (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || 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" -@@ -926,7 +926,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -935,7 +935,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { AddFirstRunNewTabs(browser_creator_.get(), master_prefs_->new_tabs); } @@ -18,25 +18,25 @@ // 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 . -@@ -935,7 +935,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -944,7 +944,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { &user_native_messaging_dir)); if (!base::PathExists(user_native_messaging_dir)) base::CreateDirectory(user_native_messaging_dir); -#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) - -@@ -957,7 +957,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { - #endif // defined(OS_MAC) + #endif // !defined(OS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH) +@@ -968,7 +968,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. #if defined(OS_WIN) || defined(OS_MAC) || \ -- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) +- (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++ (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) metrics::DesktopSessionDurationTracker::Initialize(); ProfileActivityMetricsRecorder::Initialize(); TouchModeStatsTracker::Initialize( -@@ -1114,6 +1114,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { +@@ -1125,6 +1125,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { base::TimeDelta::FromMinutes(1)); #if !defined(OS_ANDROID) @@ -44,7 +44,7 @@ if (base::FeatureList::IsEnabled(features::kWebUsb)) { web_usb_detector_.reset(new WebUsbDetector()); content::GetUIThreadTaskRunner({base::TaskPriority::BEST_EFFORT}) -@@ -1121,6 +1122,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { +@@ -1132,6 +1133,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { base::BindOnce(&WebUsbDetector::Initialize, base::Unretained(web_usb_detector_.get()))); } diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc index c493e50d957f..0350cb5daff0 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-11-13 06:36:36 UTC +--- chrome/browser/chrome_browser_main_linux.cc.orig 2021-03-12 23:57:17 UTC +++ chrome/browser/chrome_browser_main_linux.cc -@@ -81,6 +81,7 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() { +@@ -82,6 +82,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 -@@ -98,10 +99,11 @@ void ChromeBrowserMainPartsLinux::PostProfileInit() { +@@ -99,10 +100,11 @@ void ChromeBrowserMainPartsLinux::PostProfileInit() { } g_browser_process->metrics_service()->RecordBreakpadRegistration( breakpad_registered); @@ -16,17 +16,17 @@ } void ChromeBrowserMainPartsLinux::PostMainMessageLoopStart() { --#if !defined(OS_CHROMEOS) -+#if !defined(OS_CHROMEOS) && !defined(OS_BSD) +-#if !BUILDFLAG(IS_CHROMEOS_ASH) ++#if !BUILDFLAG(IS_CHROMEOS_ASH) && !defined(OS_BSD) bluez::BluezDBusManager::Initialize(nullptr /* system_bus */); #endif -@@ -109,7 +111,7 @@ void ChromeBrowserMainPartsLinux::PostMainMessageLoopS +@@ -110,7 +112,7 @@ void ChromeBrowserMainPartsLinux::PostMainMessageLoopS } void ChromeBrowserMainPartsLinux::PostDestroyThreads() { --#if !defined(OS_CHROMEOS) -+#if !defined(OS_CHROMEOS) && !defined(OS_BSD) +-#if !BUILDFLAG(IS_CHROMEOS_ASH) ++#if !BUILDFLAG(IS_CHROMEOS_ASH) && !defined(OS_BSD) bluez::BluezDBusManager::Shutdown(); bluez::BluezDBusThreadManager::Shutdown(); #endif 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 376071a0f4bc..761d10956b15 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,11 +1,11 @@ ---- chrome/browser/chrome_browser_main_posix.cc.orig 2020-11-13 06:36:36 UTC +--- chrome/browser/chrome_browser_main_posix.cc.orig 2021-03-12 23:57:17 UTC +++ chrome/browser/chrome_browser_main_posix.cc -@@ -70,7 +70,7 @@ void ExitHandler::ExitWhenPossibleOnUIThread(int signa - // ExitHandler takes care of deleting itself. - new ExitHandler(); +@@ -72,7 +72,7 @@ void ExitHandler::ExitWhenPossibleOnUIThread(int signa } else { --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) switch (signal) { case SIGINT: case SIGHUP: 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 f326832f6045..87c0062c22f3 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,33 +1,33 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2021-01-18 21:28:49 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2021-03-12 23:57:17 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -432,7 +432,7 @@ +@@ -448,7 +448,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" --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) #include "chrome/browser/chrome_browser_main_linux.h" #elif defined(OS_ANDROID) #include "base/android/application_status_listener.h" -@@ -490,7 +490,7 @@ - #endif // !defined(OS_ANDROID) - +@@ -508,7 +508,7 @@ + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. #if defined(OS_WIN) || defined(OS_MAC) || \ -- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) +- (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++ (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) #include "chrome/browser/browser_switcher/browser_switcher_navigation_throttle.h" #endif -@@ -522,7 +522,7 @@ - #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h" - #endif +@@ -542,7 +542,7 @@ --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h" #endif -@@ -849,11 +849,13 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHos +@@ -866,11 +866,13 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHos } int GetCrashSignalFD(const base::CommandLine& command_line) { @@ -41,25 +41,25 @@ // Extensions have the same process type as renderers. if (command_line.HasSwitch(extensions::switches::kExtensionProcess)) { -@@ -1378,7 +1380,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( - #elif defined(OS_CHROMEOS) - main_parts = std::make_unique<chromeos::ChromeBrowserMainPartsChromeos>( - parameters, &startup_data_); --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +@@ -1417,7 +1419,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( + #elif BUILDFLAG(IS_CHROMEOS_LACROS) + main_parts = std::make_unique<ChromeBrowserMainPartsLacros>(parameters, + &startup_data_); +-#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) main_parts = std::make_unique<ChromeBrowserMainPartsLinux>(parameters, &startup_data_); #elif defined(OS_ANDROID) -@@ -1407,7 +1409,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( - #if BUILDFLAG(IS_LACROS) - main_parts->AddParts( +@@ -1448,7 +1450,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( std::make_unique<ChromeBrowserMainExtraPartsViewsLacros>()); --#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) main_parts->AddParts( std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>()); #else -@@ -2168,7 +2170,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2205,7 +2207,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin command_line->AppendSwitchASCII(switches::kMetricsClientID, client_info->client_id); } @@ -68,7 +68,16 @@ #if defined(OS_ANDROID) bool enable_crash_reporter = true; #else -@@ -3725,7 +3727,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst +@@ -2499,7 +2501,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin + ThreadProfilerConfiguration::Get()->AppendCommandLineSwitchForChildProcess( + command_line); + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + // Processes may only query perf_event_open with the BPF sandbox disabled. + if (browser_command_line.HasSwitch(switches::kEnableThreadInstructionCount) && + command_line->HasSwitch(sandbox::policy::switches::kNoSandbox)) { +@@ -3806,7 +3808,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst } } @@ -77,7 +86,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -3760,7 +3762,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFi +@@ -3841,7 +3843,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFi mappings->Share(kCrashDumpSignal, crash_signal_fd); } } @@ -86,21 +95,12 @@ #if defined(OS_WIN) base::string16 ChromeContentBrowserClient::GetAppContainerSidForSandboxType( -@@ -3848,7 +3850,7 @@ bool ChromeContentBrowserClient::IsRendererCodeIntegri - - void ChromeContentBrowserClient::WillStartServiceManager() { - #if defined(OS_WIN) || defined(OS_MAC) || \ -- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - auto* chrome_feature_list_creator = - startup_data_.chrome_feature_list_creator(); - // This has to run very early before ServiceManagerContext is created. -@@ -4083,7 +4085,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati - } - +@@ -4165,7 +4167,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. #if defined(OS_WIN) || defined(OS_MAC) || \ -- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) +- (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++ (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle:: MaybeCreateThrottleFor(handle), &throttles); 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 27f74011b88f..31cda22750d7 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h +++ b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.h.orig 2020-11-13 06:36:36 UTC +--- chrome/browser/chrome_content_browser_client.h.orig 2021-03-12 23:57:17 UTC +++ chrome/browser/chrome_content_browser_client.h -@@ -394,12 +394,12 @@ class ChromeContentBrowserClient : public content::Con +@@ -407,12 +407,12 @@ class ChromeContentBrowserClient : public content::Con void OverridePageVisibilityState( content::RenderFrameHost* render_frame_host, content::PageVisibilityState* visibility_state) override; diff --git a/www/chromium/files/patch-chrome_browser_crash__upload__list_crash__upload__list.cc b/www/chromium/files/patch-chrome_browser_crash__upload__list_crash__upload__list.cc index 5f623d2a942d..273043a7a182 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,11 +1,11 @@ ---- 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.orig 2021-03-12 23:57:17 UTC +++ chrome/browser/crash_upload_list/crash_upload_list.cc -@@ -38,7 +38,7 @@ scoped_refptr<UploadList> CreateCrashUploadList() { +@@ -39,7 +39,7 @@ scoped_refptr<UploadList> CreateCrashUploadList() { // ChromeOS uses crash_sender as its uploader even when Crashpad is enabled, // which isn't compatible with CrashUploadListCrashpad. crash_sender continues // to log uploads in CrashUploadList::kReporterLogFilename. --#if !defined(OS_CHROMEOS) -+#if !defined(OS_CHROMEOS) && !defined(OS_BSD) +-#if !BUILDFLAG(IS_CHROMEOS_ASH) ++#if !BUILDFLAG(IS_CHROMEOS_ASH) && !defined(OS_BSD) if (crash_reporter::IsCrashpadEnabled()) { return new CrashUploadListCrashpad(); } 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 dd5533beb0b2..8ad947b9b75b 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 2020-11-13 06:36:36 UTC +--- chrome/browser/crash_upload_list/crash_upload_list_crashpad.cc.orig 2021-03-12 23:57:17 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 b7f5388358ec..c0a5999f8613 100644 --- a/www/chromium/files/patch-chrome_browser_custom__handlers_protocol__handler__registry.cc +++ b/www/chromium/files/patch-chrome_browser_custom__handlers_protocol__handler__registry.cc @@ -1,6 +1,6 @@ ---- chrome/browser/custom_handlers/protocol_handler_registry.cc.orig 2020-11-13 06:36:36 UTC +--- chrome/browser/custom_handlers/protocol_handler_registry.cc.orig 2021-03-12 23:57:17 UTC +++ chrome/browser/custom_handlers/protocol_handler_registry.cc -@@ -43,7 +43,7 @@ const ProtocolHandler& LookupHandler( +@@ -45,7 +45,7 @@ const ProtocolHandler& LookupHandler( // If true default protocol handlers will be removed if the OS level // registration for a protocol is no longer Chrome. bool ShouldRemoveHandlersNotInOS() { diff --git a/www/chromium/files/patch-chrome_browser_defaults.cc b/www/chromium/files/patch-chrome_browser_defaults.cc index 98d87662a554..c0d44968bfd0 100644 --- a/www/chromium/files/patch-chrome_browser_defaults.cc +++ b/www/chromium/files/patch-chrome_browser_defaults.cc @@ -1,11 +1,11 @@ ---- chrome/browser/defaults.cc.orig 2020-11-13 06:36:36 UTC +--- chrome/browser/defaults.cc.orig 2021-03-12 23:57:17 UTC +++ chrome/browser/defaults.cc -@@ -43,7 +43,7 @@ const bool kSyncAutoStarts = true; - const bool kSyncAutoStarts = false; - #endif +@@ -46,7 +46,7 @@ const bool kSyncAutoStarts = false; --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) const bool kScrollEventChangesTab = true; #else const bool kScrollEventChangesTab = 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 e8d62f2f17ce..59053815c2d7 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-11-13 06:36:36 UTC +--- chrome/browser/dev_ui_browser_resources.grd.orig 2021-03-12 23:57:17 UTC +++ chrome/browser/dev_ui_browser_resources.grd -@@ -57,7 +57,7 @@ This file specifies browser resources for developer-fa +@@ -55,7 +55,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" /> - <include name="IDR_SANDBOX_INTERNALS_JS" file="resources\sandbox_internals\sandbox_internals.js" type="BINDATA" /> + <include name="IDR_SANDBOX_INTERNALS_HTML" file="resources\sandbox_internals\sandbox_internals.html" preprocess="true" type="BINDATA" /> + <include name="IDR_SANDBOX_INTERNALS_JS" file="resources\sandbox_internals\sandbox_internals.js" preprocess="true" 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 ca42fa004943..1df6bcb563c4 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-11-13 06:36:36 UTC +--- chrome/browser/device_identity/device_oauth2_token_service_factory.cc.orig 2021-03-12 23:57:17 UTC +++ chrome/browser/device_identity/device_oauth2_token_service_factory.cc -@@ -28,7 +28,7 @@ std::unique_ptr<DeviceOAuth2TokenStore> CreatePlatform - #if defined(OS_CHROMEOS) +@@ -30,7 +30,7 @@ std::unique_ptr<DeviceOAuth2TokenStore> CreatePlatform return std::make_unique<chromeos::DeviceOAuth2TokenStoreChromeOS>( local_state); --#elif defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) -+#elif defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) + #elif defined(OS_WIN) || defined(OS_MAC) || \ +- (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++ (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) DCHECK( base::FeatureList::IsEnabled(policy::features::kCBCMPolicyInvalidations)); return std::make_unique<DeviceOAuth2TokenStoreDesktop>(local_state); 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 2ae6632fbd5a..231300fd95fc 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,4 +1,4 @@ ---- chrome/browser/devtools/devtools_eye_dropper.cc.orig 2021-01-18 21:28:49 UTC +--- chrome/browser/devtools/devtools_eye_dropper.cc.orig 2021-03-12 23:57:17 UTC +++ chrome/browser/devtools/devtools_eye_dropper.cc @@ -165,7 +165,7 @@ void DevToolsEyeDropper::UpdateCursor() { // magnified projection only with centered hotspot. 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 eb170bb7f4e1..9373fba60358 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 2020-11-13 06:36:36 UTC +--- chrome/browser/diagnostics/diagnostics_writer.h.orig 2021-03-12 23:57:17 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 43e7a724148a..aa0c0b995969 100644 --- a/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc +++ b/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2021-01-18 21:28:49 UTC +--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2021-03-12 23:57:17 UTC +++ chrome/browser/download/chrome_download_manager_delegate.cc -@@ -1400,7 +1400,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1443,7 +1443,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe target_info->is_filetype_handled_safely) DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true); @@ -9,7 +9,7 @@ if (item->GetOriginalMimeType() == "application/x-x509-user-cert") DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true); #endif -@@ -1453,7 +1453,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1496,7 +1496,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile( const base::FilePath& path) { @@ -18,7 +18,7 @@ defined(OS_MAC) if (path.MatchesExtension(FILE_PATH_LITERAL(".pdf"))) { return !download_prefs_->ShouldOpenPdfInSystemReader(); -@@ -1549,7 +1549,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow +@@ -1593,7 +1593,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow bool content_initiated, content::CheckDownloadAllowedCallback check_download_allowed_cb) { DCHECK_CURRENTLY_ON(BrowserThread::UI); 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 b96ac86ba7b7..e59032af5729 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__commands.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__commands.cc @@ -1,4 +1,4 @@ ---- chrome/browser/download/download_commands.cc.orig 2020-11-13 06:36:36 UTC +--- chrome/browser/download/download_commands.cc.orig 2021-03-12 23:57:17 UTC +++ chrome/browser/download/download_commands.cc @@ -27,7 +27,7 @@ #include "net/base/url_util.h" 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 2c1f4554fc6c..ceaa75f9c2ef 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__commands.h +++ b/www/chromium/files/patch-chrome_browser_download_download__commands.h @@ -1,4 +1,4 @@ ---- chrome/browser/download/download_commands.h.orig 2020-11-13 06:36:36 UTC +--- chrome/browser/download/download_commands.h.orig 2021-03-12 23:57:17 UTC +++ chrome/browser/download/download_commands.h @@ -48,7 +48,7 @@ class DownloadCommands { bool IsCommandVisible(Command command) 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 32eccd31fd46..cff9400d5423 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,4 +1,4 @@ ---- chrome/browser/download/download_item_model.cc.orig 2020-11-13 06:36:36 UTC +--- chrome/browser/download/download_item_model.cc.orig 2021-03-12 23:57:17 UTC +++ chrome/browser/download/download_item_model.cc @@ -571,7 +571,7 @@ bool DownloadItemModel::IsCommandChecked( return download_->GetOpenWhenComplete() || 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 7417997e3766..bbdb1e796d3c 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__prefs.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__prefs.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_prefs.cc.orig 2020-11-13 06:36:36 UTC +--- chrome/browser/download/download_prefs.cc.orig 2021-03-12 23:57:17 UTC +++ chrome/browser/download/download_prefs.cc -@@ -67,7 +67,7 @@ namespace { +@@ -68,7 +68,7 @@ namespace { // Consider downloads 'dangerous' if they go to the home directory on Linux and // to the desktop on any platform. bool DownloadPathIsDangerous(const base::FilePath& download_path) { @@ -9,16 +9,16 @@ base::FilePath home_dir = base::GetHomeDir(); if (download_path == home_dir) { return true; -@@ -172,7 +172,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi +@@ -173,7 +173,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi GetDefaultDownloadDirectoryForProfile())); - #endif // defined(OS_CHROMEOS) + #endif // BUILDFLAG(IS_CHROMEOS_ASH) -#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); -@@ -300,7 +300,7 @@ void DownloadPrefs::RegisterProfilePrefs( +@@ -301,7 +301,7 @@ void DownloadPrefs::RegisterProfilePrefs( default_download_path); registry->RegisterFilePathPref(prefs::kSaveFileDefaultDirectory, default_download_path); @@ -27,7 +27,7 @@ defined(OS_MAC) registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false); #endif -@@ -430,7 +430,7 @@ bool DownloadPrefs::IsDownloadPathManaged() const { +@@ -431,7 +431,7 @@ bool DownloadPrefs::IsDownloadPathManaged() const { } bool DownloadPrefs::IsAutoOpenByUserUsed() const { @@ -36,7 +36,7 @@ defined(OS_MAC) if (ShouldOpenPdfInSystemReader()) return true; -@@ -445,7 +445,7 @@ bool DownloadPrefs::IsAutoOpenEnabled(const GURL& url, +@@ -446,7 +446,7 @@ bool DownloadPrefs::IsAutoOpenEnabled(const GURL& url, return false; DCHECK(extension[0] == base::FilePath::kExtensionSeparator); extension.erase(0, 1); @@ -45,7 +45,7 @@ defined(OS_MAC) if (base::FilePath::CompareEqualIgnoreCase(extension, FILE_PATH_LITERAL("pdf")) && -@@ -496,7 +496,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens +@@ -497,7 +497,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens SaveAutoOpenState(); } @@ -54,7 +54,7 @@ defined(OS_MAC) void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) { if (should_open_pdf_in_system_reader_ == should_open) -@@ -518,7 +518,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons +@@ -519,7 +519,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons #endif void DownloadPrefs::ResetAutoOpenByUser() { diff --git a/www/chromium/files/patch-chrome_browser_download_download__prefs.h b/www/chromium/files/patch-chrome_browser_download_download__prefs.h index dc591a61de75..d6bc6675807d 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__prefs.h +++ b/www/chromium/files/patch-chrome_browser_download_download__prefs.h @@ -1,4 +1,4 @@ ---- chrome/browser/download/download_prefs.h.orig 2020-11-13 06:36:36 UTC +--- chrome/browser/download/download_prefs.h.orig 2021-03-12 23:57:17 UTC +++ chrome/browser/download/download_prefs.h @@ -117,7 +117,7 @@ class DownloadPrefs { // Disables auto-open based on file extension. 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 a3d5b963a963..9888563b9532 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-11-13 06:36:36 UTC +--- chrome/browser/download/download_query.cc.orig 2021-03-12 23:57:17 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 684cafa34674..bd3f723c96dc 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,4 +1,4 @@ ---- chrome/browser/download/download_shelf_context_menu.cc.orig 2020-11-13 06:36:36 UTC +--- chrome/browser/download/download_shelf_context_menu.cc.orig 2021-03-12 23:57:17 UTC +++ chrome/browser/download/download_shelf_context_menu.cc @@ -146,7 +146,7 @@ base::string16 DownloadShelfContextMenu::GetLabelForCo : IDS_DOWNLOAD_MENU_PLATFORM_OPEN_ALWAYS; diff --git a/www/chromium/files/patch-chrome_browser_error__reporting_BUILD.gn b/www/chromium/files/patch-chrome_browser_error__reporting_BUILD.gn index 3098fc8c7046..1d5b25c51816 100644 --- a/www/chromium/files/patch-chrome_browser_error__reporting_BUILD.gn +++ b/www/chromium/files/patch-chrome_browser_error__reporting_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/browser/error_reporting/BUILD.gn.orig 2021-01-19 12:11:56 UTC +--- chrome/browser/error_reporting/BUILD.gn.orig 2021-03-12 23:57:17 UTC +++ chrome/browser/error_reporting/BUILD.gn -@@ -22,6 +22,13 @@ static_library("error_reporting") { +@@ -25,6 +25,13 @@ static_library("error_reporting") { "//services/network:network_service", "//services/network/public/cpp", ] @@ -14,8 +14,8 @@ } source_set("test_support") { -@@ -35,6 +42,12 @@ source_set("test_support") { - "//base", +@@ -42,6 +49,12 @@ source_set("test_support") { + "//components/crash/content/browser/error_reporting", "//components/crash/content/browser/error_reporting:mock_crash_endpoint", ] + @@ -27,7 +27,7 @@ } source_set("unit_test") { -@@ -52,4 +65,12 @@ source_set("unit_test") { +@@ -60,4 +73,12 @@ source_set("unit_test") { "//net:test_support", "//testing/gtest", ] diff --git a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn index 2d6ff3f86733..ed7c6f3d7bd7 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn +++ b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn @@ -1,7 +1,7 @@ ---- chrome/browser/extensions/BUILD.gn.orig 2021-01-18 21:28:49 UTC +--- chrome/browser/extensions/BUILD.gn.orig 2021-03-12 23:57:17 UTC +++ chrome/browser/extensions/BUILD.gn -@@ -1233,6 +1233,12 @@ static_library("extensions") { - deps += [ "//chrome/common:service_process_mojom" ] +@@ -1248,6 +1248,12 @@ static_library("extensions") { + ] } + if (is_bsd) { 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 02ba7ca0e7b0..a717fdad027c 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 2021-01-18 21:28:49 UTC +--- chrome/browser/extensions/activity_log/activity_log.cc.orig 2021-03-12 23:57:17 UTC +++ chrome/browser/extensions/activity_log/activity_log.cc @@ -49,7 +49,11 @@ #include "extensions/common/extension.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 032cb09214b2..3a882dddbcee 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,4 +1,4 @@ ---- 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.orig 2021-03-12 23:57:17 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" 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 0f027d5724f1..5aa9ea53fa8b 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-11-13 06:36:36 UTC +--- chrome/browser/extensions/api/enterprise_reporting_private/device_info_fetcher_linux.cc.orig 2021-03-12 23:57:17 UTC +++ chrome/browser/extensions/api/enterprise_reporting_private/device_info_fetcher_linux.cc @@ -8,7 +8,9 @@ #include <gio/gio.h> 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 72a1313efa83..d05d040aca65 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_erp_chrome_desktop_report_request_helper.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_erp_chrome_desktop_report_request_helper.cc @@ -1,4 +1,4 @@ ---- chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc.orig 2021-01-18 21:28:50 UTC +--- chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc.orig 2021-03-12 23:57:17 UTC +++ chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc @@ -22,7 +22,7 @@ #include "base/win/registry.h" diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_extension__action_browser__action__interactive__test.cc b/www/chromium/files/patch-chrome_browser_extensions_api_extension__action_browser__action__interactive__test.cc index ba7cf1f62692..319d165d57a1 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_extension__action_browser__action__interactive__test.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_extension__action_browser__action__interactive__test.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc.orig 2021-01-18 21:28:50 UTC +--- chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc.orig 2021-03-12 23:57:17 UTC +++ chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc -@@ -280,7 +280,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionInteractiveTest, T +@@ -281,7 +281,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionInteractiveTest, T frame_observer.Wait(); // Non-Aura Linux uses a singleton for the popup, so it looks like all windows // have popups if there is any popup open. diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc b/www/chromium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc index 0db1b2f1cf37..d5212afd6b17 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-11-13 06:36:36 UTC +--- chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc.orig 2021-03-12 23:57:17 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_runtime_chrome__runtime__api__delegate.cc b/www/chromium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc index 5502b9a61bc3..1f7a5b0cdb8b 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-11-13 06:36:36 UTC +--- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig 2021-03-12 23:57:17 UTC +++ chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc -@@ -284,6 +284,8 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor +@@ -286,6 +286,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 672c3ce67a76..57214f0e3892 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 2021-01-18 21:28:50 UTC +--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2021-03-12 23:57:17 UTC +++ chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -171,7 +171,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist - (*s_allowlist)[bookmarks::prefs::kShowBookmarkBar] = - settings_api::PrefType::PREF_TYPE_BOOLEAN; +@@ -176,7 +176,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) (*s_allowlist)[::prefs::kUseCustomChromeFrame] = settings_api::PrefType::PREF_TYPE_BOOLEAN; #endif -@@ -181,7 +181,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist - // Appearance settings. - (*s_allowlist)[::prefs::kCurrentThemeID] = +@@ -188,7 +188,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist settings_api::PrefType::PREF_TYPE_STRING; --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) (*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 0677c99de1fb..6d8ab9650cdb 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-11-13 06:36:36 UTC +--- chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc.orig 2021-03-12 23:57:17 UTC +++ chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc @@ -30,7 +30,7 @@ #include "extensions/browser/process_manager.h" 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 52c2f5c66e64..f00c82fb7496 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2020-11-13 06:36:36 UTC +--- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2021-03-12 23:57:17 UTC +++ chrome/browser/extensions/browser_context_keyed_service_factories.cc -@@ -53,7 +53,7 @@ +@@ -54,7 +54,7 @@ #include "extensions/browser/api/networking_private/networking_private_delegate_factory.h" #include "ppapi/buildflags/buildflags.h" 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 834594ad882e..e76cbaed81eb 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,15 +1,15 @@ ---- chrome/browser/extensions/external_provider_impl.cc.orig 2020-11-13 06:36:37 UTC +--- chrome/browser/extensions/external_provider_impl.cc.orig 2021-03-12 23:57:18 UTC +++ chrome/browser/extensions/external_provider_impl.cc -@@ -776,7 +776,7 @@ void ExternalProviderImpl::CreateExternalProviders( - } - #endif +@@ -792,7 +792,7 @@ void ExternalProviderImpl::CreateExternalProviders( if (!profile->GetPrefs()->GetBoolean(pref_names::kBlockExternalExtensions)) { --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) provider_list->push_back(std::make_unique<ExternalProviderImpl>( service, base::MakeRefCounted<ExternalPrefLoader>( -@@ -803,7 +803,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -819,7 +819,7 @@ void ExternalProviderImpl::CreateExternalProviders( bundled_extension_creation_flags)); // Define a per-user source of external extensions. diff --git a/www/chromium/files/patch-chrome_browser_native__file__system_chrome__native__file__system__permission__context.cc b/www/chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc index e8aa98c2da4e..bfb1783f908d 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_file__system__access_chrome__file__system__access__permission__context.cc @@ -1,6 +1,6 @@ ---- chrome/browser/native_file_system/chrome_native_file_system_permission_context.cc.orig 2021-01-18 21:28:50 UTC -+++ chrome/browser/native_file_system/chrome_native_file_system_permission_context.cc -@@ -143,7 +143,7 @@ const struct { +--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2021-03-12 23:57:18 UTC ++++ chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc +@@ -144,7 +144,7 @@ const struct { {base::DIR_APP_DATA, nullptr, kBlockAllChildren}, {base::DIR_HOME, FILE_PATH_LITERAL("Library"), kBlockAllChildren}, #endif 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 d35311ebd097..c86ce4f8c056 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 2020-11-13 06:36:37 UTC +--- chrome/browser/first_run/first_run_dialog.h.orig 2021-03-12 23:57:18 UTC +++ chrome/browser/first_run/first_run_dialog.h -@@ -9,7 +9,7 @@ - #include "build/build_config.h" - +@@ -12,7 +12,7 @@ // Hide this function on platforms where the dialog does not exist. --#if defined(OS_MAC) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+#if defined(OS_MAC) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if defined(OS_MAC) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++#if defined(OS_MAC) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || 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 bda3866c4958..8af510712cfa 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,19 @@ ---- chrome/browser/first_run/first_run_internal.h.orig 2021-01-18 21:28:50 UTC +--- chrome/browser/first_run/first_run_internal.h.orig 2021-03-12 23:57:18 UTC +++ chrome/browser/first_run/first_run_internal.h -@@ -55,13 +55,13 @@ FirstRunState DetermineFirstRunState(bool has_sentinel - bool force_first_run, - bool no_first_run); +@@ -58,14 +58,13 @@ FirstRunState DetermineFirstRunState(bool has_sentinel --#if defined(OS_MAC) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+#if defined(OS_MAC) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if defined(OS_MAC) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++#if defined(OS_MAC) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || 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_MAC) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+#endif // defined(OS_MAC) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) +-#endif // defined(OS_MAC) || (defined(OS_LINUX) || +- // BUILDFLAG(IS_CHROMEOS_LACROS)) ++#endif // defined(OS_MAC) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || 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 7413bfd572dd..60672eda45a6 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,20 +1,20 @@ ---- 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.orig 2021-03-12 23:57:18 UTC +++ chrome/browser/first_run/first_run_internal_posix.cc -@@ -45,7 +45,7 @@ enum class ForcedShowDialogState { +@@ -46,7 +46,7 @@ enum class ForcedShowDialogState { ForcedShowDialogState g_forced_show_dialog_state = ForcedShowDialogState::kNotForced; --#if !defined(OS_CHROMEOS) -+#if !defined(OS_CHROMEOS) && !defined(OS_BSD) +-#if !BUILDFLAG(IS_CHROMEOS_ASH) ++#if !BUILDFLAG(IS_CHROMEOS_ASH) && !defined(OS_BSD) // Returns whether the first run dialog should be shown. This is only true for // certain builds, and only if the user has not already set preferences. In a // real, official-build first run, initializes the default metrics reporting if -@@ -96,7 +96,7 @@ void ForceFirstRunDialogShownForTesting(bool shown) { +@@ -97,7 +97,7 @@ void ForceFirstRunDialogShownForTesting(bool shown) { } void DoPostImportPlatformSpecificTasks(Profile* profile) { --#if !defined(OS_CHROMEOS) -+#if !defined(OS_CHROMEOS) && !defined(OS_BSD) +-#if !BUILDFLAG(IS_CHROMEOS_ASH) ++#if !BUILDFLAG(IS_CHROMEOS_ASH) && !defined(OS_BSD) if (!ShouldShowFirstRunDialog()) return; diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc index 06233854a178..cfc4b0641408 100644 --- a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc @@ -1,6 +1,6 @@ ---- chrome/browser/flag_descriptions.cc.orig 2021-01-18 21:28:50 UTC +--- chrome/browser/flag_descriptions.cc.orig 2021-03-12 23:57:18 UTC +++ chrome/browser/flag_descriptions.cc -@@ -4609,7 +4609,7 @@ const char kEnableNewBadgeOnMenuItemsDescription[] = +@@ -4772,7 +4772,7 @@ const char kEnableNewBadgeOnMenuItemsDescription[] = // Random platform combinations ----------------------------------------------- @@ -9,7 +9,7 @@ defined(OS_CHROMEOS) const char kEnableMediaFeedsName[] = "Enables Media Feeds"; -@@ -4653,17 +4653,17 @@ const char kRemoteCopyProgressNotificationDescription[ +@@ -4816,27 +4816,27 @@ const char kRemoteCopyProgressNotificationDescription[ "Enables progress notifications to be shown for the remote copy feature " "when receiving a message."; @@ -29,11 +29,6 @@ +#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) -@@ -4675,14 +4675,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) @@ -45,21 +40,30 @@ -#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) + #if !defined(OS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH) const char kUserDataSnapshotName[] = "Enable user data snapshots"; -@@ -4698,13 +4698,13 @@ const char kWebShareDescription[] = - "platforms."; - #endif // defined(OS_WIN) || defined(OS_CHROMEOS) +@@ -4854,13 +4854,13 @@ const char kWebShareDescription[] = --#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || \ -+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) || \ + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ ++#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) || \ defined(OS_MAC) const char kEnableEphemeralGuestProfilesOnDesktopName[] = "Enable ephemeral Guest profiles on Desktop"; const char kEnableEphemeralGuestProfilesOnDesktopDescription[] = "Enables ephemeral Guest profiles on Windows, Linux, and Mac."; --#endif // defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || -+#endif // defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) || - // defined(OS_MAC) +-#endif // defined(OS_WIN) || (defined(OS_LINUX) || ++#endif // defined(OS_WIN) || (defined(OS_LINUX) || defined(OS_BSD) || + // BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_MAC) // Feature flags -------------------------------------------------------------- +@@ -4953,7 +4953,7 @@ const char kAutofillCreditCardUploadDescription[] = + + #endif // defined(TOOLKIT_VIEWS) || defined(OS_ANDROID) + +-#if !defined(OS_WIN) && !defined(OS_FUCHSIA) ++#if !defined(OS_WIN) && !defined(OS_FUCHSIA) && !defined(OS_BSD) + const char kSendWebUIJavaScriptErrorReportsName[] = + "Send WebUI JavaScript Error Reports"; + const char kSendWebUIJavaScriptErrorReportsDescription[] = diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.h b/www/chromium/files/patch-chrome_browser_flag__descriptions.h index 70902c3e7489..28ba171c144e 100644 --- a/www/chromium/files/patch-chrome_browser_flag__descriptions.h +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.h @@ -1,6 +1,6 @@ ---- chrome/browser/flag_descriptions.h.orig 2021-01-18 21:28:50 UTC +--- chrome/browser/flag_descriptions.h.orig 2021-03-12 23:57:18 UTC +++ chrome/browser/flag_descriptions.h -@@ -19,9 +19,9 @@ +@@ -20,9 +20,9 @@ #include "ppapi/buildflags/buildflags.h" #include "printing/buildflags/buildflags.h" @@ -12,7 +12,7 @@ // This file declares strings used in chrome://flags. These messages are not // translated, because instead of end-users they target Chromium developers and -@@ -2699,7 +2699,7 @@ extern const char kEnableNewBadgeOnMenuItemsDescriptio +@@ -2790,7 +2790,7 @@ extern const char kEnableNewBadgeOnMenuItemsDescriptio // Random platform combinations ----------------------------------------------- @@ -21,7 +21,7 @@ defined(OS_CHROMEOS) extern const char kEnableMediaFeedsName[]; -@@ -2726,7 +2726,7 @@ extern const char kRemoteCopyProgressNotificationDescr +@@ -2817,15 +2817,15 @@ extern const char kRemoteCopyProgressNotificationDescr extern const char kDirectManipulationStylusName[]; extern const char kDirectManipulationStylusDescription[]; @@ -29,11 +29,6 @@ +#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) -@@ -2736,12 +2736,12 @@ extern 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) @@ -43,19 +38,28 @@ -#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) + #if !defined(OS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH) extern const char kUserDataSnapshotName[]; -@@ -2753,11 +2753,11 @@ extern const char kWebShareName[]; - extern const char kWebShareDescription[]; - #endif // defined(OS_WIN) || defined(OS_CHROMEOS) +@@ -2839,11 +2839,11 @@ extern const char kWebShareDescription[]; --#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || \ -+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) || \ + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ ++#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) || \ defined(OS_MAC) extern const char kEnableEphemeralGuestProfilesOnDesktopName[]; extern const char kEnableEphemeralGuestProfilesOnDesktopDescription[]; --#endif // defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS) || -+#endif // defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) || - // defined(OS_MAC) +-#endif // defined(OS_WIN) || (defined(OS_LINUX) || ++#endif // defined(OS_WIN) || (defined(OS_LINUX) || defined(OS_BSD) || + // BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_MAC) // Feature flags -------------------------------------------------------------- +@@ -2906,7 +2906,7 @@ extern const char kAutofillCreditCardUploadDescription + + #endif // defined(TOOLKIT_VIEWS) || defined(OS_ANDROID) + +-#if !defined(OS_WIN) && !defined(OS_FUCHSIA) ++#if !defined(OS_WIN) && !defined(OS_FUCHSIA) && !defined(OS_BSD) + extern const char kSendWebUIJavaScriptErrorReportsName[]; + extern const char kSendWebUIJavaScriptErrorReportsDescription[]; + #endif diff --git a/www/chromium/files/patch-chrome_browser_intranet__redirect__detector.h b/www/chromium/files/patch-chrome_browser_intranet__redirect__detector.h index 5d71568395bd..f5e4258b7e67 100644 --- a/www/chromium/files/patch-chrome_browser_intranet__redirect__detector.h +++ b/www/chromium/files/patch-chrome_browser_intranet__redirect__detector.h @@ -1,4 +1,4 @@ ---- chrome/browser/intranet_redirect_detector.h.orig 2020-11-16 14:19:24 UTC +--- chrome/browser/intranet_redirect_detector.h.orig 2021-03-12 23:57:18 UTC +++ chrome/browser/intranet_redirect_detector.h @@ -27,7 +27,7 @@ class SimpleURLLoader; 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 b5eef183a63e..87ee148fcfab 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 2020-11-13 06:36:37 UTC +--- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig 2021-03-12 23:57:18 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 @@ -7,8 +7,8 @@ +#if !defined(OS_FREEBSD) CreateMTPDeviceAsyncDelegate( device_location, read_only, - base::Bind(&MTPDeviceMapService::AddAsyncDelegate, - base::Unretained(this), device_location, read_only)); + base::BindOnce(&MTPDeviceMapService::AddAsyncDelegate, + base::Unretained(this), device_location, read_only)); +#endif mtp_device_usage_map_[key] = 0; } 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 d46dbf815aec..1d0354461ad5 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-11-13 06:36:37 UTC +--- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2021-03-12 23:57:18 UTC +++ chrome/browser/media_galleries/media_file_system_registry.cc -@@ -735,7 +735,10 @@ class MediaFileSystemRegistry::MediaFileSystemContextI +@@ -736,7 +736,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_audio__service__util.cc b/www/chromium/files/patch-chrome_browser_media_audio__service__util.cc new file mode 100644 index 000000000000..c34939baeee8 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_media_audio__service__util.cc @@ -0,0 +1,11 @@ +--- chrome/browser/media/audio_service_util.cc.orig 2021-03-12 23:57:18 UTC ++++ chrome/browser/media/audio_service_util.cc +@@ -24,7 +24,7 @@ bool IsAudioServiceSandboxEnabled() { + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. + #if defined(OS_WIN) || defined(OS_MAC) || \ +- (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++ (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) + const policy::PolicyMap& policies = + g_browser_process->browser_policy_connector() + ->GetPolicyService() 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 d2b2859bc266..61a8f93f7274 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 2020-11-13 06:36:37 UTC +--- chrome/browser/media/router/discovery/discovery_network_list_posix.cc.orig 2021-03-12 23:57:18 UTC +++ chrome/browser/media/router/discovery/discovery_network_list_posix.cc @@ -10,6 +10,7 @@ #include <netinet/in.h> 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 bdac76446e89..c42ffa495a4c 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-11-13 06:36:37 UTC +--- chrome/browser/media/router/discovery/discovery_network_list_wifi_linux.cc.orig 2021-03-12 23:57:18 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 068d8fd2862c..b883b109864a 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,6 +1,6 @@ ---- 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.orig 2021-03-12 23:57:18 UTC +++ chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.cc -@@ -112,6 +112,12 @@ void WiredDisplayMediaRouteProvider::CreateRoute( +@@ -105,6 +105,12 @@ void WiredDisplayMediaRouteProvider::CreateRoute( bool off_the_record, CreateRouteCallback callback) { DCHECK(!base::Contains(presentations_, presentation_id)); @@ -13,7 +13,7 @@ base::Optional<Display> display = GetDisplayBySinkId(sink_id); if (!display) { std::move(callback).Run(base::nullopt, nullptr, -@@ -138,6 +144,7 @@ void WiredDisplayMediaRouteProvider::CreateRoute( +@@ -131,6 +137,7 @@ void WiredDisplayMediaRouteProvider::CreateRoute( std::move(callback).Run(route, nullptr, base::nullopt, RouteRequestResult::OK); NotifyRouteObservers(); 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 f5946e14d1b5..0336df512390 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,8 +1,8 @@ ---- 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.orig 2021-03-12 23:57:18 UTC +++ chrome/browser/media/webrtc/webrtc_event_log_uploader.cc -@@ -40,6 +40,8 @@ const char kProduct[] = "Chrome_Mac"; +@@ -41,6 +41,8 @@ const char kProduct[] = "Chrome_Mac"; const char kProduct[] = "Chrome_ChromeOS"; - #elif defined(OS_LINUX) + #elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) const char kProduct[] = "Chrome_Linux"; +#elif defined(OS_FREEBSD) +const char kProduct[] = "Chrome_FreeBSD"; 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 479fa6c52f70..2e65e602bbb9 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,8 +1,8 @@ ---- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2020-11-13 06:36:37 UTC +--- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2021-03-12 23:57:18 UTC +++ chrome/browser/media/webrtc/webrtc_log_uploader.cc -@@ -357,6 +357,8 @@ void WebRtcLogUploader::SetupMultipart( +@@ -360,6 +360,8 @@ void WebRtcLogUploader::SetupMultipart( const char product[] = "Chrome_Android"; - #elif defined(OS_CHROMEOS) + #elif BUILDFLAG(IS_CHROMEOS_ASH) const char product[] = "Chrome_ChromeOS"; +#elif defined(OS_FREEBSD) + const char product[] = "Chrome_FreeBSD"; 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 7d91b0ea5d5d..72f24793cc14 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-11-13 06:36:37 UTC +--- chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig 2021-03-12 23:57:18 UTC +++ chrome/browser/media/webrtc/webrtc_logging_controller.cc @@ -23,10 +23,10 @@ #include "content/public/browser/browser_context.h" 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 fe8b7922599f..ae65167a1515 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 2020-11-13 06:36:37 UTC +--- chrome/browser/media/webrtc/webrtc_logging_controller.h.orig 2021-03-12 23:57:18 UTC +++ chrome/browser/media/webrtc/webrtc_logging_controller.h @@ -129,13 +129,13 @@ class WebRtcLoggingController size_t web_app_id, diff --git a/www/chromium/files/patch-chrome_browser_memory__details.cc b/www/chromium/files/patch-chrome_browser_memory__details.cc index c12c2928f020..0ca5d7cd708d 100644 --- a/www/chromium/files/patch-chrome_browser_memory__details.cc +++ b/www/chromium/files/patch-chrome_browser_memory__details.cc @@ -1,4 +1,4 @@ ---- chrome/browser/memory_details.cc.orig 2020-11-13 06:36:37 UTC +--- chrome/browser/memory_details.cc.orig 2021-03-12 23:57:18 UTC +++ chrome/browser/memory_details.cc @@ -38,7 +38,7 @@ #include "services/resource_coordinator/public/cpp/memory_instrumentation/memory_instrumentation.h" 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 8247a2268794..db0d3691e531 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 2020-11-13 06:36:37 UTC +--- chrome/browser/memory_details_linux.cc.orig 2021-03-12 23:57:18 UTC +++ chrome/browser/memory_details_linux.cc -@@ -69,8 +69,10 @@ ProcessData GetProcessDataMemoryInformation( +@@ -70,8 +70,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 208ca0daeeaf..128c217f37eb 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,8 +1,8 @@ ---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2021-01-18 21:28:50 UTC +--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2021-03-12 23:57:18 UTC +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc -@@ -52,7 +52,9 @@ - - #if defined(OS_LINUX) && !defined(OS_CHROMEOS) +@@ -56,7 +56,9 @@ + // of lacros-chrome is complete. + #if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) #include <gnu/libc-version.h> +#endif @@ -10,12 +10,12 @@ #include "base/linux_util.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" -@@ -61,7 +63,7 @@ +@@ -65,7 +67,7 @@ #include "ui/base/ui_base_features.h" #include "ui/base/x/x11_util.h" #endif --#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) #if defined(USE_OZONE) || defined(USE_X11) #include "ui/events/devices/device_data_manager.h" 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 56b456672897..f61540727dc9 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,25 +1,24 @@ ---- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2021-01-18 21:28:50 UTC +--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2021-03-12 23:57:18 UTC +++ chrome/browser/metrics/chrome_metrics_service_client.cc -@@ -696,11 +696,11 @@ void ChromeMetricsServiceClient::RegisterMetricsServic - #endif // defined(OS_WIN) - +@@ -697,10 +697,10 @@ void ChromeMetricsServiceClient::RegisterMetricsServic + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. #if defined(OS_WIN) || defined(OS_MAC) || \ -- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) +- (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++ (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) metrics_service_->RegisterMetricsProvider( std::make_unique<DesktopPlatformFeaturesMetricsProvider>()); - #endif // defined(OS_WIN) || defined(OS_MAC) || \ -- // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+ // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || 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) || + // BUILDFLAG(IS_CHROMEOS_LACROS)) #if BUILDFLAG(ENABLE_PLUGINS) - plugin_metrics_provider_ = new PluginMetricsProvider(local_state); -@@ -974,7 +974,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve - } - #endif +@@ -978,7 +978,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. #if defined(OS_WIN) || defined(OS_MAC) || \ -- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) +- (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++ (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) // This creates the DesktopProfileSessionDurationsServices if it didn't exist // already. metrics::DesktopProfileSessionDurationsServiceFactory::GetForBrowserContext( 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 8f7295bcca48..13065dafb06a 100644 --- a/www/chromium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc +++ b/www/chromium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/process_memory_metrics_emitter.cc.orig 2021-01-18 21:28:50 UTC +--- chrome/browser/metrics/process_memory_metrics_emitter.cc.orig 2021-03-12 23:57:18 UTC +++ chrome/browser/metrics/process_memory_metrics_emitter.cc -@@ -497,7 +497,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc +@@ -509,7 +509,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc builder->SetPrivateMemoryFootprint(pmd.os_dump().private_footprint_kb / kKiB); builder->SetSharedMemoryFootprint(pmd.os_dump().shared_footprint_kb / kKiB); @@ -9,7 +9,7 @@ builder->SetPrivateSwapFootprint(pmd.os_dump().private_footprint_swap_kb / kKiB); #endif -@@ -520,7 +520,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc +@@ -532,7 +532,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc MEMORY_METRICS_HISTOGRAM_MB(std::string(kMemoryHistogramPrefix) + process_name + ".SharedMemoryFootprint", pmd.os_dump().shared_footprint_kb / kKiB); diff --git a/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc index afed6828fa4c..6995743b2d87 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,20 +1,20 @@ ---- chrome/browser/net/system_network_context_manager.cc.orig 2021-01-18 21:28:50 UTC +--- chrome/browser/net/system_network_context_manager.cc.orig 2021-03-12 23:57:18 UTC +++ chrome/browser/net/system_network_context_manager.cc -@@ -77,11 +77,11 @@ - #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" - #endif // defined(OS_CHROMEOS) +@@ -81,11 +81,11 @@ --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) #include "chrome/common/chrome_paths_internal.h" #include "chrome/grit/chromium_strings.h" #include "ui/base/l10n/l10n_util.h" --#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) #if BUILDFLAG(ENABLE_EXTENSIONS) #include "extensions/common/constants.h" -@@ -142,10 +142,10 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -146,10 +146,10 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut auth_dynamic_params->basic_over_http_enabled = local_state->GetBoolean(prefs::kBasicAuthOverHttpEnabled); @@ -27,7 +27,7 @@ #if defined(OS_POSIX) auth_dynamic_params->ntlm_v2_enabled = -@@ -360,10 +360,10 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -364,10 +364,10 @@ SystemNetworkContextManager::SystemNetworkContextManag pref_change_registrar_.Add(prefs::kBasicAuthOverHttpEnabled, auth_pref_callback); @@ -40,7 +40,7 @@ #if defined(OS_POSIX) pref_change_registrar_.Add(prefs::kNtlmV2Enabled, auth_pref_callback); -@@ -411,10 +411,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -416,10 +416,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe registry->RegisterStringPref(prefs::kAuthServerAllowlist, std::string()); registry->RegisterStringPref(prefs::kAuthNegotiateDelegateAllowlist, std::string()); @@ -53,12 +53,12 @@ #if defined(OS_POSIX) registry->RegisterBooleanPref( -@@ -506,7 +506,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea - // NetworkContext is created, but before anything has the chance to use it. - stub_resolver_config_reader_.UpdateNetworkService(true /* record_metrics */); +@@ -513,7 +513,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) || defined(OS_BSD) + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) 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 841884f60f2d..2df862c7a918 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,6 +1,6 @@ ---- chrome/browser/notifications/notification_display_service_impl.cc.orig 2021-01-18 21:28:50 UTC +--- chrome/browser/notifications/notification_display_service_impl.cc.orig 2021-03-12 23:57:18 UTC +++ chrome/browser/notifications/notification_display_service_impl.cc -@@ -29,7 +29,7 @@ +@@ -30,7 +30,7 @@ #include "chrome/browser/extensions/api/notifications/extension_notification_handler.h" #endif @@ -9,16 +9,16 @@ defined(OS_WIN) #include "chrome/browser/send_tab_to_self/desktop_notification_handler.h" #include "chrome/browser/sharing/sharing_notification_handler.h" -@@ -63,7 +63,7 @@ NotificationDisplayServiceImpl* NotificationDisplaySer - // static - void NotificationDisplayServiceImpl::RegisterProfilePrefs( +@@ -66,7 +66,7 @@ void NotificationDisplayServiceImpl::RegisterProfilePr user_prefs::PrefRegistrySyncable* registry) { --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) registry->RegisterBooleanPref(prefs::kAllowNativeNotifications, true); #endif } -@@ -78,7 +78,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer +@@ -81,7 +81,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer AddNotificationHandler(NotificationHandler::Type::WEB_PERSISTENT, std::make_unique<PersistentNotificationHandler>()); diff --git a/www/chromium/files/patch-chrome_browser_notifications_notification__platform__bridge__delegator.cc b/www/chromium/files/patch-chrome_browser_notifications_notification__platform__bridge__delegator.cc index 880d5c7e1983..604c62522ab0 100644 --- a/www/chromium/files/patch-chrome_browser_notifications_notification__platform__bridge__delegator.cc +++ b/www/chromium/files/patch-chrome_browser_notifications_notification__platform__bridge__delegator.cc @@ -1,11 +1,11 @@ ---- chrome/browser/notifications/notification_platform_bridge_delegator.cc.orig 2021-01-19 11:25:20 UTC +--- chrome/browser/notifications/notification_platform_bridge_delegator.cc.orig 2021-03-12 23:57:18 UTC +++ chrome/browser/notifications/notification_platform_bridge_delegator.cc -@@ -55,7 +55,7 @@ bool NativeNotificationsEnabled(Profile* profile) { +@@ -56,7 +56,7 @@ bool NativeNotificationsEnabled(Profile* profile) { return true; #elif defined(OS_WIN) return NotificationPlatformBridgeWin::NativeNotificationEnabled(); --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) if (profile) { // Prefs take precedence over flags. PrefService* prefs = profile->GetPrefs(); diff --git a/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc b/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc index 73a160aa0a8e..362cb84d8915 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,14 +1,26 @@ ---- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2021-01-18 21:28:50 UTC +--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2021-03-12 23:57:18 UTC +++ chrome/browser/password_manager/chrome_password_manager_client.cc -@@ -99,7 +99,11 @@ - #include "net/base/url_util.h" - #include "net/cert/cert_status_flags.h" - #include "services/metrics/public/cpp/ukm_recorder.h" +@@ -9,6 +9,10 @@ + #include <string> + #include <utility> + +#if defined(OS_BSD) +#include <re2/re2.h> -+#else - #include "third_party/re2/src/re2/re2.h" +#endif ++ + #include "base/bind.h" + #include "base/callback_helpers.h" + #include "base/command_line.h" +@@ -101,8 +105,11 @@ + #include "net/cert/cert_status_flags.h" + #include "services/metrics/public/cpp/ukm_recorder.h" + #include "services/network/public/cpp/is_potentially_trustworthy.h" +-#include "third_party/re2/src/re2/re2.h" #include "url/url_constants.h" ++ ++#if !defined(OS_BSD) ++#include "third_party/re2/src/re2/re2.h" ++#endif #if BUILDFLAG(FULL_SAFE_BROWSING) + #include "chrome/browser/safe_browsing/advanced_protection_status_manager.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 3961c25d2a66..de9c680b0432 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,11 +1,11 @@ ---- chrome/browser/password_manager/password_store_factory.cc.orig 2021-01-18 21:28:50 UTC +--- chrome/browser/password_manager/password_store_factory.cc.orig 2021-03-12 23:57:18 UTC +++ chrome/browser/password_manager/password_store_factory.cc -@@ -171,7 +171,7 @@ PasswordStoreFactory::BuildServiceInstanceFor( - network_context_getter); - +@@ -163,7 +163,7 @@ PasswordStoreFactory::BuildServiceInstanceFor( + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. #if defined(OS_WIN) || defined(OS_MAC) || \ -- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) +- (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++ (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) std::unique_ptr<password_manager::PasswordStoreSigninNotifier> notifier = std::make_unique<password_manager::PasswordStoreSigninNotifierImpl>( IdentityManagerFactory::GetForProfile(profile)); diff --git a/www/chromium/files/patch-chrome_browser_pdf_pdf__extension__test.cc b/www/chromium/files/patch-chrome_browser_pdf_pdf__extension__test.cc index cf811f1a48e3..b2754c5da7c1 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,20 @@ ---- chrome/browser/pdf/pdf_extension_test.cc.orig 2021-01-18 21:28:50 UTC +--- chrome/browser/pdf/pdf_extension_test.cc.orig 2021-03-12 23:57:18 UTC +++ chrome/browser/pdf/pdf_extension_test.cc -@@ -2192,7 +2192,7 @@ class PDFExtensionClipboardTest : public PDFExtensionT - // Runs `action` and checks the Linux selection clipboard contains `expected`. - void DoActionAndCheckSelectionClipboard(base::OnceClosure action, +@@ -2188,7 +2188,7 @@ class PDFExtensionClipboardTest : public PDFExtensionT const std::string& expected) { --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) DoActionAndCheckClipboard(std::move(action), ui::ClipboardBuffer::kSelection, expected); #else +@@ -2320,7 +2320,7 @@ IN_PROC_BROWSER_TEST_P(PDFExtensionClipboardTest, + // Flaky on ChromeOS (https://crbug.com/1121446) + // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is + // complete. +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) + #define MAYBE_CombinedShiftArrowPresses DISABLED_CombinedShiftArrowPresses + #else + #define MAYBE_CombinedShiftArrowPresses CombinedShiftArrowPresses diff --git a/www/chromium/files/patch-chrome_browser_performance__manager_policies_policy__features.cc b/www/chromium/files/patch-chrome_browser_performance__manager_policies_policy__features.cc index 63f71da34584..fa4a7c73ddef 100644 --- a/www/chromium/files/patch-chrome_browser_performance__manager_policies_policy__features.cc +++ b/www/chromium/files/patch-chrome_browser_performance__manager_policies_policy__features.cc @@ -1,4 +1,4 @@ ---- chrome/browser/performance_manager/policies/policy_features.cc.orig 2021-01-19 11:25:47 UTC +--- chrome/browser/performance_manager/policies/policy_features.cc.orig 2021-03-12 23:57:18 UTC +++ chrome/browser/performance_manager/policies/policy_features.cc @@ -125,7 +125,7 @@ const base::Feature kPageFreezingFromPerformanceManage 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 e8223a8b41ea..fc5c3d110f1a 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,4 +1,4 @@ ---- chrome/browser/performance_monitor/process_metrics_history.cc.orig 2020-11-13 06:36:37 UTC +--- chrome/browser/performance_monitor/process_metrics_history.cc.orig 2021-03-12 23:57:18 UTC +++ chrome/browser/performance_monitor/process_metrics_history.cc @@ -47,7 +47,7 @@ void ProcessMetricsHistory::SampleMetrics() { #if defined(OS_WIN) 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 da3196ef2c61..af0c64060238 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,4 +1,4 @@ ---- chrome/browser/performance_monitor/process_metrics_history.h.orig 2020-11-13 06:36:37 UTC +--- chrome/browser/performance_monitor/process_metrics_history.h.orig 2021-03-12 23:57:18 UTC +++ chrome/browser/performance_monitor/process_metrics_history.h @@ -71,7 +71,7 @@ class ProcessMetricsHistory { uint64_t disk_usage_ = 0; 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 ea664315e958..98274b15c1fc 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,6 +1,6 @@ ---- chrome/browser/plugins/plugin_info_host_impl.cc.orig 2021-01-18 21:28:50 UTC +--- chrome/browser/plugins/plugin_info_host_impl.cc.orig 2021-03-12 23:57:18 UTC +++ chrome/browser/plugins/plugin_info_host_impl.cc -@@ -380,7 +380,7 @@ void PluginInfoHostImpl::ComponentPluginLookupDone( +@@ -379,7 +379,7 @@ void PluginInfoHostImpl::ComponentPluginLookupDone( std::unique_ptr<component_updater::ComponentInfo> cus_plugin_info) { if (cus_plugin_info) { output->status = chrome::mojom::PluginStatus::kComponentUpdateRequired; 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 f29fc42d052d..089a8c4da522 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,11 +1,11 @@ ---- chrome/browser/plugins/plugins_resource_service.cc.orig 2020-11-13 06:36:37 UTC +--- chrome/browser/plugins/plugins_resource_service.cc.orig 2021-03-12 23:57:18 UTC +++ chrome/browser/plugins/plugins_resource_service.cc @@ -62,7 +62,7 @@ GURL GetPluginsServerURL() { filename = "plugins_win.json"; - #elif defined(OS_CHROMEOS) + #elif BUILDFLAG(IS_CHROMEOS_ASH) filename = "plugins_chromeos.json"; --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) filename = "plugins_linux.json"; #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 e45bc256af17..1ffba3d3fb9b 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,4 +1,4 @@ ---- chrome/browser/policy/browser_signin_policy_handler.cc.orig 2020-11-13 06:36:37 UTC +--- chrome/browser/policy/browser_signin_policy_handler.cc.orig 2021-03-12 23:57:18 UTC +++ chrome/browser/policy/browser_signin_policy_handler.cc @@ -52,7 +52,7 @@ void BrowserSigninPolicyHandler::ApplyPolicySettings(c } diff --git a/www/chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc b/www/chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc index de246c17fb79..279da02a8aa0 100644 --- a/www/chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc +++ b/www/chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc @@ -1,4 +1,4 @@ ---- 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.orig 2021-03-12 23:57:18 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" 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 8febb778ebac..9df20861015c 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,30 +1,30 @@ ---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2021-01-18 21:28:50 UTC +--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2021-03-12 23:57:18 UTC +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -1231,11 +1231,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1233,11 +1233,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, - #endif // !defined(OS_MAC) && !defined(OS_CHROMEOS) + #endif // !defined(OS_MAC) && !BUILDFLAG(IS_CHROMEOS_ASH) -#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_MAC) || defined(OS_CHROMEOS) -+#endif // defined(OS_LINUX) || defined(OS_MAC) || 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_MAC) { key::kFullscreenAllowed, -@@ -1279,11 +1279,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = - base::Value::Type::BOOLEAN }, +@@ -1282,11 +1282,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = #endif // BUILDFLAG(ENABLE_SPELLCHECK) --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch of lacros-chrome is complete. +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) { key::kAllowNativeNotifications, prefs::kAllowNativeNotifications, base::Value::Type::BOOLEAN }, --#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || deined(OS_BSD) { 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 index 24ef044f429a..1e914d8434c2 100644 --- a/www/chromium/files/patch-chrome_browser_policy_device__management__service__configuration.cc +++ b/www/chromium/files/patch-chrome_browser_policy_device__management__service__configuration.cc @@ -1,20 +1,20 @@ ---- chrome/browser/policy/device_management_service_configuration.cc.orig 2021-01-18 21:28:50 UTC +--- chrome/browser/policy/device_management_service_configuration.cc.orig 2021-03-12 23:57:18 UTC +++ chrome/browser/policy/device_management_service_configuration.cc -@@ -18,7 +18,7 @@ +@@ -20,7 +20,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" + #include "chrome/browser/enterprise/connectors/connectors_service.h" #endif -@@ -95,7 +95,7 @@ DeviceManagementServiceConfiguration::GetEncryptedRepo - std::string - DeviceManagementServiceConfiguration::GetReportingConnectorServerUrl() { +@@ -98,7 +98,7 @@ std::string + DeviceManagementServiceConfiguration::GetReportingConnectorServerUrl( + content::BrowserContext* context) { #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( + auto* service = + enterprise_connectors::ConnectorsServiceFactory::GetForBrowserContext( + context); 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 beb84f618c6e..bcd864746b74 100644 --- a/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc +++ b/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc @@ -1,20 +1,20 @@ ---- chrome/browser/prefs/browser_prefs.cc.orig 2021-01-18 21:28:50 UTC +--- chrome/browser/prefs/browser_prefs.cc.orig 2021-03-12 23:57:18 UTC +++ chrome/browser/prefs/browser_prefs.cc -@@ -382,7 +382,7 @@ - #endif - +@@ -388,7 +388,7 @@ + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. #if defined(OS_WIN) || defined(OS_MAC) || \ -- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) +- (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++ (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" #endif -@@ -1012,7 +1012,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync - #endif - +@@ -1080,7 +1080,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. #if defined(OS_WIN) || defined(OS_MAC) || \ -- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) +- (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++ (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) browser_switcher::BrowserSwitcherPrefs::RegisterProfilePrefs(registry); #endif diff --git a/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc b/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc index c9c613035e8d..b75c93b9a804 100644 --- a/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc +++ b/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc @@ -1,11 +1,11 @@ ---- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2021-01-18 21:28:50 UTC +--- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2021-03-12 23:57:18 UTC +++ chrome/browser/prefs/pref_service_incognito_allowlist.cc @@ -136,7 +136,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)) + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) // 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 index 2c60efb1bd28..a459cd5e7693 100644 --- a/www/chromium/files/patch-chrome_browser_printing_print__job__worker.cc +++ b/www/chromium/files/patch-chrome_browser_printing_print__job__worker.cc @@ -1,20 +1,20 @@ ---- chrome/browser/printing/print_job_worker.cc.orig 2020-11-16 14:22:42 UTC +--- chrome/browser/printing/print_job_worker.cc.orig 2021-03-12 23:57:18 UTC +++ chrome/browser/printing/print_job_worker.cc -@@ -223,7 +223,7 @@ void PrintJobWorker::UpdatePrintSettings(base::Value n +@@ -224,7 +224,7 @@ void PrintJobWorker::UpdatePrintSettings(base::Value n crash_key = std::make_unique<crash_keys::ScopedPrinterInfo>( print_backend->GetPrinterDriverInfo(printer_name)); --#if defined(OS_LINUX) && defined(USE_CUPS) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_CUPS) && !defined(OS_CHROMEOS) +-#if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && defined(USE_CUPS) ++#if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) && defined(USE_CUPS) 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 +@@ -234,7 +234,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) +-#endif // (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && ++#endif // (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) && + // defined(USE_CUPS) } - 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 685ecb00646f..f78dd938359c 100644 --- a/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc +++ b/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc @@ -1,6 +1,6 @@ ---- chrome/browser/process_singleton_posix.cc.orig 2020-11-13 06:36:37 UTC +--- chrome/browser/process_singleton_posix.cc.orig 2021-03-12 23:57:18 UTC +++ chrome/browser/process_singleton_posix.cc -@@ -94,11 +94,11 @@ +@@ -95,12 +95,12 @@ #include "net/base/network_interfaces.h" #include "ui/base/l10n/l10n_util.h" @@ -9,12 +9,13 @@ #include "chrome/browser/ui/process_singleton_dialog_linux.h" #endif --#if defined(TOOLKIT_VIEWS) && defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if defined(TOOLKIT_VIEWS) && (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + #if defined(TOOLKIT_VIEWS) && \ +- (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++ (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) #include "ui/views/linux_ui/linux_ui.h" #endif -@@ -295,7 +295,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo +@@ -297,7 +297,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo if (g_disable_prompt) return g_user_opted_unlock_in_use_profile; @@ -23,12 +24,12 @@ base::string16 relaunch_button_text = l10n_util::GetStringUTF16( IDS_PROFILE_IN_USE_LINUX_RELAUNCH); return ShowProcessSingletonDialog(error, relaunch_button_text); -@@ -871,7 +871,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::Notif - SendRemoteProcessInteractionResultHistogram(REMOTE_PROCESS_SHUTTING_DOWN); +@@ -874,7 +874,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::Notif return PROCESS_NONE; } else if (strncmp(buf, kACKToken, base::size(kACKToken) - 1) == 0) { --#if defined(TOOLKIT_VIEWS) && defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if defined(TOOLKIT_VIEWS) && (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + #if defined(TOOLKIT_VIEWS) && \ +- (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++ (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) // Likely NULL in unit tests. views::LinuxUI* linux_ui = views::LinuxUI::instance(); if (linux_ui) 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 58c178088b70..d6e69643b0fc 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,11 +1,11 @@ ---- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2021-01-18 21:28:50 UTC +--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2021-03-12 23:57:18 UTC +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -319,7 +319,7 @@ void ChromeBrowserMainExtraPartsProfiles:: - media_router::MediaRouterUIServiceFactory::GetInstance(); - #endif +@@ -337,7 +337,7 @@ void ChromeBrowserMainExtraPartsProfiles:: + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. #if defined(OS_WIN) || defined(OS_MAC) || \ -- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) +- (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++ (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance(); #endif ModelTypeStoreServiceFactory::GetInstance(); diff --git a/www/chromium/files/patch-chrome_browser_profiles_profile.cc b/www/chromium/files/patch-chrome_browser_profiles_profile.cc index 4c8fd4448a54..7a0eb7be5283 100644 --- a/www/chromium/files/patch-chrome_browser_profiles_profile.cc +++ b/www/chromium/files/patch-chrome_browser_profiles_profile.cc @@ -1,11 +1,11 @@ ---- chrome/browser/profiles/profile.cc.orig 2021-01-19 11:26:11 UTC +--- chrome/browser/profiles/profile.cc.orig 2021-03-12 23:57:18 UTC +++ chrome/browser/profiles/profile.cc -@@ -387,7 +387,7 @@ bool Profile::IsIncognitoProfile() const { - - // static +@@ -360,7 +360,7 @@ bool Profile::IsIncognitoProfile() const { bool Profile::IsEphemeralGuestProfileEnabled() { --#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || \ -+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) || \ + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ ++#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) || \ defined(OS_MAC) return base::FeatureList::IsEnabled( features::kEnableEphemeralGuestProfilesOnDesktop); diff --git a/www/chromium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc b/www/chromium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc index f6b59e998304..951c83a99ba1 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,6 +1,6 @@ ---- chrome/browser/profiles/profile_attributes_entry.cc.orig 2021-01-18 21:28:50 UTC +--- chrome/browser/profiles/profile_attributes_entry.cc.orig 2021-03-12 23:57:18 UTC +++ chrome/browser/profiles/profile_attributes_entry.cc -@@ -158,7 +158,7 @@ void ProfileAttributesEntry::Initialize(ProfileInfoCac +@@ -159,7 +159,7 @@ void ProfileAttributesEntry::Initialize(ProfileInfoCac if (is_force_signin_enabled_) { if (!IsAuthenticated()) is_force_signin_profile_locked_ = true; diff --git a/www/chromium/files/patch-chrome_browser_profiles_profiles__state.cc b/www/chromium/files/patch-chrome_browser_profiles_profiles__state.cc index 522081927248..43c751460e17 100644 --- a/www/chromium/files/patch-chrome_browser_profiles_profiles__state.cc +++ b/www/chromium/files/patch-chrome_browser_profiles_profiles__state.cc @@ -1,6 +1,6 @@ ---- chrome/browser/profiles/profiles_state.cc.orig 2021-01-19 11:26:28 UTC +--- chrome/browser/profiles/profiles_state.cc.orig 2021-03-12 23:57:18 UTC +++ chrome/browser/profiles/profiles_state.cc -@@ -179,7 +179,7 @@ bool IsRegularOrGuestSession(Browser* browser) { +@@ -180,7 +180,7 @@ bool IsRegularOrGuestSession(Browser* browser) { bool IsGuestModeRequested(const base::CommandLine& command_line, PrefService* local_state, bool show_warning) { diff --git a/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc b/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc index 8c9310106ba3..802cb76d4d9f 100644 --- a/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc +++ b/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc @@ -1,6 +1,6 @@ ---- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig 2021-01-18 21:28:50 UTC +--- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig 2021-03-12 23:57:18 UTC +++ chrome/browser/renderer_context_menu/render_view_context_menu.cc -@@ -2085,7 +2085,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) +@@ -2117,7 +2117,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) case IDC_CHECK_SPELLING_WHILE_TYPING: return prefs->GetBoolean(spellcheck::prefs::kSpellCheckEnable); diff --git a/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc b/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc index 709bd4d86e22..85d0d7208ee7 100644 --- a/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc +++ b/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc @@ -1,24 +1,24 @@ ---- chrome/browser/renderer_preferences_util.cc.orig 2021-01-18 21:28:50 UTC +--- chrome/browser/renderer_preferences_util.cc.orig 2021-03-12 23:57:18 UTC +++ chrome/browser/renderer_preferences_util.cc -@@ -34,7 +34,7 @@ +@@ -35,7 +35,7 @@ #include "ui/base/cocoa/defaults_utils.h" #endif --#if defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if defined(USE_AURA) && (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) +-#if defined(USE_AURA) && (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++#if defined(USE_AURA) && (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" #include "ui/views/linux_ui/linux_ui.h" -@@ -153,7 +153,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc +@@ -154,7 +154,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc prefs->caret_blink_interval = interval; #endif --#if defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if defined(USE_AURA) && (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) +-#if defined(USE_AURA) && (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++#if defined(USE_AURA) && (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) views::LinuxUI* linux_ui = views::LinuxUI::instance(); if (linux_ui) { if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) { -@@ -172,7 +172,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc +@@ -173,7 +173,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc } #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 3ef9b11912dd..40e53f4f6dd7 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-11-13 06:36:37 UTC +--- chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.js.orig 2021-03-12 23:57:18 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 a7551ed59495..752d4a350d5f 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,11 +1,11 @@ ---- 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.orig 2021-03-12 23:57:18 UTC +++ chrome/browser/resources/settings/appearance_page/appearance_page.html @@ -27,7 +27,7 @@ <cr-link-row class="first" hidden="[[!pageVisibility.setTheme]]" label="$i18n{themes}" sub-label="[[themeSublabel_]]" on-click="openThemeUrl_" external></cr-link-row> --<if expr="not is_linux or chromeos"> -+<if expr="not is_posix or chromeos"> +-<if expr="not is_linux or chromeos or lacros"> ++<if expr="not is_posix or chromeos or lacros"> <template is="dom-if" if="[[prefs.extensions.theme.id.value]]"> <div class="separator"></div> <cr-button id="useDefault" on-click="onUseDefaultTap_"> @@ -13,17 +13,17 @@ </cr-button> </template> </if> --<if expr="is_linux and not chromeos"> -+<if expr="is_posix and not chromeos"> +-<if expr="is_linux and not chromeos and not lacros"> ++<if expr="is_posix and not chromeos and not lacros"> <div class="settings-row continuation" hidden="[[!showThemesSecondary_( prefs.extensions.theme.id.value, useSystemTheme_)]]" -@@ -99,7 +99,7 @@ +@@ -109,7 +109,7 @@ pref="{{prefs.bookmark_bar.show_on_all_tabs}}" label="$i18n{showBookmarksBar}"> </settings-toggle-button> --<if expr="is_linux and not chromeos"> -+<if expr="is_posix and not chromeos"> +-<if expr="is_linux and not chromeos and not lacros"> ++<if expr="is_posix and not chromeos and not lacros"> <div class="hr" hidden="[[!pageVisibility.bookmarksBar]]"></div> <settings-toggle-button pref="{{prefs.browser.custom_chrome_frame}}" 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 3949958c61bb..6a750abcf0f5 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-11-13 06:36:37 UTC +--- chrome/browser/resources/settings/appearance_page/appearance_page.js.orig 2021-03-12 23:57:18 UTC +++ chrome/browser/resources/settings/appearance_page/appearance_page.js @@ -137,7 +137,7 @@ Polymer({ 'defaultFontSizeChanged_(prefs.webkit.webprefs.default_font_size.value)', @@ -22,12 +22,12 @@ } let i18nId; -- // <if expr="is_linux and not chromeos"> -+ // <if expr="is_bsd and not chromeos"> +- // <if expr="is_linux and not chromeos and not lacros"> ++ // <if expr="is_posix and not chromeos and not lacros"> i18nId = useSystemTheme ? 'systemTheme' : 'classicTheme'; // </if> -- // <if expr="not is_linux or chromeos"> -+ // <if expr="not is_bsd or chromeos"> +- // <if expr="not is_linux or chromeos or lacros"> ++ // <if expr="not is_posix or chromeos or lacros"> i18nId = 'chooseFromWebStore'; // </if> this.themeSublabel_ = this.i18n(i18nId); diff --git a/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__handler__util.cc b/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__handler__util.cc index 15819a569eaa..a38ecd5e6014 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-11-13 06:36:37 UTC +--- chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc.orig 2021-03-12 23:57:18 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 39e05c8ddba0..0f91113fa607 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,4 +1,4 @@ ---- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig 2021-01-18 21:28:51 UTC +--- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig 2021-03-12 23:57:18 UTC +++ chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc @@ -708,7 +708,7 @@ void IncidentReportingService::OnEnvironmentDataCollec environment_collection_pending_ = false; 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 5be8db6d33dc..2602baf5ed42 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 2021-01-18 21:28:51 UTC +--- chrome/browser/search/search_suggest/search_suggest_service.cc.orig 2021-03-12 23:57:18 UTC +++ chrome/browser/search/search_suggest/search_suggest_service.cc @@ -21,7 +21,11 @@ #include "components/search/ntp_features.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 8f9ac3f8aa36..c801c7584a2f 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,4 +1,4 @@ ---- 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.orig 2021-03-12 23:57:18 UTC +++ chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc @@ -11,7 +11,7 @@ #include "chrome/browser/profiles/profile.h" 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 1a04e8053ad5..5de5bca399cf 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,4 +1,4 @@ ---- 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.orig 2021-03-12 23:57:18 UTC +++ chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc @@ -40,7 +40,7 @@ void SendTabToSelfClientService::SendTabToSelfModelLoa void SendTabToSelfClientService::EntriesAddedRemotely( 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 9db0cf762235..2b367cf352a9 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,4 +1,4 @@ ---- chrome/browser/sharing/shared_clipboard/feature_flags.cc.orig 2020-11-13 06:36:37 UTC +--- chrome/browser/sharing/shared_clipboard/feature_flags.cc.orig 2021-03-12 23:57:18 UTC +++ chrome/browser/sharing/shared_clipboard/feature_flags.cc @@ -7,7 +7,7 @@ const base::Feature kSharedClipboardUI{"SharedClipboardUI", 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 2be79ddd69ee..72cf2e40c847 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,4 +1,4 @@ ---- chrome/browser/sharing/shared_clipboard/feature_flags.h.orig 2020-11-13 06:36:37 UTC +--- chrome/browser/sharing/shared_clipboard/feature_flags.h.orig 2021-03-12 23:57:18 UTC +++ chrome/browser/sharing/shared_clipboard/feature_flags.h @@ -14,7 +14,7 @@ // Feature to allow shared clipboard gets processed. 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 4e65f78dc6fe..ef9dcdc48a58 100644 --- a/www/chromium/files/patch-chrome_browser_sharing_sharing__device__registration.cc +++ b/www/chromium/files/patch-chrome_browser_sharing_sharing__device__registration.cc @@ -1,6 +1,6 @@ ---- chrome/browser/sharing/sharing_device_registration.cc.orig 2020-11-13 06:36:37 UTC +--- chrome/browser/sharing/sharing_device_registration.cc.orig 2021-03-12 23:57:18 UTC +++ chrome/browser/sharing/sharing_device_registration.cc -@@ -325,7 +325,7 @@ bool SharingDeviceRegistration::IsSmsFetcherSupported( +@@ -324,7 +324,7 @@ bool SharingDeviceRegistration::IsSmsFetcherSupported( } bool SharingDeviceRegistration::IsRemoteCopySupported() const { diff --git a/www/chromium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc b/www/chromium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc index d0eedc032628..95bb19a9de0d 100644 --- a/www/chromium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc +++ b/www/chromium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/sharing/sharing_handler_registry_impl.cc.orig 2020-11-13 06:36:37 UTC +--- chrome/browser/sharing/sharing_handler_registry_impl.cc.orig 2021-03-12 23:57:18 UTC +++ chrome/browser/sharing/sharing_handler_registry_impl.cc -@@ -22,10 +22,10 @@ +@@ -23,10 +23,10 @@ #include "chrome/browser/sharing/shared_clipboard/shared_clipboard_message_handler_desktop.h" #endif // defined(OS_ANDROID) @@ -8,12 +8,12 @@ +#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_MAC) || defined(OS_LINUX) -+#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || - // defined(OS_CHROMEOS) +-#endif // defined(OS_WIN) || defined(OS_MAC) || (defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_MAC) || (defined(OS_LINUX) || defined(OS_BSD) || + // BUILDFLAG(IS_CHROMEOS_LACROS)) defined(OS_CHROMEOS) SharingHandlerRegistryImpl::SharingHandlerRegistryImpl( -@@ -70,14 +70,14 @@ SharingHandlerRegistryImpl::SharingHandlerRegistryImpl +@@ -71,14 +71,14 @@ SharingHandlerRegistryImpl::SharingHandlerRegistryImpl {chrome_browser_sharing::SharingMessage::kSharedClipboardMessage}); } 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 4d1a0b5802ad..5861fffb09ff 100644 --- a/www/chromium/files/patch-chrome_browser_signin_signin__util.cc +++ b/www/chromium/files/patch-chrome_browser_signin_signin__util.cc @@ -1,6 +1,6 @@ ---- chrome/browser/signin/signin_util.cc.orig 2021-01-18 21:28:51 UTC +--- chrome/browser/signin/signin_util.cc.orig 2021-03-12 23:57:18 UTC +++ chrome/browser/signin/signin_util.cc -@@ -33,7 +33,7 @@ +@@ -34,7 +34,7 @@ #include "google_apis/gaia/gaia_auth_util.h" #include "ui/base/l10n/l10n_util.h" diff --git a/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc b/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc index 4dc0568e821d..3ecf338a4a7c 100644 --- a/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc +++ b/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/sync/chrome_sync_client.cc.orig 2021-01-18 21:28:51 UTC +--- chrome/browser/sync/chrome_sync_client.cc.orig 2021-03-12 23:57:18 UTC +++ chrome/browser/sync/chrome_sync_client.cc -@@ -470,7 +470,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy +@@ -466,7 +466,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy // Chrome prefers OS provided spell checkers where they exist. So only sync the // custom dictionary on platforms that typically don't provide one. @@ -9,12 +9,12 @@ // Dictionary sync is enabled by default. if (!disabled_types.Has(syncer::DICTIONARY) && GetPrefService()->GetBoolean(spellcheck::prefs::kSpellCheckEnable)) { -@@ -479,7 +479,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy +@@ -475,7 +475,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy syncer::DICTIONARY, model_type_store_factory, GetSyncableServiceForType(syncer::DICTIONARY), dump_stack)); } -#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 BUILDFLAG(IS_CHROMEOS_ASH) if (arc::IsArcAllowedForProfile(profile_) && diff --git a/www/chromium/files/patch-chrome_browser_sync_device__info__sync__service__factory.cc b/www/chromium/files/patch-chrome_browser_sync_device__info__sync__service__factory.cc index d42df1b06cf7..8bdafda18a83 100644 --- a/www/chromium/files/patch-chrome_browser_sync_device__info__sync__service__factory.cc +++ b/www/chromium/files/patch-chrome_browser_sync_device__info__sync__service__factory.cc @@ -1,17 +1,17 @@ ---- chrome/browser/sync/device_info_sync_service_factory.cc.orig 2021-01-19 11:26:56 UTC +--- chrome/browser/sync/device_info_sync_service_factory.cc.orig 2021-03-12 23:57:18 UTC +++ chrome/browser/sync/device_info_sync_service_factory.cc -@@ -42,12 +42,12 @@ class DeviceInfoSyncClient : public syncer::DeviceInfo - std::string GetSigninScopedDeviceId() const override { - // Since the local sync backend is currently only supported on Windows, Mac and - // Linux don't even check the pref on other os-es. --#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) +@@ -47,12 +47,12 @@ class DeviceInfoSyncClient : public syncer::DeviceInfo + // in lacros-chrome once build flag switch of lacros-chrome is + // complete. + #if defined(OS_WIN) || defined(OS_MAC) || \ +- (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++ (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) syncer::SyncPrefs prefs(profile_->GetPrefs()); if (prefs.IsLocalSyncEnabled()) { return "local_device"; } --#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) -+#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_WIN) || defined(OS_MAC) || (defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_MAC) || (defined(OS_LINUX) || defined(OS_BSD) || + // BUILDFLAG(IS_CHROMEOS_LACROS)) return GetSigninScopedDeviceIdForProfile(profile_); - } diff --git a/www/chromium/files/patch-chrome_browser_sync_profile__sync__service__factory.cc b/www/chromium/files/patch-chrome_browser_sync_profile__sync__service__factory.cc index 7f9ece9d002b..83fb3a06079a 100644 --- a/www/chromium/files/patch-chrome_browser_sync_profile__sync__service__factory.cc +++ b/www/chromium/files/patch-chrome_browser_sync_profile__sync__service__factory.cc @@ -1,20 +1,20 @@ ---- chrome/browser/sync/profile_sync_service_factory.cc.orig 2021-01-19 11:27:21 UTC +--- chrome/browser/sync/profile_sync_service_factory.cc.orig 2021-03-12 23:57:18 UTC +++ chrome/browser/sync/profile_sync_service_factory.cc -@@ -202,7 +202,7 @@ KeyedService* ProfileSyncServiceFactory::BuildServiceI - - // Only check the local sync backend pref on the supported platforms of - // Windows, Mac and Linux. --#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) +@@ -217,7 +217,7 @@ KeyedService* ProfileSyncServiceFactory::BuildServiceI + // in lacros-chrome once build flag switch of lacros-chrome is + // complete. + #if defined(OS_WIN) || defined(OS_MAC) || \ +- (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++ (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) syncer::SyncPrefs prefs(profile->GetPrefs()); local_sync_backend_enabled = prefs.IsLocalSyncEnabled(); UMA_HISTOGRAM_BOOLEAN("Sync.Local.Enabled", local_sync_backend_enabled); -@@ -220,7 +220,7 @@ KeyedService* ProfileSyncServiceFactory::BuildServiceI +@@ -235,7 +235,7 @@ KeyedService* ProfileSyncServiceFactory::BuildServiceI init_params.start_behavior = syncer::ProfileSyncService::AUTO_START; } --#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) -+#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_WIN) || defined(OS_MAC) || (defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_MAC) || (defined(OS_LINUX) || defined(OS_BSD) || + // BUILDFLAG(IS_CHROMEOS_LACROS)) if (!local_sync_backend_enabled) { - // Always create the GCMProfileService instance such that we can listen to 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 7be6220182e7..ecbbffc1d037 100644 --- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc +++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc @@ -1,6 +1,6 @@ ---- chrome/browser/task_manager/sampling/task_group.cc.orig 2020-11-13 06:36:37 UTC +--- chrome/browser/task_manager/sampling/task_group.cc.orig 2021-03-12 23:57:19 UTC +++ chrome/browser/task_manager/sampling/task_group.cc -@@ -32,9 +32,9 @@ const int kBackgroundRefreshTypesMask = +@@ -33,9 +33,9 @@ const int kBackgroundRefreshTypesMask = #if defined(OS_WIN) REFRESH_TYPE_START_TIME | REFRESH_TYPE_CPU_TIME | #endif // defined(OS_WIN) @@ -12,7 +12,7 @@ #if BUILDFLAG(ENABLE_NACL) REFRESH_TYPE_NACL | #endif // BUILDFLAG(ENABLE_NACL) -@@ -113,9 +113,9 @@ TaskGroup::TaskGroup( +@@ -114,9 +114,9 @@ TaskGroup::TaskGroup( #if BUILDFLAG(ENABLE_NACL) nacl_debug_stub_port_(nacl::kGdbDebugStubPortUnknown), #endif // BUILDFLAG(ENABLE_NACL) @@ -24,7 +24,7 @@ idle_wakeups_per_second_(-1), gpu_memory_has_duplicates_(false), is_backgrounded_(false) { -@@ -128,10 +128,10 @@ TaskGroup::TaskGroup( +@@ -129,10 +129,10 @@ TaskGroup::TaskGroup( weak_ptr_factory_.GetWeakPtr()), base::BindRepeating(&TaskGroup::OnIdleWakeupsRefreshDone, weak_ptr_factory_.GetWeakPtr()), @@ -37,7 +37,7 @@ base::BindRepeating(&TaskGroup::OnProcessPriorityDone, weak_ptr_factory_.GetWeakPtr())); -@@ -299,14 +299,14 @@ void TaskGroup::OnRefreshNaClDebugStubPortDone(int nac +@@ -300,14 +300,14 @@ void TaskGroup::OnRefreshNaClDebugStubPortDone(int nac } #endif // BUILDFLAG(ENABLE_NACL) diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h index 4a6df838317f..34a3c4b7e2e1 100644 --- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h +++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h @@ -1,6 +1,6 @@ ---- chrome/browser/task_manager/sampling/task_group.h.orig 2020-11-13 06:36:37 UTC +--- chrome/browser/task_manager/sampling/task_group.h.orig 2021-03-12 23:57:19 UTC +++ chrome/browser/task_manager/sampling/task_group.h -@@ -39,7 +39,7 @@ constexpr int kUnsupportedVMRefreshFlags = +@@ -40,7 +40,7 @@ constexpr int kUnsupportedVMRefreshFlags = REFRESH_TYPE_WEBCACHE_STATS | REFRESH_TYPE_NETWORK_USAGE | REFRESH_TYPE_NACL | REFRESH_TYPE_IDLE_WAKEUPS | REFRESH_TYPE_HANDLES | REFRESH_TYPE_START_TIME | REFRESH_TYPE_CPU_TIME | REFRESH_TYPE_PRIORITY | @@ -9,7 +9,7 @@ REFRESH_TYPE_FD_COUNT | #endif REFRESH_TYPE_HARD_FAULTS; -@@ -122,9 +122,9 @@ class TaskGroup { +@@ -123,9 +123,9 @@ class TaskGroup { int nacl_debug_stub_port() const { return nacl_debug_stub_port_; } #endif // BUILDFLAG(ENABLE_NACL) @@ -21,7 +21,7 @@ int idle_wakeups_per_second() const { return idle_wakeups_per_second_; } -@@ -138,9 +138,9 @@ class TaskGroup { +@@ -139,9 +139,9 @@ class TaskGroup { void RefreshNaClDebugStubPort(int child_process_unique_id); void OnRefreshNaClDebugStubPortDone(int port); #endif @@ -33,7 +33,7 @@ void OnCpuRefreshDone(double cpu_usage); void OnSwappedMemRefreshDone(int64_t swapped_mem_bytes); -@@ -209,10 +209,10 @@ class TaskGroup { +@@ -210,10 +210,10 @@ class TaskGroup { #if BUILDFLAG(ENABLE_NACL) int nacl_debug_stub_port_; #endif // BUILDFLAG(ENABLE_NACL) diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc index 144111528150..ffa0292c2205 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,6 +1,6 @@ ---- 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.orig 2021-03-12 23:57:19 UTC +++ chrome/browser/task_manager/sampling/task_group_sampler.cc -@@ -43,9 +43,9 @@ TaskGroupSampler::TaskGroupSampler( +@@ -44,9 +44,9 @@ TaskGroupSampler::TaskGroupSampler( const OnCpuRefreshCallback& on_cpu_refresh, const OnSwappedMemRefreshCallback& on_swapped_mem_refresh, const OnIdleWakeupsCallback& on_idle_wakeups, @@ -12,7 +12,7 @@ const OnProcessPriorityCallback& on_process_priority) : process_(std::move(process)), process_metrics_(CreateProcessMetrics(process_.Handle())), -@@ -53,9 +53,9 @@ TaskGroupSampler::TaskGroupSampler( +@@ -54,9 +54,9 @@ TaskGroupSampler::TaskGroupSampler( on_cpu_refresh_callback_(on_cpu_refresh), on_swapped_mem_refresh_callback_(on_swapped_mem_refresh), on_idle_wakeups_callback_(on_idle_wakeups), @@ -24,7 +24,7 @@ on_process_priority_callback_(on_process_priority) { DCHECK(blocking_pool_runner.get()); -@@ -85,7 +85,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) +@@ -86,7 +86,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) base::BindOnce(on_swapped_mem_refresh_callback_)); } @@ -33,7 +33,7 @@ if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_IDLE_WAKEUPS, refresh_flags)) { base::PostTaskAndReplyWithResult( -@@ -93,9 +93,9 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) +@@ -94,9 +94,9 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) base::BindOnce(&TaskGroupSampler::RefreshIdleWakeupsPerSecond, this), base::BindOnce(on_idle_wakeups_callback_)); } @@ -45,7 +45,7 @@ if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_FD_COUNT, refresh_flags)) { base::PostTaskAndReplyWithResult( -@@ -103,7 +103,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) +@@ -104,7 +104,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) base::BindOnce(&TaskGroupSampler::RefreshOpenFdCount, this), base::BindOnce(on_open_fd_count_callback_)); } @@ -54,7 +54,7 @@ if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_PRIORITY, refresh_flags)) { -@@ -145,13 +145,13 @@ int TaskGroupSampler::RefreshIdleWakeupsPerSecond() { +@@ -146,13 +146,13 @@ int TaskGroupSampler::RefreshIdleWakeupsPerSecond() { return process_metrics_->GetIdleWakeupsPerSecond(); } 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 65c55ccfc48c..9cb379f38e60 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,4 +1,4 @@ ---- 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.orig 2021-03-12 23:57:19 UTC +++ chrome/browser/task_manager/sampling/task_group_sampler.h @@ -32,9 +32,9 @@ class TaskGroupSampler : public base::RefCountedThread using OnCpuRefreshCallback = base::RepeatingCallback<void(double)>; 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 7721b4b0c510..4f0c20ce89e8 100644 --- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc +++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2020-11-13 06:36:37 UTC +--- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2021-03-12 23:57:19 UTC +++ chrome/browser/task_manager/sampling/task_manager_impl.cc -@@ -220,11 +220,11 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id, +@@ -221,11 +221,11 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id, } int TaskManagerImpl::GetOpenFdCount(TaskId task_id) const { diff --git a/www/chromium/files/patch-chrome_browser_task__manager_task__manager__observer.h b/www/chromium/files/patch-chrome_browser_task__manager_task__manager__observer.h index 2c5fac1b70f5..4b2b181290c9 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,4 +1,4 @@ ---- chrome/browser/task_manager/task_manager_observer.h.orig 2020-11-13 06:36:37 UTC +--- chrome/browser/task_manager/task_manager_observer.h.orig 2021-03-12 23:57:19 UTC +++ chrome/browser/task_manager/task_manager_observer.h @@ -43,11 +43,11 @@ enum RefreshType { // or backgrounded. 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 3513040b5e1f..73c9a11094eb 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,29 +1,29 @@ ---- chrome/browser/themes/theme_service_factory.cc.orig 2020-11-13 06:36:37 UTC +--- chrome/browser/themes/theme_service_factory.cc.orig 2021-03-12 23:57:19 UTC +++ chrome/browser/themes/theme_service_factory.cc -@@ -22,7 +22,7 @@ - #include "chrome/browser/themes/theme_helper_win.h" - #endif +@@ -25,7 +25,7 @@ --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) #include "chrome/browser/themes/theme_service_aura_linux.h" #include "ui/views/linux_ui/linux_ui.h" #endif -@@ -77,7 +77,7 @@ ThemeServiceFactory::~ThemeServiceFactory() {} - - KeyedService* ThemeServiceFactory::BuildServiceInstanceFor( +@@ -82,7 +82,7 @@ KeyedService* ThemeServiceFactory::BuildServiceInstanc content::BrowserContext* profile) const { --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) using ThemeService = ThemeServiceAuraLinux; #endif -@@ -89,7 +89,7 @@ KeyedService* ThemeServiceFactory::BuildServiceInstanc - - void ThemeServiceFactory::RegisterProfilePrefs( +@@ -96,7 +96,7 @@ void ThemeServiceFactory::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) bool default_uses_system_theme = false; const views::LinuxUI* linux_ui = views::LinuxUI::instance(); 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 ebf3e8cb8521..50ba900fbdb9 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-11-13 06:36:37 UTC +--- chrome/browser/tracing/crash_service_uploader.cc.orig 2021-03-12 23:57:19 UTC +++ chrome/browser/tracing/crash_service_uploader.cc -@@ -160,6 +160,8 @@ void TraceCrashServiceUploader::DoCompressOnBackground +@@ -161,6 +161,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 c1b26ea14dec..2481cdc04ebd 100644 --- a/www/chromium/files/patch-chrome_browser_ui_BUILD.gn +++ b/www/chromium/files/patch-chrome_browser_ui_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/browser/ui/BUILD.gn.orig 2021-01-18 21:28:51 UTC +--- chrome/browser/ui/BUILD.gn.orig 2021-03-12 23:57:19 UTC +++ chrome/browser/ui/BUILD.gn -@@ -610,12 +610,15 @@ static_library("ui") { +@@ -617,12 +617,15 @@ static_library("ui") { deps += [ "//components/autofill/content/browser/webauthn" ] } 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 0115dc7feccd..9013611d79ae 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,38 +1,38 @@ ---- chrome/browser/ui/browser_command_controller.cc.orig 2021-01-18 21:28:51 UTC +--- chrome/browser/ui/browser_command_controller.cc.orig 2021-03-12 23:57:19 UTC +++ chrome/browser/ui/browser_command_controller.cc -@@ -83,7 +83,7 @@ - #include "components/session_manager/core/session_manager.h" - #endif +@@ -87,7 +87,7 @@ --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" #endif -@@ -247,7 +247,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( - #endif - } +@@ -256,7 +256,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) // If this key was registered by the user as a content editing hotkey, then // it is not reserved. ui::TextEditKeyBindingsDelegateAuraLinux* delegate = -@@ -477,7 +477,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo - break; - #endif +@@ -492,7 +492,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) case IDC_MINIMIZE_WINDOW: browser_->window()->Minimize(); break; -@@ -951,7 +951,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); +@@ -989,7 +989,7 @@ void BrowserCommandController::InitCommandState() { #endif --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) command_updater_.UpdateCommandEnabled(IDC_MINIMIZE_WINDOW, true); command_updater_.UpdateCommandEnabled(IDC_MAXIMIZE_WINDOW, true); command_updater_.UpdateCommandEnabled(IDC_RESTORE_WINDOW, true); 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 aaa30d1ce8ac..991c95bc0229 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,24 +1,24 @@ ---- chrome/browser/ui/browser_view_prefs.cc.orig 2020-11-13 06:36:38 UTC +--- chrome/browser/ui/browser_view_prefs.cc.orig 2021-03-12 23:57:19 UTC +++ chrome/browser/ui/browser_view_prefs.cc -@@ -26,7 +26,7 @@ namespace { - // Old values: 0 = SHRINK (default), 1 = STACKED. - const char kTabStripLayoutType[] = "tab_strip_layout_type"; +@@ -29,7 +29,7 @@ const char kTabStripLayoutType[] = "tab_strip_layout_t --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) bool GetCustomFramePrefDefault() { #if defined(USE_OZONE) if (features::IsUsingOzonePlatform()) { -@@ -51,10 +51,10 @@ void RegisterBrowserViewLocalPrefs(PrefRegistrySimple* - - void RegisterBrowserViewProfilePrefs( +@@ -56,10 +56,10 @@ void RegisterBrowserViewProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) registry->RegisterBooleanPref(prefs::kUseCustomChromeFrame, GetCustomFramePrefDefault()); --#endif // defined(OS_LINUX) && defined(!OS_CHROMEOS) -+#endif // (defined(OS_LINUX) || defined(OS_BSD)) && defined(!OS_CHROMEOS) +-#endif // (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && ++#endif // (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || 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 d4f53e99e416..aebb564701cb 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,4 +1,4 @@ ---- 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.orig 2021-03-12 23:57:19 UTC +++ chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc @@ -16,7 +16,7 @@ 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 98d6e66c7427..5310e445c1b0 100644 --- a/www/chromium/files/patch-chrome_browser_ui_sad__tab.cc +++ b/www/chromium/files/patch-chrome_browser_ui_sad__tab.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/sad_tab.cc.orig 2020-11-13 06:36:38 UTC +--- chrome/browser/ui/sad_tab.cc.orig 2021-03-12 23:57:19 UTC +++ chrome/browser/ui/sad_tab.cc @@ -189,7 +189,7 @@ std::vector<int> SadTab::GetSubMessages() { // Only show Incognito suggestion if not already in Incognito mode. 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 d1fbf6b0263c..62627a62dee4 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,11 +1,11 @@ ---- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2020-11-13 06:36:38 UTC +--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2021-03-12 23:57:19 UTC +++ chrome/browser/ui/startup/bad_flags_prompt.cc -@@ -88,7 +88,7 @@ static const char* kBadFlags[] = { - extensions::switches::kExtensionsOnChromeURLs, - #endif +@@ -96,7 +96,7 @@ static const char* kBadFlags[] = { --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) // Speech dispatcher is buggy, it can crash and it can make Chrome freeze. // http://crbug.com/327295 switches::kEnableSpeechDispatcher, 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 79d52bc86f1d..62db14a4382d 100644 --- a/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc +++ b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/tab_helpers.cc.orig 2021-01-18 21:28:51 UTC +--- chrome/browser/ui/tab_helpers.cc.orig 2021-03-12 23:57:19 UTC +++ chrome/browser/ui/tab_helpers.cc -@@ -149,7 +149,7 @@ +@@ -150,7 +150,7 @@ #include "chrome/browser/ui/app_list/search/cros_action_history/cros_action_recorder_tab_tracker.h" #endif @@ -9,12 +9,12 @@ defined(OS_CHROMEOS) #include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h" #include "chrome/browser/ui/hats/hats_helper.h" -@@ -409,11 +409,11 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con - #endif - +@@ -422,11 +422,11 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. #if defined(OS_WIN) || defined(OS_MAC) || \ -- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) +- (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++ (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) metrics::DesktopSessionDurationObserver::CreateForWebContents(web_contents); #endif 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 32245f7e2452..d5aed68ad26e 100644 --- a/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.cc +++ b/ |