diff --git a/www/chromium/Makefile b/www/chromium/Makefile index d623cdc57569..80b981b2feed 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -1,361 +1,355 @@ # Created by: Florent Thoumie PORTNAME= chromium -PORTVERSION= 90.0.4430.212 -PORTREVISION= 1 +PORTVERSION= 91.0.4472.101 CATEGORIES= www java MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ LOCAL/rene/chromium/:fonts DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= chromium@FreeBSD.org COMMENT= Google web browser based on WebKit LICENSE= BSD3CLAUSE LGPL21 MPL11 LICENSE_COMB= multi BROKEN_FreeBSD_11_aarch64= components/safe_browsing_db/v4_rice.cc:120:18: use of overloaded operator '&' is ambiguous ONLY_FOR_ARCHS= aarch64 amd64 i386 BUILD_DEPENDS= bash:shells/bash \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${PY_FLAVOR} \ gperf:devel/gperf \ ffmpeg>=3.2.2,1:multimedia/ffmpeg \ flock:sysutils/flock \ node:www/node \ xcb-proto>0:x11/xcb-proto \ ${LOCALBASE}/bin/ar:devel/binutils \ ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \ ${LOCALBASE}/share/usbids/usb.ids:misc/usbids \ ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR} \ ${LOCALBASE}/include/va/va.h:multimedia/libva LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-atk \ libatspi.so:accessibility/at-spi2-core \ libspeechd.so:accessibility/speech-dispatcher \ libsnappy.so:archivers/snappy \ libFLAC.so:audio/flac \ libopus.so:audio/opus \ libspeex.so:audio/speex \ libdbus-1.so:devel/dbus \ libdbus-glib-1.so:devel/dbus-glib \ libicuuc.so:devel/icu \ libjsoncpp.so:devel/jsoncpp \ libpci.so:devel/libpci \ libnspr4.so:devel/nspr \ libre2.so:devel/re2 \ libcairo.so:graphics/cairo \ libdrm.so:graphics/libdrm \ libexif.so:graphics/libexif \ libpng.so:graphics/png \ libwebp.so:graphics/webp \ libavcodec.so:multimedia/ffmpeg \ libopenh264.so:multimedia/openh264 \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ libharfbuzz-icu.so:print/harfbuzz-icu \ libgcrypt.so:security/libgcrypt \ libsecret-1.so:security/libsecret \ libnss3.so:security/nss \ libexpat.so:textproc/expat2 \ libfontconfig.so:x11-fonts/fontconfig \ libxkbcommon.so:x11/libxkbcommon \ libxshmfence.so:x11/libxshmfence RUN_DEPENDS= xdg-open:devel/xdg-utils \ noto-basic>0:x11-fonts/noto-basic \ virtual_oss>0:audio/virtual_oss 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 CPE_VENDOR= google CPE_PRODUCT= chrome -DOS2UNIX_FILES= third_party/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h +DOS2UNIX_FILES= third_party/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h \ + third_party/vulkan_memory_allocator/src/vk_mem_alloc.h USE_GL= gbm gl USE_GNOME= atk dconf glib20 gtk30 libxml2 libxslt INSTALLS_ICONS= yes USE_LDCONFIG= ${DATADIR} USE_PERL5= build USE_XORG= x11 xcb xcomposite xcursor xext xdamage xfixes xi \ xorgproto xrandr xrender xscrnsaver xtst SHEBANG_FILES= chrome/tools/build/linux/chrome-wrapper buildtools/linux64/clang-format MAKE_ARGS= -C out/${BUILDTYPE} ALL_TARGET= chrome BINARY_ALIAS= python=${PYTHON_CMD} EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang # TODO bz@ : install libwidevinecdm.so (see third_party/widevine/cdm/BUILD.gn) # # Run "./out/${BUILDTYPE}/gn args out/${BUILDTYPE} --list" for all variables. # Some parts don't have use_system_* flag, and can be turned on/off by using # replace_gn_files.py script, some parts just turned on/off for target host # OS "target_os == is_bsd", like libusb, libpci. GN_ARGS+= clang_use_chrome_plugins=false \ enable_hangout_services_extension=true \ + enable_js_type_check=false \ enable_nacl=false \ enable_one_click_signin=true \ enable_remoting=false \ fieldtrial_testing_like_official_build=true \ is_clang=true \ + optimize_webui=false \ toolkit_views=true \ treat_warnings_as_errors=false \ use_allocator="none" \ use_allocator_shim=false \ use_aura=true \ use_custom_libcxx=false \ use_gnome_keyring=false \ use_lld=true \ use_sysroot=false \ use_system_freetype=true \ use_system_harfbuzz=true \ use_system_libjpeg=true \ extra_cxxflags="${CXXFLAGS}" \ extra_ldflags="${LDFLAGS}" # TODO: investigate building with these options: # use_system_minigbm GN_BOOTSTRAP_FLAGS= --no-clean --no-rebuild --skip-generate-buildfiles # FreeBSD Chromium Api Key # 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" SUB_FILES= chromium-browser.desktop chrome SUB_LIST+= COMMENT="${COMMENT}" OPTIONS_DEFINE= CODECS CUPS DEBUG DRIVER KERBEROS LTO TEST OPTIONS_DEFAULT= CODECS CUPS DRIVER KERBEROS SNDIO OPTIONS_GROUP= AUDIO OPTIONS_GROUP_AUDIO= ALSA PULSEAUDIO SNDIO OPTIONS_RADIO= KERBEROS OPTIONS_RADIO_KERBEROS= HEIMDAL HEIMDAL_BASE MIT OPTIONS_SUB= yes CODECS_DESC= Compile and enable patented codecs like H.264 DRIVER_DESC= Install chromedriver HEIMDAL_BASE_DESC= Heimdal Kerberos (base) HEIMDAL_DESC= Heimdal Kerberos (security/heimdal) MIT_DESC= MIT Kerberos (security/krb5) ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins \ alsa-lib>=1.1.1_1:audio/alsa-lib ALSA_VARS= GN_ARGS+=use_alsa=true ALSA_VARS_OFF= GN_ARGS+=use_alsa=false CODECS_VARS= GN_ARGS+=ffmpeg_branding="Chrome" \ GN_ARGS+=proprietary_codecs=true CODECS_VARS_OFF= GN_ARGS+=ffmpeg_branding="Chromium" \ GN_ARGS+=proprietary_codecs=false CUPS_LIB_DEPENDS= libcups.so:print/cups CUPS_VARS= GN_ARGS+=use_cups=true CUPS_VARS_OFF= GN_ARGS+=use_cups=false DEBUG_VARS= BUILDTYPE=Debug \ GN_ARGS+=is_debug=true \ GN_ARGS+=is_component_build=false \ GN_ARGS+=symbol_level=1 \ GN_BOOTSTRAP_FLAGS+=--debug \ WANTSPACE="13 GB" DEBUG_VARS_OFF= BUILDTYPE=Release \ GN_ARGS+=blink_symbol_level=0 \ GN_ARGS+=is_debug=false \ GN_ARGS+=is_official_build=true \ GN_ARGS+=symbol_level=0 \ WANTSPACE="6.5 GB" DRIVER_MAKE_ARGS= chromedriver HEIMDAL_LIB_DEPENDS= libkrb.so.26:security/heimdal KERBEROS_VARS= GN_ARGS+=use_kerberos=true KERBEROS_VARS_OFF= GN_ARGS+=use_kerberos=false LTO_VARS= GN_ARGS+=use_thin_lto=true \ GN_ARGS+=thin_lto_enable_optimizations=true \ WANTSPACE="14 GB" MIT_LIB_DEPENDS= libkrb.so.3:security/krb5 PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_VARS= GN_ARGS+=use_pulseaudio=true PULSEAUDIO_VARS_OFF= GN_ARGS+=use_pulseaudio=false # With SNDIO=on we exclude audio_manager_linux from the build (see # media/audio/BUILD.gn) and use audio_manager_openbsd which does not # support falling back to ALSA or PulseAudio. SNDIO_PREVENTS= ALSA PULSEAUDIO SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio SNDIO_VARS= GN_ARGS+=use_sndio=true SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false .include "Makefile.tests" TEST_DISTFILES= ${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX} \ test_fonts-85${EXTRACT_SUFX}:fonts TEST_ALL_TARGET= ${TEST_TARGETS} .include .include .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 ${COMPILER_VERSION} < 120 EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-build_config_compiler_pgo_pgo.gni .if ${PORT_OPTIONS:MLTO} BROKEN+= does not build with LTO needs LLVM 12+ .endif .endif # swiftshader/lib/{libEGL.so,libGLESv2.so} is x86 only .if ${ARCH} == aarch64 PLIST_SUB+= NOT_AARCH64="@comment " .else PLIST_SUB+= NOT_AARCH64="" .endif -# Make better javascript with java -JAVA_BUILD= yes -JAVA_VERSION= 1.8 -USE_JAVA= yes - # Allow relocations against read-only segments (override lld default) LDFLAGS_i386= -Wl,-znotext # TODO: -isystem, would be just as ugly as this approach, but more reliably # build would fail without C_INCLUDE_PATH/CPLUS_INCLUDE_PATH env var set. MAKE_ENV+= C_INCLUDE_PATH=${LOCALBASE}/include \ CPLUS_INCLUDE_PATH=${LOCALBASE}/include pre-everything:: @${ECHO_MSG} @${ECHO_MSG} "To build Chromium, you should have around 2GB of memory" @${ECHO_MSG} "and around ${WANTSPACE} of free disk space." @${ECHO_MSG} post-extract-TEST-on: @${MKDIR} ${WRKSRC}/third_party/test_fonts/test_fonts @${MV} ${WRKDIR}/test_fonts ${WRKSRC}/third_party/test_fonts/ post-patch: + @${MKDIR} ${WRKSRC}/sandbox/policy/freebsd @${CP} ${FILESDIR}/dir_reader_freebsd.h ${WRKSRC}/base/files @${CP} ${FILESDIR}/device_info_fetcher_freebsd.h ${WRKSRC}/chrome/browser/enterprise/signals @${CP} ${FILESDIR}/device_info_fetcher_freebsd.cc ${WRKSRC}/chrome/browser/enterprise/signals + @${CP} ${FILESDIR}/sandbox_freebsd.h ${WRKSRC}/sandbox/policy/freebsd + @${CP} ${FILESDIR}/sandbox_freebsd.cc ${WRKSRC}/sandbox/policy/freebsd post-patch-SNDIO-on: @${MKDIR} ${WRKSRC}/media/audio/sndio ${WRKSRC}/media/audio/openbsd @${CP} ${FILESDIR}/sndio_output.* ${WRKSRC}/media/audio/sndio @${CP} ${FILESDIR}/sndio_input.* ${WRKSRC}/media/audio/sndio @${CP} ${FILESDIR}/audio_manager_openbsd.* ${WRKSRC}/media/audio/openbsd pre-configure: # We used to remove bundled libraries to be sure that chromium uses # system libraries and not shipped ones. # cd ${WRKSRC} && ${PYTHON_CMD} \ #./build/linux/unbundle/remove_bundled_libraries.py [list of preserved] cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \ ./build/linux/unbundle/replace_gn_files.py --system-libraries \ ffmpeg flac fontconfig freetype harfbuzz-ng libdrm libpng libwebp libxml libxslt openh264 opus snappy || ${FALSE} # We need the site package from xcbgen, which installs as python3.x (really: default version), while the chromium # build still needs to use python2.7. It works, because xcbgen can run with both versions, but we want to avoid # having the pre-compiled pyc files from 2.7 in the 3.x site packages # Remove this as soon as chromium uses python3.x as well @${MKDIR} ${WRKDIR}/site-packages/xcbgen ${CP} ${PYTHONBASE}/lib/python${PYTHON_DEFAULT}/site-packages/xcbgen/*.py \ ${WRKDIR}/site-packages/xcbgen do-configure: # GN generator bootstrapping and generating ninja files cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} CC=${CC} CXX=${CXX} LD=${CXX} \ READELF=${READELF} AR=${AR} NM=${NM} ${PYTHON_CMD} \ ./tools/gn/bootstrap/bootstrap.py ${GN_BOOTSTRAP_FLAGS} cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./out/${BUILDTYPE}/gn \ gen --args='${GN_ARGS}' out/${BUILDTYPE} # Setup nodejs dependency @${MKDIR} ${WRKSRC}/third_party/node/freebsd/node-freebsd-x64/bin ${LN} -sf ${LOCALBASE}/bin/node ${WRKSRC}/third_party/node/freebsd/node-freebsd-x64/bin/node - # Setup java dependency on amd64 and i386 -.if ${ARCH} == amd64 || ${ARCH} == i386 - @${MKDIR} ${WRKDIR}/bin - ${LN} -sf ${LOCALBASE}/openjdk8/bin/java ${WRKDIR}/bin/java -.endif - # Setup buildtools/freebsd @${MKDIR} ${WRKSRC}/buildtools/freebsd ${LN} -sf ${WRKSRC}/buildtools/linux64/clang-format ${WRKSRC}/buildtools/freebsd ${LN} -sf ${WRKSRC}/out/${BUILDTYPE}/gn ${WRKSRC}/buildtools/freebsd do-install: @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_MAN} ${WRKSRC}/chrome/app/resources/manpage.1.in \ ${STAGEDIR}${MANPREFIX}/man/man1/chrome.1 ${CP} ${WRKSRC}/chrome/app/theme/chromium/product_logo_22_mono.png ${WRKSRC}/chrome/app/theme/chromium/product_logo_22.png .for s in 22 24 48 64 128 256 @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps ${INSTALL_DATA} ${WRKSRC}/chrome/app/theme/chromium/product_logo_${s}.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps/chrome.png .endfor ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*.png ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*.pak ${STAGEDIR}${DATADIR} .for d in protoc mksnapshot ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR} .endfor .for d in icudtl.dat snapshot_blob.bin v8_context_snapshot.bin ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR} .endfor ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chrome \ ${STAGEDIR}${DATADIR} cd ${WRKSRC}/out/${BUILDTYPE} && \ ${COPYTREE_SHARE} "locales resources" ${STAGEDIR}${DATADIR} @${MKDIR} ${STAGEDIR}${DESKTOPDIR} ${INSTALL_DATA} ${WRKDIR}/chromium-browser.desktop \ ${STAGEDIR}${DESKTOPDIR} ${INSTALL_SCRIPT} ${WRKDIR}/chrome ${STAGEDIR}${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/chrome/tools/build/linux/chrome-wrapper \ ${STAGEDIR}${DATADIR} # ANGLE, EGL, Vk .for f in libEGL.so libGLESv2.so libVkICD_mock_icd.so ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR} .endfor .if ${BUILDTYPE} == Debug ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libVkLayer_khronos_validation.so ${STAGEDIR}${DATADIR} .endif # SwiftShader .if ${ARCH} != aarch64 @${MKDIR} ${STAGEDIR}${DATADIR}/swiftshader ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libvk_swiftshader.so ${STAGEDIR}${DATADIR} .for g in libEGL.so libGLESv2.so ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/swiftshader/${g} \ ${STAGEDIR}${DATADIR}/swiftshader .endfor .endif 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} post-install-DRIVER-on: ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chromedriver \ ${STAGEDIR}${PREFIX}/bin do-test-TEST-on: .for t in ${TEST_TARGETS} cd ${WRKSRC}/out/${BUILDTYPE} && ${SETENV} LC_ALL=en_US.UTF-8 \ ./${t} --gtest_filter=-${EXCLUDE_${t}:ts:} || ${TRUE} .endfor .include diff --git a/www/chromium/distinfo b/www/chromium/distinfo index 8be9f1212a33..5a0fe5716fa8 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,3 +1,7 @@ -TIMESTAMP = 1620717235 -SHA256 (chromium-90.0.4430.212.tar.xz) = abe11d0cb1ff21278aad2eec1a1e279d59176b15331804d7df1807446786d59e -SIZE (chromium-90.0.4430.212.tar.xz) = 917430448 +TIMESTAMP = 1623320688 +SHA256 (chromium-91.0.4472.101.tar.xz) = 78146192aaae7771d9130c2828e1081d940da32af3aadcb73578521683307eb4 +SIZE (chromium-91.0.4472.101.tar.xz) = 950228560 +SHA256 (chromium-91.0.4472.101-testdata.tar.xz) = cd590860745d352c2de3737e188ab6dbd0c7ee179e34275c2b8fad03861266e8 +SIZE (chromium-91.0.4472.101-testdata.tar.xz) = 256763876 +SHA256 (test_fonts-85.tar.xz) = f22b61b3639acb147c98ec2e2305d8b96f0b55c8c74c40e2ea696402fae8cef9 +SIZE (test_fonts-85.tar.xz) = 9511984 diff --git a/www/chromium/files/extra-patch-build_config_compiler_pgo_pgo.gni b/www/chromium/files/extra-patch-build_config_compiler_pgo_pgo.gni index 158b7269d92f..6e19cd7c7da5 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-04-20 18:58:23 UTC +--- build/config/compiler/pgo/pgo.gni.orig 2021-06-09 22:13:52 UTC +++ build/config/compiler/pgo/pgo.gni @@ -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 9a2964553490..d13e0e3e592a 100644 --- a/www/chromium/files/patch-3p-pdfium_3p_base_allocator_partition__allocator_page__allocator__internals__posix.h +++ b/www/chromium/files/patch-3p-pdfium_3p_base_allocator_partition__allocator_page__allocator__internals__posix.h @@ -1,11 +1,11 @@ ---- third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2021-04-20 19:05:14 UTC +--- third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2021-06-09 22:16:18 UTC +++ third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h @@ -16,7 +16,7 @@ #if defined(OS_ANDROID) #include #endif -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include #include diff --git a/www/chromium/files/patch-BUILD.gn b/www/chromium/files/patch-BUILD.gn index d1b7c835627e..4a38e2e73dcf 100644 --- a/www/chromium/files/patch-BUILD.gn +++ b/www/chromium/files/patch-BUILD.gn @@ -1,96 +1,96 @@ ---- BUILD.gn.orig 2021-04-14 18:40:47 UTC +--- BUILD.gn.orig 2021-05-12 22:05:39 UTC +++ BUILD.gn -@@ -425,7 +425,7 @@ group("gn_all") { +@@ -429,7 +429,7 @@ group("gn_all") { ] } - if (is_linux || is_chromeos || is_android) { + if ((is_linux && !is_bsd) || is_chromeos || is_android) { deps += [ "//third_party/breakpad:breakpad_unittests", "//third_party/breakpad:core-2-minidump", -@@ -468,8 +468,6 @@ group("gn_all") { +@@ -474,8 +474,6 @@ group("gn_all") { "//net:disk_cache_memory_test", "//net:quic_client", "//net:quic_server", - "//sandbox/linux:chrome_sandbox", - "//sandbox/linux:sandbox_linux_unittests", "//testing:empty_main", ] -@@ -524,10 +522,6 @@ group("gn_all") { +@@ -530,10 +528,6 @@ group("gn_all") { "//chrome/test:load_library_perf_tests", "//chrome/test:sync_performance_tests", "//chrome/test/chromedriver:chromedriver", - "//courgette:courgette", - "//courgette:courgette_fuzz", - "//courgette:courgette_minimal_tool", - "//courgette:courgette_unittests", "//media/cast:generate_barcode_video", "//media/cast:generate_timecode_audio", "//net:crash_cache", -@@ -586,10 +580,6 @@ group("gn_all") { +@@ -592,10 +586,6 @@ group("gn_all") { "//mojo:mojo_perftests", "//services/service_manager/public/cpp", "//testing/gmock:gmock_main", - "//third_party/breakpad:dump_syms($host_toolchain)", - "//third_party/breakpad:microdump_stackwalk($host_toolchain)", - "//third_party/breakpad:minidump_dump($host_toolchain)", - "//third_party/breakpad:minidump_stackwalk($host_toolchain)", ] if (!is_android) { -@@ -667,7 +657,7 @@ group("gn_all") { +@@ -673,7 +663,7 @@ group("gn_all") { host_os == "win") { deps += [ "//chrome/test/mini_installer:mini_installer_tests" ] } - } else if (!is_android && !is_ios && !is_fuchsia) { + } else if (!is_android && !is_ios && !is_fuchsia && !is_bsd) { deps += [ "//third_party/breakpad:symupload($host_toolchain)" ] } -@@ -682,7 +672,7 @@ group("gn_all") { +@@ -688,7 +678,7 @@ group("gn_all") { } } - if (is_mac || is_win || is_android || is_linux || is_chromeos) { + if (is_mac || is_win || is_android || (is_linux && !is_bsd) || is_chromeos) { deps += [ "//third_party/crashpad/crashpad:crashpad_tests", "//third_party/crashpad/crashpad/handler:crashpad_handler", -@@ -793,7 +783,6 @@ group("gn_all") { +@@ -803,7 +793,6 @@ group("gn_all") { "//chrome/browser/vr:vr_common_perftests", "//chrome/browser/vr:vr_common_unittests", "//chrome/browser/vr:vr_pixeltests", - "//tools/perf/contrib/vr_benchmarks:vr_perf_tests", ] if (is_android) { deps += [ "//chrome/browser/android/vr:vr_android_unittests" ] -@@ -1086,7 +1075,7 @@ if (!is_ios) { +@@ -1102,7 +1091,7 @@ if (!is_ios) { data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ] } - if (!is_win && !is_android) { + if (!is_win && !is_android && !is_bsd) { data_deps += [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } -@@ -1095,7 +1084,7 @@ if (!is_ios) { +@@ -1111,7 +1100,7 @@ if (!is_ios) { data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } - if (is_linux || is_chromeos) { + if ((is_linux && !is_bsd) || is_chromeos) { data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } -@@ -1321,9 +1310,6 @@ group("chromium_builder_perf") { +@@ -1355,9 +1344,6 @@ group("chromium_builder_perf") { if (is_win) { data_deps += [ "//chrome/installer/mini_installer:mini_installer" ] - } else { - data_deps += - [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } if (is_win || is_android) { data_deps += [ diff --git a/www/chromium/files/patch-base_BUILD.gn b/www/chromium/files/patch-base_BUILD.gn index edc279a61b6b..f18542dec520 100644 --- a/www/chromium/files/patch-base_BUILD.gn +++ b/www/chromium/files/patch-base_BUILD.gn @@ -1,94 +1,94 @@ ---- base/BUILD.gn.orig 2021-04-14 18:40:48 UTC +--- base/BUILD.gn.orig 2021-05-24 22:05:31 UTC +++ base/BUILD.gn -@@ -948,7 +948,7 @@ component("base") { +@@ -963,7 +963,7 @@ component("base") { "timer/hi_res_timer_manager_posix.cc", ] - if (!is_nacl && !is_apple) { + if (!is_nacl && !is_apple && !is_bsd) { sources += [ "cpu_affinity_posix.cc", "cpu_affinity_posix.h", -@@ -959,6 +959,11 @@ component("base") { +@@ -974,6 +974,11 @@ component("base") { "profiler/thread_delegate_posix.h", ] } + if (is_bsd) { + sources += [ + "profiler/stack_sampler_posix.cc", + ] + } } if (is_win) { -@@ -1364,7 +1369,7 @@ component("base") { +@@ -1377,7 +1382,7 @@ component("base") { # building inside the cros_sdk environment - use host_toolchain as a # more robust check for this. if (!use_sysroot && - (is_android || ((is_linux || is_chromeos) && !is_chromecast)) && + (is_android || ((is_linux || is_chromeos) && !is_chromecast) && !is_clang) && host_toolchain != "//build/toolchain/cros:host") { libs += [ "atomic" ] } -@@ -1414,7 +1419,7 @@ component("base") { +@@ -1430,7 +1435,7 @@ component("base") { "allocator/allocator_shim_default_dispatch_to_mac_zoned_malloc.cc", ] } - if (is_chromeos || is_linux) { + if ((is_chromeos || is_linux) && !is_bsd) { sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ] } if (is_win) { -@@ -2045,6 +2050,34 @@ component("base") { +@@ -2064,6 +2069,34 @@ component("base") { } } + if (is_bsd) { + sources -= [ + "files/file_path_watcher_linux.cc", + "files/file_util_linux.cc", + "process/memory_linux.cc", + "process/process_handle_linux.cc", + "process/process_iterator_linux.cc", + "process/process_metrics_linux.cc", + "system/sys_info_linux.cc" + ] + sources += [ + "files/file_path_watcher_freebsd.cc", + "files/file_path_watcher_kqueue.cc", + "files/file_path_watcher_kqueue.h", + "process/memory_stubs.cc", + "process/process_handle_freebsd.cc", + "process/process_iterator_freebsd.cc", + "process/process_metrics_freebsd.cc", + "system/sys_info_freebsd.cc", + ] + libs = [ + "execinfo", # logging.cc + "kvm", # process_metrics_freebsd + "util" # process_metrics_freebsd + ] + } + + # iOS if (is_ios) { sources -= [ -@@ -3231,7 +3264,7 @@ if (build_base_unittests) { +@@ -3273,7 +3306,7 @@ if (build_base_unittests) { } } - if (is_linux || is_chromeos) { + if ((is_linux || is_chromeos) && !is_bsd) { sources += [ "debug/proc_maps_linux_unittest.cc" ] } -@@ -3272,7 +3305,7 @@ if (build_base_unittests) { +@@ -3313,7 +3346,7 @@ if (build_base_unittests) { "posix/unix_domain_socket_unittest.cc", "task/thread_pool/task_tracker_posix_unittest.cc", ] - if (!is_nacl && !is_apple) { + if (!is_nacl && !is_apple && !is_bsd) { sources += [ "cpu_affinity_posix_unittest.cc", "profiler/stack_copier_signal_unittest.cc", diff --git a/www/chromium/files/patch-base_allocator_allocator.gni b/www/chromium/files/patch-base_allocator_allocator.gni index f3f2ae41d6a1..460eda24c41a 100644 --- a/www/chromium/files/patch-base_allocator_allocator.gni +++ b/www/chromium/files/patch-base_allocator_allocator.gni @@ -1,11 +1,11 @@ ---- base/allocator/allocator.gni.orig 2021-04-14 18:40:48 UTC +--- base/allocator/allocator.gni.orig 2021-05-24 22:05:31 UTC +++ base/allocator/allocator.gni -@@ -60,7 +60,7 @@ declare_args() { +@@ -63,7 +63,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_partition__allocator_partition__alloc__config.h b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h new file mode 100644 index 000000000000..20ff541d2e02 --- /dev/null +++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h @@ -0,0 +1,17 @@ +--- base/allocator/partition_allocator/partition_alloc_config.h.orig 2021-05-18 13:58:13 UTC ++++ base/allocator/partition_allocator/partition_alloc_config.h +@@ -34,9 +34,13 @@ static_assert(sizeof(void*) != 8, ""); + #define PA_HAS_LINUX_KERNEL + #endif + ++#if defined(OS_FREEBSD) ++#define PA_HAS_FREEBSD_KERNEL ++#endif ++ + // SpinningMutex uses either futex(2) on Linux, or a fast userspace "try" + // operation, which is available on Windows. +-#if defined(PA_HAS_LINUX_KERNEL) || defined(OS_WIN) ++#if defined(PA_HAS_LINUX_KERNEL) || defined(PA_HAS_FREEBSD_KERNEL) || defined(OS_WIN) + #define PA_HAS_SPINNING_MUTEX + #endif + diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__unittest.cc b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__unittest.cc index 45fa7177cd36..8f6488a80bd6 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,20 +1,20 @@ ---- base/allocator/partition_allocator/partition_alloc_unittest.cc.orig 2021-04-14 18:40:48 UTC +--- base/allocator/partition_allocator/partition_alloc_unittest.cc.orig 2021-05-12 22:05:40 UTC +++ base/allocator/partition_allocator/partition_alloc_unittest.cc -@@ -1644,7 +1644,7 @@ TEST_F(PartitionAllocTest, LostFreeSlotSpansBug) { +@@ -1659,7 +1659,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)))) // 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 -@@ -1695,7 +1695,7 @@ TEST_F(PartitionAllocDeathTest, DISABLED_RepeatedTryRe +@@ -1710,7 +1710,7 @@ TEST_F(PartitionAllocDeathTest, DISABLED_RepeatedTryRe } #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__root.cc b/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.cc index 5c97ae660a7b..147faa94e4b7 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.cc +++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.cc @@ -1,47 +1,47 @@ ---- base/allocator/partition_allocator/partition_root.cc.orig 2021-04-15 11:28:02 UTC +--- base/allocator/partition_allocator/partition_root.cc.orig 2021-05-12 22:05:40 UTC +++ base/allocator/partition_allocator/partition_root.cc -@@ -20,7 +20,7 @@ +@@ -22,7 +22,7 @@ #include "wow64apiset.h" #endif -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) #include #endif -@@ -34,7 +34,7 @@ namespace { +@@ -36,7 +36,7 @@ namespace { #if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // NO_THREAD_SAFETY_ANALYSIS: acquires the lock and doesn't release it, by // design. -@@ -87,7 +87,7 @@ void AfterForkInChild() { +@@ -89,7 +89,7 @@ void AfterForkInChild() { internal::ThreadCacheRegistry::Instance() .ForcePurgeAllThreadAfterForkUnsafe(); } -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) std::atomic g_global_init_called; void PartitionAllocMallocInitOnce() { -@@ -97,7 +97,7 @@ void PartitionAllocMallocInitOnce() { +@@ -99,7 +99,7 @@ void PartitionAllocMallocInitOnce() { if (!g_global_init_called.compare_exchange_strong(expected, true)) return; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // When fork() is called, only the current thread continues to execute in the // child process. If the lock is held, but *not* by this thread when fork() is // called, we have a deadlock. -@@ -122,7 +122,7 @@ void PartitionAllocMallocInitOnce() { +@@ -124,7 +124,7 @@ void PartitionAllocMallocInitOnce() { int err = pthread_atfork(BeforeForkInParent, AfterForkInParent, AfterForkInChild); PA_CHECK(err == 0); -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) } #endif // BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) 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 index e40dd3c13a0e..c33dc5dc8adc 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_spinning__mutex.h +++ b/www/chromium/files/patch-base_allocator_partition__allocator_spinning__mutex.h @@ -1,33 +1,20 @@ ---- base/allocator/partition_allocator/spinning_mutex.h.orig 2021-04-14 18:40:48 UTC +--- base/allocator/partition_allocator/spinning_mutex.h.orig 2021-05-12 22:05:40 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 { +@@ -59,7 +59,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() { +@@ -104,7 +104,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; + // Using the weak variant of compare_exchange(), which may fail spuriously. On diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_starscan_pcscan.cc b/www/chromium/files/patch-base_allocator_partition__allocator_starscan_pcscan.cc new file mode 100644 index 000000000000..fb0af07cb8d8 --- /dev/null +++ b/www/chromium/files/patch-base_allocator_partition__allocator_starscan_pcscan.cc @@ -0,0 +1,11 @@ +--- base/allocator/partition_allocator/starscan/pcscan.cc.orig 2021-05-25 11:07:18 UTC ++++ base/allocator/partition_allocator/starscan/pcscan.cc +@@ -67,7 +67,7 @@ namespace internal { + + namespace { + +-#if DCHECK_IS_ON() && defined(OS_LINUX) ++#if DCHECK_IS_ON() && (defined(OS_LINUX) || defined(OS_BSD)) + // Currently, check reentracy only on Linux. On Android TLS is emulated by the + // runtime lib, which can allocate and therefore cause reentrancy. + struct ReentrantScannerGuard final { diff --git a/www/chromium/files/patch-base_base__switches.cc b/www/chromium/files/patch-base_base__switches.cc index 5b612f9cd666..c7fd2e4d641b 100644 --- a/www/chromium/files/patch-base_base__switches.cc +++ b/www/chromium/files/patch-base_base__switches.cc @@ -1,22 +1,22 @@ ---- base/base_switches.cc.orig 2021-04-14 18:40:48 UTC +--- base/base_switches.cc.orig 2021-05-12 22:05:40 UTC +++ base/base_switches.cc -@@ -120,8 +120,8 @@ const char kDisableUsbKeyboardDetect[] = "disable +@@ -125,8 +125,8 @@ const char kDisableUsbKeyboardDetect[] = "disable // 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 -@@ -156,7 +156,7 @@ const char kForceFieldTrialParams[] = "force-fieldtria +@@ -161,7 +161,7 @@ const char kForceFieldTrialParams[] = "force-fieldtria #endif -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Controls whether or not retired instruction counts are surfaced for threads // in trace events on Linux. // diff --git a/www/chromium/files/patch-base_base__switches.h b/www/chromium/files/patch-base_base__switches.h index 106fbd5599dc..f878cbc00f2d 100644 --- a/www/chromium/files/patch-base_base__switches.h +++ b/www/chromium/files/patch-base_base__switches.h @@ -1,22 +1,22 @@ ---- base/base_switches.h.orig 2021-04-14 18:40:48 UTC +--- base/base_switches.h.orig 2021-05-12 22:05:40 UTC +++ base/base_switches.h -@@ -41,8 +41,8 @@ extern const char kDisableUsbKeyboardDetect[]; +@@ -42,8 +42,8 @@ extern const char kDisableUsbKeyboardDetect[]; // 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 -@@ -58,7 +58,7 @@ extern const char kEnableIdleTracing[]; +@@ -59,7 +59,7 @@ extern const char kEnableIdleTracing[]; extern const char kForceFieldTrialParams[]; #endif -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) extern const char kEnableThreadInstructionCount[]; // TODO(crbug.com/1176772): Remove kEnableCrashpad and IsCrashpadEnabled() when diff --git a/www/chromium/files/patch-base_bind.h b/www/chromium/files/patch-base_bind.h deleted file mode 100644 index f2715eccde4d..000000000000 --- a/www/chromium/files/patch-base_bind.h +++ /dev/null @@ -1,11 +0,0 @@ ---- base/bind.h.orig 2021-04-15 11:29:10 UTC -+++ base/bind.h -@@ -313,7 +313,7 @@ inline OnceCallback>()), - "BindOnce requires non-const rvalue for OnceCallback binding." - " I.e.: base::BindOnce(std::move(callback))."); --#if defined(OS_LINUX) || defined(OS_WIN) || \ -+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) || \ - defined(NCTEST_BIND_ONCE_WITH_PASSED) - // TODO(https://crbug.com/1180750): Enable this everywhere. - static_assert( 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 f638d3146191..c885c484f31d 100644 --- a/www/chromium/files/patch-base_files_file__path__unittest.cc +++ b/www/chromium/files/patch-base_files_file__path__unittest.cc @@ -1,11 +1,11 @@ ---- base/files/file_path_unittest.cc.orig 2021-04-14 18:40:48 UTC +--- base/files/file_path_unittest.cc.orig 2021-05-12 22:05:40 UTC +++ base/files/file_path_unittest.cc -@@ -1149,7 +1149,7 @@ TEST_F(FilePathTest, FromUTF8Unsafe_And_AsUTF8Unsafe) +@@ -1179,7 +1179,7 @@ TEST_F(FilePathTest, FromUTF8Unsafe_And_AsUTF8Unsafe) "\xEF\xBC\xA1\xEF\xBC\xA2\xEF\xBC\xA3.txt" }, }; -#if !defined(SYSTEM_NATIVE_UTF8) && (defined(OS_LINUX) || defined(OS_CHROMEOS)) +#if !defined(SYSTEM_NATIVE_UTF8) && (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) ScopedLocale locale("en_US.UTF-8"); #endif diff --git a/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc b/www/chromium/files/patch-base_files_file__path__watcher__unittest.cc index a19163383934..71d6ea460ea5 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,56 +1,56 @@ ---- base/files/file_path_watcher_unittest.cc.orig 2021-04-14 18:40:48 UTC +--- base/files/file_path_watcher_unittest.cc.orig 2021-05-12 22:05:40 UTC +++ base/files/file_path_watcher_unittest.cc -@@ -444,12 +444,12 @@ TEST_F(FilePathWatcherTest, WatchDirectory) { +@@ -452,12 +452,12 @@ TEST_F(FilePathWatcherTest, WatchDirectory) { VLOG(1) << "Waiting for file1 creation"; ASSERT_TRUE(WaitForEvents()); -#if !defined(OS_APPLE) +#if !defined(OS_APPLE) && !defined(OS_BSD) // Mac implementation does not detect files modified in a directory. ASSERT_TRUE(WriteFile(file1, "content v2")); VLOG(1) << "Waiting for file1 modification"; ASSERT_TRUE(WaitForEvents()); -#endif // !OS_APPLE +#endif // !OS_APPLE && !OS_BSD ASSERT_TRUE(base::DeleteFile(file1)); VLOG(1) << "Waiting for file1 deletion"; -@@ -822,7 +822,7 @@ TEST_F(FilePathWatcherTest, LinkedDirectoryPart3) { - ASSERT_TRUE(WaitForEvents()); +@@ -1034,7 +1034,7 @@ TEST_F(FilePathWatcherTest, InotifyLimitInUpdateRecurs + } } -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) enum Permission { Read, -@@ -830,7 +830,7 @@ enum Permission { +@@ -1042,7 +1042,7 @@ enum Permission { Execute }; -#if defined(OS_APPLE) +#if defined(OS_APPLE) || defined(OS_BSD) bool ChangeFilePermissions(const FilePath& path, Permission perm, bool allow) { struct stat stat_buf; -@@ -859,9 +859,9 @@ bool ChangeFilePermissions(const FilePath& path, Permi +@@ -1071,9 +1071,9 @@ bool ChangeFilePermissions(const FilePath& path, Permi } return chmod(path.value().c_str(), stat_buf.st_mode) == 0; } -#endif // defined(OS_APPLE) +#endif // defined(OS_APPLE) || defined(OS_BSD) -#if defined(OS_APPLE) +#if defined(OS_APPLE) || defined(OS_BSD) // Linux implementation of FilePathWatcher doesn't catch attribute changes. // http://crbug.com/78043 // Windows implementation of FilePathWatcher catches attribute changes that -@@ -897,7 +897,7 @@ TEST_F(FilePathWatcherTest, DirAttributesChanged) { +@@ -1109,7 +1109,7 @@ TEST_F(FilePathWatcherTest, DirAttributesChanged) { ASSERT_TRUE(ChangeFilePermissions(test_dir1, Execute, true)); } -#endif // OS_APPLE +#endif // OS_APPLE || OS_BSD #if defined(OS_MAC) diff --git a/www/chromium/files/patch-base_files_file__util.h b/www/chromium/files/patch-base_files_file__util.h index 7c1f77514e28..40aae8f579de 100644 --- a/www/chromium/files/patch-base_files_file__util.h +++ b/www/chromium/files/patch-base_files_file__util.h @@ -1,28 +1,28 @@ ---- base/files/file_util.h.orig 2021-04-14 18:40:48 UTC +--- base/files/file_util.h.orig 2021-05-12 22:05:40 UTC +++ base/files/file_util.h -@@ -284,14 +284,14 @@ BASE_EXPORT bool SetPosixFilePermissions(const FilePat +@@ -283,14 +283,14 @@ BASE_EXPORT bool SetPosixFilePermissions(const FilePat BASE_EXPORT bool ExecutableExistsInPath(Environment* env, const FilePath::StringType& executable); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) || defined(OS_BSD) // Determine if files under a given |path| can be mapped and then mprotect'd // PROT_EXEC. This depends on the mount options used for |path|, which vary // among different Linux distributions and possibly local configuration. It also // depends on details of kernel--ChromeOS uses the noexec option for /dev/shm // but its kernel allows mprotect with PROT_EXEC anyway. BASE_EXPORT bool IsPathExecutable(const FilePath& path); -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) || defined(OS_BSD) #endif // OS_POSIX -@@ -603,7 +603,7 @@ BASE_EXPORT bool VerifyPathControlledByAdmin(const bas +@@ -602,7 +602,7 @@ BASE_EXPORT bool VerifyPathControlledByAdmin(const bas // the directory |path|, in the number of FilePath::CharType, or -1 on failure. BASE_EXPORT int GetMaximumPathComponentLength(const base::FilePath& path); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) || defined(OS_BSD) // Broad categories of file systems as returned by statfs() on Linux. enum FileSystemType { FILE_SYSTEM_UNKNOWN, // statfs failed. diff --git a/www/chromium/files/patch-base_files_file__util__posix.cc b/www/chromium/files/patch-base_files_file__util__posix.cc index b6fc1193f750..ca0e4d4a8e28 100644 --- a/www/chromium/files/patch-base_files_file__util__posix.cc +++ b/www/chromium/files/patch-base_files_file__util__posix.cc @@ -1,78 +1,78 @@ ---- base/files/file_util_posix.cc.orig 2021-04-14 18:40:48 UTC +--- base/files/file_util_posix.cc.orig 2021-05-12 22:05:40 UTC +++ base/files/file_util_posix.cc -@@ -380,7 +380,7 @@ bool CreatePipe(ScopedFD* read_fd, ScopedFD* write_fd, +@@ -384,7 +384,7 @@ bool CreatePipe(ScopedFD* read_fd, ScopedFD* write_fd, } bool CreateLocalNonBlockingPipe(int fds[2]) { -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) return pipe2(fds, O_CLOEXEC | O_NONBLOCK) == 0; #else int raw_fds[2]; -@@ -928,8 +928,12 @@ bool AllocateFileRegion(File* file, int64_t offset, si +@@ -932,8 +932,12 @@ bool AllocateFileRegion(File* file, int64_t offset, si // space. It can fail because the filesystem doesn't support it. In that case, // use the manual method below. -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +#if defined(OS_BSD) + if (HANDLE_EINTR(posix_fallocate(file->GetPlatformFile(), offset, size)) != -1) +#else if (HANDLE_EINTR(fallocate(file->GetPlatformFile(), 0, offset, size)) != -1) +#endif return true; DPLOG(ERROR) << "fallocate"; #elif defined(OS_APPLE) -@@ -1099,7 +1103,7 @@ int GetMaximumPathComponentLength(const FilePath& path +@@ -1103,7 +1107,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( -@@ -1115,7 +1119,7 @@ bool GetShmemTempDir(bool executable, FilePath* path) +@@ -1119,7 +1123,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) -@@ -1153,7 +1157,7 @@ PrefetchResult PreReadFile(const FilePath& file_path, +@@ -1157,7 +1161,7 @@ PrefetchResult PreReadFile(const FilePath& file_path, // posix_fadvise() is only available in the Android NDK in API 21+. Older // versions may have the required kernel support, but don't have enough usage // to justify backporting. -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || \ +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ (defined(OS_ANDROID) && __ANDROID_API__ >= 21) File file(file_path, File::FLAG_OPEN | File::FLAG_READ); if (!file.IsValid()) -@@ -1189,7 +1193,7 @@ PrefetchResult PreReadFile(const FilePath& file_path, +@@ -1193,7 +1197,7 @@ PrefetchResult PreReadFile(const FilePath& file_path, return internal::PreReadFileSlow(file_path, max_bytes) ? PrefetchResult{PrefetchResultCode::kSlowSuccess} : PrefetchResult{PrefetchResultCode::kSlowFailed}; -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || (defined(OS_ANDROID) && +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || (defined(OS_ANDROID) && // __ANDROID_API__ >= 21) } -@@ -1224,7 +1228,7 @@ bool MoveUnsafe(const FilePath& from_path, const FileP +@@ -1263,7 +1267,7 @@ bool CopyFileContentsWithSendfile(File& infile, #endif // !defined(OS_NACL_NONSFI) -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) || defined(OS_BSD) BASE_EXPORT bool IsPathExecutable(const FilePath& path) { bool result = false; FilePath tmp_file_path; -@@ -1245,6 +1249,6 @@ BASE_EXPORT bool IsPathExecutable(const FilePath& path +@@ -1284,6 +1288,6 @@ BASE_EXPORT bool IsPathExecutable(const FilePath& path } return result; } -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) || defined(OS_BSD) } // namespace base diff --git a/www/chromium/files/patch-base_i18n_icu__util.cc b/www/chromium/files/patch-base_i18n_icu__util.cc index 875f22e7e743..c7da7bc3c69c 100644 --- a/www/chromium/files/patch-base_i18n_icu__util.cc +++ b/www/chromium/files/patch-base_i18n_icu__util.cc @@ -1,20 +1,20 @@ ---- base/i18n/icu_util.cc.orig 2021-04-14 18:40:48 UTC +--- base/i18n/icu_util.cc.orig 2021-05-12 22:05:40 UTC +++ base/i18n/icu_util.cc -@@ -48,7 +48,7 @@ +@@ -49,7 +49,7 @@ #include "third_party/icu/source/common/unicode/unistr.h" #endif -#if defined(OS_ANDROID) || defined(OS_FUCHSIA) || \ +#if defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD) || \ ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && !BUILDFLAG(IS_CHROMECAST)) #include "third_party/icu/source/i18n/unicode/timezone.h" #endif -@@ -342,7 +342,7 @@ void InitializeIcuTimeZone() { +@@ -343,7 +343,7 @@ void InitializeIcuTimeZone() { FuchsiaIntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization(); icu::TimeZone::adoptDefault( icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id))); -#elif (defined(OS_LINUX) || defined(OS_CHROMEOS)) && !BUILDFLAG(IS_CHROMECAST) +#elif (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && !BUILDFLAG(IS_CHROMECAST) // To respond to the time zone change properly, the default time zone // cache in ICU has to be populated on starting up. // See TimeZoneMonitorLinux::NotifyClientsFromImpl(). diff --git a/www/chromium/files/patch-base_memory_discardable__memory.cc b/www/chromium/files/patch-base_memory_discardable__memory.cc index 0bc1fa1271a9..b0860eea0c36 100644 --- a/www/chromium/files/patch-base_memory_discardable__memory.cc +++ b/www/chromium/files/patch-base_memory_discardable__memory.cc @@ -1,63 +1,63 @@ ---- base/memory/discardable_memory.cc.orig 2021-04-14 18:40:48 UTC +--- base/memory/discardable_memory.cc.orig 2021-05-12 22:05:40 UTC +++ base/memory/discardable_memory.cc -@@ -23,7 +23,7 @@ const base::Feature kMadvFreeDiscardableMemory{ +@@ -24,7 +24,7 @@ const base::Feature kMadvFreeDiscardableMemory{ "MadvFreeDiscardableMemory", base::FEATURE_DISABLED_BY_DEFAULT}; #endif // defined(OS_POSIX) -#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) const base::Feature kDiscardableMemoryBackingTrial{ "DiscardableMemoryBackingTrial", base::FEATURE_DISABLED_BY_DEFAULT}; -@@ -41,13 +41,13 @@ const base::FeatureParam +@@ -42,13 +42,13 @@ const base::FeatureParam DiscardableMemoryTrialGroup::kEmulatedSharedMemory, &kDiscardableMemoryBackingParamOptions}; -#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) } // namespace features namespace { -#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) DiscardableMemoryBacking GetBackingForFieldTrial() { DiscardableMemoryTrialGroup trial_group = -@@ -61,11 +61,11 @@ DiscardableMemoryBacking GetBackingForFieldTrial() { +@@ -62,11 +62,11 @@ DiscardableMemoryBacking GetBackingForFieldTrial() { } NOTREACHED(); } -#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) } // namespace -#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Probe capabilities of this device to determine whether we should participate // in the discardable memory backing trial. -@@ -87,18 +87,18 @@ DiscardableMemoryTrialGroup GetDiscardableMemoryBackin +@@ -88,18 +88,18 @@ DiscardableMemoryTrialGroup GetDiscardableMemoryBackin DCHECK(DiscardableMemoryBackingFieldTrialIsEnabled()); return features::kDiscardableMemoryBackingParam.Get(); } -#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) DiscardableMemory::DiscardableMemory() = default; DiscardableMemory::~DiscardableMemory() = default; DiscardableMemoryBacking GetDiscardableMemoryBacking() { -#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) if (DiscardableMemoryBackingFieldTrialIsEnabled()) { return GetBackingForFieldTrial(); } -#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #if defined(OS_ANDROID) if (ashmem_device_is_supported()) diff --git a/www/chromium/files/patch-base_posix_unix__domain__socket.cc b/www/chromium/files/patch-base_posix_unix__domain__socket.cc index 567e4ba035e0..a70ddacfd021 100644 --- a/www/chromium/files/patch-base_posix_unix__domain__socket.cc +++ b/www/chromium/files/patch-base_posix_unix__domain__socket.cc @@ -1,49 +1,49 @@ ---- base/posix/unix_domain_socket.cc.orig 2021-04-14 18:40:48 UTC +--- base/posix/unix_domain_socket.cc.orig 2021-06-09 22:13:52 UTC +++ base/posix/unix_domain_socket.cc @@ -5,7 +5,10 @@ #include "base/posix/unix_domain_socket.h" #include +#include #include +#include -+#include a ++#include #if !defined(OS_NACL_NONSFI) #include #endif @@ -29,6 +32,14 @@ namespace base { const size_t UnixDomainSocket::kMaxFileDescriptors = 16; +#ifndef SCM_CREDENTIALS +# define SCM_CREDENTIALS 0x9001 +#endif + +#ifndef SO_PASSCRED +# define SO_PASSCRED 0x9002 +#endif + #if !defined(OS_NACL_NONSFI) bool CreateSocketPair(ScopedFD* one, ScopedFD* two) { int raw_socks[2]; @@ -151,7 +162,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, #if !defined(OS_NACL_NONSFI) && !defined(OS_APPLE) // The PNaCl toolchain for Non-SFI binary build and macOS do not support // ucred. macOS supports xucred, but this structure is insufficient. - + CMSG_SPACE(sizeof(struct ucred)) + + CMSG_SPACE(sizeof(struct cmsgcred)) #endif // !defined(OS_NACL_NONSFI) && !defined(OS_APPLE) ; char control_buffer[kControlBufferSize]; @@ -181,9 +192,9 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, // SCM_CREDENTIALS. if (cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_type == SCM_CREDENTIALS) { - DCHECK_EQ(payload_len, sizeof(struct ucred)); + DCHECK_EQ(payload_len, sizeof(struct cmsgcred)); DCHECK_EQ(pid, -1); - pid = reinterpret_cast(CMSG_DATA(cmsg))->pid; + pid = getpid(); } #endif // !defined(OS_NACL_NONSFI) && !defined(OS_APPLE) } diff --git a/www/chromium/files/patch-base_process_launch.h b/www/chromium/files/patch-base_process_launch.h index f9695cb9f7f7..6c44c2cac20b 100644 --- a/www/chromium/files/patch-base_process_launch.h +++ b/www/chromium/files/patch-base_process_launch.h @@ -1,29 +1,29 @@ ---- base/process/launch.h.orig 2021-04-14 18:40:48 UTC +--- base/process/launch.h.orig 2021-05-12 22:05:40 UTC +++ base/process/launch.h @@ -190,7 +190,7 @@ struct BASE_EXPORT LaunchOptions { bool clear_environment = false; #endif // OS_WIN || OS_POSIX || OS_FUCHSIA -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // If non-zero, start the process using clone(), using flags as provided. // Unlike in clone, clone_flags may not contain a custom termination signal // that is sent to the parent when the child dies. The termination signal will @@ -203,7 +203,7 @@ struct BASE_EXPORT LaunchOptions { // Sets parent process death signal to SIGKILL. bool kill_on_parent_death = false; -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #if defined(OS_MAC) // Mach ports that will be accessible to the child process. These are not -@@ -418,7 +418,7 @@ BASE_EXPORT void RaiseProcessToHighPriority(); +@@ -415,7 +415,7 @@ BASE_EXPORT void RaiseProcessToHighPriority(); // binary. This should not be called in production/released code. BASE_EXPORT LaunchOptions LaunchOptionsForTest(); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_NACL_NONSFI) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_NACL_NONSFI) || defined(OS_BSD) // A wrapper for clone with fork-like behavior, meaning that it returns the // child's pid in the parent and 0 in the child. |flags|, |ptid|, and |ctid| are // as in the clone system call (the CLONE_VM flag is not supported). diff --git a/www/chromium/files/patch-base_process_memory.cc b/www/chromium/files/patch-base_process_memory.cc index a51cddeb2ed4..a5b9652c888b 100644 --- a/www/chromium/files/patch-base_process_memory.cc +++ b/www/chromium/files/patch-base_process_memory.cc @@ -1,11 +1,11 @@ ---- base/process/memory.cc.orig 2021-04-14 18:40:48 UTC +--- base/process/memory.cc.orig 2021-05-12 22:05:40 UTC +++ base/process/memory.cc -@@ -68,7 +68,7 @@ void TerminateBecauseOutOfMemory(size_t size) { +@@ -69,7 +69,7 @@ void TerminateBecauseOutOfMemory(size_t size) { } // Defined in memory_mac.mm for Mac. -#if !defined(OS_APPLE) +#if !defined(OS_APPLE) && !defined(OS_BSD) bool UncheckedCalloc(size_t num_items, size_t size, void** result) { const size_t alloc_size = num_items * size; diff --git a/www/chromium/files/patch-base_process_process__metrics.cc b/www/chromium/files/patch-base_process_process__metrics.cc index e8b37cab59d8..54e191de70b0 100644 --- a/www/chromium/files/patch-base_process_process__metrics.cc +++ b/www/chromium/files/patch-base_process_process__metrics.cc @@ -1,38 +1,47 @@ ---- base/process/process_metrics.cc.orig 2021-04-14 18:40:48 UTC +--- base/process/process_metrics.cc.orig 2021-06-09 22:13:52 UTC +++ base/process/process_metrics.cc -@@ -50,7 +50,7 @@ SystemMetrics SystemMetrics::Sample() { +@@ -17,7 +17,7 @@ namespace base { + + namespace { + +-#if defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ ++#if defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ + defined(OS_AIX) + int CalculateEventsPerSecond(uint64_t event_count, + uint64_t* last_event_count, +@@ -53,7 +53,7 @@ SystemMetrics SystemMetrics::Sample() { SystemMetrics system_metrics; system_metrics.committed_memory_ = GetSystemCommitCharge(); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) GetSystemMemoryInfo(&system_metrics.memory_info_); GetVmStatInfo(&system_metrics.vmstat_info_); GetSystemDiskInfo(&system_metrics.disk_info_); -@@ -69,7 +69,7 @@ std::unique_ptr SystemMetrics::ToValue() const +@@ -72,7 +72,7 @@ std::unique_ptr SystemMetrics::ToValue() const std::unique_ptr res(new DictionaryValue()); res->SetIntKey("committed_memory", static_cast(committed_memory_)); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) std::unique_ptr meminfo = memory_info_.ToValue(); std::unique_ptr vmstat = vmstat_info_.ToValue(); meminfo->MergeDictionary(vmstat.get()); -@@ -120,7 +120,7 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage( +@@ -123,7 +123,7 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage( } #endif -#if defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ +#if defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ defined(OS_AIX) int ProcessMetrics::CalculateIdleWakeupsPerSecond( uint64_t absolute_idle_wakeups) { -@@ -133,7 +133,7 @@ int ProcessMetrics::GetIdleWakeupsPerSecond() { +@@ -136,7 +136,7 @@ int ProcessMetrics::GetIdleWakeupsPerSecond() { NOTIMPLEMENTED(); // http://crbug.com/120488 return 0; } -#endif // defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || +#endif // defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || // defined(OS_AIX) #if defined(OS_APPLE) diff --git a/www/chromium/files/patch-base_process_process__metrics.h b/www/chromium/files/patch-base_process_process__metrics.h index 2705a62eb1a9..9ca0b2333067 100644 --- a/www/chromium/files/patch-base_process_process__metrics.h +++ b/www/chromium/files/patch-base_process_process__metrics.h @@ -1,163 +1,163 @@ ---- base/process/process_metrics.h.orig 2021-04-14 18:40:48 UTC +--- base/process/process_metrics.h.orig 2021-05-12 22:05:40 UTC +++ base/process/process_metrics.h @@ -47,7 +47,7 @@ namespace base { // Full declaration is in process_metrics_iocounters.h. struct IoCounters; -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) // Minor and major page fault counts since the process creation. // Both counts are process-wide, and exclude child processes. // @@ -57,7 +57,7 @@ struct PageFaultCounts { int64_t minor; int64_t major; }; -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) // Convert a POSIX timeval to microseconds. BASE_EXPORT int64_t TimeValToMicroseconds(const struct timeval& tv); @@ -98,7 +98,7 @@ class BASE_EXPORT ProcessMetrics { // convenience wrapper for CreateProcessMetrics(). static std::unique_ptr CreateCurrentProcessMetrics(); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) // Resident Set Size is a Linux/Android specific memory concept. Do not // attempt to extend this to other platforms. BASE_EXPORT size_t GetResidentSetSize() const; @@ -124,7 +124,7 @@ class BASE_EXPORT ProcessMetrics { // will result in a time delta of 2 seconds/per 1 wall-clock second. TimeDelta GetCumulativeCPUUsage(); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) || \ defined(OS_AIX) // Emits the cumulative CPU usage for all currently active threads since they // were started into the output parameter (replacing its current contents). @@ -159,7 +159,7 @@ class BASE_EXPORT ProcessMetrics { bool ParseProcTimeInState(const std::string& content, PlatformThreadId tid, TimeInStatePerThread& time_in_state_per_thread); -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) || // defined(OS_AIX) // Returns the number of average idle cpu wakeups per second since the last -@@ -216,14 +216,14 @@ class BASE_EXPORT ProcessMetrics { +@@ -208,14 +208,14 @@ class BASE_EXPORT ProcessMetrics { int GetOpenFdSoftLimit() const; #endif // defined(OS_POSIX) -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) // Bytes of swap as reported by /proc/[pid]/status. uint64_t GetVmSwapBytes() const; // Minor and major page fault count as reported by /proc/[pid]/stat. // Returns true for success. bool GetPageFaultCounts(PageFaultCounts* counts) const; -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) // Returns total memory usage of malloc. size_t GetMallocUsage(); -@@ -235,7 +235,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -227,7 +227,7 @@ class BASE_EXPORT ProcessMetrics { ProcessMetrics(ProcessHandle process, PortProvider* port_provider); #endif // !defined(OS_MAC) -#if defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ +#if defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ defined(OS_AIX) int CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups); #endif -@@ -246,10 +246,10 @@ class BASE_EXPORT ProcessMetrics { +@@ -238,10 +238,10 @@ class BASE_EXPORT ProcessMetrics { uint64_t absolute_package_idle_wakeups); #endif -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) || \ defined(OS_AIX) CPU::CoreType GetCoreType(int core_index); -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) || // defined(OS_AIX) #if defined(OS_WIN) -@@ -271,7 +271,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -263,7 +263,7 @@ class BASE_EXPORT ProcessMetrics { // Number of bytes transferred to/from disk in bytes. uint64_t last_cumulative_disk_usage_ = 0; -#if defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ +#if defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ defined(OS_AIX) // Same thing for idle wakeups. TimeTicks last_idle_wakeups_time_; -@@ -323,7 +323,7 @@ BASE_EXPORT size_t GetHandleLimit(); +@@ -315,7 +315,7 @@ BASE_EXPORT size_t GetHandleLimit(); BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_descriptors); #endif // defined(OS_POSIX) -#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_AIX) || \ defined(OS_FUCHSIA) // Data about system-wide memory consumption. Values are in KB. Available on -@@ -358,7 +358,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -350,7 +350,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { int avail_phys = 0; #endif -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) || \ defined(OS_AIX) // This provides an estimate of available memory as described here: // https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773 -@@ -373,7 +373,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -365,7 +365,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { int swap_free = 0; #endif -#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ +#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ defined(OS_AIX) || defined(OS_FUCHSIA) int buffers = 0; int cached = 0; -@@ -383,7 +383,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -375,7 +375,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { int inactive_file = 0; int dirty = 0; int reclaimable = 0; -#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || +#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || // defined(OS_AIX) defined(OS_FUCHSIA) #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) -@@ -406,11 +406,11 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -398,11 +398,11 @@ struct BASE_EXPORT SystemMemoryInfoKB { // Exposed for memory debugging widget. BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoKB* meminfo); -#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || +#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || // defined(OS_CHROMEOS) defined(OS_ANDROID) || defined(OS_AIX) || // defined(OS_FUCHSIA) -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) || \ defined(OS_AIX) // Parse the data found in /proc//stat and return the sum of the // CPU-related ticks. Returns -1 on parse error. -@@ -485,7 +485,7 @@ BASE_EXPORT bool GetSystemDiskInfo(SystemDiskInfo* dis +@@ -477,7 +477,7 @@ BASE_EXPORT bool GetSystemDiskInfo(SystemDiskInfo* dis // Returns the amount of time spent in user space since boot across all CPUs. BASE_EXPORT TimeDelta GetUserCpuTimeSinceBoot(); -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) || // defined(OS_AIX) #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) -@@ -597,7 +597,7 @@ class BASE_EXPORT SystemMetrics { +@@ -589,7 +589,7 @@ class BASE_EXPORT SystemMetrics { FRIEND_TEST_ALL_PREFIXES(SystemMetricsTest, SystemMetrics); size_t committed_memory_; -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) SystemMemoryInfoKB memory_info_; VmStatInfo vmstat_info_; SystemDiskInfo disk_info_; 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 60f317885f8b..909703eed7db 100644 --- a/www/chromium/files/patch-base_profiler_stack__copier__signal.cc +++ b/www/chromium/files/patch-base_profiler_stack__copier__signal.cc @@ -1,63 +1,63 @@ ---- base/profiler/stack_copier_signal.cc.orig 2021-04-14 18:40:48 UTC +--- base/profiler/stack_copier_signal.cc.orig 2021-05-12 22:05:40 UTC +++ base/profiler/stack_copier_signal.cc @@ -4,7 +4,14 @@ #include "base/profiler/stack_copier_signal.h" +#if defined(OS_LINUX) #include +#include +#elif defined(OS_FREEBSD) +#include +#include +#include +#endif #include #include #include -@@ -35,8 +42,13 @@ class AsyncSafeWaitableEvent { +@@ -36,8 +43,13 @@ class AsyncSafeWaitableEvent { // for a pthread mutex. So, also check the condition. while (true) { int res = +#if defined(OS_LINUX) syscall(SYS_futex, futex_int_ptr(), FUTEX_WAIT | FUTEX_PRIVATE_FLAG, 0, nullptr, nullptr, 0); +#elif defined(OS_FREEBSD) + _umtx_op(futex_int_ptr(), UMTX_OP_WAIT_UINT_PRIVATE, 0, nullptr, + nullptr); +#endif if (futex_.load(std::memory_order_acquire) != 0) return true; if (res != 0) -@@ -46,8 +58,12 @@ class AsyncSafeWaitableEvent { +@@ -47,8 +59,12 @@ class AsyncSafeWaitableEvent { void Signal() { futex_.store(1, std::memory_order_release); +#if defined(OS_LINUX) syscall(SYS_futex, futex_int_ptr(), FUTEX_WAKE | FUTEX_PRIVATE_FLAG, 1, nullptr, nullptr, 0); +#elif defined(OS_FREEBSD) + _umtx_op(futex_int_ptr(), UMTX_OP_WAKE_PRIVATE, 1, nullptr, nullptr); +#endif } private: -@@ -221,11 +237,18 @@ bool StackCopierSignal::CopyStack(StackBuffer* stack_b +@@ -222,11 +238,18 @@ bool StackCopierSignal::CopyStack(StackBuffer* stack_b if (!scoped_sigaction.succeeded()) return false; +#if defined(OS_LINUX) if (syscall(SYS_tgkill, getpid(), thread_delegate_->GetThreadId(), SIGURG) != 0) { NOTREACHED(); return false; } +#elif defined(OS_FREEBSD) + if (thr_kill2(getpid(), thread_delegate_->GetThreadId(), SIGURG) != 0) { + NOTREACHED(); + return false; + } +#endif bool finished_waiting = wait_event.Wait(); TRACE_EVENT_END0(TRACE_DISABLED_BY_DEFAULT("cpu_profiler.debug"), "StackCopierSignal copy stack"); diff --git a/www/chromium/files/patch-base_test_BUILD.gn b/www/chromium/files/patch-base_test_BUILD.gn index 18f8ca8e64a4..46256e1091d1 100644 --- a/www/chromium/files/patch-base_test_BUILD.gn +++ b/www/chromium/files/patch-base_test_BUILD.gn @@ -1,15 +1,15 @@ ---- base/test/BUILD.gn.orig 2021-04-14 18:40:48 UTC +--- base/test/BUILD.gn.orig 2021-05-12 22:05:40 UTC +++ base/test/BUILD.gn -@@ -421,7 +421,11 @@ if (is_linux || is_chromeos) { +@@ -423,7 +423,11 @@ if (is_linux || is_chromeos) { copy("fonts_conf") { sources = [ "fonts.conf" ] - outputs = [ "${root_build_dir}/etc/fonts/{{source_file_part}}" ] + if (is_bsd) { + outputs = [ "${root_build_dir}/usr/local/etc/fonts/{{source_file_part}}" ] + } else { + outputs = [ "${root_build_dir}/etc/fonts/{{source_file_part}}" ] + } } if (current_toolchain == host_toolchain) { diff --git a/www/chromium/files/patch-base_test_test__suite.cc b/www/chromium/files/patch-base_test_test__suite.cc index db96223b4238..ee31c754a5a0 100644 --- a/www/chromium/files/patch-base_test_test__suite.cc +++ b/www/chromium/files/patch-base_test_test__suite.cc @@ -1,55 +1,55 @@ ---- base/test/test_suite.cc.orig 2021-04-20 18:58:23 UTC +--- base/test/test_suite.cc.orig 2021-05-12 22:05:40 UTC +++ base/test/test_suite.cc @@ -68,7 +68,7 @@ #include "base/test/test_support_android.h" #endif -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "base/test/fontconfig_util_linux.h" #endif @@ -214,7 +214,7 @@ class CheckForLeakedGlobals : public testing::EmptyTes }; // base::Process is not available on iOS -#if !defined(OS_IOS) +#if !defined(OS_IOS) && !defined(OS_BSD) class CheckProcessPriority : public testing::EmptyTestEventListener { public: CheckProcessPriority() { CHECK(!IsProcessBackgrounded()); } -@@ -384,14 +384,14 @@ void TestSuite::PreInitialize() { +@@ -399,14 +399,14 @@ void TestSuite::PreInitialize() { testing::GTEST_FLAG(catch_exceptions) = false; #endif EnableTerminationOnHeapCorruption(); -#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(USE_AURA) +#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(USE_AURA) // When calling native char conversion functions (e.g wrctomb) we need to // have the locale set. In the absence of such a call the "C" locale is the // default. In the gtk code (below) gtk_init() implicitly sets a locale. setlocale(LC_ALL, ""); // We still need number to string conversions to be locale insensitive. setlocale(LC_NUMERIC, "C"); -#endif // (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(USE_AURA) +#endif // (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(USE_AURA) // On Android, AtExitManager is created in // testing/android/native_test_wrapper.cc before main() is called. -@@ -657,7 +657,7 @@ void TestSuite::Initialize() { +@@ -680,7 +680,7 @@ void TestSuite::Initialize() { // TODO(jshin): Should we set the locale via an OS X locale API here? i18n::SetICUDefaultLocale("en_US"); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) SetUpFontconfig(); #endif -@@ -670,7 +670,7 @@ void TestSuite::Initialize() { +@@ -693,7 +693,7 @@ void TestSuite::Initialize() { if (check_for_leaked_globals_) listeners.Append(new CheckForLeakedGlobals); if (check_for_thread_and_process_priority_) { -#if !defined(OS_IOS) +#if !defined(OS_IOS) && !defined(OS_BSD) listeners.Append(new CheckProcessPriority); #endif } 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 73d12e31ceb6..bb8888d61b1e 100644 --- a/www/chromium/files/patch-base_threading_platform__thread__posix.cc +++ b/www/chromium/files/patch-base_threading_platform__thread__posix.cc @@ -1,54 +1,22 @@ ---- base/threading/platform_thread_posix.cc.orig 2021-04-14 18:40:48 UTC +--- base/threading/platform_thread_posix.cc.orig 2021-06-09 22:13:52 UTC +++ base/threading/platform_thread_posix.cc @@ -32,6 +32,10 @@ #include #endif +#if defined(OS_BSD) +#include +#endif + #if defined(OS_FUCHSIA) #include #else -@@ -141,7 +145,7 @@ bool CreateThread(size_t stack_size, - return success; - } - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - - // Store the thread ids in local storage since calling the SWI can 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_BSD) - - } // namespace - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - - namespace internal { - -@@ -173,7 +177,7 @@ void ClearTidCache() { - - } // namespace internal - --#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) -+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - - // static - PlatformThreadId PlatformThread::CurrentId() { @@ -181,6 +185,8 @@ PlatformThreadId PlatformThread::CurrentId() { // into the kernel. #if defined(OS_APPLE) return pthread_mach_thread_np(pthread_self()); +#elif defined(OS_BSD) + return pthread_getthreadid_np(); #elif defined(OS_LINUX) || defined(OS_CHROMEOS) static NoDestructor init_at_fork; if (g_thread_id == -1) { 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 0507cf7347c6..b23c3958b13c 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,20 +1,20 @@ ---- base/threading/scoped_blocking_call_unittest.cc.orig 2021-04-14 18:40:48 UTC +--- base/threading/scoped_blocking_call_unittest.cc.orig 2021-05-12 22:05:40 UTC +++ base/threading/scoped_blocking_call_unittest.cc -@@ -273,7 +273,7 @@ TEST_F(ScopedBlockingCallIOJankMonitoringTest, ManyInA +@@ -274,7 +274,7 @@ TEST_F(ScopedBlockingCallIOJankMonitoringTest, ManyInA } TEST_F(ScopedBlockingCallIOJankMonitoringTest, OverlappingMultipleWindows) { - constexpr auto kJankTiming = + auto kJankTiming = internal::IOJankMonitoringWindow::kMonitoringWindow * 3 + internal::IOJankMonitoringWindow::kIOJankInterval * 5; -@@ -530,7 +530,7 @@ TEST_F(ScopedBlockingCallIOJankMonitoringTest, MultiTh +@@ -531,7 +531,7 @@ TEST_F(ScopedBlockingCallIOJankMonitoringTest, MultiTh // First one starting at 10 seconds (can't start later than that or we'll trip // the kTimeDiscrepancyTimeout per TaskEnvironment's inability to RunUntilIdle() // with pending blocked tasks). -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // https://crbug.com/1071166 #define MAYBE_MultiThreadedOverlappedWindows \ DISABLED_MultiThreadedOverlappedWindows diff --git a/www/chromium/files/patch-base_time_time__unittest.cc b/www/chromium/files/patch-base_time_time__unittest.cc index 79f46256e239..4014b577f727 100644 --- a/www/chromium/files/patch-base_time_time__unittest.cc +++ b/www/chromium/files/patch-base_time_time__unittest.cc @@ -1,18 +1,18 @@ ---- base/time/time_unittest.cc.orig 2021-04-14 18:40:48 UTC +--- base/time/time_unittest.cc.orig 2021-05-12 22:05:40 UTC +++ base/time/time_unittest.cc -@@ -1969,6 +1969,7 @@ TEST(TimeDelta, Overflows) { +@@ -2074,6 +2074,7 @@ TEST(TimeDelta, Overflows) { EXPECT_TRUE((kLargeDelta / 0.5).is_max()); EXPECT_TRUE((kLargeDelta / -0.5).is_min()); +#if !defined(OS_BSD) static_assert( TimeDelta::Max() / kOneSecond == std::numeric_limits::infinity(), ""); -@@ -1997,6 +1998,7 @@ TEST(TimeDelta, Overflows) { +@@ -2102,6 +2103,7 @@ TEST(TimeDelta, Overflows) { static_assert(TimeDelta::Max() % -kOneSecond == TimeDelta::Max(), ""); static_assert(TimeDelta::Min() % kOneSecond == TimeDelta::Min(), ""); static_assert(TimeDelta::Min() % -kOneSecond == TimeDelta::Min(), ""); +#endif // Division by zero. static_assert((kOneSecond / 0).is_max(), ""); diff --git a/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc b/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc index 4f094d046bd0..cf882af43d79 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,21 +1,21 @@ ---- base/trace_event/malloc_dump_provider.cc.orig 2021-04-14 18:40:48 UTC +--- base/trace_event/malloc_dump_provider.cc.orig 2021-05-12 22:05:40 UTC +++ base/trace_event/malloc_dump_provider.cc -@@ -17,6 +17,8 @@ +@@ -20,6 +20,8 @@ #if defined(OS_APPLE) #include +#elif defined(OS_BSD) +#include #else #include #endif -@@ -185,6 +187,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump +@@ -199,6 +201,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump } #elif defined(OS_FUCHSIA) // TODO(fuchsia): Port, see https://crbug.com/706592. +#elif defined(OS_BSD) + total_virtual_size = 0; + allocated_objects_size = 0; #else struct mallinfo info = mallinfo(); // In case of Android's jemalloc |arena| is 0 and the outer pages size is 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 2d3d5a52f78c..a33f302f5f91 100644 --- a/www/chromium/files/patch-base_trace__event_process__memory__dump.cc +++ b/www/chromium/files/patch-base_trace__event_process__memory__dump.cc @@ -1,11 +1,11 @@ ---- base/trace_event/process_memory_dump.cc.orig 2021-04-14 18:40:48 UTC +--- base/trace_event/process_memory_dump.cc.orig 2021-05-12 22:05:40 UTC +++ base/trace_event/process_memory_dump.cc -@@ -101,7 +101,7 @@ base::Optional ProcessMemoryDump::CountResiden +@@ -102,7 +102,7 @@ base::Optional ProcessMemoryDump::CountResiden #if defined(OS_WIN) std::unique_ptr vec( new PSAPI_WORKING_SET_EX_INFORMATION[max_vec_size]); -#elif defined(OS_APPLE) +#elif defined(OS_APPLE) || defined(OS_BSD) std::unique_ptr vec(new char[max_vec_size]); #elif defined(OS_POSIX) || defined(OS_FUCHSIA) std::unique_ptr vec(new unsigned char[max_vec_size]); 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 deleted file mode 100644 index 9c506c990d39..000000000000 --- a/www/chromium/files/patch-base_util_memory__pressure_system__memory__pressure__evaluator.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- base/util/memory_pressure/system_memory_pressure_evaluator.cc.orig 2021-04-14 18:40:48 UTC -+++ base/util/memory_pressure/system_memory_pressure_evaluator.cc -@@ -17,7 +17,7 @@ - #include "base/win/windows_version.h" - // 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 - -@@ -50,7 +50,7 @@ SystemMemoryPressureEvaluator::CreateDefaultSystemEval - return evaluator; - // 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( - monitor->CreateVoter()); - #endif diff --git a/www/chromium/files/patch-build_config_BUILD.gn b/www/chromium/files/patch-build_config_BUILD.gn index 35b0684f9256..bd6a0ed90cff 100644 --- a/www/chromium/files/patch-build_config_BUILD.gn +++ b/www/chromium/files/patch-build_config_BUILD.gn @@ -1,21 +1,21 @@ ---- build/config/BUILD.gn.orig 2021-04-14 18:40:48 UTC +--- build/config/BUILD.gn.orig 2021-05-12 22:05:40 UTC +++ build/config/BUILD.gn -@@ -232,9 +232,7 @@ config("default_libs") { +@@ -227,9 +227,7 @@ config("default_libs") { ] } else if (is_linux || is_chromeos) { libs = [ - "dl", "pthread", - "rt", ] } } -@@ -313,7 +311,7 @@ config("executable_config") { +@@ -308,7 +306,7 @@ config("executable_config") { "//build/config/ios:ios_dynamic_flags", "//build/config/ios:ios_executable_flags", ] - } else if (is_linux || is_chromeos || is_android || current_os == "aix") { + } else if (is_linux || is_bsd || is_chromeos || is_android || current_os == "aix") { configs += [ "//build/config/gcc:executable_config" ] if (is_chromecast) { configs += [ "//build/config/chromecast:executable_config" ] diff --git a/www/chromium/files/patch-build_config_BUILDCONFIG.gn b/www/chromium/files/patch-build_config_BUILDCONFIG.gn index a9a78e5cf361..a9ad6db86deb 100644 --- a/www/chromium/files/patch-build_config_BUILDCONFIG.gn +++ b/www/chromium/files/patch-build_config_BUILDCONFIG.gn @@ -1,35 +1,35 @@ ---- build/config/BUILDCONFIG.gn.orig 2021-04-14 18:40:48 UTC +--- build/config/BUILDCONFIG.gn.orig 2021-05-12 22:05:40 UTC +++ build/config/BUILDCONFIG.gn -@@ -183,8 +183,8 @@ if (host_toolchain == "") { +@@ -184,8 +184,8 @@ if (host_toolchain == "") { # TODO(dpranke): Add some sort of assert here that verifies that # no toolchain omitted host_toolchain from its toolchain_args(). - if (host_os == "linux") { - if (target_os != "linux") { + if (host_os == "linux" || host_os == "freebsd") { + if (target_os != "linux" && target_os != "freebsd") { 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") { +@@ -222,7 +222,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" -} else if (target_os == "chromeos" || target_os == "linux") { +} else if (target_os == "chromeos" || target_os == "linux" || target_os == "freebsd") { # 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 != "") { +@@ -284,10 +284,11 @@ if (custom_toolchain != "") { # current_os value directly. is_android = current_os == "android" +is_bsd = current_os == "freebsd" is_chromeos = current_os == "chromeos" is_fuchsia = current_os == "fuchsia" is_ios = current_os == "ios" -is_linux = current_os == "linux" +is_linux = current_os == "linux" || current_os == "freebsd" is_mac = current_os == "mac" is_nacl = current_os == "nacl" is_win = current_os == "win" || current_os == "winuwp" diff --git a/www/chromium/files/patch-build_config_compiler_BUILD.gn b/www/chromium/files/patch-build_config_compiler_BUILD.gn index 13b39bd99279..ef52986708aa 100644 --- a/www/chromium/files/patch-build_config_compiler_BUILD.gn +++ b/www/chromium/files/patch-build_config_compiler_BUILD.gn @@ -1,120 +1,134 @@ ---- build/config/compiler/BUILD.gn.orig 2021-04-14 18:40:48 UTC +--- build/config/compiler/BUILD.gn.orig 2021-06-09 22:13:52 UTC +++ build/config/compiler/BUILD.gn -@@ -132,7 +132,7 @@ declare_args() { +@@ -133,7 +133,7 @@ declare_args() { # # TODO(crbug.com/977230): Enabling this when 'use_xcode_clang' is true may # call an old clang that doesn't support auto-init. - init_stack_vars = !is_android && !use_xcode_clang + init_stack_vars = !is_android && !use_xcode_clang && !is_bsd # This argument is to control whether enabling text section splitting in the # final binary. When enabled, the separated text sections with prefix -@@ -324,7 +324,7 @@ config("compiler") { +@@ -333,7 +333,7 @@ config("compiler") { } # Linker warnings. - if (fatal_linker_warnings && !is_apple && current_os != "aix") { + if (fatal_linker_warnings && !is_apple && !is_bsd && current_os != "aix") { ldflags += [ "-Wl,--fatal-warnings" ] } if (fatal_linker_warnings && is_apple) { -@@ -419,7 +419,7 @@ config("compiler") { +@@ -428,7 +428,7 @@ config("compiler") { # Compiler instrumentation can introduce dependencies in DSOs to symbols in # the executable they are loaded into, so they are unresolved at link-time. - if (!using_sanitizer) { + if (!using_sanitizer && !is_bsd) { ldflags += [ "-Wl,-z,defs", "-Wl,--as-needed", -@@ -509,7 +509,7 @@ config("compiler") { +@@ -518,7 +518,7 @@ config("compiler") { ldflags += [ "-Wl,-z,keep-text-section-prefix" ] } - if (is_clang && !is_nacl && !use_xcode_clang) { + if (is_clang && !is_nacl && !use_xcode_clang && !is_bsd) { cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ] # TODO(hans): Remove this once Clang generates better optimized debug info -@@ -848,7 +848,7 @@ config("compiler_cpu_abi") { +@@ -661,7 +661,12 @@ config("compiler") { + # and let it use all cores. + # TODO(thakis): Check if '=0' (that is, number of cores, instead + # of "all" which means number of hardware threads) is faster. +- ldflags += [ "-Wl,--thinlto-jobs=all" ] ++ if (is_bsd) { ++ # FreeBSD < 13 uses LLVM 10, which doesn't support --thinlto-jobs=all ++ ldflags += [ "-Wl,--thinlto-jobs=2" ] ++ } else { ++ ldflags += [ "-Wl,--thinlto-jobs=all" ] ++ } + + ldflags += [ + "-Wl,--thinlto-cache-dir=" + +@@ -851,7 +856,7 @@ config("compiler_cpu_abi") { cflags += [ "-mtune=$arm_tune" ] } } else if (current_cpu == "arm64") { - if (is_clang && !is_android && !is_nacl && !is_fuchsia) { + if (is_clang && !is_android && !is_nacl && !is_fuchsia && !is_bsd) { cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] } -@@ -1198,7 +1198,7 @@ config("compiler_deterministic") { +@@ -1201,7 +1206,7 @@ config("compiler_deterministic") { "-Xclang", ".", ] - if (!is_win) { + if (!is_win && !is_bsd) { # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167) asmflags = [ "-Wa,-fdebug-compilation-dir,." ] } -@@ -1581,7 +1581,7 @@ config("default_warnings") { +@@ -1584,7 +1589,7 @@ config("default_warnings") { cflags += [ "-Wno-nonportable-include-path" ] } - if (current_toolchain == host_toolchain || !use_xcode_clang) { + if ((current_toolchain == host_toolchain || !use_xcode_clang) && !is_bsd) { # Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not # recognize. cflags += [ -@@ -1622,6 +1622,18 @@ config("default_warnings") { +@@ -1625,6 +1630,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", + ] + } } } } -@@ -1751,7 +1763,7 @@ config("no_chromium_code") { +@@ -1754,7 +1771,7 @@ config("no_chromium_code") { # suppressing them individually, we just blanket suppress them here. "-Wno-unused-variable", ] - if (!is_nacl && (current_toolchain == host_toolchain || !use_xcode_clang)) { + if (!is_nacl && (current_toolchain == host_toolchain || !use_xcode_clang) && !is_bsd) { cflags += [ # TODO(https://crbug.com/1031169): Clean up and enable. "-Wno-misleading-indentation", -@@ -1829,7 +1841,7 @@ config("export_dynamic") { +@@ -1832,7 +1849,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" ] -@@ -2374,7 +2386,7 @@ config("symbols") { +@@ -2373,7 +2390,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) { - cflags += [ "-g2" ] + cflags += [ "-g0" ] } # TODO(https://crbug.com/1050118): Investigate missing debug info on mac. -@@ -2407,7 +2419,7 @@ config("symbols") { +@@ -2406,7 +2423,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" && - (use_gold || use_lld)) { + (use_gold || use_lld) && !is_bsd) { if (is_clang) { # This flag enables the GNU-format pubnames and pubtypes sections, # which lld needs in order to generate a correct GDB index. diff --git a/www/chromium/files/patch-build_config_compiler_compiler.gni b/www/chromium/files/patch-build_config_compiler_compiler.gni index 653a3fce454e..66d5dcf2d2d4 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-04-14 18:40:48 UTC +--- build/config/compiler/compiler.gni.orig 2021-05-12 22:05:40 UTC +++ build/config/compiler/compiler.gni -@@ -201,7 +201,7 @@ declare_args() { +@@ -202,7 +202,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 && + 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_toolchain_gcc__toolchain.gni b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni index 5fc7d6d58dc3..1613bd73a406 100644 --- a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni +++ b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni @@ -1,45 +1,58 @@ ---- build/toolchain/gcc_toolchain.gni.orig 2021-04-14 18:40:48 UTC +--- build/toolchain/gcc_toolchain.gni.orig 2021-06-09 22:13:52 UTC +++ build/toolchain/gcc_toolchain.gni @@ -51,6 +51,11 @@ if (enable_resource_allowlist_generation) { "enable_resource_allowlist_generation=true does not work for target_os=$target_os") } +declare_args() { + extra_cxxflags = "" + extra_ldflags = "" +} + # This template defines a toolchain for something that works like gcc # (including clang). # -@@ -646,13 +651,23 @@ template("clang_toolchain") { +@@ -647,20 +652,32 @@ template("gcc_toolchain") { + # actually just be doing a native compile. The invoker can optionally override + # use_gold too. + template("clang_toolchain") { +- if (defined(invoker.toolprefix)) { +- toolprefix = invoker.toolprefix +- } else { +- toolprefix = "" ++ if (!is_bsd) { ++ if (defined(invoker.toolprefix)) { ++ toolprefix = invoker.toolprefix ++ } else { ++ toolprefix = "" ++ } } gcc_toolchain(target_name) { - prefix = rebase_path("$clang_base_path/bin", root_build_dir) - cc = "$prefix/clang" - cxx = "$prefix/clang++" - ld = cxx - readelf = "${toolprefix}readelf" - ar = "${prefix}/llvm-ar" -- nm = "${toolprefix}nm" +- nm = "${prefix}/llvm-nm" + if (is_bsd) { + prefix = "/usr/local/bin" + cc = "cc" + cxx = "c++" + ld = cxx + readelf = "readelf" + ar = "${prefix}/ar" -+ nm = "${toolprefix}nm" ++ nm = "${prefix}/nm" + } else { + prefix = rebase_path("$clang_base_path/bin", root_build_dir) + cc = "$prefix/clang" + cxx = "$prefix/clang++" + ld = cxx + readelf = "${toolprefix}readelf" + ar = "${prefix}/llvm-ar" -+ nm = "${toolprefix}nm" ++ nm = "${prefix}/llvm-nm" + } forward_variables_from(invoker, [ diff --git a/www/chromium/files/patch-build_toolchain_linux_BUILD.gn b/www/chromium/files/patch-build_toolchain_linux_BUILD.gn index e2710a5019fd..f4d88ae95db0 100644 --- a/www/chromium/files/patch-build_toolchain_linux_BUILD.gn +++ b/www/chromium/files/patch-build_toolchain_linux_BUILD.gn @@ -1,10 +1,21 @@ ---- build/toolchain/linux/BUILD.gn.orig 2021-04-14 18:40:48 UTC +--- build/toolchain/linux/BUILD.gn.orig 2021-06-09 22:13:52 UTC +++ build/toolchain/linux/BUILD.gn -@@ -23,7 +23,6 @@ clang_toolchain("clang_arm") { +@@ -15,7 +15,9 @@ clang_toolchain("clang_ppc64") { + } + + clang_toolchain("clang_arm") { +- toolprefix = "arm-linux-gnueabihf-" ++ if (!is_bsd) { ++ toolprefix = "arm-linux-gnueabihf-" ++ } + toolchain_args = { + current_cpu = "arm" + current_os = "linux" +@@ -23,7 +25,6 @@ clang_toolchain("clang_arm") { } clang_toolchain("clang_arm64") { - toolprefix = "aarch64-linux-gnu-" toolchain_args = { current_cpu = "arm64" current_os = "linux" diff --git a/www/chromium/files/patch-cc_BUILD.gn b/www/chromium/files/patch-cc_BUILD.gn index 266840d1ea45..d3301d156f48 100644 --- a/www/chromium/files/patch-cc_BUILD.gn +++ b/www/chromium/files/patch-cc_BUILD.gn @@ -1,19 +1,19 @@ ---- cc/BUILD.gn.orig 2021-04-14 18:40:48 UTC +--- cc/BUILD.gn.orig 2021-05-12 22:05:40 UTC +++ cc/BUILD.gn -@@ -639,7 +639,7 @@ cc_test_static_library("test_support") { +@@ -640,7 +640,7 @@ cc_test_static_library("test_support") { if (enable_vulkan) { deps += [ "//gpu/vulkan/init" ] } - if (!is_android) { + if (!is_android && !is_bsd) { data_deps = [ "//third_party/mesa_headers" ] } } -@@ -856,7 +856,6 @@ cc_test("cc_unittests") { +@@ -857,7 +857,6 @@ cc_test("cc_unittests") { ] data_deps = [ "//testing/buildbot/filters:cc_unittests_filters", - "//third_party/mesa_headers", ] if (is_fuchsia) { diff --git a/www/chromium/files/patch-cc_trees_frame__rate__estimator.cc b/www/chromium/files/patch-cc_trees_frame__rate__estimator.cc deleted file mode 100644 index f70fd5aaebe8..000000000000 --- a/www/chromium/files/patch-cc_trees_frame__rate__estimator.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- cc/trees/frame_rate_estimator.cc.orig 2021-04-14 18:40:48 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. - // The delta below is to account for minor offsets in frame times. - constexpr auto kFudgeDelta = base::TimeDelta::FromMilliseconds(1); -- constexpr auto kMinDelta = -+ auto kMinDelta = - (viz::BeginFrameArgs::DefaultInterval() * 2) + kFudgeDelta; - if (draw_delta < kMinDelta) - num_of_consecutive_frames_with_min_delta_++; diff --git a/www/chromium/files/patch-chrome_BUILD.gn b/www/chromium/files/patch-chrome_BUILD.gn index 6df141ba9bcf..91e75d0d389f 100644 --- a/www/chromium/files/patch-chrome_BUILD.gn +++ b/www/chromium/files/patch-chrome_BUILD.gn @@ -1,13 +1,13 @@ ---- chrome/BUILD.gn.orig 2021-04-14 18:40:48 UTC +--- chrome/BUILD.gn.orig 2021-05-12 22:05:41 UTC +++ chrome/BUILD.gn -@@ -1249,6 +1249,10 @@ group("browser_dependencies") { +@@ -1335,6 +1335,10 @@ group("browser_dependencies") { public_deps += [ "//chromeos/lacros" ] } + if (is_bsd) { + public_deps -= [ "//components/crash/core/app" ] + } + if (is_chromeos_ash) { public_deps += [ "//ash/constants", diff --git a/www/chromium/files/patch-chrome_app_BUILD.gn b/www/chromium/files/patch-chrome_app_BUILD.gn index 24fe0c956d1d..2c74fdad393e 100644 --- a/www/chromium/files/patch-chrome_app_BUILD.gn +++ b/www/chromium/files/patch-chrome_app_BUILD.gn @@ -1,11 +1,11 @@ ---- chrome/app/BUILD.gn.orig 2021-04-14 18:40:49 UTC +--- chrome/app/BUILD.gn.orig 2021-05-12 22:05:41 UTC +++ chrome/app/BUILD.gn -@@ -140,7 +140,7 @@ static_library("test_support") { +@@ -141,7 +141,7 @@ static_library("test_support") { "//v8:v8_headers", ] - if (!is_fuchsia) { + if (!is_fuchsia && !is_bsd) { # TODO(crbug.com/753619): Enable crash reporting on Fuchsia. deps += [ "//components/crash/core/app", 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 0a4f96b13554..4ada1cf4bc66 100644 --- a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc +++ b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc @@ -1,170 +1,170 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2021-04-14 18:40:49 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2021-05-12 22:05:41 UTC +++ chrome/app/chrome_main_delegate.cc @@ -150,12 +150,12 @@ #include "v8/include/v8.h" #endif -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "base/environment.h" #endif #if defined(OS_MAC) || defined(OS_WIN) || defined(OS_ANDROID) || \ - defined(OS_LINUX) || defined(OS_CHROMEOS) + defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "chrome/browser/policy/policy_path_parser.h" #include "components/crash/core/app/crashpad.h" #endif @@ -259,7 +259,7 @@ void SetUpExtendedCrashReporting(bool is_browser_proce #endif // defined(OS_WIN) -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) void AdjustLinuxOOMScore(const std::string& process_type) { int score = -1; @@ -294,7 +294,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty if (score > -1) base::AdjustOOMScore(base::GetCurrentProcId(), score); } -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // (defined(OS_LINUX) || defined(OS_CHROMEOS)) // Returns true if this subprocess type needs the ResourceBundle initialized // and resources loaded. @@ -340,7 +340,7 @@ bool HandleVersionSwitches(const base::CommandLine& co // 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) || @@ -350,7 +350,7 @@ void HandleHelpSwitches(const base::CommandLine& comma PLOG(FATAL) << "execlp failed"; } } -#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) { @@ -404,7 +404,7 @@ void InitializeUserDataDir(base::CommandLine* command_ std::string process_type = command_line->GetSwitchValueASCII(switches::kProcessType); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // On Linux, Chrome does not support running multiple copies under different // DISPLAYs, so the profile directory can be specified in the environment to // support the virtual desktop use-case. @@ -416,7 +416,7 @@ void InitializeUserDataDir(base::CommandLine* command_ user_data_dir = base::FilePath::FromUTF8Unsafe(user_data_dir_string); } } -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #if defined(OS_MAC) policy::path_parser::CheckUserDataDirPolicy(&user_data_dir); #endif // OS_MAC @@ -487,7 +487,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat startup_metric_utils::RecordApplicationStartTime(now); #endif -#if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || \ +#if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) // Record the startup process creation time on supported platforms. On Android // this is recorded in ChromeMainDelegateAndroid. -@@ -730,7 +730,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -735,7 +735,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi v8_crashpad_support::SetUp(); #endif -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) if (!crash_reporter::IsCrashpadEnabled()) { breakpad::SetFirstChanceExceptionHandler(v8::TryHandleWebAssemblyTrapPosix); } -@@ -743,7 +743,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -748,7 +748,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi } // 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 -@@ -952,7 +952,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -957,7 +957,7 @@ void ChromeMainDelegate::PreSandboxStartup() { crash_reporter::InitializeCrashKeys(); -#if defined(OS_POSIX) +#if defined(OS_POSIX) && !defined(OS_BSD) ChromeCrashReporterClient::Create(); #endif -@@ -965,7 +965,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -970,7 +970,7 @@ void ChromeMainDelegate::PreSandboxStartup() { child_process_logging::Init(); #endif #if defined(ARCH_CPU_ARM_FAMILY) && \ - (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS)) + (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) // Create an instance of the CPU class to parse /proc/cpuinfo and cache // cpu_brand info. base::CPU cpu_info; -@@ -1083,7 +1083,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1088,7 +1088,7 @@ void ChromeMainDelegate::PreSandboxStartup() { locale; } -#if defined(OS_POSIX) && !defined(OS_MAC) +#if defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_BSD) // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess) { #if defined(OS_ANDROID) -@@ -1104,7 +1104,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1109,7 +1109,7 @@ void ChromeMainDelegate::PreSandboxStartup() { } #endif // defined(OS_ANDROID) } -#endif // defined(OS_POSIX) && !defined(OS_MAC) +#endif // defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_BSD) #if defined(OS_ANDROID) CHECK_EQ(base::android::GetLibraryProcessType(), -@@ -1124,7 +1124,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1129,7 +1129,7 @@ void ChromeMainDelegate::PreSandboxStartup() { void ChromeMainDelegate::SandboxInitialized(const std::string& process_type) { // Note: If you are adding a new process type below, be sure to adjust the // AdjustLinuxOOMScore function too. -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) AdjustLinuxOOMScore(process_type); #endif #if defined(OS_WIN) -@@ -1166,7 +1166,7 @@ int ChromeMainDelegate::RunProcess( +@@ -1171,7 +1171,7 @@ int ChromeMainDelegate::RunProcess( // This entry is not needed on Linux, where the NaCl loader // process is launched via nacl_helper instead. -#if BUILDFLAG(ENABLE_NACL) && !defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if BUILDFLAG(ENABLE_NACL) && !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_BSD) {switches::kNaClLoaderProcess, NaClMain}, #else {"", nullptr}, // To avoid constant array of size 0 -@@ -1194,7 +1194,7 @@ void ChromeMainDelegate::ProcessExiting(const std::str +@@ -1199,7 +1199,7 @@ void ChromeMainDelegate::ProcessExiting(const std::str #endif // !defined(OS_ANDROID) } -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) void ChromeMainDelegate::ZygoteStarting( std::vector>* delegates) { #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -1231,7 +1231,7 @@ void ChromeMainDelegate::ZygoteForked() { +@@ -1236,7 +1236,7 @@ void ChromeMainDelegate::ZygoteForked() { crash_keys::SetCrashKeysFromCommandLine(*command_line); } -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // (defined(OS_LINUX) || defined(OS_CHROMEOS)) content::ContentClient* ChromeMainDelegate::CreateContentClient() { return &chrome_content_client_; diff --git a/www/chromium/files/patch-chrome_app_chromium__strings.grd b/www/chromium/files/patch-chrome_app_chromium__strings.grd index 1f414e0346fa..a9584c2b8f57 100644 --- a/www/chromium/files/patch-chrome_app_chromium__strings.grd +++ b/www/chromium/files/patch-chrome_app_chromium__strings.grd @@ -1,20 +1,20 @@ ---- chrome/app/chromium_strings.grd.orig 2021-04-14 18:40:49 UTC +--- chrome/app/chromium_strings.grd.orig 2021-05-12 22:05:41 UTC +++ chrome/app/chromium_strings.grd -@@ -722,7 +722,7 @@ Chromium is unable to recover your settings. +@@ -703,7 +703,7 @@ Chromium is unable to recover your settings. - + Your system administrator has configured Chromium to open an alternative browser to access $1example.com. -@@ -851,7 +851,7 @@ Chromium is unable to recover your settings. +@@ -833,7 +833,7 @@ Chromium is unable to recover your settings. - + The profile appears to be in use by another Chromium process ($112345) on another computer ($2example.com). 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. diff --git a/www/chromium/files/patch-chrome_app_generated__resources.grd b/www/chromium/files/patch-chrome_app_generated__resources.grd index 677c44f8549e..7b58b87c724f 100644 --- a/www/chromium/files/patch-chrome_app_generated__resources.grd +++ b/www/chromium/files/patch-chrome_app_generated__resources.grd @@ -1,29 +1,29 @@ ---- chrome/app/generated_resources.grd.orig 2021-04-14 18:40:49 UTC +--- chrome/app/generated_resources.grd.orig 2021-05-12 22:05:41 UTC +++ chrome/app/generated_resources.grd -@@ -5254,7 +5254,7 @@ Keep your key file in a safe place. You will need it t +@@ -5271,7 +5271,7 @@ Keep your key file in a safe place. You will need it t - + Legacy Browser Support -@@ -7345,7 +7345,7 @@ Keep your key file in a safe place. You will need it t +@@ -7432,7 +7432,7 @@ Keep your key file in a safe place. You will need it t Google Pay - + Use system title bar and borders -@@ -8336,7 +8336,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -8443,7 +8443,7 @@ Please help our engineers fix this problem. Tell us wh Set as default - + Minimize 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 9b525aa17e80..442cb826ae67 100644 --- a/www/chromium/files/patch-chrome_app_google__chrome__strings.grd +++ b/www/chromium/files/patch-chrome_app_google__chrome__strings.grd @@ -1,20 +1,20 @@ ---- chrome/app/google_chrome_strings.grd.orig 2021-04-14 18:40:49 UTC +--- chrome/app/google_chrome_strings.grd.orig 2021-05-12 22:05:41 UTC +++ chrome/app/google_chrome_strings.grd -@@ -729,7 +729,7 @@ Google Chrome is unable to recover your settings. +@@ -711,7 +711,7 @@ Google Chrome is unable to recover your settings. - + Your system administrator has configured Google Chrome to open an alternative browser to access $1example.com. -@@ -858,7 +858,7 @@ Google Chrome is unable to recover your settings. +@@ -841,7 +841,7 @@ Google Chrome is unable to recover your settings. - + The profile appears to be in use by another Google Chrome process ($112345) on another computer ($2example.com). 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. diff --git a/www/chromium/files/patch-chrome_app_settings__strings.grdp b/www/chromium/files/patch-chrome_app_settings__strings.grdp index 9fde56f272f5..fe05c6f9aa33 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 2021-04-14 18:40:52 UTC +--- chrome/app/settings_strings.grdp.orig 2021-05-12 22:05:42 UTC +++ chrome/app/settings_strings.grdp -@@ -117,7 +117,7 @@ +@@ -123,7 +123,7 @@ Theme - + GTK+ -@@ -131,7 +131,7 @@ +@@ -137,7 +137,7 @@ Use Classic - + Reset to default diff --git a/www/chromium/files/patch-chrome_browser_BUILD.gn b/www/chromium/files/patch-chrome_browser_BUILD.gn index 224e5620b074..14b4d3fa05c5 100644 --- a/www/chromium/files/patch-chrome_browser_BUILD.gn +++ b/www/chromium/files/patch-chrome_browser_BUILD.gn @@ -1,49 +1,49 @@ ---- chrome/browser/BUILD.gn.orig 2021-04-20 18:58:25 UTC +--- chrome/browser/BUILD.gn.orig 2021-05-12 22:05:42 UTC +++ chrome/browser/BUILD.gn -@@ -2458,9 +2458,18 @@ static_library("browser") { +@@ -2427,9 +2427,18 @@ static_library("browser") { ] } } - if (is_linux || is_chromeos) { + if ((is_linux || is_chromeos) && !is_bsd) { deps += [ "//chrome/browser/error_reporting" ] } + if (is_bsd) { + sources -= [ + "crash_upload_list/crash_upload_list.cc", + "crash_upload_list/crash_upload_list.h", + ] + deps -= [ + "//components/crash/core/browser", + ] + } if (use_ozone) { deps += [ "//ui/events/ozone", -@@ -5123,6 +5132,17 @@ static_library("browser") { +@@ -5134,6 +5143,17 @@ static_library("browser") { } } + if (is_bsd) { + sources -= [ + "enterprise/signals/device_info_fetcher_linux.cc", + "enterprise/signals/device_info_fetcher_linux.h", + ] + sources += [ + "enterprise/signals/device_info_fetcher_freebsd.cc", + "enterprise/signals/device_info_fetcher_freebsd.h", + ] + } + if (is_chromeos_ash) { if (use_allocator == "tcmalloc") { deps += [ "//chrome/common/performance_manager/mojom" ] -@@ -5350,7 +5370,7 @@ static_library("browser") { +@@ -5361,7 +5381,7 @@ static_library("browser") { ] } - if (is_posix && !is_mac) { + if (is_posix && !is_mac && !is_bsd) { # TODO(crbug.com / 753619): Enable crash reporting on Fuchsia. sources += [ "//chrome/app/chrome_crash_reporter_client.cc", diff --git a/www/chromium/files/patch-chrome_browser_about__flags.cc b/www/chromium/files/patch-chrome_browser_about__flags.cc index 2956ec69e1c6..90d337fb7e23 100644 --- a/www/chromium/files/patch-chrome_browser_about__flags.cc +++ b/www/chromium/files/patch-chrome_browser_about__flags.cc @@ -1,189 +1,225 @@ ---- chrome/browser/about_flags.cc.orig 2021-04-20 18:58:25 UTC +--- chrome/browser/about_flags.cc.orig 2021-06-09 22:13:54 UTC +++ chrome/browser/about_flags.cc -@@ -967,7 +967,7 @@ const FeatureEntry::Choice kMemlogSamplingRateChoices[ +@@ -937,7 +937,7 @@ const FeatureEntry::Choice kMemlogSamplingRateChoices[ heap_profiling::kMemlogSamplingRate5MB}, }; -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) || \ defined(OS_WIN) const FeatureEntry::FeatureParam kOmniboxDocumentProviderServerScoring[] = { {"DocumentUseServerScore", "true"}, -@@ -1239,7 +1239,7 @@ const FeatureEntry::FeatureVariation kOmniboxBookmarkP - }, - }; +@@ -1225,7 +1225,7 @@ const FeatureEntry::FeatureVariation + nullptr, + }}; -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) || // defined(OS_WIN) const FeatureEntry::FeatureVariation -@@ -3074,7 +3074,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3076,7 +3076,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(media::kDeprecateLowUsageCodecs)}, - #endif // BUILDFLAG(IS_CHROMEOS_ASH) + #endif // defined(OS_CHROMEOS) --#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) +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) { "enable-accelerated-video-decode", flag_descriptions::kAcceleratedVideoDecodeName, -@@ -3090,7 +3090,7 @@ const FeatureEntry kFeatureEntries[] = { - kOsMac | kOsWin | kOsCrOS | kOsAndroid, +@@ -3094,7 +3094,7 @@ const FeatureEntry kFeatureEntries[] = { + kOsMac | kOsWin | kOsCrOS | kOsAndroid | kOsLinux, SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode), }, --#endif // (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && -+#endif // (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) && - // !defined(OS_ANDROID) +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) { "disable-accelerated-video-encode", -@@ -3456,7 +3456,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kAcceleratedVideoEncodeName, +@@ -3439,7 +3439,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( -@@ -3470,7 +3470,7 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kEnableNavigationPredictorRendererWarmupName, - flag_descriptions::kEnableNavigationPredictorRendererWarmupDescription, - kOsAll, FEATURE_VALUE_TYPE(features::kNavigationPredictorRendererWarmup)}, +@@ -3449,7 +3449,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kEnableNavigationPredictorDescription, + kOsCrOS | kOsLinux, + FEATURE_VALUE_TYPE(blink::features::kNavigationPredictor)}, -#endif // BUILDFLAG(IS_CHROMEOS_ASH) || OS_LINUX -+#endif // BUILDFLAG(IS_CHROMEOS_ASH) || OS_LINUX || defined(OS_BSD) ++#endif // BUILDFLAG(IS_CHROMEOS_ASH) || OS_LINUX || OS_BSD {"enable-preconnect-to-search", flag_descriptions::kEnablePreconnectToSearchName, flag_descriptions::kEnablePreconnectToSearchDescription, kOsAll, -@@ -4308,7 +4308,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4307,7 +4307,7 @@ const FeatureEntry kFeatureEntries[] = { kOsAll, FEATURE_VALUE_TYPE(omnibox::kOmniboxTrendingZeroPrefixSuggestionsOnNTP)}, -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) || \ defined(OS_WIN) {"omnibox-experimental-keyword-mode", flag_descriptions::kOmniboxExperimentalKeywordModeName, -@@ -4398,7 +4398,7 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kOmniboxDisableCGIParamMatchingName, - flag_descriptions::kOmniboxDisableCGIParamMatchingDescription, kOsDesktop, - FEATURE_VALUE_TYPE(omnibox::kDisableCGIParamMatching)}, +@@ -4410,7 +4410,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_WITH_PARAMS_VALUE_TYPE(omnibox::kKeywordSpaceTriggering, + kOmniboxKeywordSpaceTriggeringVariations, + "OmniboxBundledExperimentV1")}, -#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", -@@ -4715,14 +4715,14 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4706,14 +4706,14 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(chrome::android::kReaderModeInCCT)}, #endif // !defined(OS_ANDROID) -#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) {"direct-manipulation-stylus", flag_descriptions::kDirectManipulationStylusName, flag_descriptions::kDirectManipulationStylusDescription, kOsWin | kOsMac | kOsLinux, FEATURE_VALUE_TYPE(features::kDirectManipulationStylus)}, -#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || +#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || // defined(OS_CHROMEOS) #if !defined(OS_ANDROID) -@@ -5381,7 +5381,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(kClickToCallUI)}, - #endif // BUILDFLAG(ENABLE_CLICK_TO_CALL) +@@ -5350,7 +5350,7 @@ const FeatureEntry kFeatureEntries[] = { + chromeos::assistant::features::kAssistantBetterOnboarding)}, + #endif // BUILDFLAG(IS_CHROMEOS_ASH) -#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) {"remote-copy-receiver", flag_descriptions::kRemoteCopyReceiverName, flag_descriptions::kRemoteCopyReceiverDescription, kOsDesktop, -@@ -5398,7 +5398,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5367,7 +5367,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kRemoteCopyProgressNotificationName, flag_descriptions::kRemoteCopyProgressNotificationDescription, kOsDesktop, FEATURE_VALUE_TYPE(kRemoteCopyProgressNotification)}, -#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || +#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || // defined(OS_CHROMEOS) {"restrict-gamepad-access", flag_descriptions::kRestrictGamepadAccessName, -@@ -5955,7 +5955,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5398,7 +5398,7 @@ const FeatureEntry kFeatureEntries[] = { + kSharingDeviceExpirationVariations, + "SharingDeviceExpiration")}, + +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) + {"sharing-hub-desktop-app-menu", + flag_descriptions::kSharingHubDesktopAppMenuName, + flag_descriptions::kSharingHubDesktopAppMenuDescription, kOsDesktop, +@@ -5407,7 +5407,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kSharingHubDesktopOmniboxName, + flag_descriptions::kSharingHubDesktopOmniboxDescription, kOsDesktop, + FEATURE_VALUE_TYPE(sharing_hub::kSharingHubDesktopOmnibox)}, +-#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) ++#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) + + #if BUILDFLAG(IS_CHROMEOS_ASH) + {"ash-enable-pip-rounded-corners", +@@ -5889,7 +5889,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kMouseSubframeNoImplicitCaptureDescription, kOsAll, FEATURE_VALUE_TYPE(features::kMouseSubframeNoImplicitCapture)}, -#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) {"global-media-controls", flag_descriptions::kGlobalMediaControlsName, flag_descriptions::kGlobalMediaControlsDescription, -@@ -5996,7 +5996,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5930,7 +5930,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kGlobalMediaControlsOverlayControlsDescription, kOsWin | kOsMac | kOsLinux, FEATURE_VALUE_TYPE(media::kGlobalMediaControlsOverlayControls)}, -#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || +#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || // defined(OS_CHROMEOS) #if BUILDFLAG(ENABLE_SPELLCHECK) && defined(OS_WIN) -@@ -6191,7 +6191,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6122,7 +6122,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, -@@ -6199,7 +6199,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6130,7 +6130,7 @@ const FeatureEntry kFeatureEntries[] = { kOsWin | kOsMac | kOsLinux, FEATURE_VALUE_TYPE( feature_engagement::kIPHPasswordsAccountStorageFeature)}, -#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || +#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || // defined(OS_CHROMEOS) {"autofill-always-return-cloud-tokenized-card", -@@ -6858,7 +6858,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6731,7 +6731,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(features::kEnableIncognitoShortcutOnDesktop)}, + #endif // defined(OS_WIN) + +-#if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || \ ++#if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + {"incognito-brand-consistency-for-desktop", + flag_descriptions::kIncognitoBrandConsistencyForDesktopName, +@@ -6823,7 +6823,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(language::kDetailedLanguageSettings)}, #endif -#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) {"commander", flag_descriptions::kCommanderName, flag_descriptions::kCommanderDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kCommander)}, -@@ -6895,7 +6895,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6860,7 +6860,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(ash::features::kEnhancedDeskAnimations)}, #endif -#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) {"enable-oop-print-drivers", flag_descriptions::kEnableOopPrintDriversName, flag_descriptions::kEnableOopPrintDriversDescription, kOsDesktop, -@@ -6927,14 +6927,14 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6879,14 +6879,14 @@ const FeatureEntry kFeatureEntries[] = { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ +#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) || \ defined(OS_MAC) {"enable-ephemeral-guest-profiles-on-desktop", flag_descriptions::kEnableEphemeralGuestProfilesOnDesktopName, flag_descriptions::kEnableEphemeralGuestProfilesOnDesktopDescription, kOsWin | kOsLinux | kOsMac, FEATURE_VALUE_TYPE(features::kEnableEphemeralGuestProfilesOnDesktop)}, -#endif // defined(OS_WIN) || (defined(OS_LINUX) || +#endif // defined(OS_WIN) || (defined(OS_LINUX) || defined(OS_BSD) || // BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_MAC) #if defined(OS_ANDROID) -@@ -7215,7 +7215,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7162,7 +7162,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(media::kVaapiAV1Decoder)}, - #endif // BUILDFLAG(IS_CHROMEOS_ASH) + #endif // defined(OS_CHROMEOS) -#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ -+#if defined(OS_WIN) || (defined(OS_LINUX) || defined(OS_BSD) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ ++#if defined(OS_WIN) || (defined(OS_LINUX) || defined(OS_BSD) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) || \ defined(OS_MAC) { "ui-debug-tools", +@@ -7243,7 +7243,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(metrics::structured::kBluetoothSessionizedMetrics)}, + #endif + +-#if defined(OS_LINUX) && defined(USE_OZONE) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_OZONE) + {"use-ozone-platform", flag_descriptions::kUseOzonePlatformName, + flag_descriptions::kUseOzonePlatformDescription, kOsLinux, + FEATURE_VALUE_TYPE(features::kUseOzonePlatform)}, 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 795304853d01..21d70b5fc31e 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,38 +1,38 @@ ---- chrome/browser/after_startup_task_utils.cc.orig 2021-04-14 18:40:52 UTC +--- chrome/browser/after_startup_task_utils.cc.orig 2021-05-12 22:05:42 UTC +++ chrome/browser/after_startup_task_utils.cc @@ -35,7 +35,7 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) #include "ui/views/linux_ui/linux_ui.h" #endif -@@ -122,7 +122,7 @@ void QueueTask(std::unique_ptr queue +@@ -113,7 +113,7 @@ void QueueTask(std::unique_ptr queue void SetBrowserStartupIsComplete() { DCHECK_CURRENTLY_ON(BrowserThread::UI); -#if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || \ +#if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) // Process::Current().CreationTime() is not available on all platforms. const base::Time process_creation_time = -@@ -131,7 +131,7 @@ void SetBrowserStartupIsComplete() { +@@ -122,7 +122,7 @@ void SetBrowserStartupIsComplete() { UMA_HISTOGRAM_LONG_TIMES("Startup.AfterStartupTaskDelayedUntilTime", base::Time::Now() - process_creation_time); } -#endif // defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || +#endif // defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || // defined(OS_CHROMEOS) UMA_HISTOGRAM_COUNTS_10000("Startup.AfterStartupTaskCount", g_after_startup_tasks.Get().size()); -@@ -143,7 +143,7 @@ void SetBrowserStartupIsComplete() { +@@ -134,7 +134,7 @@ void SetBrowserStartupIsComplete() { // 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 index bf8c003c3fe7..dc4902fe60fa 100644 --- 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 @@ -1,20 +1,20 @@ ---- chrome/browser/apps/platform_apps/api/media_galleries/media_galleries_apitest.cc.orig 2021-04-14 18:40:52 UTC +--- chrome/browser/apps/platform_apps/api/media_galleries/media_galleries_apitest.cc.orig 2021-05-12 22:05:43 UTC +++ chrome/browser/apps/platform_apps/api/media_galleries/media_galleries_apitest.cc -@@ -294,7 +294,7 @@ IN_PROC_BROWSER_TEST_F(MediaGalleriesPlatformAppPpapiT +@@ -299,7 +299,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 +@@ -337,7 +337,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 index e244d0669bc1..ab2df2289660 100644 --- a/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_media__galleries_media__galleries__watch__apitest.cc +++ b/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_media__galleries_media__galleries__watch__apitest.cc @@ -1,11 +1,11 @@ ---- chrome/browser/apps/platform_apps/api/media_galleries/media_galleries_watch_apitest.cc.orig 2021-04-14 18:40:52 UTC +--- chrome/browser/apps/platform_apps/api/media_galleries/media_galleries_watch_apitest.cc.orig 2021-05-12 22:05:43 UTC +++ chrome/browser/apps/platform_apps/api/media_galleries/media_galleries_watch_apitest.cc -@@ -224,7 +224,7 @@ IN_PROC_BROWSER_TEST_F(MediaGalleriesGalleryWatchApiTe +@@ -234,7 +234,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_background_background__mode__manager.cc b/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc index 7070f4f94f60..1161c330736d 100644 --- a/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc +++ b/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc @@ -1,11 +1,11 @@ ---- chrome/browser/background/background_mode_manager.cc.orig 2021-04-14 18:40:52 UTC +--- chrome/browser/background/background_mode_manager.cc.orig 2021-05-12 22:05:43 UTC +++ chrome/browser/background/background_mode_manager.cc -@@ -871,7 +871,7 @@ gfx::ImageSkia GetStatusTrayIcon() { +@@ -882,7 +882,7 @@ gfx::ImageSkia GetStatusTrayIcon() { return gfx::ImageSkia(); return family->CreateExact(size).AsImageSkia(); -#elif defined(OS_LINUX) || defined(OS_CHROMEOS) +#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) return *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed( IDR_PRODUCT_LOGO_128); #elif defined(OS_MAC) diff --git a/www/chromium/files/patch-chrome_browser_browser__resources.grd b/www/chromium/files/patch-chrome_browser_browser__resources.grd index edee9a8f2b22..e0b0b128c4c6 100644 --- a/www/chromium/files/patch-chrome_browser_browser__resources.grd +++ b/www/chromium/files/patch-chrome_browser_browser__resources.grd @@ -1,11 +1,11 @@ ---- chrome/browser/browser_resources.grd.orig 2021-04-14 18:40:52 UTC +--- chrome/browser/browser_resources.grd.orig 2021-05-12 22:05:43 UTC +++ chrome/browser/browser_resources.grd -@@ -115,7 +115,7 @@ +@@ -41,7 +41,7 @@ - + diff --git a/www/chromium/files/patch-chrome_browser_browsing__data_chrome__browsing__data__remover__delegate.cc b/www/chromium/files/patch-chrome_browser_browsing__data_chrome__browsing__data__remover__delegate.cc index 30503001330b..f597a4167eba 100644 --- a/www/chromium/files/patch-chrome_browser_browsing__data_chrome__browsing__data__remover__delegate.cc +++ b/www/chromium/files/patch-chrome_browser_browsing__data_chrome__browsing__data__remover__delegate.cc @@ -1,12 +1,12 @@ ---- chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc.orig 2021-04-23 20:21:42 UTC +--- chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc.orig 2021-05-12 22:05:43 UTC +++ chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc -@@ -640,7 +640,9 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedder +@@ -635,7 +635,9 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedder } #endif +#if !defined(OS_BSD) CreateCrashUploadList()->Clear(delete_begin_, delete_end_); +#endif FindBarStateFactory::GetForBrowserContext(profile_)->SetLastSearchText( - base::string16()); + std::u16string()); 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 9cc31760eb57..67fb12045ff0 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc @@ -1,20 +1,29 @@ ---- chrome/browser/chrome_browser_interface_binders.cc.orig 2021-04-14 18:40:52 UTC +--- chrome/browser/chrome_browser_interface_binders.cc.orig 2021-06-09 22:13:55 UTC +++ chrome/browser/chrome_browser_interface_binders.cc -@@ -144,7 +144,7 @@ +@@ -148,7 +148,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" -@@ -841,7 +841,7 @@ void PopulateChromeWebUIFrameBinders( +@@ -612,7 +612,7 @@ void PopulateChromeFrameBinders( + base::BindRepeating(&BindCaptionContextHandler)); + #endif + +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) + if (base::FeatureList::IsEnabled(features::kWebAppWindowControlsOverlay) && + !render_frame_host->GetParent()) { + map->Add( +@@ -846,7 +846,7 @@ void PopulateChromeWebUIFrameBinders( } #endif -#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) RegisterWebUIControllerInterfaceBinder(map); diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc index c549c86141d9..1adca260583c 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc @@ -1,54 +1,54 @@ ---- chrome/browser/chrome_browser_main.cc.orig 2021-04-14 18:40:52 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2021-05-24 22:05:33 UTC +++ chrome/browser/chrome_browser_main.cc -@@ -250,7 +250,7 @@ +@@ -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) || 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" -@@ -932,7 +932,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -946,7 +946,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { AddFirstRunNewTabs(browser_creator_.get(), master_prefs_->new_tabs); } -#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Create directory for user-level Native Messaging manifest files. This // makes it less likely that the directory will be created by third-party // software with incorrect owner or permission. See crbug.com/725513 . -@@ -941,7 +941,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -955,7 +955,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) && !BUILDFLAG(IS_CHROMEOS_ASH) -@@ -965,7 +965,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -980,7 +980,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) || BUILDFLAG(IS_CHROMEOS_LACROS)) + (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) metrics::DesktopSessionDurationTracker::Initialize(); ProfileActivityMetricsRecorder::Initialize(); TouchModeStatsTracker::Initialize( -@@ -1125,6 +1125,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { +@@ -1142,6 +1142,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { base::TimeDelta::FromMinutes(1)); #if !defined(OS_ANDROID) +#if !defined(OS_BSD) if (base::FeatureList::IsEnabled(features::kWebUsb)) { - web_usb_detector_.reset(new WebUsbDetector()); + web_usb_detector_ = std::make_unique(); content::GetUIThreadTaskRunner({base::TaskPriority::BEST_EFFORT}) -@@ -1132,6 +1133,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { +@@ -1149,6 +1150,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { base::BindOnce(&WebUsbDetector::Initialize, base::Unretained(web_usb_detector_.get()))); } +#endif if (base::FeatureList::IsEnabled(features::kTabMetricsLogging)) { // Initialize the TabActivityWatcher to begin logging tab activity events. resource_coordinator::TabActivityWatcher::GetInstance(); 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 24ac8dc37b4d..5276a2ff105d 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,106 +1,132 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2021-04-14 18:40:52 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2021-06-09 22:13:55 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -450,7 +450,7 @@ +@@ -446,7 +446,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) || 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" -@@ -510,7 +510,7 @@ +@@ -507,7 +507,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) || 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 -@@ -543,7 +543,7 @@ +@@ -526,9 +526,9 @@ + + // TODO(crbug/1169547) Remove `BUILDFLAG(IS_CHROMEOS_LACROS)` once the + // migration is complete. +-#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) ++#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || defined(OS_BSD) + #include "chrome/browser/enterprise/connectors/device_trust/navigation_throttle.h" +-#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) ++#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || defined(OS_BSD) + + // TODO(crbug.com/939205): Once the upcoming App Service is available, use a + // single navigation throttle to display the intent picker on all platforms. +@@ -546,7 +546,7 @@ // 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 -@@ -903,11 +903,13 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHos +@@ -957,11 +957,13 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHos } int GetCrashSignalFD(const base::CommandLine& command_line) { +#if !defined(OS_BSD) if (crash_reporter::IsCrashpadEnabled()) { int fd; pid_t pid; return crash_reporter::GetHandlerSocket(&fd, &pid) ? fd : -1; } +#endif // Extensions have the same process type as renderers. if (command_line.HasSwitch(extensions::switches::kExtensionProcess)) { -@@ -1325,7 +1327,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( +@@ -1381,7 +1383,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( #elif BUILDFLAG(IS_CHROMEOS_LACROS) main_parts = std::make_unique(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(parameters, &startup_data_); #elif defined(OS_ANDROID) -@@ -1356,7 +1358,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( +@@ -1412,7 +1414,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( std::make_unique()); // 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()); #else -@@ -2137,7 +2139,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2190,7 +2192,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin command_line->AppendSwitchASCII(switches::kMetricsClientID, client_info->client_id); } -#elif defined(OS_POSIX) +#elif defined(OS_POSIX) && !defined(OS_BSD) #if defined(OS_ANDROID) bool enable_crash_reporter = true; #else -@@ -2431,7 +2433,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2493,7 +2495,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin ThreadProfilerConfiguration::Get()->AppendCommandLineSwitchForChildProcess( command_line); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Processes may only query perf_event_open with the BPF sandbox disabled. if (browser_command_line.HasSwitch(switches::kEnableThreadInstructionCount) && command_line->HasSwitch(sandbox::policy::switches::kNoSandbox)) { -@@ -3747,7 +3749,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst +@@ -3821,7 +3823,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst } } -#if defined(OS_POSIX) && !defined(OS_MAC) +#if defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_BSD) void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -3782,7 +3784,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFi +@@ -3856,7 +3858,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFi mappings->Share(kCrashDumpSignal, crash_signal_fd); } } -#endif // defined(OS_POSIX) && !defined(OS_MAC) +#endif // defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_BSD) #if defined(OS_WIN) std::wstring ChromeContentBrowserClient::GetAppContainerSidForSandboxType( -@@ -4143,7 +4145,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -4210,11 +4212,11 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati + &throttles); + } + +-#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) ++#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || defined(OS_BSD) + MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle:: + MaybeCreateThrottleFor(handle), + &throttles); +-#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) ++#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || defined(OS_BSD) + + #if !defined(OS_ANDROID) + MaybeAddThrottle(DevToolsWindow::MaybeCreateNavigationThrottle(handle), +@@ -4236,7 +4238,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) || 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 bf28d2ce6a19..6a512952dacb 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h +++ b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h @@ -1,17 +1,17 @@ ---- chrome/browser/chrome_content_browser_client.h.orig 2021-04-14 18:40:52 UTC +--- chrome/browser/chrome_content_browser_client.h.orig 2021-05-12 22:05:43 UTC +++ chrome/browser/chrome_content_browser_client.h -@@ -401,12 +401,12 @@ class ChromeContentBrowserClient : public content::Con +@@ -395,12 +395,12 @@ class ChromeContentBrowserClient : public content::Con void OverridePageVisibilityState( content::RenderFrameHost* render_frame_host, content::PageVisibilityState* visibility_state) override; -#if defined(OS_POSIX) && !defined(OS_MAC) +#if defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_BSD) void GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, content::PosixFileDescriptorInfo* mappings) override; -#endif // defined(OS_POSIX) && !defined(OS_MAC) +#endif // defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_BSD) #if defined(OS_WIN) bool PreSpawnChild(sandbox::TargetPolicy* policy, sandbox::policy::SandboxType sandbox_type, 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 cd4be27a0a22..a54db09784be 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 2021-04-14 18:40:53 UTC +--- chrome/browser/crash_upload_list/crash_upload_list.cc.orig 2021-05-12 22:05:43 UTC +++ chrome/browser/crash_upload_list/crash_upload_list.cc -@@ -39,7 +39,7 @@ scoped_refptr CreateCrashUploadList() { - // ChromeOS uses crash_sender as its uploader even when Crashpad is enabled, - // which isn't compatible with CrashUploadListCrashpad. crash_sender continues +@@ -48,7 +48,7 @@ scoped_refptr CreateCrashUploadList() { // to log uploads in CrashUploadList::kReporterLogFilename. --#if !(BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+#if !(BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) + // Linux is handled below. + #if !(BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ +- defined(OS_LINUX)) ++ defined(OS_LINUX) || defined(OS_BSD)) if (crash_reporter::IsCrashpadEnabled()) { return new CrashUploadListCrashpad(); } 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 ef3e8c247889..11a187a00238 100644 --- a/www/chromium/files/patch-chrome_browser_custom__handlers_protocol__handler__registry.cc +++ b/www/chromium/files/patch-chrome_browser_custom__handlers_protocol__handler__registry.cc @@ -1,11 +1,11 @@ ---- chrome/browser/custom_handlers/protocol_handler_registry.cc.orig 2021-04-14 18:40:53 UTC +--- chrome/browser/custom_handlers/protocol_handler_registry.cc.orig 2021-05-12 22:05:43 UTC +++ chrome/browser/custom_handlers/protocol_handler_registry.cc -@@ -45,7 +45,7 @@ const ProtocolHandler& LookupHandler( +@@ -46,7 +46,7 @@ const ProtocolHandler& LookupHandler( // If true default protocol handlers will be removed if the OS level // registration for a protocol is no longer Chrome. bool ShouldRemoveHandlersNotInOS() { -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // We don't do this on Linux as the OS registration there is not reliable, // and Chrome OS doesn't have any notion of OS registration. // TODO(benwells): When Linux support is more reliable remove this diff --git a/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd b/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd index efb531c3a5cd..c15238834196 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 2021-04-14 18:40:53 UTC +--- chrome/browser/dev_ui_browser_resources.grd.orig 2021-05-12 22:05:43 UTC +++ chrome/browser/dev_ui_browser_resources.grd -@@ -55,7 +55,7 @@ This file specifies browser resources for developer-fa +@@ -47,7 +47,7 @@ This file specifies browser resources for developer-fa - + 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 fe349a509975..a6fa5e8db1ce 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 2021-04-14 18:40:53 UTC +--- chrome/browser/device_identity/device_oauth2_token_service_factory.cc.orig 2021-05-12 22:05:43 UTC +++ chrome/browser/device_identity/device_oauth2_token_service_factory.cc -@@ -29,7 +29,7 @@ std::unique_ptr CreatePlatform +@@ -28,7 +28,7 @@ std::unique_ptr CreatePlatform return std::make_unique( local_state); #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(local_state); 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 4f56136f04f9..e29a9b3a51fb 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,38 +1,38 @@ ---- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2021-04-20 18:58:26 UTC +--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2021-05-12 22:05:43 UTC +++ chrome/browser/download/chrome_download_manager_delegate.cc -@@ -1444,7 +1444,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1436,7 +1436,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe target_info->is_filetype_handled_safely) DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) if (item->GetOriginalMimeType() == "application/x-x509-user-cert") DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true); #endif -@@ -1497,7 +1497,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1489,7 +1489,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile( const base::FilePath& path) { -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ defined(OS_MAC) if (path.MatchesExtension(FILE_PATH_LITERAL(".pdf"))) { return !download_prefs_->ShouldOpenPdfInSystemReader(); -@@ -1594,7 +1594,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow +@@ -1586,7 +1586,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow bool content_initiated, content::CheckDownloadAllowedCallback check_download_allowed_cb) { DCHECK_CURRENTLY_ON(BrowserThread::UI); -#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) // Don't download pdf if it is a file URL, as that might cause an infinite // download loop if Chrome is not the system pdf viewer. -@@ -1636,7 +1636,7 @@ ChromeDownloadManagerDelegate::GetQuarantineConnection +@@ -1628,7 +1628,7 @@ ChromeDownloadManagerDelegate::GetQuarantineConnection std::unique_ptr ChromeDownloadManagerDelegate::GetRenameHandlerForDownload( download::DownloadItem* download_item) { -#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) return enterprise_connectors::FileSystemRenameHandler::CreateIfNeeded( download_item); diff --git a/www/chromium/files/patch-chrome_browser_download_download__commands.h b/www/chromium/files/patch-chrome_browser_download_download__commands.h index beb145301193..c84859608113 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__commands.h +++ b/www/chromium/files/patch-chrome_browser_download_download__commands.h @@ -1,11 +1,11 @@ ---- chrome/browser/download/download_commands.h.orig 2021-04-14 18:40:53 UTC +--- chrome/browser/download/download_commands.h.orig 2021-05-12 22:05:43 UTC +++ chrome/browser/download/download_commands.h -@@ -48,7 +48,7 @@ class DownloadCommands { +@@ -49,7 +49,7 @@ class DownloadCommands { bool IsCommandVisible(Command command) const; void ExecuteCommand(Command command); -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ defined(OS_MAC) bool IsDownloadPdf() const; bool CanOpenPdfInSystemViewer() const; 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 87e3b7dc8e0a..2c676690db0d 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__query.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__query.cc @@ -1,14 +1,14 @@ ---- chrome/browser/download/download_query.cc.orig 2021-04-14 18:40:53 UTC +--- chrome/browser/download/download_query.cc.orig 2021-05-12 22:05:43 UTC +++ chrome/browser/download/download_query.cc -@@ -28,7 +28,11 @@ +@@ -27,7 +27,11 @@ #include "components/download/public/common/download_item.h" #include "components/url_formatter/url_formatter.h" #include "content/public/browser/content_browser_client.h" +#if defined(OS_BSD) +#include +#else #include "third_party/re2/src/re2/re2.h" +#endif #include "url/gurl.h" using download::DownloadDangerType; 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 6f46d677272f..7460978af18f 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__shelf__context__menu.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__shelf__context__menu.cc @@ -1,11 +1,11 @@ ---- chrome/browser/download/download_shelf_context_menu.cc.orig 2021-04-14 18:40:53 UTC +--- chrome/browser/download/download_shelf_context_menu.cc.orig 2021-05-12 22:05:43 UTC +++ chrome/browser/download/download_shelf_context_menu.cc -@@ -146,7 +146,7 @@ base::string16 DownloadShelfContextMenu::GetLabelForCo +@@ -148,7 +148,7 @@ std::u16string DownloadShelfContextMenu::GetLabelForCo : IDS_DOWNLOAD_MENU_PLATFORM_OPEN_ALWAYS; break; } -#elif defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#elif defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) if (can_open_pdf_in_system_viewer) { id = IDS_DOWNLOAD_MENU_PLATFORM_OPEN_ALWAYS; break; diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service.cc b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service.cc new file mode 100644 index 000000000000..7b2bb199cc08 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service.cc @@ -0,0 +1,38 @@ +--- chrome/browser/enterprise/connectors/device_trust/device_trust_service.cc.orig 2021-06-10 11:07:22 UTC ++++ chrome/browser/enterprise/connectors/device_trust/device_trust_service.cc +@@ -21,9 +21,9 @@ DeviceTrustService::DeviceTrustService(Profile* profil + signal_report_callback_( + base::BindOnce(&DeviceTrustService::OnSignalReported, + base::Unretained(this))) { +-#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) ++#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) + key_pair_ = std::make_unique(); +-#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) ++#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) + + pref_observer_.Init(prefs_); + pref_observer_.Add(kContextAwareAccessSignalsAllowlistPref, +@@ -53,9 +53,9 @@ void DeviceTrustService::OnPolicyUpdated() { + + if (!first_report_sent_ && + IsEnabled()) { // Policy enabled for the first time. +-#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) ++#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) + key_pair_->Init(); +-#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) ++#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) + reporter_->Init( + base::BindRepeating( + [](DeviceTrustService* self) { return self->IsEnabled(); }, +@@ -76,9 +76,9 @@ void DeviceTrustService::OnReporterInitialized(bool su + + base::Value val(base::Value::Type::DICTIONARY); + +-#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) ++#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) + val.SetStringKey("machine_attestion_key", key_pair_->ExportPEMPublicKey()); +-#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) ++#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) + + reporter_->SendReport(std::move(val), std::move(signal_report_callback_)); + } diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service.h b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service.h new file mode 100644 index 000000000000..9b16792e67b6 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service.h @@ -0,0 +1,26 @@ +--- chrome/browser/enterprise/connectors/device_trust/device_trust_service.h.orig 2021-06-10 11:08:08 UTC ++++ chrome/browser/enterprise/connectors/device_trust/device_trust_service.h +@@ -16,9 +16,9 @@ + + #include + +-#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) ++#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) + #include "chrome/browser/enterprise/connectors/device_trust/device_trust_key_pair.h" +-#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) ++#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) + + class KeyedService; + class Profile; +@@ -59,9 +59,9 @@ class DeviceTrustService : public KeyedService { + + PrefService* prefs_; + +-#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) ++#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) + std::unique_ptr key_pair_; +-#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) ++#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MAC) || defined(OS_BSD) + + PrefChangeRegistrar pref_observer_; + bool first_report_sent_; diff --git a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn index d0feb92bfc22..d89cd2e9eb0b 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn +++ b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn @@ -1,15 +1,15 @@ ---- chrome/browser/extensions/BUILD.gn.orig 2021-04-14 18:40:53 UTC +--- chrome/browser/extensions/BUILD.gn.orig 2021-05-12 22:05:43 UTC +++ chrome/browser/extensions/BUILD.gn -@@ -1249,6 +1249,12 @@ static_library("extensions") { +@@ -1269,6 +1269,12 @@ static_library("extensions") { ] } + if (is_bsd) { + sources -= [ + "api/image_writer_private/removable_storage_provider_linux.cc", + ] + } + if (enable_service_discovery) { sources += [ "api/mdns/mdns_api.cc", 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 1543833016c1..bac5f1c1f447 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_erp_chrome_desktop_report_request_helper.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_erp_chrome_desktop_report_request_helper.cc @@ -1,29 +1,29 @@ ---- chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc.orig 2021-04-20 18:58:26 UTC +--- chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc.orig 2021-06-09 22:13:55 UTC +++ chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc @@ -22,7 +22,7 @@ #include "base/win/registry.h" #endif -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "base/environment.h" #include "base/nix/xdg_util.h" #endif @@ -238,7 +238,7 @@ base::FilePath GetEndpointVerificationDir() { return *GetEndpointVerificationDirOverride(); #if defined(OS_WIN) if (!base::PathService::Get(base::DIR_LOCAL_APP_DATA, &path)) -#elif defined(OS_LINUX) || defined(OS_CHROMEOS) +#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) std::unique_ptr env(base::Environment::Create()); path = base::nix::GetXDGDirectory(env.get(), base::nix::kXdgConfigHomeEnvVar, base::nix::kDotConfigDir); @@ -249,7 +249,7 @@ base::FilePath GetEndpointVerificationDir() { if (true) #endif return path; -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) path = path.AppendASCII("google"); #else path = path.AppendASCII("Google"); diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_extension__action_browser__action__interactive__test.cc b/www/chromium/files/patch-chrome_browser_extensions_api_extension__action_browser__action__interactive__test.cc index 0852451ff108..1bb1f9c1f806 100644 --- a/www/chromium/files/patch-chrome_browser_extensions_api_extension__action_browser__action__interactive__test.cc +++ b/www/chromium/files/patch-chrome_browser_extensions_api_extension__action_browser__action__interactive__test.cc @@ -1,11 +1,11 @@ ---- chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc.orig 2021-04-14 18:40:53 UTC +--- chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc.orig 2021-05-12 22:05:43 UTC +++ chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc -@@ -281,7 +281,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionInteractiveTest, T +@@ -282,7 +282,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionInteractiveTest, T frame_observer.Wait(); // Non-Aura Linux uses a singleton for the popup, so it looks like all windows // have popups if there is any popup open. -#if !((defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(USE_AURA)) +#if !((defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && !defined(USE_AURA)) // Starting window does not have a popup. EXPECT_FALSE(ExtensionActionTestHelper::Create(browser())->HasPopup()); #endif diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc b/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc index dbea0f3529c3..7e13554a197d 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-04-14 18:40:53 UTC +--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2021-05-12 22:05:44 UTC +++ chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -176,7 +176,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -178,7 +178,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist // 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 -@@ -188,7 +188,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist - settings_api::PrefType::PREF_TYPE_STRING; +@@ -192,7 +192,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist + settings_api::PrefType::PREF_TYPE_NUMBER; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#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 e75d7cb276d0..b2daa01497ed 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,41 +1,41 @@ ---- chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc.orig 2021-04-14 18:40:53 UTC +--- chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc.orig 2021-05-12 22:05:44 UTC +++ chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc @@ -30,7 +30,7 @@ #include "extensions/browser/process_manager.h" #include "extensions/common/error_utils.h" -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "extensions/common/permissions/permissions_data.h" #endif @@ -39,7 +39,7 @@ namespace { bool CanEnableAudioDebugRecordingsFromExtension( const extensions::Extension* extension) { bool enabled_by_permissions = false; -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) if (extension) { enabled_by_permissions = extension->permissions_data()->active_permissions().HasAPIPermission( -@@ -571,7 +571,7 @@ void WebrtcLoggingPrivateStartEventLoggingFunction::Fi +@@ -572,7 +572,7 @@ void WebrtcLoggingPrivateStartEventLoggingFunction::Fi ExtensionFunction::ResponseAction WebrtcLoggingPrivateGetLogsDirectoryFunction::Run() { -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Unlike other WebrtcLoggingPrivate functions that take a RequestInfo object, // this function shouldn't be called by a component extension on behalf of // some web code. It returns a DirectoryEntry for use directly in the calling -@@ -594,9 +594,9 @@ WebrtcLoggingPrivateGetLogsDirectoryFunction::Run() { +@@ -595,9 +595,9 @@ WebrtcLoggingPrivateGetLogsDirectoryFunction::Run() { &WebrtcLoggingPrivateGetLogsDirectoryFunction::FireErrorCallback, this)); return RespondLater(); -#else // defined(OS_LINUX) || defined(OS_CHROMEOS) +#else // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) return RespondNow(Error("Not supported on the current OS")); -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) } void WebrtcLoggingPrivateGetLogsDirectoryFunction::FireCallback( 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 7bbf834f4b59..9e0811f6ef6a 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,20 +1,20 @@ ---- chrome/browser/extensions/external_provider_impl.cc.orig 2021-04-14 18:40:53 UTC +--- chrome/browser/extensions/external_provider_impl.cc.orig 2021-05-12 22:05:44 UTC +++ chrome/browser/extensions/external_provider_impl.cc -@@ -794,7 +794,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -796,7 +796,7 @@ void ExternalProviderImpl::CreateExternalProviders( if (!profile->GetPrefs()->GetBoolean(pref_names::kBlockExternalExtensions)) { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#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( service, base::MakeRefCounted( -@@ -820,7 +820,7 @@ void ExternalProviderImpl::CreateExternalProviders( +@@ -824,7 +824,7 @@ void ExternalProviderImpl::CreateExternalProviders( bundled_extension_creation_flags)); // Define a per-user source of external extensions. -#if defined(OS_MAC) || ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && \ +#if defined(OS_MAC) || defined(OS_BSD) || ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && \ BUILDFLAG(CHROMIUM_BRANDING)) provider_list->push_back(std::make_unique( service, diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc index a8133b9ed86c..41242761d61c 100644 --- a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc @@ -1,79 +1,88 @@ ---- chrome/browser/flag_descriptions.cc.orig 2021-04-14 18:40:53 UTC +--- chrome/browser/flag_descriptions.cc.orig 2021-06-09 22:13:55 UTC +++ chrome/browser/flag_descriptions.cc -@@ -4949,7 +4949,7 @@ const char kEnableNewBadgeOnMenuItemsDescription[] = +@@ -5007,7 +5007,7 @@ const char kEnableNewBadgeOnMenuItemsDescription[] = // Random platform combinations ----------------------------------------------- -#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) - const char kEnableMediaFeedsName[] = "Enables Media Feeds"; -@@ -4993,20 +4993,20 @@ const char kRemoteCopyProgressNotificationDescription[ + const char kEnableOopPrintDriversName[] = +@@ -5040,20 +5040,20 @@ const char kRemoteCopyProgressNotificationDescription[ "Enables progress notifications to be shown for the remote copy feature " "when receiving a message."; -#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || +#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || // defined(OS_CHROMEOS) -#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) const char kDirectManipulationStylusName[] = "Direct Manipulation Stylus"; const char kDirectManipulationStylusDescription[] = "If enabled, Chrome will scroll web pages on stylus drag."; -#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || +#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) // defined(OS_CHROMEOS) -#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) const char kCommanderName[] = "Commander"; const char kCommanderDescription[] = -@@ -5022,7 +5022,7 @@ const char kDesktopDetailedLanguageSettingsName[] = +@@ -5069,7 +5069,7 @@ const char kDesktopDetailedLanguageSettingsName[] = const char kDesktopDetailedLanguageSettingsDescription[] = "Enable the new detailed language settings page"; -#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) +#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) #if defined(OS_CHROMEOS) || defined(OS_LINUX) #if BUILDFLAG(USE_TCMALLOC) -@@ -5049,13 +5049,13 @@ const char kWebShareDescription[] = +@@ -5096,20 +5096,20 @@ const char kWebShareDescription[] = // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ +#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) || \ defined(OS_MAC) const char kEnableEphemeralGuestProfilesOnDesktopName[] = "Enable ephemeral Guest profiles on Desktop"; const char kEnableEphemeralGuestProfilesOnDesktopDescription[] = "Enables ephemeral Guest profiles on Windows, Linux, and Mac."; -#endif // defined(OS_WIN) || (defined(OS_LINUX) || +#endif // defined(OS_WIN) || (defined(OS_LINUX) || defined(OS_BSD) || // BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_MAC) +-#if defined(OS_LINUX) && defined(USE_OZONE) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_OZONE) + const char kUseOzonePlatformName[] = "Use ozone."; + const char kUseOzonePlatformDescription[] = + "Use the Ozone/X11 platform implementation on X11."; +-#endif // defined(OS_LINUX) && defined(USE_OZONE) ++#endif // (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_OZONE) + // Feature flags -------------------------------------------------------------- -@@ -5139,7 +5139,7 @@ const char kAutofillCreditCardUploadDescription[] = + +@@ -5190,7 +5190,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[] = -@@ -5148,7 +5148,7 @@ const char kSendWebUIJavaScriptErrorReportsDescription +@@ -5199,7 +5199,7 @@ const char kSendWebUIJavaScriptErrorReportsDescription "will be sent to Google."; #endif -#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ +#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) || \ defined(OS_MAC) const char kUIDebugToolsName[] = "Debugging tools for UI"; const char kUIDebugToolsDescription[] = diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.h b/www/chromium/files/patch-chrome_browser_flag__descriptions.h index 409546d0dbfd..59b088eed300 100644 --- a/www/chromium/files/patch-chrome_browser_flag__descriptions.h +++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.h @@ -1,74 +1,82 @@ ---- chrome/browser/flag_descriptions.h.orig 2021-04-14 18:40:53 UTC +--- chrome/browser/flag_descriptions.h.orig 2021-06-09 22:13:55 UTC +++ chrome/browser/flag_descriptions.h -@@ -21,9 +21,9 @@ - #include "ppapi/buildflags/buildflags.h" +@@ -22,9 +22,9 @@ #include "printing/buildflags/buildflags.h" + #include "third_party/blink/public/common/buildflags.h" -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "base/allocator/buildflags.h" -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // This file declares strings used in chrome://flags. These messages are not // translated, because instead of end-users they target Chromium developers and -@@ -2900,7 +2900,7 @@ extern const char kEnableNewBadgeOnMenuItemsDescriptio +@@ -2919,7 +2919,7 @@ extern const char kEnableNewBadgeOnMenuItemsDescriptio // Random platform combinations ----------------------------------------------- -#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) - extern const char kEnableMediaFeedsName[]; -@@ -2927,10 +2927,10 @@ extern const char kRemoteCopyProgressNotificationDescr + extern const char kEnableOopPrintDriversName[]; +@@ -2940,10 +2940,10 @@ extern const char kRemoteCopyProgressNotificationDescr extern const char kDirectManipulationStylusName[]; extern const char kDirectManipulationStylusDescription[]; -#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || +#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || // defined(OS_CHROMEOS) -#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) extern const char kCommanderName[]; extern const char kCommanderDescription[]; -@@ -2941,7 +2941,7 @@ extern const char kDesktopRestructuredLanguageSettings +@@ -2954,7 +2954,7 @@ extern const char kDesktopRestructuredLanguageSettings extern const char kDesktopDetailedLanguageSettingsName[]; extern const char kDesktopDetailedLanguageSettingsDescription[]; -#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) +#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) #if defined(OS_CHROMEOS) || defined(OS_LINUX) #if BUILDFLAG(USE_TCMALLOC) -@@ -2962,11 +2962,11 @@ extern const char kWebShareDescription[]; +@@ -2975,17 +2975,17 @@ extern const char kWebShareDescription[]; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ +#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) || \ defined(OS_MAC) extern const char kEnableEphemeralGuestProfilesOnDesktopName[]; extern const char kEnableEphemeralGuestProfilesOnDesktopDescription[]; -#endif // defined(OS_WIN) || (defined(OS_LINUX) || +#endif // defined(OS_WIN) || (defined(OS_LINUX) || defined(OS_BSD) || // BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_MAC) +-#if defined(OS_LINUX) && defined(USE_OZONE) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_OZONE) + extern const char kUseOzonePlatformName[]; + extern const char kUseOzonePlatformDescription[]; +-#endif // defined(OS_LINUX) && defined(USE_OZONE) ++#endif // (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_OZONE) + // Feature flags -------------------------------------------------------------- -@@ -3023,12 +3023,12 @@ extern const char kAutofillCreditCardUploadDescription + +@@ -3041,12 +3041,12 @@ extern const char kAutofillCreditCardUploadDescription #endif // defined(TOOLKIT_VIEWS) || defined(OS_ANDROID) -#if !defined(OS_WIN) && !defined(OS_FUCHSIA) +#if !defined(OS_WIN) && !defined(OS_FUCHSIA) && !defined(OS_BSD) extern const char kSendWebUIJavaScriptErrorReportsName[]; extern const char kSendWebUIJavaScriptErrorReportsDescription[]; #endif -#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 kUIDebugToolsName[]; extern const char kUIDebugToolsDescription[]; 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 6701da8634f4..c5f578d2b173 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,14 +1,14 @@ ---- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2021-04-14 18:40:53 UTC +--- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2021-05-12 22:05:44 UTC +++ chrome/browser/media_galleries/media_file_system_registry.cc -@@ -737,7 +737,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) { - StorageMonitor::GetInstance()->AddObserver(this); + // This conditional is needed for shutdown. Destructors + // try to get the media file system registry. + if (StorageMonitor::GetInstance()) + StorageMonitor::GetInstance()->AddObserver(this); } MediaFileSystemRegistry::~MediaFileSystemRegistry() { 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 da2275f69a1f..5c35f14f9e0a 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,33 +1,33 @@ ---- chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig 2021-04-14 18:40:53 UTC +--- chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig 2021-05-12 22:05:44 UTC +++ chrome/browser/media/webrtc/webrtc_logging_controller.cc -@@ -23,10 +23,10 @@ +@@ -24,10 +24,10 @@ #include "content/public/browser/browser_context.h" #include "content/public/browser/render_process_host.h" -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "content/public/browser/child_process_security_policy.h" #include "storage/browser/file_system/isolated_context.h" -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) using webrtc_event_logging::WebRtcEventLogManager; -@@ -272,7 +272,7 @@ void WebRtcLoggingController::StartEventLogging( +@@ -273,7 +273,7 @@ void WebRtcLoggingController::StartEventLogging( web_app_id, callback); } -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) void WebRtcLoggingController::GetLogsDirectory( LogsDirectoryCallback callback, LogsDirectoryErrorCallback error_callback) { -@@ -318,7 +318,7 @@ void WebRtcLoggingController::GrantLogsDirectoryAccess +@@ -319,7 +319,7 @@ void WebRtcLoggingController::GrantLogsDirectoryAccess FROM_HERE, base::BindOnce(std::move(callback), file_system.id(), registered_name)); } -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) void WebRtcLoggingController::OnRtpPacket( std::unique_ptr packet_header, diff --git a/www/chromium/files/patch-chrome_browser_memory__details.cc b/www/chromium/files/patch-chrome_browser_memory__details.cc index 85f7e8c0d7a5..733c455f8a0f 100644 --- a/www/chromium/files/patch-chrome_browser_memory__details.cc +++ b/www/chromium/files/patch-chrome_browser_memory__details.cc @@ -1,20 +1,20 @@ ---- chrome/browser/memory_details.cc.orig 2021-04-14 18:40:53 UTC +--- chrome/browser/memory_details.cc.orig 2021-05-12 22:05:44 UTC +++ chrome/browser/memory_details.cc -@@ -38,7 +38,7 @@ +@@ -39,7 +39,7 @@ #include "services/resource_coordinator/public/cpp/memory_instrumentation/memory_instrumentation.h" #include "ui/base/l10n/l10n_util.h" -#if defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_ANDROID) +#if defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_ANDROID) && !defined(OS_BSD) #include "content/public/browser/zygote_host/zygote_host_linux.h" #endif -@@ -339,7 +339,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() { +@@ -347,7 +347,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() { process.titles.push_back(title); } -#if defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_ANDROID) +#if defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_ANDROID) && !defined(OS_BSD) if (content::ZygoteHost::GetInstance()->IsZygotePid(process.pid)) { process.process_type = content::PROCESS_TYPE_ZYGOTE; } diff --git a/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc b/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc index eddecc0854fd..ac30a2c7a052 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,21 +1,21 @@ ---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2021-04-14 18:40:53 UTC +--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2021-05-12 22:05:44 UTC +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc -@@ -59,7 +59,9 @@ +@@ -63,7 +63,9 @@ // of lacros-chrome is complete. #if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) #include +#endif +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) #include "base/linux_util.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" -@@ -68,7 +70,7 @@ +@@ -72,7 +74,7 @@ #include "ui/base/ui_base_features.h" #include "ui/base/x/x11_util.h" #endif -#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 a3d3fb66fac8..3baffb487384 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,24 +1,24 @@ ---- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2021-04-14 18:40:53 UTC +--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2021-05-12 22:05:44 UTC +++ chrome/browser/metrics/chrome_metrics_service_client.cc -@@ -707,10 +707,10 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -711,10 +711,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) || BUILDFLAG(IS_CHROMEOS_LACROS)) + (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) metrics_service_->RegisterMetricsProvider( std::make_unique()); -#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) -@@ -998,7 +998,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve +@@ -1002,7 +1002,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) || 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_net_system__network__context__manager.cc b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc index 5c3f621d83c1..648e3bfb22ff 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,64 +1,64 @@ ---- chrome/browser/net/system_network_context_manager.cc.orig 2021-04-14 18:40:53 UTC +--- chrome/browser/net/system_network_context_manager.cc.orig 2021-05-12 22:05:44 UTC +++ chrome/browser/net/system_network_context_manager.cc -@@ -80,11 +80,11 @@ +@@ -82,11 +82,11 @@ // 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) || BUILDFLAG(IS_CHROMEOS_LACROS) +#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) #if BUILDFLAG(ENABLE_EXTENSIONS) #include "extensions/common/constants.h" -@@ -145,10 +145,10 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -147,10 +147,10 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut auth_dynamic_params->basic_over_http_enabled = local_state->GetBoolean(prefs::kBasicAuthOverHttpEnabled); -#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) || defined(OS_BSD) auth_dynamic_params->delegate_by_kdc_policy = local_state->GetBoolean(prefs::kAuthNegotiateDelegateByKdcPolicy); -#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) || defined(OS_BSD) #if defined(OS_POSIX) auth_dynamic_params->ntlm_v2_enabled = -@@ -363,10 +363,10 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -364,10 +364,10 @@ SystemNetworkContextManager::SystemNetworkContextManag pref_change_registrar_.Add(prefs::kBasicAuthOverHttpEnabled, auth_pref_callback); -#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) || defined(OS_BSD) pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy, auth_pref_callback); -#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) || defined(OS_BSD) #if defined(OS_POSIX) pref_change_registrar_.Add(prefs::kNtlmV2Enabled, auth_pref_callback); -@@ -415,10 +415,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe +@@ -422,10 +422,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe registry->RegisterStringPref(prefs::kAuthServerAllowlist, std::string()); registry->RegisterStringPref(prefs::kAuthNegotiateDelegateAllowlist, std::string()); -#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) || defined(OS_BSD) registry->RegisterBooleanPref(prefs::kAuthNegotiateDelegateByKdcPolicy, false); -#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) || defined(OS_BSD) #if defined(OS_POSIX) registry->RegisterBooleanPref( -@@ -512,7 +512,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea +@@ -521,7 +521,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea // 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 1af8bb9914fd..1c0775de4e01 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,29 +1,29 @@ ---- chrome/browser/notifications/notification_display_service_impl.cc.orig 2021-04-14 18:40:53 UTC +--- chrome/browser/notifications/notification_display_service_impl.cc.orig 2021-05-12 22:05:44 UTC +++ chrome/browser/notifications/notification_display_service_impl.cc -@@ -30,7 +30,7 @@ +@@ -29,7 +29,7 @@ #include "chrome/browser/extensions/api/notifications/extension_notification_handler.h" #endif -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) || \ defined(OS_WIN) #include "chrome/browser/send_tab_to_self/desktop_notification_handler.h" #include "chrome/browser/sharing/sharing_notification_handler.h" -@@ -66,7 +66,7 @@ void NotificationDisplayServiceImpl::RegisterProfilePr +@@ -65,7 +65,7 @@ void NotificationDisplayServiceImpl::RegisterProfilePr user_prefs::PrefRegistrySyncable* registry) { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) registry->RegisterBooleanPref(prefs::kAllowNativeNotifications, true); registry->RegisterBooleanPref(prefs::kAllowSystemNotifications, true); #endif -@@ -82,7 +82,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer +@@ -81,7 +81,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer AddNotificationHandler(NotificationHandler::Type::WEB_PERSISTENT, std::make_unique()); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) || \ defined(OS_WIN) AddNotificationHandler( NotificationHandler::Type::SEND_TAB_TO_SELF, 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 a0fe22fac790..9926d71400ac 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,26 +1,26 @@ ---- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2021-04-14 18:40:54 UTC +--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2021-05-12 22:05:44 UTC +++ chrome/browser/password_manager/chrome_password_manager_client.cc @@ -9,6 +9,10 @@ #include #include +#if defined(OS_BSD) +#include +#endif + #include "base/bind.h" #include "base/callback_helpers.h" #include "base/command_line.h" -@@ -101,8 +105,11 @@ +@@ -102,8 +106,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 969cc1b4f37c..d68836ddba11 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-04-14 18:40:54 UTC +--- chrome/browser/password_manager/password_store_factory.cc.orig 2021-05-12 22:05:44 UTC +++ chrome/browser/password_manager/password_store_factory.cc -@@ -166,7 +166,7 @@ PasswordStoreFactory::BuildServiceInstanceFor( +@@ -167,7 +167,7 @@ PasswordStoreFactory::BuildServiceInstanceFor( // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if defined(OS_WIN) || defined(OS_MAC) || \ - (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) + (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) std::unique_ptr notifier = std::make_unique( 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 feff7c1b7e14..a62ccc3702d6 100644 --- a/www/chromium/files/patch-chrome_browser_pdf_pdf__extension__test.cc +++ b/www/chromium/files/patch-chrome_browser_pdf_pdf__extension__test.cc @@ -1,20 +1,20 @@ ---- chrome/browser/pdf/pdf_extension_test.cc.orig 2021-04-14 18:40:54 UTC +--- chrome/browser/pdf/pdf_extension_test.cc.orig 2021-05-12 22:05:44 UTC +++ chrome/browser/pdf/pdf_extension_test.cc -@@ -2162,7 +2162,7 @@ class PDFExtensionClipboardTest : public PDFExtensionT +@@ -2180,7 +2180,7 @@ class PDFExtensionClipboardTest : public PDFExtensionT const std::string& expected) { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) DoActionAndCheckClipboard(std::move(action), ui::ClipboardBuffer::kSelection, expected); #else -@@ -2294,7 +2294,7 @@ IN_PROC_BROWSER_TEST_F(PDFExtensionClipboardTest, +@@ -2312,7 +2312,7 @@ IN_PROC_BROWSER_TEST_F(PDFExtensionClipboardTest, // Flaky on ChromeOS (https://crbug.com/1121446) // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. -#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) #define MAYBE_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 ca0285da5f06..b401971734e8 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,11 +1,11 @@ ---- chrome/browser/performance_manager/policies/policy_features.cc.orig 2021-04-14 18:40:54 UTC +--- chrome/browser/performance_manager/policies/policy_features.cc.orig 2021-05-12 22:05:44 UTC +++ chrome/browser/performance_manager/policies/policy_features.cc -@@ -126,7 +126,7 @@ const base::Feature kPageFreezingFromPerformanceManage +@@ -125,7 +125,7 @@ const base::Feature kPageFreezingFromPerformanceManage + const base::Feature kUrgentDiscardingFromPerformanceManager{ "UrgentDiscardingFromPerformanceManager", - #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ -- defined(OS_LINUX) -+ defined(OS_LINUX) || defined(OS_BSD) +-#if BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_LINUX) || defined(OS_BSD) base::FEATURE_DISABLED_BY_DEFAULT #else base::FEATURE_ENABLED_BY_DEFAULT diff --git a/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__history.cc b/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__history.cc index cc7af4945e4d..ae857749f61e 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,11 +1,11 @@ ---- chrome/browser/performance_monitor/process_metrics_history.cc.orig 2021-04-14 18:40:54 UTC +--- chrome/browser/performance_monitor/process_metrics_history.cc.orig 2021-05-12 22:05:44 UTC +++ chrome/browser/performance_monitor/process_metrics_history.cc -@@ -42,7 +42,7 @@ ProcessMonitor::Metrics ProcessMetricsHistory::SampleM - #if defined(OS_WIN) - metrics.disk_usage = process_metrics_->GetDiskUsageBytesPerSecond(); - #endif +@@ -39,7 +39,7 @@ ProcessMonitor::Metrics ProcessMetricsHistory::SampleM + ProcessMonitor::Metrics metrics; + + metrics.cpu_usage = process_metrics_->GetPlatformIndependentCPUUsage(); -#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ +#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ defined(OS_AIX) metrics.idle_wakeups = process_metrics_->GetIdleWakeupsPerSecond(); #endif diff --git a/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__recorder.cc b/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__recorder.cc index e55b3b7db91b..b03918f8cc5a 100644 --- a/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__recorder.cc +++ b/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__recorder.cc @@ -1,29 +1,11 @@ ---- chrome/browser/performance_monitor/process_metrics_recorder.cc.orig 2021-04-22 07:55:58 UTC +--- chrome/browser/performance_monitor/process_metrics_recorder.cc.orig 2021-05-12 22:05:44 UTC +++ chrome/browser/performance_monitor/process_metrics_recorder.cc -@@ -58,7 +58,7 @@ void ProcessMetricsRecorder::OnMetricsSampled( - kDiskUsageHistogramMin, kDiskUsageHistogramMax, - kDiskUsageHistogramBucketCount); - #endif +@@ -32,7 +32,7 @@ void RecordProcessHistograms(const char* histogram_suf + ""), + metrics.cpu_usage * kCPUUsageFactor, kCPUUsageHistogramMin, + kCPUUsageHistogramMax, kCPUUsageHistogramBucketCount); -#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ +#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ defined(OS_AIX) - UMA_HISTOGRAM_COUNTS_10000( - "PerformanceMonitor.IdleWakeups.BrowserProcess", -@@ -82,7 +82,7 @@ void ProcessMetricsRecorder::OnMetricsSampled( - UMA_HISTOGRAM_BOOLEAN("PerformanceMonitor.HighCPU.RendererProcess", - true); - } --#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -+#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ - defined(OS_AIX) - UMA_HISTOGRAM_COUNTS_10000( - "PerformanceMonitor.IdleWakeups.RendererProcess", -@@ -105,7 +105,7 @@ void ProcessMetricsRecorder::OnMetricsSampled( - kHistogramMax, kHistogramBucketCount); - if (metrics.cpu_usage > kHighCPUUtilizationThreshold) - UMA_HISTOGRAM_BOOLEAN("PerformanceMonitor.HighCPU.GPUProcess", true); --#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -+#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ - defined(OS_AIX) - UMA_HISTOGRAM_COUNTS_10000("PerformanceMonitor.IdleWakeups.GPUProcess", - metrics.idle_wakeups); + base::UmaHistogramCounts10000( + base::JoinString({"PerformanceMonitor.IdleWakeUps.", histogram_suffix}, diff --git a/www/chromium/files/patch-chrome_browser_performance__monitor_process__monitor.cc b/www/chromium/files/patch-chrome_browser_performance__monitor_process__monitor.cc index f361a737689c..81a25f3b443b 100644 --- a/www/chromium/files/patch-chrome_browser_performance__monitor_process__monitor.cc +++ b/www/chromium/files/patch-chrome_browser_performance__monitor_process__monitor.cc @@ -1,11 +1,11 @@ ---- chrome/browser/performance_monitor/process_monitor.cc.orig 2021-04-22 07:56:37 UTC +--- chrome/browser/performance_monitor/process_monitor.cc.orig 2021-05-12 22:05:44 UTC +++ chrome/browser/performance_monitor/process_monitor.cc -@@ -82,7 +82,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me - lhs.disk_usage += rhs.disk_usage; - #endif +@@ -80,7 +80,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me + const ProcessMonitor::Metrics& rhs) { + lhs.cpu_usage += rhs.cpu_usage; -#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ +#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ defined(OS_AIX) lhs.idle_wakeups += rhs.idle_wakeups; #endif diff --git a/www/chromium/files/patch-chrome_browser_performance__monitor_process__monitor.h b/www/chromium/files/patch-chrome_browser_performance__monitor_process__monitor.h index c4ab8f7e27c7..c95b87393778 100644 --- a/www/chromium/files/patch-chrome_browser_performance__monitor_process__monitor.h +++ b/www/chromium/files/patch-chrome_browser_performance__monitor_process__monitor.h @@ -1,11 +1,11 @@ ---- chrome/browser/performance_monitor/process_monitor.h.orig 2021-04-22 07:56:51 UTC +--- chrome/browser/performance_monitor/process_monitor.h.orig 2021-05-12 22:05:44 UTC +++ chrome/browser/performance_monitor/process_monitor.h -@@ -51,7 +51,7 @@ class ProcessMonitor { - uint64_t disk_usage = 0; - #endif +@@ -44,7 +44,7 @@ class ProcessMonitor { + // can exceed 100% in multi-thread processes running on multi-core systems. + double cpu_usage = 0.0; -#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ +#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ defined(OS_AIX) // Returns the number of average idle cpu wakeups per second since the last // time the metric was sampled. diff --git a/www/chromium/files/patch-chrome_browser_platform__util__linux.cc b/www/chromium/files/patch-chrome_browser_platform__util__linux.cc new file mode 100644 index 000000000000..fa4fa58a7fe8 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_platform__util__linux.cc @@ -0,0 +1,12 @@ +--- chrome/browser/platform_util_linux.cc.orig 2021-06-11 09:25:25 UTC ++++ chrome/browser/platform_util_linux.cc +@@ -126,7 +126,9 @@ void RunCommand(const std::string& command, + + base::LaunchOptions options; + options.current_directory = working_directory; ++#if !defined(OS_BSD) + options.allow_new_privs = true; ++#endif + // xdg-open can fall back on mailcap which eventually might plumb through + // to a command that needs a terminal. Set the environment variable telling + // it that we definitely don't have a terminal available and that it should 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 6adc6fb7993f..9167be6cb070 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,23 +1,23 @@ ---- chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc.orig 2021-04-14 18:40:54 UTC +--- chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc.orig 2021-05-12 22:05:44 UTC +++ chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc -@@ -45,9 +45,9 @@ +@@ -43,9 +43,9 @@ #include "chrome/browser/policy/browser_dm_token_storage_mac.h" #endif // defined(OS_MAC) -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "chrome/browser/policy/browser_dm_token_storage_linux.h" -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #if defined(OS_WIN) #include "chrome/browser/policy/browser_dm_token_storage_win.h" -@@ -178,7 +178,7 @@ void ChromeBrowserCloudManagementControllerDesktop:: +@@ -75,7 +75,7 @@ void ChromeBrowserCloudManagementControllerDesktop:: #if defined(OS_MAC) storage_delegate = std::make_unique(); -#elif defined(OS_LINUX) || defined(OS_CHROMEOS) +#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) storage_delegate = std::make_unique(); #elif defined(OS_WIN) storage_delegate = std::make_unique(); 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 920247d2dfe6..a4bfbcde9c17 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,68 +1,67 @@ ---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2021-04-14 18:40:54 UTC +--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2021-05-12 22:05:44 UTC +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -1242,11 +1242,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1293,11 +1293,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, - #endif // !defined(OS_MAC) && !BUILDFLAG(IS_CHROMEOS_ASH) + #endif // !defined(OS_MAC) && !defined(OS_CHROMEOS) -#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) #if !defined(OS_MAC) { key::kFullscreenAllowed, -@@ -1594,7 +1594,7 @@ std::unique_ptr BuildH +@@ -1650,14 +1650,14 @@ std::unique_ptr BuildH + SimpleSchemaValidatingPolicyHandler::MANDATORY_ALLOWED)); + #endif // defined(OS_ANDROID) - // TODO(crbug/1169547) Remove `BUILDFLAG(IS_CHROMEOS_LACROS)` once the - // migration is complete. --#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || \ -+#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || defined(OS_BSD) || \ - BUILDFLAG(IS_CHROMEOS_LACROS) +-#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) ++#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || defined(OS_BSD) handlers->AddHandler( std::make_unique< -@@ -1602,7 +1602,7 @@ std::unique_ptr BuildH + enterprise_connectors::EnterpriseConnectorsPolicyHandler>( key::kContextAwareAccessSignalsAllowlist, enterprise_connectors::kContextAwareAccessSignalsAllowlistPref, chrome_schema)); -#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) +#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || defined(OS_BSD) - #if BUILDFLAG(IS_CHROMEOS_ASH) - std::vector> -@@ -1950,13 +1950,13 @@ std::unique_ptr BuildH + #if defined(OS_CHROMEOS) + handlers->AddHandler(std::make_unique( +@@ -2012,13 +2012,13 @@ std::unique_ptr BuildH + SimpleSchemaValidatingPolicyHandler::RECOMMENDED_PROHIBITED, SimpleSchemaValidatingPolicyHandler::MANDATORY_ALLOWED)); - // TODO(crbug.com/1175651): Remove BUILDFLAG(IS_CHROMEOS_LACROS) --#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) handlers->AddHandler(std::make_unique( key::kWebAppSettings, prefs::kWebAppSettings, chrome_schema, SCHEMA_ALLOW_UNKNOWN, SimpleSchemaValidatingPolicyHandler::RECOMMENDED_PROHIBITED, SimpleSchemaValidatingPolicyHandler::MANDATORY_ALLOWED)); -#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) +#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) #endif // BUILDFLAG(ENABLE_EXTENSIONS) -@@ -1969,7 +1969,7 @@ std::unique_ptr BuildH +@@ -2031,7 +2031,7 @@ std::unique_ptr BuildH // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) handlers->AddHandler(std::make_unique( std::make_unique(key::kAllowNativeNotifications, prefs::kAllowNativeNotifications, -@@ -1977,7 +1977,7 @@ std::unique_ptr BuildH +@@ -2039,7 +2039,7 @@ std::unique_ptr BuildH std::make_unique(key::kAllowSystemNotifications, prefs::kAllowSystemNotifications, base::Value::Type::BOOLEAN))); -#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) return handlers; } 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 d01c259ba409..1dec6f86d1c6 100644 --- a/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc +++ b/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc @@ -1,37 +1,50 @@ ---- chrome/browser/prefs/browser_prefs.cc.orig 2021-04-20 18:58:26 UTC +--- chrome/browser/prefs/browser_prefs.cc.orig 2021-05-12 22:05:44 UTC +++ chrome/browser/prefs/browser_prefs.cc -@@ -383,14 +383,14 @@ +@@ -386,14 +386,14 @@ #endif #if defined(OS_WIN) || defined(OS_MAC) || \ - (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) + (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) #include "chrome/browser/web_applications/components/url_handler_prefs.h" #endif // 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) #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" #endif -@@ -865,7 +865,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) +@@ -840,10 +840,10 @@ void RegisterLocalState(PrefRegistrySimple* registry) + + // TODO(crbug/1169547) Remove `BUILDFLAG(IS_CHROMEOS_LACROS)` once the + // migration is complete. +-#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || \ ++#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || defined(OS_BSD) || \ + BUILDFLAG(IS_CHROMEOS_LACROS) + enterprise_connectors::RegisterLocalPrefs(registry); +-#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) ++#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || defined(OS_BSD) + + #if defined(OS_MAC) + confirm_quit::RegisterLocalState(registry); +@@ -871,7 +871,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) #endif // defined(OS_WIN) #if defined(OS_WIN) || defined(OS_MAC) || \ - (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) + (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) - web_app::UrlHandlerPrefs::RegisterLocalStatePrefs(registry); + web_app::url_handler_prefs::RegisterLocalStatePrefs(registry); #endif -@@ -1140,7 +1140,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync +@@ -1153,7 +1153,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) || 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_process__singleton__posix.cc b/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc index 6d673f8961bc..12561beaa09d 100644 --- a/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc +++ b/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc @@ -1,35 +1,35 @@ ---- chrome/browser/process_singleton_posix.cc.orig 2021-04-14 18:40:54 UTC +--- chrome/browser/process_singleton_posix.cc.orig 2021-05-12 22:05:44 UTC +++ chrome/browser/process_singleton_posix.cc @@ -95,12 +95,12 @@ #include "net/base/network_interfaces.h" #include "ui/base/l10n/l10n_util.h" -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "chrome/browser/ui/process_singleton_dialog_linux.h" #endif #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 @@ -297,7 +297,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo if (g_disable_prompt) return g_user_opted_unlock_in_use_profile; -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - base::string16 relaunch_button_text = l10n_util::GetStringUTF16( - IDS_PROFILE_IN_USE_LINUX_RELAUNCH); + std::u16string relaunch_button_text = + l10n_util::GetStringUTF16(IDS_PROFILE_IN_USE_LINUX_RELAUNCH); return ShowProcessSingletonDialog(error, relaunch_button_text); @@ -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) || 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 c34407ab3782..39db6078c3c7 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-04-14 18:40:54 UTC +--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2021-05-12 22:05:44 UTC +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -345,7 +345,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -349,7 +349,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) || 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 412795ec22f9..33250bb38305 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-04-14 18:40:54 UTC +--- chrome/browser/profiles/profile.cc.orig 2021-05-12 22:05:44 UTC +++ chrome/browser/profiles/profile.cc -@@ -356,7 +356,7 @@ bool Profile::IsIncognitoProfile() const { +@@ -376,7 +376,7 @@ bool Profile::IsIncognitoProfile() const { bool Profile::IsEphemeralGuestProfileEnabled() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ +#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) || \ defined(OS_MAC) return base::FeatureList::IsEnabled( features::kEnableEphemeralGuestProfilesOnDesktop); diff --git a/www/chromium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc b/www/chromium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc index 9bae83b9550b..304842f01f61 100644 --- a/www/chromium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc +++ b/www/chromium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc @@ -1,11 +1,11 @@ ---- chrome/browser/profiles/profile_attributes_entry.cc.orig 2021-04-14 18:40:54 UTC +--- chrome/browser/profiles/profile_attributes_entry.cc.orig 2021-05-12 22:05:44 UTC +++ chrome/browser/profiles/profile_attributes_entry.cc -@@ -157,7 +157,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; -#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ +#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ defined(OS_WIN) } else if (IsSigninRequired()) { // Profiles that require signin in the absence of an enterprise policy are diff --git a/www/chromium/files/patch-chrome_browser_profiles_profiles__state.cc b/www/chromium/files/patch-chrome_browser_profiles_profiles__state.cc index 1ad037961f9b..58fabfe570e8 100644 --- a/www/chromium/files/patch-chrome_browser_profiles_profiles__state.cc +++ b/www/chromium/files/patch-chrome_browser_profiles_profiles__state.cc @@ -1,11 +1,11 @@ ---- chrome/browser/profiles/profiles_state.cc.orig 2021-04-14 18:40:54 UTC +--- chrome/browser/profiles/profiles_state.cc.orig 2021-05-12 22:05:44 UTC +++ chrome/browser/profiles/profiles_state.cc -@@ -179,7 +179,7 @@ bool IsRegularOrGuestSession(Browser* browser) { +@@ -227,7 +227,7 @@ bool IsRegularOrGuestSession(Browser* browser) { bool IsGuestModeRequested(const base::CommandLine& command_line, PrefService* local_state, bool show_warning) { -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || \ +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_BSD) || \ defined(OS_MAC) DCHECK(local_state); 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 13da6c20f8e0..0fb329c8fca4 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,11 +1,11 @@ ---- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig 2021-04-14 18:40:54 UTC +--- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig 2021-05-12 22:05:44 UTC +++ chrome/browser/renderer_context_menu/render_view_context_menu.cc -@@ -2144,7 +2144,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) +@@ -2148,7 +2148,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) case IDC_CHECK_SPELLING_WHILE_TYPING: return prefs->GetBoolean(spellcheck::prefs::kSpellCheckEnable); -#if !defined(OS_MAC) && defined(OS_POSIX) +#if !defined(OS_MAC) && !defined(OS_BSD) && defined(OS_POSIX) // TODO(suzhe): this should not be enabled for password fields. case IDC_INPUT_METHODS_MENU: return true; diff --git a/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc b/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc index 0b18255916a3..e702f0d14fd8 100644 --- a/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc +++ b/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc @@ -1,29 +1,29 @@ ---- chrome/browser/renderer_preferences_util.cc.orig 2021-04-14 18:40:54 UTC +--- chrome/browser/renderer_preferences_util.cc.orig 2021-05-12 22:05:44 UTC +++ chrome/browser/renderer_preferences_util.cc -@@ -38,7 +38,7 @@ +@@ -42,7 +42,7 @@ #include "ui/base/cocoa/defaults_utils.h" #endif -#if defined(USE_AURA) && (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) +#if defined(USE_AURA) && (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" #include "ui/views/linux_ui/linux_ui.h" -@@ -167,7 +167,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc +@@ -171,7 +171,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc prefs->caret_blink_interval = interval; #endif -#if defined(USE_AURA) && (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) +#if defined(USE_AURA) && (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) views::LinuxUI* linux_ui = views::LinuxUI::instance(); if (linux_ui) { if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) { -@@ -186,7 +186,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc +@@ -190,7 +190,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc } #endif -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) || \ defined(OS_WIN) content::UpdateFontRendererPreferencesFromSystemSettings(prefs); #endif diff --git a/www/chromium/files/patch-chrome_browser_resources_media__router_extension_src_utils_platform__utils.js b/www/chromium/files/patch-chrome_browser_resources_media__router_extension_src_utils_platform__utils.js new file mode 100644 index 000000000000..ee9ff1a103bf --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_resources_media__router_extension_src_utils_platform__utils.js @@ -0,0 +1,11 @@ +--- chrome/browser/resources/media_router/extension/src/utils/platform_utils.js.orig 2021-06-11 09:26:56 UTC ++++ chrome/browser/resources/media_router/extension/src/utils/platform_utils.js +@@ -58,5 +58,8 @@ mr.PlatformUtils.getCurrentOS = function() { + if (userAgent.includes('Linux')) { + return mr.PlatformUtils.OS.LINUX; + } ++ if (userAgent.includes('FreeBSD')) { ++ return mr.PlatformUtils.OS.LINUX; ++ } + return mr.PlatformUtils.OS.OTHER; + }; diff --git a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.js b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.js index 3d7f4b65abe4..1733158d82fe 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,33 +1,33 @@ ---- chrome/browser/resources/settings/appearance_page/appearance_page.js.orig 2021-04-14 18:40:54 UTC +--- chrome/browser/resources/settings/appearance_page/appearance_page.js.orig 2021-05-12 22:05:45 UTC +++ chrome/browser/resources/settings/appearance_page/appearance_page.js -@@ -137,7 +137,7 @@ Polymer({ - 'defaultFontSizeChanged_(prefs.webkit.webprefs.default_font_size.value)', - 'themeChanged_(prefs.extensions.theme.id.value, useSystemTheme_)', +@@ -150,7 +150,7 @@ Polymer({ + 'themeChanged_(' + + 'prefs.extensions.theme.id.value, useSystemTheme_, isForcedTheme_)', - // + // // NOTE: this pref only exists on Linux. 'useSystemThemePrefChanged_(prefs.extensions.theme.use_system.value)', // -@@ -222,7 +222,7 @@ Polymer({ +@@ -239,7 +239,7 @@ Polymer({ this.appearanceBrowserProxy_.useDefaultTheme(); }, - // + // /** * @param {boolean} useSystemTheme * @private -@@ -299,10 +299,10 @@ Polymer({ +@@ -322,10 +322,10 @@ Polymer({ } let i18nId; - // + // i18nId = useSystemTheme ? 'systemTheme' : 'classicTheme'; // - // + // i18nId = 'chooseFromWebStore'; // this.themeSublabel_ = this.i18n(i18nId); diff --git a/www/chromium/files/patch-chrome_browser_resources_settings_autofill__page_passwords__shared__css.html b/www/chromium/files/patch-chrome_browser_resources_settings_autofill__page_passwords__shared__css.html new file mode 100644 index 000000000000..2c4c2b72475e --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_resources_settings_autofill__page_passwords__shared__css.html @@ -0,0 +1,11 @@ +--- chrome/browser/resources/settings/autofill_page/passwords_shared_css.html.orig 2021-06-11 09:29:24 UTC ++++ chrome/browser/resources/settings/autofill_page/passwords_shared_css.html +@@ -64,7 +64,7 @@ + * necessary to prevent Chrome from using the operating system's font + * instead of the Material Design font. + * TODO(dbeam): why not font: inherit? */ +- ++ + font-family: 'DejaVu Sans Mono', monospace; + + diff --git a/www/chromium/files/patch-chrome_browser_resources_settings_route.js b/www/chromium/files/patch-chrome_browser_resources_settings_route.js new file mode 100644 index 000000000000..e813d2950790 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_resources_settings_route.js @@ -0,0 +1,11 @@ +--- chrome/browser/resources/settings/route.js.orig 2021-06-11 09:29:55 UTC ++++ chrome/browser/resources/settings/route.js +@@ -183,7 +183,7 @@ function createBrowserSettingsRoutes() { + + r.ACCESSIBILITY = r.ADVANCED.createSection('/accessibility', 'a11y'); + +- // ++ // + r.CAPTIONS = r.ACCESSIBILITY.createChild('/captions'); + // + diff --git a/www/chromium/files/patch-chrome_browser_resources_signin_signin__shared__css.html b/www/chromium/files/patch-chrome_browser_resources_signin_signin__shared__css.html new file mode 100644 index 000000000000..c76a00d636c6 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_resources_signin_signin__shared__css.html @@ -0,0 +1,11 @@ +--- chrome/browser/resources/signin/signin_shared_css.html.orig 2021-06-11 09:30:40 UTC ++++ chrome/browser/resources/signin/signin_shared_css.html +@@ -30,7 +30,7 @@ + margin-inline-start: 8px; + } + +- ++ + .action-container { + flex-flow: row-reverse; + justify-content: flex-start; 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 86974e3f1868..11c23a9331f6 100644 --- a/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc +++ b/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc @@ -1,11 +1,11 @@ ---- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig 2021-04-14 18:40:54 UTC +--- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig 2021-05-12 22:05:45 UTC +++ chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc -@@ -708,7 +708,7 @@ void IncidentReportingService::OnEnvironmentDataCollec +@@ -709,7 +709,7 @@ void IncidentReportingService::OnEnvironmentDataCollec environment_collection_pending_ = false; // Process::Current().CreationTime() is missing on some platforms. -#if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || \ +#if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) base::TimeDelta uptime = first_incident_time_ - base::Process::Current().CreationTime(); diff --git a/www/chromium/files/patch-chrome_browser_search_drive_drive__service.cc b/www/chromium/files/patch-chrome_browser_search_drive_drive__service.cc new file mode 100644 index 000000000000..9a7c1b397c42 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_search_drive_drive__service.cc @@ -0,0 +1,11 @@ +--- chrome/browser/search/drive/drive_service.cc.orig 2021-06-10 11:15:16 UTC ++++ chrome/browser/search/drive/drive_service.cc +@@ -19,6 +19,8 @@ namespace { + constexpr char kDriveScope[] = "https://www.googleapis.com/auth/drive.readonly"; + #if OS_LINUX + constexpr char kPlatform[] = "LINUX"; ++#elif OS_FREEBSD ++constexpr char kPlatform[] = "FREEBSD"; + #elif OS_WIN + constexpr char kPlatform[] = "WINDOWS"; + #elif OS_MAC diff --git a/www/chromium/files/patch-chrome_browser_sessions_session__restore.cc b/www/chromium/files/patch-chrome_browser_sessions_session__restore.cc new file mode 100644 index 000000000000..c26096a11622 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_sessions_session__restore.cc @@ -0,0 +1,11 @@ +--- chrome/browser/sessions/session_restore.cc.orig 2021-06-10 11:16:08 UTC ++++ chrome/browser/sessions/session_restore.cc +@@ -931,7 +931,7 @@ void SessionRestore::RestoreSessionAfterCrash(Browser* + // On linux, apps can be restored without the proper app frame, + // disabling restorations on linux for now. http://crbug.com/1199109 + #if BUILDFLAG(ENABLE_APP_SESSION_SERVICE) +-#if !defined(OS_MAC) && !defined(OS_LINUX) ++#if !defined(OS_MAC) && !defined(OS_LINUX) && !defined(OS_BSD) + // Apps should always be restored on crash restore. + behavior |= SessionRestore::RESTORE_APPS; + #endif diff --git a/www/chromium/files/patch-chrome_browser_sharing_sharing__device__registration.cc b/www/chromium/files/patch-chrome_browser_sharing_sharing__device__registration.cc index 01e986c150bb..d179dddc441f 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,11 +1,11 @@ ---- chrome/browser/sharing/sharing_device_registration.cc.orig 2021-04-14 18:40:55 UTC +--- chrome/browser/sharing/sharing_device_registration.cc.orig 2021-05-12 22:05:45 UTC +++ chrome/browser/sharing/sharing_device_registration.cc -@@ -324,7 +324,7 @@ bool SharingDeviceRegistration::IsSmsFetcherSupported( +@@ -321,7 +321,7 @@ bool SharingDeviceRegistration::IsSmsFetcherSupported( } bool SharingDeviceRegistration::IsRemoteCopySupported() const { -#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) return base::FeatureList::IsEnabled(kRemoteCopyReceiver); #else 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 63f168cacefd..e4a2e7c328c7 100644 --- a/www/chromium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc +++ b/www/chromium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc @@ -1,32 +1,32 @@ ---- chrome/browser/sharing/sharing_handler_registry_impl.cc.orig 2021-04-14 18:40:55 UTC +--- chrome/browser/sharing/sharing_handler_registry_impl.cc.orig 2021-05-12 22:05:45 UTC +++ chrome/browser/sharing/sharing_handler_registry_impl.cc -@@ -23,10 +23,10 @@ +@@ -21,10 +21,10 @@ #include "chrome/browser/sharing/shared_clipboard/shared_clipboard_message_handler_desktop.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/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) || // BUILDFLAG(IS_CHROMEOS_LACROS)) defined(OS_CHROMEOS) SharingHandlerRegistryImpl::SharingHandlerRegistryImpl( -@@ -71,14 +71,14 @@ SharingHandlerRegistryImpl::SharingHandlerRegistryImpl +@@ -67,14 +67,14 @@ SharingHandlerRegistryImpl::SharingHandlerRegistryImpl {chrome_browser_sharing::SharingMessage::kSharedClipboardMessage}); } -#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) if (sharing_device_registration->IsRemoteCopySupported()) { AddSharingHandler( std::make_unique(profile), {chrome_browser_sharing::SharingMessage::kRemoteCopyMessage}); } -#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || +#endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || // defined(OS_CHROMEOS) } diff --git a/www/chromium/files/patch-chrome_browser_sync_device__info__sync__client__impl.cc b/www/chromium/files/patch-chrome_browser_sync_device__info__sync__client__impl.cc new file mode 100644 index 000000000000..e7129c08dc6b --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_sync_device__info__sync__client__impl.cc @@ -0,0 +1,11 @@ +--- chrome/browser/sync/device_info_sync_client_impl.cc.orig 2021-06-11 09:31:26 UTC ++++ chrome/browser/sync/device_info_sync_client_impl.cc +@@ -38,7 +38,7 @@ std::string DeviceInfoSyncClientImpl::GetSigninScopedD + // 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"; 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 deleted file mode 100644 index cf4cb01fbfb1..000000000000 --- a/www/chromium/files/patch-chrome_browser_sync_device__info__sync__service__factory.cc +++ /dev/null @@ -1,17 +0,0 @@ ---- chrome/browser/sync/device_info_sync_service_factory.cc.orig 2021-04-14 18:40:55 UTC -+++ chrome/browser/sync/device_info_sync_service_factory.cc -@@ -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) || - // BUILDFLAG(IS_CHROMEOS_LACROS)) - - return GetSigninScopedDeviceIdForProfile(profile_); 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 6c8134e4b4e3..f0cd5ce5aa31 100644 --- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc +++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc @@ -1,56 +1,56 @@ ---- chrome/browser/task_manager/sampling/task_group.cc.orig 2021-04-14 18:40:55 UTC +--- chrome/browser/task_manager/sampling/task_group.cc.orig 2021-05-12 22:05:45 UTC +++ chrome/browser/task_manager/sampling/task_group.cc @@ -33,9 +33,9 @@ const int kBackgroundRefreshTypesMask = #if defined(OS_WIN) REFRESH_TYPE_START_TIME | REFRESH_TYPE_CPU_TIME | #endif // defined(OS_WIN) -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) REFRESH_TYPE_FD_COUNT | -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) #if BUILDFLAG(ENABLE_NACL) REFRESH_TYPE_NACL | #endif // BUILDFLAG(ENABLE_NACL) @@ -114,9 +114,9 @@ TaskGroup::TaskGroup( #if BUILDFLAG(ENABLE_NACL) nacl_debug_stub_port_(nacl::kGdbDebugStubPortUnknown), #endif // BUILDFLAG(ENABLE_NACL) -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) open_fd_count_(-1), -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) idle_wakeups_per_second_(-1), gpu_memory_has_duplicates_(false), is_backgrounded_(false) { @@ -129,10 +129,10 @@ TaskGroup::TaskGroup( weak_ptr_factory_.GetWeakPtr()), base::BindRepeating(&TaskGroup::OnIdleWakeupsRefreshDone, weak_ptr_factory_.GetWeakPtr()), -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) base::BindRepeating(&TaskGroup::OnOpenFdCountRefreshDone, weak_ptr_factory_.GetWeakPtr()), -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) base::BindRepeating(&TaskGroup::OnProcessPriorityDone, weak_ptr_factory_.GetWeakPtr())); -@@ -300,14 +300,14 @@ void TaskGroup::OnRefreshNaClDebugStubPortDone(int nac +@@ -301,14 +301,14 @@ void TaskGroup::OnRefreshNaClDebugStubPortDone(int nac } #endif // BUILDFLAG(ENABLE_NACL) -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) void TaskGroup::OnOpenFdCountRefreshDone(int open_fd_count) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); open_fd_count_ = open_fd_count; OnBackgroundRefreshTypeFinished(REFRESH_TYPE_FD_COUNT); } -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) void TaskGroup::OnCpuRefreshDone(double cpu_usage) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc index ef9fd285356a..2c0a5994a470 100644 --- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc +++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc @@ -1,16 +1,16 @@ ---- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2021-04-14 18:40:55 UTC +--- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2021-05-12 22:05:45 UTC +++ chrome/browser/task_manager/sampling/task_manager_impl.cc -@@ -222,11 +222,11 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id, +@@ -213,11 +213,11 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id, } int TaskManagerImpl::GetOpenFdCount(TaskId task_id) const { -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) return GetTaskGroupByTaskId(task_id)->open_fd_count(); #else return -1; -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) } bool TaskManagerImpl::IsTaskOnBackgroundedProcess(TaskId task_id) const { diff --git a/www/chromium/files/patch-chrome_browser_task__manager_task__manager__observer.h b/www/chromium/files/patch-chrome_browser_task__manager_task__manager__observer.h index 6fa40461748e..77111779aba6 100644 --- a/www/chromium/files/patch-chrome_browser_task__manager_task__manager__observer.h +++ b/www/chromium/files/patch-chrome_browser_task__manager_task__manager__observer.h @@ -1,16 +1,16 @@ ---- chrome/browser/task_manager/task_manager_observer.h.orig 2021-04-14 18:40:55 UTC +--- chrome/browser/task_manager/task_manager_observer.h.orig 2021-05-12 22:05:45 UTC +++ chrome/browser/task_manager/task_manager_observer.h -@@ -43,11 +43,11 @@ enum RefreshType { +@@ -47,11 +47,11 @@ enum RefreshType { // or backgrounded. REFRESH_TYPE_PRIORITY = 1 << 13, -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) // For observers interested in getting the number of open file descriptors of // processes. REFRESH_TYPE_FD_COUNT = 1 << 14, -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) REFRESH_TYPE_KEEPALIVE_COUNT = 1 << 15, REFRESH_TYPE_MEMORY_FOOTPRINT = 1 << 16, diff --git a/www/chromium/files/patch-chrome_browser_themes_theme__helper.cc b/www/chromium/files/patch-chrome_browser_themes_theme__helper.cc index f6805c0e87df..35fc615debb8 100644 --- a/www/chromium/files/patch-chrome_browser_themes_theme__helper.cc +++ b/www/chromium/files/patch-chrome_browser_themes_theme__helper.cc @@ -1,11 +1,11 @@ ---- chrome/browser/themes/theme_helper.cc.orig 2021-04-22 07:57:50 UTC +--- chrome/browser/themes/theme_helper.cc.orig 2021-05-12 22:05:45 UTC +++ chrome/browser/themes/theme_helper.cc -@@ -304,7 +304,7 @@ bool ThemeHelper::ShouldUseIncreasedContrastThemeSuppl +@@ -289,7 +289,7 @@ bool ThemeHelper::ShouldUseIncreasedContrastThemeSuppl ui::NativeTheme* native_theme) const { // 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) // On Linux the GTK system theme provides the high contrast colors, // so don't use the IncreasedContrastThemeSupplier. return false; diff --git a/www/chromium/files/patch-chrome_browser_ui_BUILD.gn b/www/chromium/files/patch-chrome_browser_ui_BUILD.gn index cd77d16a18c9..5a6da10d2346 100644 --- a/www/chromium/files/patch-chrome_browser_ui_BUILD.gn +++ b/www/chromium/files/patch-chrome_browser_ui_BUILD.gn @@ -1,22 +1,22 @@ ---- chrome/browser/ui/BUILD.gn.orig 2021-04-20 18:58:27 UTC +--- chrome/browser/ui/BUILD.gn.orig 2021-05-12 22:05:45 UTC +++ chrome/browser/ui/BUILD.gn -@@ -642,11 +642,18 @@ static_library("ui") { +@@ -648,11 +648,18 @@ static_library("ui") { deps += [ "//components/autofill/content/browser/webauthn" ] } - if (!is_fuchsia) { + if (!is_fuchsia && !is_bsd) { # TODO(crbug.com/753619): Enable crash reporting on Fuchsia. deps += [ "//components/crash/core/app", "//components/crash/core/browser", + ] + } + + if (is_bsd) { + sources -= [ + "webui/crashes_ui.cc", + "webui/crashes_ui.h", ] } diff --git a/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc new file mode 100644 index 000000000000..697b2f071ad3 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc @@ -0,0 +1,29 @@ +--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2021-06-10 11:17:17 UTC ++++ chrome/browser/ui/startup/startup_browser_creator.cc +@@ -125,7 +125,7 @@ + #endif + + #if defined(OS_WIN) || defined(OS_MAC) || \ +- (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) ++ (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) + #include "chrome/browser/web_applications/components/url_handler_launch_params.h" + #include "chrome/browser/web_applications/components/url_handler_manager_impl.h" + #include "third_party/blink/public/common/features.h" +@@ -510,7 +510,7 @@ bool MaybeLaunchApplication( + } + + #if defined(OS_WIN) || defined(OS_MAC) || \ +- (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) ++ (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) + // If |command_line| contains a single URL argument and that URL matches URL + // handling registration from installed web apps, show app options to user and + // launch one if accepted. +@@ -1061,7 +1061,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( + + // Web app URL handling. + #if defined(OS_WIN) || defined(OS_MAC) || \ +- (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) ++ (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) + if (MaybeLaunchUrlHandlerWebApp(command_line, cur_dir, + std::make_unique())) { + return true; diff --git a/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc new file mode 100644 index 000000000000..cb016f1c3bf2 --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc @@ -0,0 +1,11 @@ +--- chrome/browser/ui/startup/startup_browser_creator_impl.cc.orig 2021-06-10 11:16:56 UTC ++++ chrome/browser/ui/startup/startup_browser_creator_impl.cc +@@ -106,7 +106,7 @@ namespace { + bool ShouldRestoreApps(bool is_post_restart) { + #if BUILDFLAG(IS_CHROMEOS_ASH) + return true; +-#elif defined(OS_MAC) || defined(OS_LINUX) || defined(OS_WIN) ++#elif defined(OS_MAC) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) + // TODO(stahon@microsoft.com) + // Even when app restores are enabled on mac, don't actually restore apps + // because they do not restore correctly. http://crbug.com/1194201 diff --git a/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc index 4966039cccd7..4847977ad5ef 100644 --- a/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc +++ b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc @@ -1,25 +1,25 @@ ---- chrome/browser/ui/tab_helpers.cc.orig 2021-04-14 18:40:55 UTC +--- chrome/browser/ui/tab_helpers.cc.orig 2021-05-12 22:05:45 UTC +++ chrome/browser/ui/tab_helpers.cc -@@ -151,7 +151,7 @@ +@@ -150,7 +150,7 @@ #include "chrome/browser/ui/app_list/search/cros_action_history/cros_action_recorder_tab_tracker.h" #endif -#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) #include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h" #include "chrome/browser/ui/hats/hats_helper.h" -@@ -425,11 +425,11 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con +@@ -414,11 +414,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) || BUILDFLAG(IS_CHROMEOS_LACROS)) + (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) metrics::DesktopSessionDurationObserver::CreateForWebContents(web_contents); #endif -#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) if (base::FeatureList::IsEnabled( - features::kHappinessTrackingSurveysForDesktop) || + features::kHappinessTrackingSurveysForDesktopDemo)) { diff --git a/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc b/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc index b6721c152744..169bdfe15f85 100644 --- a/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc +++ b/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc @@ -1,50 +1,50 @@ ---- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2021-04-14 18:40:55 UTC +--- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2021-05-12 22:05:45 UTC +++ chrome/browser/ui/task_manager/task_manager_table_model.cc -@@ -450,13 +450,13 @@ base::string16 TaskManagerTableModel::GetText(int row, +@@ -449,13 +449,13 @@ std::u16string TaskManagerTableModel::GetText(int row, ? stringifier_->backgrounded_string() : stringifier_->foregrounded_string(); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: { const int fd_count = observed_task_manager()->GetOpenFdCount(tasks_[row]); return fd_count >= 0 ? base::FormatNumber(fd_count) : stringifier_->n_a_string(); } -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) case IDS_TASK_MANAGER_KEEPALIVE_COUNT_COLUMN: { return stringifier_->GetKeepaliveCountText( -@@ -616,7 +616,7 @@ int TaskManagerTableModel::CompareValues(int row1, +@@ -615,7 +615,7 @@ int TaskManagerTableModel::CompareValues(int row1, return BooleanCompare(is_proc1_bg, is_proc2_bg); } -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: { const int proc1_fd_count = observed_task_manager()->GetOpenFdCount(tasks_[row1]); -@@ -624,7 +624,7 @@ int TaskManagerTableModel::CompareValues(int row1, +@@ -623,7 +623,7 @@ int TaskManagerTableModel::CompareValues(int row1, observed_task_manager()->GetOpenFdCount(tasks_[row2]); return ValueCompare(proc1_fd_count, proc2_fd_count); } -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) default: NOTREACHED(); -@@ -790,11 +790,11 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col +@@ -789,11 +789,11 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col type = REFRESH_TYPE_KEEPALIVE_COUNT; break; -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: type = REFRESH_TYPE_FD_COUNT; break; -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) default: NOTREACHED(); diff --git a/www/chromium/files/patch-chrome_browser_ui_test_test__browser__dialog.cc b/www/chromium/files/patch-chrome_browser_ui_test_test__browser__dialog.cc index fcab24a1e6e7..38b1bd7d5c54 100644 --- a/www/chromium/files/patch-chrome_browser_ui_test_test__browser__dialog.cc +++ b/www/chromium/files/patch-chrome_browser_ui_test_test__browser__dialog.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/test/test_browser_dialog.cc.orig 2021-04-14 18:40:55 UTC +--- chrome/browser/ui/test/test_browser_dialog.cc.orig 2021-05-12 22:05:45 UTC +++ chrome/browser/ui/test/test_browser_dialog.cc -@@ -117,7 +117,7 @@ bool TestBrowserDialog::VerifyUi() { +@@ -115,7 +115,7 @@ bool TestBrowserDialog::VerifyUi() { // TODO(https://crbug.com/958242) support Mac for pixel tests. // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#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) dialog_widget->SetBlockCloseForTesting(true); // Deactivate before taking screenshot. Deactivated dialog pixel outputs // is more predictable than activated dialog. diff --git a/www/chromium/files/patch-chrome_browser_ui_views_bookmarks_bookmark__bar__view__test.cc b/www/chromium/files/patch-chrome_browser_ui_views_bookmarks_bookmark__bar__view__test.cc index 3a0eacf363b7..efbc5821608a 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_bookmarks_bookmark__bar__view__test.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_bookmarks_bookmark__bar__view__test.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc.orig 2021-04-14 18:40:55 UTC +--- chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc.orig 2021-05-12 22:05:46 UTC +++ chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc -@@ -1856,7 +1856,7 @@ class BookmarkBarViewTest20 : public BookmarkBarViewEv +@@ -1857,7 +1857,7 @@ class BookmarkBarViewTest20 : public BookmarkBarViewEv } void Step3() { -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) EXPECT_EQ(1, test_view_->press_count()); #else EXPECT_EQ(2, test_view_->press_count()); diff --git a/www/chromium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view.cc new file mode 100644 index 000000000000..45793b210fbd --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view.cc @@ -0,0 +1,11 @@ +--- chrome/browser/ui/views/eye_dropper/eye_dropper_view.cc.orig 2021-06-10 11:18:23 UTC ++++ chrome/browser/ui/views/eye_dropper/eye_dropper_view.cc +@@ -104,7 +104,7 @@ EyeDropperView::EyeDropperView(content::RenderFrameHos + SetModalType(ui::MODAL_TYPE_WINDOW); + SetOwnedByWidget(false); + SetPreferredSize(GetSize()); +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Use TYPE_MENU for Linux to ensure that the eye dropper view is displayed + // above the color picker. + views::Widget::InitParams params(views::Widget::InitParams::TYPE_MENU); diff --git a/www/chromium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view__aura.cc b/www/chromium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view__aura.cc new file mode 100644 index 000000000000..47cdcd94121d --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view__aura.cc @@ -0,0 +1,11 @@ +--- chrome/browser/ui/views/eye_dropper/eye_dropper_view_aura.cc.orig 2021-06-10 11:18:04 UTC ++++ chrome/browser/ui/views/eye_dropper/eye_dropper_view_aura.cc +@@ -38,7 +38,7 @@ void EyeDropperView::MoveViewToFront() { + } + + void EyeDropperView::CaptureInputIfNeeded() { +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // The eye dropper needs to capture input since it is not activated + // in order to avoid dismissing the color picker. + GetWidget()->GetNativeWindow()->SetCapture(); diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc index ae803bbe2d04..0dc665cd252d 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc @@ -1,29 +1,29 @@ ---- chrome/browser/ui/views/frame/browser_frame.cc.orig 2021-04-14 18:40:55 UTC +--- chrome/browser/ui/views/frame/browser_frame.cc.orig 2021-05-12 22:05:46 UTC +++ chrome/browser/ui/views/frame/browser_frame.cc -@@ -43,7 +43,7 @@ +@@ -44,7 +44,7 @@ // 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/display/screen.h" #endif -@@ -52,7 +52,7 @@ namespace { +@@ -53,7 +53,7 @@ namespace { bool IsUsingGtkTheme(Profile* profile) { // 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) return ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme(); #else return false; -@@ -220,7 +220,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() { +@@ -221,7 +221,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() { IsVisibleOnAllWorkspaces()); // 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 the window was sent to a different workspace, prioritize it if // it was sent to the current workspace and deprioritize it // otherwise. This is done by MoveBrowsersInWorkspaceToFront() diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc index 73885e860515..f3bbeb57a328 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc @@ -1,20 +1,20 @@ ---- chrome/browser/ui/views/frame/browser_view.cc.orig 2021-04-14 18:40:55 UTC +--- chrome/browser/ui/views/frame/browser_view.cc.orig 2021-05-12 22:05:46 UTC +++ chrome/browser/ui/views/frame/browser_view.cc -@@ -1532,7 +1532,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra +@@ -1563,7 +1563,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra // CrOS cleanup is done. // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#if !(defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) +#if !(defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) contents_web_view_->SetFastResize(is_dragging); if (!is_dragging) { // When tab dragging is ended, we need to make sure the web contents get -@@ -1915,7 +1915,7 @@ void BrowserView::UserChangedTheme(BrowserThemeChangeT +@@ -1951,7 +1951,7 @@ void BrowserView::UserChangedTheme(BrowserThemeChangeT bool must_regenerate_frame; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) // GTK and user theme changes can both change frame buttons, so the frame // always needs to be regenerated on Linux. must_regenerate_frame = true; diff --git a/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc index 09e14b33a1e0..055568693ddc 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/views/hung_renderer_view.cc.orig 2021-04-14 18:40:55 UTC +--- chrome/browser/ui/views/hung_renderer_view.cc.orig 2021-05-12 22:05:46 UTC +++ chrome/browser/ui/views/hung_renderer_view.cc -@@ -424,7 +424,7 @@ void HungRendererDialogView::ForceCrashHungRenderer() +@@ -413,7 +413,7 @@ void HungRendererDialogView::ForceCrashHungRenderer() content::RenderProcessHost* rph = hung_pages_table_model_->GetRenderWidgetHost()->GetProcess(); if (rph) { -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // A generic |CrashDumpHungChildProcess()| is not implemented for Linux. // Instead we send an explicit IPC to crash on the renderer's IO thread. rph->ForceCrash(); diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc index b3df7da806b0..fe26cd435c31 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/views/tabs/tab.cc.orig 2021-04-14 18:40:56 UTC +--- chrome/browser/ui/views/tabs/tab.cc.orig 2021-05-12 22:05:46 UTC +++ chrome/browser/ui/views/tabs/tab.cc -@@ -577,7 +577,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& +@@ -582,7 +582,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& if (mouse_hovered_ || !GetWidget()->IsMouseEventsEnabled()) return; -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Move the hit test area for hovering up so that it is not overlapped by tab // hover cards when they are shown. - // TODO(crbug/978134): Once Linux/CrOS widget transparency is solved, remove + // TODO(crbug.com/978134): Once Linux/CrOS widget transparency is solved, diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc index 67961ab45de3..c39053d48c6e 100644 --- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc +++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc @@ -1,29 +1,29 @@ ---- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2021-04-14 18:40:56 UTC +--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2021-05-12 22:05:46 UTC +++ chrome/browser/ui/views/tabs/tab_drag_controller.cc -@@ -447,7 +447,7 @@ void TabDragController::Init(TabDragContext* source_co +@@ -456,7 +456,7 @@ void TabDragController::Init(TabDragContext* source_co // synchronous on desktop Linux, so use that. // - Chrome OS // Releasing capture on Ash cancels gestures so avoid it. -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) can_release_capture_ = false; #endif start_point_in_screen_ = gfx::Point(source_view_offset, mouse_offset.y()); -@@ -898,7 +898,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon +@@ -918,7 +918,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon // 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)) // EndMoveLoop is going to snap the window back to its original location. // Hide it so users don't see this. Hiding a window in Linux aura causes // it to lose capture so skip it. -@@ -2117,7 +2117,7 @@ TabDragController::Liveness TabDragController::GetLoca +@@ -2145,7 +2145,7 @@ TabDragController::Liveness TabDragController::GetLoca } // 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) // Exclude windows which are pending deletion via Browser::TabStripEmpty(). // These windows can be returned in the Linux Aura port because the browser // window which was used for dragging is not hidden once all of its tabs are diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc b/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc index 7e385e9e4c4f..37296e596a29 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc @@ -1,92 +1,92 @@ ---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2021-04-20 18:58:27 UTC +--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2021-05-12 22:05:46 UTC +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc @@ -30,7 +30,9 @@ #include "chrome/browser/ui/webui/bluetooth_internals/bluetooth_internals_ui.h" #include "chrome/browser/ui/webui/components/components_ui.h" #include "chrome/browser/ui/webui/constrained_web_dialog_ui.h" +#if !defined(OS_BSD) #include "chrome/browser/ui/webui/crashes_ui.h" +#endif #include "chrome/browser/ui/webui/device_log_ui.h" #include "chrome/browser/ui/webui/domain_reliability_internals_ui.h" #include "chrome/browser/ui/webui/download_internals/download_internals_ui.h" -@@ -266,12 +268,12 @@ +@@ -272,12 +274,12 @@ #include "chrome/browser/ui/webui/conflicts/conflicts_ui.h" #endif -#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) #include "chrome/browser/ui/webui/discards/discards_ui.h" #endif -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ defined(OS_ANDROID) #include "chrome/browser/ui/webui/sandbox/sandbox_internals_ui.h" #endif -@@ -478,7 +480,7 @@ bool IsAboutUI(const GURL& url) { +@@ -496,7 +498,7 @@ bool IsAboutUI(const GURL& url) { #if !defined(OS_ANDROID) || url.host_piece() == chrome::kChromeUITermsHost #endif -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_OPENBSD) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || url.host_piece() == chrome::kChromeUILinuxProxyConfigHost #endif #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -527,8 +529,10 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -545,8 +547,10 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we return &NewWebUI; if (url.spec() == chrome::kChromeUIConstrainedHTMLTestURL) return &NewWebUI; +#if !defined(OS_BSD) if (url.host_piece() == chrome::kChromeUICrashesHost) return &NewWebUI; +#endif if (url.host_piece() == chrome::kChromeUIDeviceLogHost) return &NewWebUI; if (url.host_piece() == chrome::kChromeUIDomainReliabilityInternalsHost) -@@ -892,7 +896,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -927,7 +931,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we if (url.host_piece() == chrome::kChromeUINaClHost) return &NewWebUI; #endif -#if ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(TOOLKIT_VIEWS)) || \ +#if ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(TOOLKIT_VIEWS)) || defined(OS_BSD) || \ defined(USE_AURA) if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost) return &NewWebUI; -@@ -936,13 +940,13 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -971,13 +975,13 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we return &NewWebUI; } #endif -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ defined(OS_ANDROID) if (url.host_piece() == chrome::kChromeUISandboxHost) { return &NewWebUI; } #endif -#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) if (url.host_piece() == chrome::kChromeUIDiscardsHost) return &NewWebUI; -@@ -950,7 +954,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -985,7 +989,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if defined(OS_WIN) || defined(OS_MAC) || \ - (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) + (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) if (url.host_piece() == chrome::kChromeUIBrowserSwitchHost) return &NewWebUI; #endif -@@ -1153,8 +1157,10 @@ base::RefCountedMemory* ChromeWebUIControllerFactory:: +@@ -1181,8 +1185,10 @@ base::RefCountedMemory* ChromeWebUIControllerFactory:: return ConflictsUI::GetFaviconResourceBytes(scale_factor); #endif +#if !defined(OS_BSD) if (page_url.host_piece() == chrome::kChromeUICrashesHost) return CrashesUI::GetFaviconResourceBytes(scale_factor); +#endif if (page_url.host_piece() == chrome::kChromeUIFlagsHost) return FlagsUI::GetFaviconResourceBytes(scale_factor); diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc index a4a298381dfe..3e444821332d 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/webui/ntp/app_launcher_handler.cc.orig 2021-04-22 07:58:52 UTC +--- chrome/browser/ui/webui/ntp/app_launcher_handler.cc.orig 2021-05-12 22:05:46 UTC +++ chrome/browser/ui/webui/ntp/app_launcher_handler.cc -@@ -1395,7 +1395,7 @@ void AppLauncherHandler::InstallOsHooks(const web_app: +@@ -1396,7 +1396,7 @@ void AppLauncherHandler::InstallOsHooks(const web_app: options.os_hooks[web_app::OsHookType::kRunOnOsLogin] = false; options.os_hooks[web_app::OsHookType::kUninstallationViaOsSettings] = true; #if defined(OS_WIN) || defined(OS_MAC) || \ - (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) + (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) options.os_hooks[web_app::OsHookType::kUrlHandlers] = true; #else options.os_hooks[web_app::OsHookType::kUrlHandlers] = false; diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc b/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc index 414df95e8591..5c31faca434c 100644 --- a/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc +++ b/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc @@ -1,20 +1,20 @@ ---- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2021-04-14 18:40:56 UTC +--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2021-05-12 22:05:46 UTC +++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -344,7 +344,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -338,7 +338,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht {"huge", IDS_SETTINGS_HUGE_FONT_SIZE}, // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#if defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS) +#if (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) {"systemTheme", IDS_SETTINGS_SYSTEM_THEME}, {"useSystemTheme", IDS_SETTINGS_USE_SYSTEM_THEME}, {"classicTheme", IDS_SETTINGS_CLASSIC_THEME}, -@@ -352,7 +352,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -346,7 +346,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht #else {"resetToDefaultTheme", IDS_SETTINGS_RESET_TO_DEFAULT_THEME}, #endif -#if defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS) +#if (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS}, #endif #if defined(OS_MAC) diff --git a/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__file__handler__registration.h b/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__file__handler__registration.h index 892c8040b07c..5097be46172b 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__file__handler__registration.h +++ b/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__file__handler__registration.h @@ -1,11 +1,11 @@ ---- chrome/browser/web_applications/components/web_app_file_handler_registration.h.orig 2021-04-14 18:40:56 UTC +--- chrome/browser/web_applications/components/web_app_file_handler_registration.h.orig 2021-05-12 22:05:46 UTC +++ chrome/browser/web_applications/components/web_app_file_handler_registration.h -@@ -38,7 +38,7 @@ void RegisterFileHandlersWithOs(const AppId& app_id, - // If a shim app was required, also removes the shim app. - void UnregisterFileHandlersWithOs(const AppId& app_id, Profile* profile); +@@ -42,7 +42,7 @@ void UnregisterFileHandlersWithOs(const AppId& app_id, + std::unique_ptr info, + base::OnceCallback callback); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) using RegisterMimeTypesOnLinuxCallback = base::OnceCallback; diff --git a/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__protocol__handler__registration.cc b/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__protocol__handler__registration.cc new file mode 100644 index 000000000000..edb22367ca2c --- /dev/null +++ b/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__protocol__handler__registration.cc @@ -0,0 +1,11 @@ +--- chrome/browser/web_applications/components/web_app_protocol_handler_registration.cc.orig 2021-06-10 11:20:20 UTC ++++ chrome/browser/web_applications/components/web_app_protocol_handler_registration.cc +@@ -10,7 +10,7 @@ + + namespace web_app { + +-#if !(defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX)) ++#if !(defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD)) + // Registers a protocol handler for the web app with the OS. + void RegisterProtocolHandlersWithOs( + const AppId& app_id, diff --git a/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__run__on__os__login.cc b/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__run__on__os__login.cc deleted file mode 100644 index 0dd4c547935a..000000000000 --- a/www/chromium/files/patch-chrome_browser_web__applications_components_web__app__run__on__os__login.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/web_applications/components/web_app_run_on_os_login.cc.orig 2021-04-14 18:40:56 UTC -+++ chrome/browser/web_applications/components/web_app_run_on_os_login.cc -@@ -34,7 +34,7 @@ namespace internals { - - // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is - // complete. --#if !(defined(OS_WIN) || defined(OS_MAC) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))) -+#if !(defined(OS_WIN) || defined(OS_MAC) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD)) - // This boilerplate function is used for platforms that don't support Run On OS - // Login. Currently the feature is supported on Windows, Linux and MacOS. - bool RegisterRunOnOsLogin(const ShortcutInfo& shortcut_info) { diff --git a/www/chromium/files/patch-chrome_browser_web__applications_pending__app__install__task.cc b/www/chromium/files/patch-chrome_browser_web__applications_pending__app__install__task.cc index 50f989917fef..0d5abcf7e73b 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_pending__app__install__task.cc +++ b/www/chromium/files/patch-chrome_browser_web__applications_pending__app__install__task.cc @@ -1,11 +1,11 @@ ---- chrome/browser/web_applications/pending_app_install_task.cc.orig 2021-04-22 07:59:39 UTC +--- chrome/browser/web_applications/pending_app_install_task.cc.orig 2021-05-12 22:05:46 UTC +++ chrome/browser/web_applications/pending_app_install_task.cc -@@ -310,7 +310,7 @@ void PendingAppInstallTask::OnWebAppInstalled(bool is_ +@@ -311,7 +311,7 @@ void PendingAppInstallTask::OnWebAppInstalled(bool is_ options.os_hooks[OsHookType::kProtocolHandlers] = true; options.os_hooks[OsHookType::kUninstallationViaOsSettings] = true; #if defined(OS_WIN) || defined(OS_MAC) || \ - (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) + (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) - options.os_hooks[web_app::OsHookType::kUrlHandlers] = true; + options.os_hooks[OsHookType::kUrlHandlers] = true; #else - options.os_hooks[web_app::OsHookType::kUrlHandlers] = false; + options.os_hooks[OsHookType::kUrlHandlers] = false; diff --git a/www/chromium/files/patch-chrome_browser_web__applications_web__app__install__task.cc b/www/chromium/files/patch-chrome_browser_web__applications_web__app__install__task.cc index de19d3869086..cd86b668259c 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_web__app__install__task.cc +++ b/www/chromium/files/patch-chrome_browser_web__applications_web__app__install__task.cc @@ -1,11 +1,11 @@ ---- chrome/browser/web_applications/web_app_install_task.cc.orig 2021-04-22 08:00:04 UTC +--- chrome/browser/web_applications/web_app_install_task.cc.orig 2021-05-12 22:05:46 UTC +++ chrome/browser/web_applications/web_app_install_task.cc -@@ -845,7 +845,7 @@ void WebAppInstallTask::OnInstallFinalizedCreateShortc +@@ -861,7 +861,7 @@ void WebAppInstallTask::OnInstallFinalizedCreateShortc options.os_hooks[OsHookType::kProtocolHandlers] = true; options.os_hooks[OsHookType::kUninstallationViaOsSettings] = true; #if defined(OS_WIN) || defined(OS_MAC) || \ - (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) + (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) - options.os_hooks[web_app::OsHookType::kUrlHandlers] = true; + options.os_hooks[OsHookType::kUrlHandlers] = true; #else - options.os_hooks[web_app::OsHookType::kUrlHandlers] = false; + options.os_hooks[OsHookType::kUrlHandlers] = false; diff --git a/www/chromium/files/patch-chrome_browser_web__applications_web__app__provider.cc b/www/chromium/files/patch-chrome_browser_web__applications_web__app__provider.cc index 1aa3f92b85ac..ff3a3f95bf8c 100644 --- a/www/chromium/files/patch-chrome_browser_web__applications_web__app__provider.cc +++ b/www/chromium/files/patch-chrome_browser_web__applications_web__app__provider.cc @@ -1,11 +1,11 @@ ---- chrome/browser/web_applications/web_app_provider.cc.orig 2021-04-22 08:00:21 UTC +--- chrome/browser/web_applications/web_app_provider.cc.orig 2021-05-12 22:05:46 UTC +++ chrome/browser/web_applications/web_app_provider.cc -@@ -236,7 +236,7 @@ void WebAppProvider::CreateWebAppsSubsystems(Profile* +@@ -237,7 +237,7 @@ void WebAppProvider::CreateWebAppsSubsystems(Profile* std::unique_ptr url_handler_manager = nullptr; #if defined(OS_WIN) || defined(OS_MAC) || \ - (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) + (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) url_handler_manager = std::make_unique(profile); #endif diff --git a/www/chromium/files/patch-chrome_common_BUILD.gn b/www/chromium/files/patch-chrome_common_BUILD.gn index c8ca0a74d71f..f946906ed434 100644 --- a/www/chromium/files/patch-chrome_common_BUILD.gn +++ b/www/chromium/files/patch-chrome_common_BUILD.gn @@ -1,36 +1,36 @@ ---- chrome/common/BUILD.gn.orig 2021-04-14 18:40:56 UTC +--- chrome/common/BUILD.gn.orig 2021-05-12 22:05:46 UTC +++ chrome/common/BUILD.gn -@@ -251,6 +251,10 @@ static_library("common") { +@@ -253,6 +253,10 @@ static_library("common") { public_deps += [ "//ppapi/shared_impl" ] } + if (is_bsd) { + deps -= [ "//components/crash/core/app" ] + } + if (enable_extensions) { sources += [ "extensions/api/commands/commands_handler.cc", -@@ -482,13 +486,21 @@ static_library("common") { +@@ -480,13 +484,21 @@ static_library("common") { public_deps += [ "//chrome/common/safe_browsing" ] } - if (is_linux || is_chromeos) { + if ((is_linux || is_chromeos) && !is_bsd) { sources += [ "auto_start_linux.cc", "auto_start_linux.h", "multi_process_lock_linux.cc", ] deps += [ "//sandbox/linux:sandbox_services" ] + } + + if (is_bsd) { + sources += [ + "auto_start_linux.cc", + "auto_start_linux.h", + "multi_process_lock_linux.cc", + ] } if (enable_cdm_host_verification) { diff --git a/www/chromium/files/patch-chrome_common_channel__info.h b/www/chromium/files/patch-chrome_common_channel__info.h index 082fde50493b..731571657861 100644 --- a/www/chromium/files/patch-chrome_common_channel__info.h +++ b/www/chromium/files/patch-chrome_common_channel__info.h @@ -1,11 +1,11 @@ ---- chrome/common/channel_info.h.orig 2021-04-14 18:40:56 UTC +--- chrome/common/channel_info.h.orig 2021-05-12 22:05:46 UTC +++ chrome/common/channel_info.h -@@ -70,7 +70,7 @@ std::string GetChannelSuffixForDataDir(); +@@ -91,7 +91,7 @@ std::string GetChannelSuffixForDataDir(); // 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) // Returns the channel-specific filename of the desktop shortcut used to launch // the browser. std::string GetDesktopName(base::Environment* env); diff --git a/www/chromium/files/patch-chrome_common_channel__info__posix.cc b/www/chromium/files/patch-chrome_common_channel__info__posix.cc index 2d60a836e827..c3d10dbcde87 100644 --- a/www/chromium/files/patch-chrome_common_channel__info__posix.cc +++ b/www/chromium/files/patch-chrome_common_channel__info__posix.cc @@ -1,20 +1,20 @@ ---- chrome/common/channel_info_posix.cc.orig 2021-04-14 18:40:56 UTC +--- chrome/common/channel_info_posix.cc.orig 2021-05-12 22:05:46 UTC +++ chrome/common/channel_info_posix.cc -@@ -70,7 +70,7 @@ std::string GetChannelSuffixForDataDir() { +@@ -90,7 +90,7 @@ std::string GetChannelSuffixForDataDir() { // 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) std::string GetDesktopName(base::Environment* env) { #if BUILDFLAG(GOOGLE_CHROME_BRANDING) // Google Chrome packaged as a snap is a special case: the application name -@@ -99,7 +99,7 @@ std::string GetDesktopName(base::Environment* env) { +@@ -120,7 +120,7 @@ std::string GetDesktopName(base::Environment* env) { return "chromium-browser.desktop"; #endif } -#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) version_info::Channel GetChannel() { - return GetChannelImpl(nullptr); + return GetChannelImpl().channel; diff --git a/www/chromium/files/patch-chrome_common_chrome__features.cc b/www/chromium/files/patch-chrome_common_chrome__features.cc index 91bace58c4d2..9e7679b1e5ba 100644 --- a/www/chromium/files/patch-chrome_common_chrome__features.cc +++ b/www/chromium/files/patch-chrome_common_chrome__features.cc @@ -1,34 +1,52 @@ ---- chrome/common/chrome_features.cc.orig 2021-04-14 18:40:56 UTC +--- chrome/common/chrome_features.cc.orig 2021-06-09 22:13:57 UTC +++ chrome/common/chrome_features.cc -@@ -96,13 +96,13 @@ const base::Feature kAsyncDns { +@@ -81,13 +81,13 @@ const base::Feature kAsyncDns { #endif }; -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Enables the Restart background mode optimization. When all Chrome UI is // closed and it goes in the background, allows to restart the browser to // discard memory. const base::Feature kBackgroundModeAllowRestart{ "BackgroundModeAllowRestart", base::FEATURE_DISABLED_BY_DEFAULT}; -#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #if BUILDFLAG(IS_CHROMEOS_ASH) // Enable Borealis on Chrome OS. -@@ -360,13 +360,13 @@ const base::Feature kEnableAllSystemWebApps{"EnableAll +@@ -265,7 +265,7 @@ const base::Feature kDesktopPWAsFlashAppNameInsteadOfO + // Enables or disables Desktop PWAs to be auto-started on OS login. + const base::Feature kDesktopPWAsRunOnOsLogin { + "DesktopPWAsRunOnOsLogin", +-#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) + base::FEATURE_ENABLED_BY_DEFAULT + #else + base::FEATURE_DISABLED_BY_DEFAULT +@@ -356,13 +356,13 @@ const base::Feature kEnableAllSystemWebApps{"EnableAll // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ +#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) || \ defined(OS_MAC) COMPONENT_EXPORT(CHROME_FEATURES) // Enables ephemeral Guest profiles on desktop. extern const base::Feature kEnableEphemeralGuestProfilesOnDesktop{ "EnableEphemeralGuestProfilesOnDesktop", base::FEATURE_DISABLED_BY_DEFAULT}; -#endif // defined(OS_WIN) || (defined(OS_LINUX) || +#endif // defined(OS_WIN) || (defined(OS_LINUX) || defined(OS_BSD) || // BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_MAC) #if defined(OS_WIN) +@@ -544,7 +544,7 @@ const base::Feature kIncompatibleApplicationsWarning{ + "IncompatibleApplicationsWarning", base::FEATURE_DISABLED_BY_DEFAULT}; + #endif + +-#if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || \ ++#if defined(OS_MAC) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + // When enabled, removes any theme or background customization done by the user + // on the Incognito UI. diff --git a/www/chromium/files/patch-chrome_common_chrome__features.h b/www/chromium/files/patch-chrome_common_chrome__features.h index 3f2ed04d65a8..a10edda0168a 100644 --- a/www/chromium/files/patch-chrome_common_chrome__features.h +++ b/www/chromium/files/patch-chrome_common_chrome__features.h @@ -1,29 +1,38 @@ ---- chrome/common/chrome_features.h.orig 2021-04-14 18:40:56 UTC +--- chrome/common/chrome_features.h.orig 2021-06-09 22:13:57 UTC +++ chrome/common/chrome_features.h -@@ -81,10 +81,10 @@ extern const base::Feature kAppShimNewCloseBehavior; +@@ -70,10 +70,10 @@ extern const base::Feature kAppShimNewCloseBehavior; COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kAsyncDns; -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kBackgroundModeAllowRestart; -#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #if BUILDFLAG(IS_CHROMEOS_ASH) COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kBorealis; -@@ -243,11 +243,11 @@ extern const base::Feature kEnableAmbientAuthenticatio +@@ -234,11 +234,11 @@ extern const base::Feature kEnableAmbientAuthenticatio // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ +#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) || \ defined(OS_MAC) COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kEnableEphemeralGuestProfilesOnDesktop; -#endif // defined(OS_WIN) || (defined(OS_LINUX) || +#endif // defined(OS_WIN) || (defined(OS_LINUX) || defined(OS_BSD) || // BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_MAC) #if defined(OS_WIN) +@@ -358,7 +358,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) + extern const base::Feature kIncompatibleApplicationsWarning; + #endif // defined(OS_ANDROID) + +-#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) + COMPONENT_EXPORT(CHROME_FEATURES) + extern const base::Feature kIncognitoBrandConsistencyForDesktop; diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.cc b/www/chromium/files/patch-chrome_common_chrome__switches.cc index bab1a710972c..2a4679643445 100644 --- a/www/chromium/files/patch-chrome_common_chrome__switches.cc +++ b/www/chromium/files/patch-chrome_common_chrome__switches.cc @@ -1,11 +1,11 @@ ---- chrome/common/chrome_switches.cc.orig 2021-04-14 18:40:56 UTC +--- chrome/common/chrome_switches.cc.orig 2021-05-12 22:05:46 UTC +++ chrome/common/chrome_switches.cc -@@ -804,7 +804,7 @@ const char kAllowNaClFileHandleAPI[] = "allow-n +@@ -803,7 +803,7 @@ const char kAllowNaClFileHandleAPI[] = "allow-n const char kAllowNaClSocketAPI[] = "allow-nacl-socket-api"; #endif -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) || \ defined(OS_WIN) const char kEnableNewAppMenuIcon[] = "enable-new-app-menu-icon"; diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.h b/www/chromium/files/patch-chrome_common_chrome__switches.h index 27badac84914..971ef7da360d 100644 --- a/www/chromium/files/patch-chrome_common_chrome__switches.h +++ b/www/chromium/files/patch-chrome_common_chrome__switches.h @@ -1,11 +1,11 @@ ---- chrome/common/chrome_switches.h.orig 2021-04-14 18:40:56 UTC +--- chrome/common/chrome_switches.h.orig 2021-05-12 22:05:46 UTC +++ chrome/common/chrome_switches.h -@@ -254,7 +254,7 @@ extern const char kAllowNaClFileHandleAPI[]; +@@ -253,7 +253,7 @@ extern const char kAllowNaClFileHandleAPI[]; extern const char kAllowNaClSocketAPI[]; #endif -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || \ +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) || \ defined(OS_WIN) extern const char kEnableNewAppMenuIcon[]; extern const char kGuest[]; diff --git a/www/chromium/files/patch-chrome_common_pref__names.cc b/www/chromium/files/patch-chrome_common_pref__names.cc index 69f2468179fe..b787e20781bc 100644 --- a/www/chromium/files/patch-chrome_common_pref__names.cc +++ b/www/chromium/files/patch-chrome_common_pref__names.cc @@ -1,62 +1,62 @@ ---- chrome/common/pref_names.cc.orig 2021-04-20 18:58:28 UTC +--- chrome/common/pref_names.cc.orig 2021-05-12 22:05:46 UTC +++ chrome/common/pref_names.cc -@@ -1100,7 +1100,7 @@ const char kAllowedDomainsForApps[] = "settings.allowe +@@ -1123,7 +1123,7 @@ const char kAllowedDomainsForApps[] = "settings.allowe // 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) // Linux specific preference on whether we should match the system theme. const char kUsesSystemTheme[] = "extensions.theme.use_system"; #endif -@@ -1251,7 +1251,7 @@ const char kShowUpdatePromotionInfoBar[] = +@@ -1264,7 +1264,7 @@ const char kShowUpdatePromotionInfoBar[] = // 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) // Boolean that is false if we should show window manager decorations. If // true, we draw a custom chrome frame (thicker title bar and blue border). const char kUseCustomChromeFrame[] = "browser.custom_chrome_frame"; -@@ -1709,7 +1709,7 @@ const char kDownloadDefaultDirectory[] = "download.def +@@ -1722,7 +1722,7 @@ const char kDownloadDefaultDirectory[] = "download.def // upgrade a unsafe location to a safe location. const char kDownloadDirUpgraded[] = "download.directory_upgrade"; -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ defined(OS_MAC) const char kOpenPdfDownloadInSystemReader[] = "download.open_pdf_in_system_reader"; -@@ -1980,7 +1980,7 @@ const char kWebAppsUninstalledDefaultChromeApps[] = +@@ -1993,7 +1993,7 @@ const char kWebAppsUninstalledDefaultChromeApps[] = const char kWebAppsPreferences[] = "web_apps.web_app_ids"; #if defined(OS_WIN) || defined(OS_MAC) || \ - (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) + (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) // Dictionary that maps origins to web apps that can act as URL handlers. const char kWebAppsUrlHandlerInfo[] = "web_apps.url_handler_info"; #endif -@@ -2096,12 +2096,12 @@ const char kAmbientAuthenticationInPrivateModesEnabled +@@ -2109,12 +2109,12 @@ const char kAmbientAuthenticationInPrivateModesEnabled // requests. const char kBasicAuthOverHttpEnabled[] = "auth.basic_over_http_enabled"; -#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) || defined(OS_BSD) // Boolean that specifies whether OK-AS-DELEGATE flag from KDC is respected // along with kAuthNegotiateDelegateAllowlist. const char kAuthNegotiateDelegateByKdcPolicy[] = "auth.negotiate_delegate_by_kdc_policy"; -#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) || defined(OS_BSD) #if defined(OS_POSIX) // Boolean that specifies whether NTLMv2 is enabled. -@@ -2994,7 +2994,7 @@ const char kBlockAutoplayEnabled[] = "media.block_auto +@@ -3015,7 +3015,7 @@ const char kBlockAutoplayEnabled[] = "media.block_auto // 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) // Boolean that indicates if native notifications are allowed to be used in // place of Chrome notifications. Will be replaced by kAllowSystemNotifications. const char kAllowNativeNotifications[] = "native_notifications.allowed"; diff --git a/www/chromium/files/patch-chrome_common_pref__names.h b/www/chromium/files/patch-chrome_common_pref__names.h index b87998edfec4..1bf5efd122d4 100644 --- a/www/chromium/files/patch-chrome_common_pref__names.h +++ b/www/chromium/files/patch-chrome_common_pref__names.h @@ -1,59 +1,59 @@ ---- chrome/common/pref_names.h.orig 2021-04-20 18:58:28 UTC +--- chrome/common/pref_names.h.orig 2021-05-12 22:05:46 UTC +++ chrome/common/pref_names.h -@@ -360,7 +360,7 @@ extern const char kForceYouTubeRestrict[]; +@@ -366,7 +366,7 @@ extern const char kForceYouTubeRestrict[]; extern const char kAllowedDomainsForApps[]; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) extern const char kUsesSystemTheme[]; #endif extern const char kCurrentThemePackFilename[]; -@@ -389,7 +389,7 @@ extern const char kShowUpdatePromotionInfoBar[]; +@@ -395,7 +395,7 @@ extern const char kShowUpdatePromotionInfoBar[]; #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) extern const char kUseCustomChromeFrame[]; #endif #if BUILDFLAG(ENABLE_PLUGINS) -@@ -561,7 +561,7 @@ extern const char kDownloadExtensionsToOpen[]; +@@ -567,7 +567,7 @@ extern const char kDownloadExtensionsToOpen[]; extern const char kDownloadExtensionsToOpenByPolicy[]; extern const char kDownloadAllowedURLsForOpenByPolicy[]; extern const char kDownloadDirUpgraded[]; -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ defined(OS_MAC) extern const char kOpenPdfDownloadInSystemReader[]; #endif -@@ -665,7 +665,7 @@ extern const char kWebAppsUninstalledDefaultChromeApps +@@ -671,7 +671,7 @@ extern const char kWebAppsUninstalledDefaultChromeApps extern const char kWebAppsPreferences[]; #if defined(OS_WIN) || defined(OS_MAC) || \ - (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) + (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) extern const char kWebAppsUrlHandlerInfo[]; #endif -@@ -801,9 +801,9 @@ extern const char kGloballyScopeHTTPAuthCacheEnabled[] +@@ -807,9 +807,9 @@ extern const char kGloballyScopeHTTPAuthCacheEnabled[] extern const char kAmbientAuthenticationInPrivateModesEnabled[]; extern const char kBasicAuthOverHttpEnabled[]; -#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) || defined(OS_BSD) extern const char kAuthNegotiateDelegateByKdcPolicy[]; -#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_CHROMEOS) || defined(OS_BSD) #if defined(OS_POSIX) extern const char kNtlmV2Enabled[]; -@@ -1033,7 +1033,7 @@ extern const char kBlockAutoplayEnabled[]; +@@ -1042,7 +1042,7 @@ extern const char kBlockAutoplayEnabled[]; // 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) extern const char kAllowNativeNotifications[]; extern const char kAllowSystemNotifications[]; #endif diff --git a/www/chromium/files/patch-chrome_common_webui__url__constants.cc b/www/chromium/files/patch-chrome_common_webui__url__constants.cc index f2bc902825c7..9554246a4f3e 100644 --- a/www/chromium/files/patch-chrome_common_webui__url__constants.cc +++ b/www/chromium/files/patch-chrome_common_webui__url__constants.cc @@ -1,70 +1,70 @@ ---- chrome/common/webui_url_constants.cc.orig 2021-04-14 18:40:56 UTC +--- chrome/common/webui_url_constants.cc.orig 2021-05-12 22:05:46 UTC +++ chrome/common/webui_url_constants.cc -@@ -350,12 +350,12 @@ const char kChromeUIOSSettingsHost[] = "os-settings"; +@@ -358,12 +358,12 @@ const char kChromeUIOSSettingsHost[] = "os-settings"; const char kChromeUIOSSettingsURL[] = "chrome://os-settings/"; #endif -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) const char kChromeUIWebUIJsErrorHost[] = "webuijserror"; const char kChromeUIWebUIJsErrorURL[] = "chrome://webuijserror/"; #endif -#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) const char kChromeUIDiscardsHost[] = "discards"; const char kChromeUIDiscardsURL[] = "chrome://discards/"; -@@ -372,7 +372,7 @@ const char kChromeUINearbyShareURL[] = "chrome://nearb +@@ -378,7 +378,7 @@ const char kChromeUINearbyShareURL[] = "chrome://nearb const char kChromeUILinuxProxyConfigHost[] = "linux-proxy-config"; #endif -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ defined(OS_ANDROID) const char kChromeUISandboxHost[] = "sandbox"; #endif -@@ -380,7 +380,7 @@ const char kChromeUISandboxHost[] = "sandbox"; +@@ -386,7 +386,7 @@ const char kChromeUISandboxHost[] = "sandbox"; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if defined(OS_WIN) || defined(OS_MAC) || \ - (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) + (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) const char kChromeUIBrowserSwitchHost[] = "browser-switch"; const char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/"; - const char kChromeUIProfileCustomizationHost[] = "profile-customization"; -@@ -391,7 +391,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro + const char kChromeUIEnterpriseProfileWelcomeHost[] = +@@ -401,7 +401,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro const char kChromeUIProfilePickerStartupQuery[] = "startup"; #endif -#if ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(TOOLKIT_VIEWS)) || \ +#if ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(TOOLKIT_VIEWS)) || defined(OS_BSD) || \ defined(USE_AURA) const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog"; #endif -@@ -569,14 +569,14 @@ const char* const kChromeHostURLs[] = { +@@ -583,14 +583,14 @@ const char* const kChromeHostURLs[] = { kChromeUIInternetDetailDialogHost, kChromeUIAssistantOptInHost, #endif -#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) kChromeUIDiscardsHost, #endif #if defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_ANDROID) kChromeUILinuxProxyConfigHost, #endif -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ defined(OS_ANDROID) kChromeUISandboxHost, #endif -@@ -635,7 +635,7 @@ const char* const kChromeDebugURLs[] = { +@@ -649,7 +649,7 @@ const char* const kChromeDebugURLs[] = { content::kChromeUIGpuJavaCrashURL, kChromeUIJavaCrashURL, #endif -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) kChromeUIWebUIJsErrorURL, #endif kChromeUIQuitURL, diff --git a/www/chromium/files/patch-chrome_common_webui__url__constants.h b/www/chromium/files/patch-chrome_common_webui__url__constants.h index 8f64142c25a6..c1ed02dde8ec 100644 --- a/www/chromium/files/patch-chrome_common_webui__url__constants.h +++ b/www/chromium/files/patch-chrome_common_webui__url__constants.h @@ -1,44 +1,44 @@ ---- chrome/common/webui_url_constants.h.orig 2021-04-14 18:40:56 UTC +--- chrome/common/webui_url_constants.h.orig 2021-05-12 22:05:46 UTC +++ chrome/common/webui_url_constants.h -@@ -302,12 +302,12 @@ extern const char kChromeUIOSSettingsHost[]; +@@ -308,12 +308,12 @@ extern const char kChromeUIOSSettingsHost[]; extern const char kChromeUIOSSettingsURL[]; #endif -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) extern const char kChromeUIWebUIJsErrorHost[]; extern const char kChromeUIWebUIJsErrorURL[]; #endif -#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) extern const char kChromeUIDiscardsHost[]; extern const char kChromeUIDiscardsURL[]; -@@ -324,7 +324,7 @@ extern const char kChromeUINearbyShareURL[]; +@@ -328,7 +328,7 @@ extern const char kChromeUINearbyShareURL[]; extern const char kChromeUILinuxProxyConfigHost[]; #endif -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ defined(OS_ANDROID) extern const char kChromeUISandboxHost[]; #endif -@@ -332,7 +332,7 @@ extern const char kChromeUISandboxHost[]; +@@ -336,7 +336,7 @@ extern const char kChromeUISandboxHost[]; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if defined(OS_WIN) || defined(OS_MAC) || \ - (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) + (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) extern const char kChromeUIBrowserSwitchHost[]; extern const char kChromeUIBrowserSwitchURL[]; - extern const char kChromeUIProfileCustomizationHost[]; -@@ -342,7 +342,7 @@ extern const char kChromeUIProfilePickerUrl[]; + extern const char kChromeUIEnterpriseProfileWelcomeHost[]; +@@ -348,7 +348,7 @@ extern const char kChromeUIProfilePickerUrl[]; extern const char kChromeUIProfilePickerStartupQuery[]; #endif -#if ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(TOOLKIT_VIEWS)) || \ +#if ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(TOOLKIT_VIEWS)) || defined(OS_BSD) || \ defined(USE_AURA) extern const char kChromeUITabModalConfirmDialogHost[]; #endif diff --git a/www/chromium/files/patch-chrome_services_speech_audio__source__fetcher__impl.cc b/www/chromium/files/patch-chrome_services_speech_audio__source__fetcher__impl.cc new file mode 100644 index 000000000000..4bd38a729df6 --- /dev/null +++ b/www/chromium/files/patch-chrome_services_speech_audio__source__fetcher__impl.cc @@ -0,0 +1,11 @@ +--- chrome/services/speech/audio_source_fetcher_impl.cc.orig 2021-06-10 11:24:44 UTC ++++ chrome/services/speech/audio_source_fetcher_impl.cc +@@ -65,7 +65,7 @@ void AudioSourceFetcherImpl::Start( + + // TODO(crbug.com/1185978): Check implementation / sandbox policy on Mac and + // Windows. +-#if defined(OS_CHROMEOS) || defined(OS_LINUX) ++#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) + is_started_ = true; + // Initialize the AudioCapturerSource with |this| as the CaptureCallback, + // get the parameters for the device ID, then start audio capture. diff --git a/www/chromium/files/patch-chrome_test_BUILD.gn b/www/chromium/files/patch-chrome_test_BUILD.gn index 3685eea5c4ac..62f876089f6a 100644 --- a/www/chromium/files/patch-chrome_test_BUILD.gn +++ b/www/chromium/files/patch-chrome_test_BUILD.gn @@ -1,29 +1,29 @@ ---- chrome/test/BUILD.gn.orig 2021-04-20 18:58:28 UTC +--- chrome/test/BUILD.gn.orig 2021-06-09 22:13:57 UTC +++ chrome/test/BUILD.gn -@@ -1661,7 +1661,7 @@ if (!is_android) { +@@ -1666,7 +1666,7 @@ if (!is_android) { ] } - if (is_linux || is_chromeos) { + if ((is_linux || is_chromeos) && !is_bsd) { sources += [ "../browser/error_reporting/webui_js_error_reporting_browsertest.cc", ] -@@ -5174,7 +5174,7 @@ test("unit_tests") { +@@ -5193,7 +5193,7 @@ test("unit_tests") { ] } - if (is_linux || is_chromeos) { + if ((is_linux || is_chromeos) && !is_bsd) { deps += [ "//chrome/browser/error_reporting:unit_test" ] } -@@ -6980,7 +6980,7 @@ test("chrome_app_unittests") { +@@ -7031,7 +7031,7 @@ test("chrome_app_unittests") { "//components/safe_browsing:buildflags", "//pdf:pdf_ppapi", ] - if (!is_fuchsia) { + if (!is_fuchsia && !is_bsd) { # TODO(crbug.com/753619): Enable crash reporting on Fuchsia. deps += [ "//third_party/breakpad:client" ] } diff --git a/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc b/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc index 5801cd90e4a7..5e0ce19ad492 100644 --- a/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc +++ b/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc @@ -1,31 +1,31 @@ ---- chrome/test/base/in_process_browser_test.cc.orig 2021-04-14 18:40:56 UTC +--- chrome/test/base/in_process_browser_test.cc.orig 2021-05-12 22:05:46 UTC +++ chrome/test/base/in_process_browser_test.cc -@@ -82,6 +82,10 @@ +@@ -83,6 +83,10 @@ #include "services/device/public/cpp/test/fake_geolocation_system_permission.h" #endif +#if defined(OS_FREEBSD) +#include +#endif + #if defined(OS_WIN) #include "base/win/scoped_com_initializer.h" #include "base/win/windows_version.h" -@@ -332,7 +336,7 @@ void InProcessBrowserTest::SetUp() { +@@ -334,7 +338,7 @@ void InProcessBrowserTest::SetUp() { // Cookies). Without this on Mac and Linux, many tests will hang waiting for a // user to approve KeyChain/kwallet access. On Windows this is not needed as // OS APIs never block. -#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) OSCryptMocker::SetUp(); #endif -@@ -395,7 +399,7 @@ void InProcessBrowserTest::TearDown() { +@@ -400,7 +404,7 @@ void InProcessBrowserTest::TearDown() { com_initializer_.reset(); #endif BrowserTestBase::TearDown(); -#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) OSCryptMocker::TearDown(); #endif diff --git a/www/chromium/files/patch-chrome_test_base_interactive__ui__tests__main.cc b/www/chromium/files/patch-chrome_test_base_interactive__ui__tests__main.cc index dbb3f022e4a7..3f2c50aabc0e 100644 --- a/www/chromium/files/patch-chrome_test_base_interactive__ui__tests__main.cc +++ b/www/chromium/files/patch-chrome_test_base_interactive__ui__tests__main.cc @@ -1,20 +1,20 @@ ---- chrome/test/base/interactive_ui_tests_main.cc.orig 2021-04-14 18:40:56 UTC +--- chrome/test/base/interactive_ui_tests_main.cc.orig 2021-05-12 22:05:46 UTC +++ chrome/test/base/interactive_ui_tests_main.cc @@ -17,7 +17,7 @@ #if defined(USE_AURA) #include "ui/aura/test/ui_controls_factory_aura.h" #include "ui/base/test/ui_controls_aura.h" -#if defined(USE_OZONE) && (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) +#if defined(USE_OZONE) && (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) #include "ui/base/ui_base_features.h" #include "ui/ozone/public/ozone_platform.h" - #include "ui/views/test/ui_controls_factory_desktop_aura_ozone.h" -@@ -55,7 +55,7 @@ class InteractiveUITestSuite : public ChromeTestSuite + #include "ui/platform_window/common/platform_window_defaults.h" +@@ -53,7 +53,7 @@ class InteractiveUITestSuite : public ChromeTestSuite com_initializer_.reset(new base::win::ScopedCOMInitializer()); ui_controls::InstallUIControlsAura( aura::test::CreateUIControlsAura(nullptr)); -#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) #if defined(USE_OZONE) if (features::IsUsingOzonePlatform()) { - ui::OzonePlatform::InitParams params; + // Notifies the platform that test config is needed. For Wayland, for diff --git a/www/chromium/files/patch-chrome_test_base_test__browser__window.h b/www/chromium/files/patch-chrome_test_base_test__browser__window.h index 40d6a91dca9e..abc7dc942803 100644 --- a/www/chromium/files/patch-chrome_test_base_test__browser__window.h +++ b/www/chromium/files/patch-chrome_test_base_test__browser__window.h @@ -1,11 +1,11 @@ ---- chrome/test/base/test_browser_window.h.orig 2021-04-14 18:40:56 UTC +--- chrome/test/base/test_browser_window.h.orig 2021-05-24 22:05:36 UTC +++ chrome/test/base/test_browser_window.h -@@ -176,7 +176,7 @@ class TestBrowserWindow : public BrowserWindow { - bool is_source_keyboard) override {} +@@ -179,7 +179,7 @@ class TestBrowserWindow : public BrowserWindow { + void MaybeShowProfileSwitchIPH() override {} #if defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_WIN) || \ - defined(OS_LINUX) + defined(OS_LINUX) || defined(OS_BSD) - void ShowHatsDialog(const std::string& site_id, - base::OnceClosure success_callback, - base::OnceClosure failure_callback) override {} + void ShowHatsDialog( + const std::string& site_id, + base::OnceClosure success_callback, diff --git a/www/chromium/files/patch-chrome_test_chromedriver_key__converter__unittest.cc b/www/chromium/files/patch-chrome_test_chromedriver_key__converter__unittest.cc index ce3738e20396..5d763323a36c 100644 --- a/www/chromium/files/patch-chrome_test_chromedriver_key__converter__unittest.cc +++ b/www/chromium/files/patch-chrome_test_chromedriver_key__converter__unittest.cc @@ -1,38 +1,38 @@ ---- chrome/test/chromedriver/key_converter_unittest.cc.orig 2021-04-14 18:40:56 UTC +--- chrome/test/chromedriver/key_converter_unittest.cc.orig 2021-05-12 22:05:46 UTC +++ chrome/test/chromedriver/key_converter_unittest.cc -@@ -277,7 +277,7 @@ TEST(KeyConverter, AllShorthandKeys) { +@@ -264,7 +264,7 @@ TEST(KeyConverter, AllShorthandKeys) { ->Generate(&key_events); builder.Generate(&key_events); builder.SetKeyCode(ui::VKEY_TAB); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) builder.SetText("\t", "\t")->Generate(&key_events); #else builder.SetText(std::string(), std::string()); -@@ -285,7 +285,7 @@ TEST(KeyConverter, AllShorthandKeys) { +@@ -272,7 +272,7 @@ TEST(KeyConverter, AllShorthandKeys) { key_events.push_back(builder.SetType(kKeyUpEventType)->Build()); #endif builder.SetKeyCode(ui::VKEY_BACK); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) builder.SetText("\b", "\b")->Generate(&key_events); #else builder.SetText(std::string(), std::string()); -@@ -296,7 +296,7 @@ TEST(KeyConverter, AllShorthandKeys) { +@@ -283,7 +283,7 @@ TEST(KeyConverter, AllShorthandKeys) { CheckEventsReleaseModifiers("\n\r\n\t\b ", key_events); } -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Fails on bots: crbug.com/174962 #define MAYBE_AllEnglishKeyboardSymbols DISABLED_AllEnglishKeyboardSymbols #else -@@ -353,7 +353,7 @@ TEST(KeyConverter, AllEnglishKeyboardTextChars) { +@@ -340,7 +340,7 @@ TEST(KeyConverter, AllEnglishKeyboardTextChars) { TEST(KeyConverter, AllSpecialWebDriverKeysOnEnglishKeyboard) { ui::ScopedKeyboardLayout keyboard_layout(ui::KEYBOARD_LAYOUT_ENGLISH_US); const char kTextForKeys[] = { -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) 0, 0, 0, 0, '\t', 0, '\r', '\r', 0, 0, 0, 0, 0, #else 0, 0, 0, 0, 0, 0, '\r', '\r', 0, 0, 0, 0, 0, diff --git a/www/chromium/files/patch-chrome_utility_services.cc b/www/chromium/files/patch-chrome_utility_services.cc index bc452e44d1d1..20078fb5d89a 100644 --- a/www/chromium/files/patch-chrome_utility_services.cc +++ b/www/chromium/files/patch-chrome_utility_services.cc @@ -1,29 +1,29 @@ ---- chrome/utility/services.cc.orig 2021-04-14 18:40:58 UTC +--- chrome/utility/services.cc.orig 2021-05-12 22:05:48 UTC +++ chrome/utility/services.cc -@@ -84,7 +84,7 @@ +@@ -81,7 +81,7 @@ #endif #if BUILDFLAG(ENABLE_PRINTING) -#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/services/printing/print_backend_service_impl.h" #include "chrome/services/printing/public/mojom/print_backend_service.mojom.h" -@@ -251,7 +251,7 @@ auto RunPaintPreviewCompositor( +@@ -241,7 +241,7 @@ auto RunPaintPreviewCompositor( #endif // BUILDFLAG(ENABLE_PAINT_PREVIEW) #if BUILDFLAG(ENABLE_PRINTING) -#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) auto RunPrintBackendService( mojo::PendingReceiver receiver) { -@@ -374,7 +374,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -355,7 +355,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& #endif #if BUILDFLAG(ENABLE_PRINTING) -#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) services.Add(RunPrintBackendService); #endif diff --git a/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc b/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc index 674fc89cfb00..b9ada070acfd 100644 --- a/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc +++ b/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc @@ -1,83 +1,83 @@ ---- chromecast/browser/cast_browser_main_parts.cc.orig 2021-04-14 18:40:58 UTC +--- chromecast/browser/cast_browser_main_parts.cc.orig 2021-05-12 22:05:48 UTC +++ chromecast/browser/cast_browser_main_parts.cc -@@ -75,7 +75,7 @@ +@@ -77,7 +77,7 @@ #include "ui/base/ui_base_switches.h" #include "ui/gl/gl_switches.h" -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include #include #include -@@ -131,7 +131,7 @@ +@@ -132,7 +132,7 @@ #include "extensions/browser/extension_prefs.h" // nogncheck #endif -#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(USE_OZONE) +#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(USE_OZONE) #include "chromecast/browser/exo/wayland_server_controller.h" #endif -@@ -273,7 +273,7 @@ class CastViewsDelegate : public views::ViewsDelegate +@@ -274,7 +274,7 @@ class CastViewsDelegate : public views::ViewsDelegate #endif // defined(USE_AURA) -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) base::FilePath GetApplicationFontsDir() { std::unique_ptr env(base::Environment::Create()); -@@ -289,7 +289,7 @@ base::FilePath GetApplicationFontsDir() { +@@ -290,7 +290,7 @@ base::FilePath GetApplicationFontsDir() { } } -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) } // namespace -@@ -318,7 +318,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { +@@ -319,7 +319,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { {cc::switches::kDisableThreadedAnimation, ""}, #endif // defined(OS_ANDROID) #endif // BUILDFLAG(IS_CAST_AUDIO_ONLY) -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #if defined(ARCH_CPU_X86_FAMILY) // This is needed for now to enable the x11 Ozone platform to work with // current Linux/NVidia OpenGL drivers. -@@ -328,7 +328,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { +@@ -329,7 +329,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { {switches::kEnableHardwareOverlays, "cast"}, #endif #endif -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // It's better to start GPU process on demand. For example, for TV platforms // cast starts in background and can't render until TV switches to cast // input. -@@ -482,7 +482,7 @@ void CastBrowserMainParts::ToolkitInitialized() { +@@ -486,7 +486,7 @@ void CastBrowserMainParts::ToolkitInitialized() { views_delegate_ = std::make_unique(); #endif // defined(USE_AURA) -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) base::FilePath dir_font = GetApplicationFontsDir(); const FcChar8 *dir_font_char8 = reinterpret_cast(dir_font.value().data()); if (!FcConfigAppFontAddDir(gfx::GetGlobalFontConfig(), dir_font_char8)) { -@@ -666,7 +666,7 @@ void CastBrowserMainParts::PreMainMessageLoopRun() { +@@ -668,7 +668,7 @@ int CastBrowserMainParts::PreMainMessageLoopRun() { cast_browser_process_->browser_context()); #endif -#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(USE_OZONE) +#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(USE_OZONE) wayland_server_controller_ = std::make_unique(window_manager_.get()); #endif -@@ -748,7 +748,7 @@ bool CastBrowserMainParts::MainMessageLoopRun(int* res - } +@@ -749,7 +749,7 @@ void CastBrowserMainParts::PostMainMessageLoopRun() { + + cast_browser_process_->cast_service()->Stop(); - void CastBrowserMainParts::PostMainMessageLoopRun() { -#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(USE_OZONE) +#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(USE_OZONE) wayland_server_controller_.reset(); #endif #if BUILDFLAG(ENABLE_CHROMECAST_EXTENSIONS) diff --git a/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.h b/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.h index 68357abc77d7..0bbed18f5686 100644 --- a/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.h +++ b/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.h @@ -1,11 +1,11 @@ ---- chromecast/browser/cast_browser_main_parts.h.orig 2021-04-14 18:40:58 UTC +--- chromecast/browser/cast_browser_main_parts.h.orig 2021-05-12 22:05:48 UTC +++ chromecast/browser/cast_browser_main_parts.h -@@ -133,7 +133,7 @@ class CastBrowserMainParts : public content::BrowserMa +@@ -134,7 +134,7 @@ class CastBrowserMainParts : public content::BrowserMa std::unique_ptr user_pref_service_; #endif -#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(USE_OZONE) +#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(USE_OZONE) std::unique_ptr wayland_server_controller_; #endif diff --git a/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc b/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc index f0d0cdfebdef..fe4e0d43330b 100644 --- a/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc +++ b/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc @@ -1,38 +1,38 @@ ---- chromecast/browser/cast_content_browser_client.cc.orig 2021-04-14 18:40:58 UTC +--- chromecast/browser/cast_content_browser_client.cc.orig 2021-05-12 22:05:48 UTC +++ chromecast/browser/cast_content_browser_client.cc -@@ -131,9 +131,9 @@ +@@ -130,9 +130,9 @@ #include "chromecast/external_mojo/broker_service/broker_service.h" // nogncheck #endif -#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(USE_OZONE) +#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(USE_OZONE) #include "chromecast/browser/webview/webview_controller.h" -#endif // (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(USE_OZONE) +#endif // (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(USE_OZONE) #if BUILDFLAG(ENABLE_CAST_RENDERER) #include "base/sequenced_task_runner.h" -@@ -478,7 +478,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS +@@ -479,7 +479,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS switches::kAudioOutputChannels)); } } else if (process_type == switches::kGpuProcess) { -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Necessary for accelerated 2d canvas. By default on Linux, Chromium // assumes GLES2 contexts can be lost to a power-save mode, which breaks GPU // canvas apps. -@@ -875,12 +875,12 @@ CastContentBrowserClient::CreateThrottlesForNavigation +@@ -876,12 +876,12 @@ CastContentBrowserClient::CreateThrottlesForNavigation handle, general_audience_browsing_service_.get())); } -#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(USE_OZONE) +#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(USE_OZONE) auto webview_throttle = WebviewController::MaybeGetNavigationThrottle(handle); if (webview_throttle) { throttles.push_back(std::move(webview_throttle)); } -#endif // (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(USE_OZONE) +#endif // (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(USE_OZONE) return throttles; } diff --git a/www/chromium/files/patch-chromecast_browser_metrics_cast__browser__metrics.cc b/www/chromium/files/patch-chromecast_browser_metrics_cast__browser__metrics.cc index 89517716d9af..45a4797ba07d 100644 --- a/www/chromium/files/patch-chromecast_browser_metrics_cast__browser__metrics.cc +++ b/www/chromium/files/patch-chromecast_browser_metrics_cast__browser__metrics.cc @@ -1,87 +1,103 @@ ---- chromecast/browser/metrics/cast_browser_metrics.cc.orig 2021-04-14 18:40:58 UTC +--- chromecast/browser/metrics/cast_browser_metrics.cc.orig 2021-06-09 22:13:58 UTC +++ chromecast/browser/metrics/cast_browser_metrics.cc @@ -19,9 +19,9 @@ #include "content/public/browser/network_service_instance.h" #include "content/public/common/content_switches.h" -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "chromecast/browser/metrics/external_metrics.h" -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #if defined(OS_ANDROID) #include "chromecast/base/android/dumpstate_writer.h" @@ -32,10 +32,10 @@ namespace metrics { const int kMetricsFetchTimeoutSeconds = 60; -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) const char kExternalUmaEventsRelativePath[] = "metrics/uma-events"; const char kPlatformUmaEventsPath[] = "/data/share/chrome/metrics/uma-events"; -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) CastBrowserMetrics::CastBrowserMetrics( std::unique_ptr metrics_service_client) { @@ -48,10 +48,10 @@ CastBrowserMetrics::CastBrowserMetrics( } CastBrowserMetrics::~CastBrowserMetrics() { -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) DCHECK(!external_metrics_); DCHECK(!platform_metrics_); -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) } void CastBrowserMetrics::Initialize() { @@ -61,9 +61,9 @@ void CastBrowserMetrics::Initialize() { auto stability_provider_unique_ptr = std::make_unique( metrics_service, metrics_service_client_->pref_service()); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) auto* stability_provider = stability_provider_unique_ptr.get(); -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) metrics_service->RegisterMetricsProvider( std::move(stability_provider_unique_ptr)); @@ -84,7 +84,7 @@ void CastBrowserMetrics::Initialize() { metrics_service_client_->StartMetricsService(); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS)A || defined(OS_BSD) // Start external metrics collection, which feeds data from external // processes into the main external metrics. external_metrics_ = new ExternalMetrics( @@ -94,7 +94,7 @@ void CastBrowserMetrics::Initialize() { platform_metrics_ = new ExternalMetrics(stability_provider, kPlatformUmaEventsPath); platform_metrics_->Start(); -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) } void CastBrowserMetrics::Finalize() { @@ -103,14 +103,14 @@ void CastBrowserMetrics::Finalize() { metrics_service_client_->GetMetricsService()->RecordCompletedSessionEnd(); #endif // !defined(OS_ANDROID) -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Stop metrics service cleanly before destructing CastMetricsServiceClient. // The pointer will be deleted in StopAndDestroy(). external_metrics_->StopAndDestroy(); external_metrics_ = nullptr; platform_metrics_->StopAndDestroy(); platform_metrics_ = nullptr; -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) metrics_service_client_->Finalize(); } +@@ -126,13 +126,13 @@ void CastBrowserMetrics::CollectFinalMetricsForLog( + } + + void CastBrowserMetrics::ProcessExternalEvents(base::OnceClosure cb) { +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + external_metrics_->ProcessExternalEvents( + base::BindOnce(&ExternalMetrics::ProcessExternalEvents, + base::Unretained(platform_metrics_), std::move(cb))); + #else + std::move(cb).Run(); +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + } + + } // namespace metrics diff --git a/www/chromium/files/patch-chromecast_renderer_cast__content__renderer__client.cc b/www/chromium/files/patch-chromecast_renderer_cast__content__renderer__client.cc index be4951f8422e..08f1d6a0d28f 100644 --- a/www/chromium/files/patch-chromecast_renderer_cast__content__renderer__client.cc +++ b/www/chromium/files/patch-chromecast_renderer_cast__content__renderer__client.cc @@ -1,11 +1,11 @@ ---- chromecast/renderer/cast_content_renderer_client.cc.orig 2021-04-14 18:40:58 UTC +--- chromecast/renderer/cast_content_renderer_client.cc.orig 2021-05-12 22:05:48 UTC +++ chromecast/renderer/cast_content_renderer_client.cc -@@ -196,7 +196,7 @@ void CastContentRendererClient::RenderFrameCreated( +@@ -199,7 +199,7 @@ void CastContentRendererClient::RenderFrameCreated( dispatcher->OnRenderFrameCreated(render_frame); #endif -#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(USE_OZONE) +#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(USE_OZONE) // JsChannelBindings destroys itself when the RenderFrame is destroyed. JsChannelBindings::Create(render_frame); #endif diff --git a/www/chromium/files/patch-components_BUILD.gn b/www/chromium/files/patch-components_BUILD.gn index f97b69916482..c01d87f4527e 100644 --- a/www/chromium/files/patch-components_BUILD.gn +++ b/www/chromium/files/patch-components_BUILD.gn @@ -1,18 +1,18 @@ ---- components/BUILD.gn.orig 2021-04-14 18:40:58 UTC +--- components/BUILD.gn.orig 2021-05-12 22:05:49 UTC +++ components/BUILD.gn -@@ -337,9 +337,13 @@ test("components_unittests") { +@@ -342,9 +342,13 @@ test("components_unittests") { } if (!is_fuchsia) { # !iOS and !Fuchsia + if (!is_bsd) { + deps += [ + "//components/crash/content/browser:unit_tests", + "//components/crash/core/app:unit_tests", + ] + } deps += [ - "//components/crash/content/browser:unit_tests", - "//components/crash/core/app:unit_tests", "//components/data_reduction_proxy/core/browser:unit_tests", "//components/data_reduction_proxy/core/common:unit_tests", ] diff --git a/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc b/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc index 2dbac86d1580..b36acf996c2e 100644 --- a/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc +++ b/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc @@ -1,11 +1,11 @@ ---- components/autofill/core/common/autofill_payments_features.cc.orig 2021-04-14 18:40:58 UTC +--- components/autofill/core/common/autofill_payments_features.cc.orig 2021-05-12 22:05:49 UTC +++ components/autofill/core/common/autofill_payments_features.cc -@@ -122,7 +122,7 @@ bool ShouldShowImprovedUserConsentForCreditCardSave() +@@ -144,7 +144,7 @@ bool ShouldShowImprovedUserConsentForCreditCardSave() // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if defined(OS_WIN) || defined(OS_APPLE) || \ - (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) + (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) // The new user consent UI is fully launched on MacOS, Windows and Linux. return true; #else diff --git a/www/chromium/files/patch-components_autofill_core_common_autofill__util.cc b/www/chromium/files/patch-components_autofill_core_common_autofill__util.cc index d4e79eb0b777..e6679c548588 100644 --- a/www/chromium/files/patch-components_autofill_core_common_autofill__util.cc +++ b/www/chromium/files/patch-components_autofill_core_common_autofill__util.cc @@ -1,11 +1,11 @@ ---- components/autofill/core/common/autofill_util.cc.orig 2021-04-14 18:40:58 UTC +--- components/autofill/core/common/autofill_util.cc.orig 2021-05-12 22:05:49 UTC +++ components/autofill/core/common/autofill_util.cc -@@ -170,7 +170,7 @@ bool SanitizedFieldIsEmpty(const base::string16& value +@@ -171,7 +171,7 @@ bool SanitizedFieldIsEmpty(const std::u16string& value } bool ShouldAutoselectFirstSuggestionOnArrowDown() { -#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) return true; #else diff --git a/www/chromium/files/patch-components_cast__channel_cast__message__util.cc b/www/chromium/files/patch-components_cast__channel_cast__message__util.cc new file mode 100644 index 000000000000..b27003024abd --- /dev/null +++ b/www/chromium/files/patch-components_cast__channel_cast__message__util.cc @@ -0,0 +1,11 @@ +--- components/cast_channel/cast_message_util.cc.orig 2021-06-11 09:34:59 UTC ++++ components/cast_channel/cast_message_util.cc +@@ -168,7 +168,7 @@ int GetVirtualConnectPlatformValue() { + return 4; + #elif BUILDFLAG(IS_CHROMEOS_ASH) + return 5; +-#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) + return 6; + #else + return 0; diff --git a/www/chromium/files/patch-components_crash_content_browser_BUILD.gn b/www/chromium/files/patch-components_crash_content_browser_BUILD.gn index 8076ccb7584f..40c6cc00fc51 100644 --- a/www/chromium/files/patch-components_crash_content_browser_BUILD.gn +++ b/www/chromium/files/patch-components_crash_content_browser_BUILD.gn @@ -1,20 +1,20 @@ ---- components/crash/content/browser/BUILD.gn.orig 2021-04-14 18:40:59 UTC +--- components/crash/content/browser/BUILD.gn.orig 2021-05-12 22:05:49 UTC +++ components/crash/content/browser/BUILD.gn @@ -37,7 +37,7 @@ source_set("browser") { # This is not in the GYP build but this target includes breakpad client # headers, so add the dependency here. - if ((is_posix && !is_ios) || is_fuchsia) { + if ((is_posix && !is_ios && !is_bsd) || is_fuchsia) { configs += [ "//third_party/breakpad:client_config" ] public_configs = [ "//third_party/breakpad:client_config" ] } -@@ -57,7 +57,7 @@ source_set("browser") { +@@ -59,7 +59,7 @@ source_set("browser") { "//components/crash/android:jni_headers", "//mojo/public/cpp/bindings", ] - } else { + } else if (!is_bsd) { deps += [ "//third_party/breakpad:client" ] } } diff --git a/www/chromium/files/patch-components_download_internal_common_base__file.cc b/www/chromium/files/patch-components_download_internal_common_base__file.cc deleted file mode 100644 index 86f39a6283a1..000000000000 --- a/www/chromium/files/patch-components_download_internal_common_base__file.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- components/download/internal/common/base_file.cc.orig 2021-04-14 18:40:59 UTC -+++ components/download/internal/common/base_file.cc -@@ -607,7 +607,7 @@ GURL GetEffectiveAuthorityURL(const GURL& source_url, - - } // namespace - --#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || \ -+#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || \ - defined(OS_CHROMEOS) - - DownloadInterruptReason BaseFile::AnnotateWithSourceInformationSync( -@@ -626,7 +626,7 @@ DownloadInterruptReason BaseFile::AnnotateWithSourceIn - - return QuarantineFileResultToReason(result); - } --#else // !OS_WIN && !OS_APPLE && !OS_LINUX && !OS_CHROMEOS -+#else // !OS_WIN && !OS_APPLE && !OS_LINUX && !OS_CHROMEOS && !OS_BSD - DownloadInterruptReason BaseFile::AnnotateWithSourceInformationSync( - const std::string& client_guid, - const GURL& source_url, diff --git a/www/chromium/files/patch-components_feature__engagement_public_event__constants.cc b/www/chromium/files/patch-components_feature__engagement_public_event__constants.cc index 5ac2db9c918d..cdc51637ac7f 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_event__constants.cc +++ b/www/chromium/files/patch-components_feature__engagement_public_event__constants.cc @@ -1,28 +1,28 @@ ---- components/feature_engagement/public/event_constants.cc.orig 2021-04-14 18:40:59 UTC +--- components/feature_engagement/public/event_constants.cc.orig 2021-05-12 22:05:49 UTC +++ components/feature_engagement/public/event_constants.cc @@ -10,13 +10,13 @@ namespace feature_engagement { namespace events { -#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) const char kNewTabOpened[] = "new_tab_opened"; -#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || +#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || // defined(OS_CHROMEOS) -#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) const char kSixthTabOpened[] = "sixth_tab_opened"; const char kTabGroupCreated[] = "tab_group_created"; -@@ -37,7 +37,7 @@ const char kWebUITabStripClosed[] = "webui_tab_strip_c +@@ -39,7 +39,7 @@ const char kWebUITabStripClosed[] = "webui_tab_strip_c const char kWebUITabStripOpened[] = "webui_tab_strip_opened"; const char kDesktopPwaInstalled[] = "desktop_pwa_installed"; -#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || +#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || // defined(OS_CHROMEOS) #if defined(OS_IOS) diff --git a/www/chromium/files/patch-components_feature__engagement_public_event__constants.h b/www/chromium/files/patch-components_feature__engagement_public_event__constants.h index 2bddf7ac6bce..f3cc7e19c434 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_event__constants.h +++ b/www/chromium/files/patch-components_feature__engagement_public_event__constants.h @@ -1,31 +1,31 @@ ---- components/feature_engagement/public/event_constants.h.orig 2021-04-14 18:40:59 UTC +--- components/feature_engagement/public/event_constants.h.orig 2021-05-12 22:05:49 UTC +++ components/feature_engagement/public/event_constants.h @@ -12,16 +12,16 @@ namespace feature_engagement { namespace events { // Desktop and IOS. -#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) // The user has explicitly opened a new tab via an entry point from inside of // Chrome. extern const char kNewTabOpened[]; -#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || +#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || // defined(OS_CHROMEOS) // Desktop -#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) // A new tab was opened when 5 (or more) tabs were already open. extern const char kSixthTabOpened[]; -@@ -62,7 +62,7 @@ extern const char kWebUITabStripOpened[]; +@@ -66,7 +66,7 @@ extern const char kWebUITabStripOpened[]; // The PWA was installed by the user. extern const char kDesktopPwaInstalled[]; -#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || +#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || // defined(OS_CHROMEOS) #if defined(OS_IOS) diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc b/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc index ab11b162f5e9..39483e8eeea2 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc @@ -1,20 +1,20 @@ ---- components/feature_engagement/public/feature_configurations.cc.orig 2021-04-14 18:40:59 UTC +--- components/feature_engagement/public/feature_configurations.cc.orig 2021-05-12 22:05:49 UTC +++ components/feature_engagement/public/feature_configurations.cc @@ -12,7 +12,7 @@ namespace feature_engagement { base::Optional GetClientSideFeatureConfig( const base::Feature* feature) { -#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) if (kIPHPasswordsAccountStorageFeature.name == feature->name) { base::Optional config = FeatureConfig(); -@@ -28,7 +28,7 @@ base::Optional GetClientSideFeatureConf - Comparator(EQUAL, 0), 180, 180)); +@@ -41,7 +41,7 @@ base::Optional GetClientSideFeatureConf + EventConfig("profile_menu_shown", Comparator(EQUAL, 0), 360, 360); return config; } -#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || +#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || // defined(OS_CHROMEOS) #if defined(OS_ANDROID) diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc index 5960bb14d189..41656d31555b 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc @@ -1,20 +1,20 @@ ---- components/feature_engagement/public/feature_constants.cc.orig 2021-04-14 18:40:59 UTC +--- components/feature_engagement/public/feature_constants.cc.orig 2021-05-12 22:05:49 UTC +++ components/feature_engagement/public/feature_constants.cc @@ -12,7 +12,7 @@ const base::Feature kIPHDemoMode{"IPH_DemoMode", const base::Feature kIPHDummyFeature{"IPH_Dummy", base::FEATURE_DISABLED_BY_DEFAULT}; -#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) const base::Feature kIPHDesktopTabGroupsNewGroupFeature{ "IPH_DesktopTabGroupsNewGroup", base::FEATURE_DISABLED_BY_DEFAULT}; -@@ -34,7 +34,7 @@ const base::Feature kIPHDesktopSnoozeFeature{"IPH_Desk - base::FEATURE_DISABLED_BY_DEFAULT}; - const base::Feature kIPHDesktopPwaInstallFeature{ +@@ -38,7 +38,7 @@ const base::Feature kIPHDesktopPwaInstallFeature{ "IPH_DesktopPwaInstall", base::FEATURE_DISABLED_BY_DEFAULT}; + const base::Feature kIPHProfileSwitchFeature{"IPH_ProfileSwitch", + base::FEATURE_DISABLED_BY_DEFAULT}; -#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || +#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || // defined(OS_CHROMEOS) #if defined(OS_ANDROID) diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h index 09142f430bac..44d3a8d7ba2d 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h @@ -1,20 +1,20 @@ ---- components/feature_engagement/public/feature_constants.h.orig 2021-04-14 18:40:59 UTC +--- components/feature_engagement/public/feature_constants.h.orig 2021-05-12 22:05:49 UTC +++ components/feature_engagement/public/feature_constants.h @@ -16,7 +16,7 @@ extern const base::Feature kIPHDemoMode; // A feature to ensure all arrays can contain at least one feature. extern const base::Feature kIPHDummyFeature; -#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) extern const base::Feature kIPHDesktopTabGroupsNewGroupFeature; extern const base::Feature kIPHFocusModeFeature; -@@ -28,7 +28,7 @@ extern const base::Feature kIPHReopenTabFeature; - extern const base::Feature kIPHWebUITabStripFeature; +@@ -30,7 +30,7 @@ extern const base::Feature kIPHWebUITabStripFeature; extern const base::Feature kIPHDesktopSnoozeFeature; extern const base::Feature kIPHDesktopPwaInstallFeature; + extern const base::Feature kIPHProfileSwitchFeature; -#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || +#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || // defined(OS_CHROMEOS) // All the features declared for Android below that are also used in Java, diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc b/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc index 9cc9b96b5b1f..9de0a150036c 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc @@ -1,20 +1,20 @@ ---- components/feature_engagement/public/feature_list.cc.orig 2021-04-14 18:40:59 UTC +--- components/feature_engagement/public/feature_list.cc.orig 2021-05-12 22:05:49 UTC +++ components/feature_engagement/public/feature_list.cc -@@ -79,7 +79,7 @@ const base::Feature* const kAllFeatures[] = { +@@ -83,7 +83,7 @@ const base::Feature* const kAllFeatures[] = { &kIPHBadgedTranslateManualTriggerFeature, &kIPHDiscoverFeedHeaderFeature, #endif // defined(OS_IOS) -#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) &kIPHDesktopTabGroupsNewGroupFeature, &kIPHFocusModeFeature, -@@ -90,7 +90,7 @@ const base::Feature* const kAllFeatures[] = { - &kIPHReopenTabFeature, +@@ -96,7 +96,7 @@ const base::Feature* const kAllFeatures[] = { &kIPHWebUITabStripFeature, &kIPHDesktopPwaInstallFeature, + &kIPHProfileSwitchFeature, -#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || +#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || // defined(OS_CHROMEOS) }; } // namespace diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__list.h b/www/chromium/files/patch-components_feature__engagement_public_feature__list.h index bb1401702b3b..e6c4785bc965 100644 --- a/www/chromium/files/patch-components_feature__engagement_public_feature__list.h +++ b/www/chromium/files/patch-components_feature__engagement_public_feature__list.h @@ -1,38 +1,38 @@ ---- components/feature_engagement/public/feature_list.h.orig 2021-04-14 18:40:59 UTC +--- components/feature_engagement/public/feature_list.h.orig 2021-05-24 22:05:38 UTC +++ components/feature_engagement/public/feature_list.h -@@ -148,7 +148,7 @@ DEFINE_VARIATION_PARAM(kIPHDiscoverFeedHeaderFeature, +@@ -155,7 +155,7 @@ DEFINE_VARIATION_PARAM(kIPHDiscoverFeedHeaderFeature, "IPH_DiscoverFeedHeaderMenu"); #endif // defined(OS_IOS) -#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) DEFINE_VARIATION_PARAM(kIPHDesktopTabGroupsNewGroupFeature, "IPH_DesktopTabGroupsNewGroup"); -@@ -162,7 +162,7 @@ DEFINE_VARIATION_PARAM(kIPHReadingListDiscoveryFeature - DEFINE_VARIATION_PARAM(kIPHReopenTabFeature, "IPH_ReopenTab"); +@@ -172,7 +172,7 @@ DEFINE_VARIATION_PARAM(kIPHReopenTabFeature, "IPH_Reop DEFINE_VARIATION_PARAM(kIPHWebUITabStripFeature, "IPH_WebUITabStrip"); DEFINE_VARIATION_PARAM(kIPHDesktopPwaInstallFeature, "IPH_DesktopPwaInstall"); + DEFINE_VARIATION_PARAM(kIPHProfileSwitchFeature, "IPH_ProfileSwitch"); -#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || +#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || // defined(OS_CHROMEOS) } // namespace -@@ -234,7 +234,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation +@@ -248,7 +248,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation VARIATION_ENTRY(kIPHBadgedReadingListFeature), VARIATION_ENTRY(kIPHBadgedTranslateManualTriggerFeature), VARIATION_ENTRY(kIPHDiscoverFeedHeaderFeature), -#elif defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || \ +#elif defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) VARIATION_ENTRY(kIPHDesktopTabGroupsNewGroupFeature), VARIATION_ENTRY(kIPHFocusModeFeature), -@@ -245,7 +245,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation - VARIATION_ENTRY(kIPHReopenTabFeature), +@@ -261,7 +261,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation VARIATION_ENTRY(kIPHWebUITabStripFeature), VARIATION_ENTRY(kIPHDesktopPwaInstallFeature), + VARIATION_ENTRY(kIPHProfileSwitchFeature), -#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || +#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) || defined(OS_BSD) || // defined(OS_CHROMEOS) }; diff --git a/www/chromium/files/patch-components_feed_core_proto_v2_wire_version.proto b/www/chromium/files/patch-components_feed_core_proto_v2_wire_version.proto index b6ce19bc4bc1..96224d006191 100644 --- a/www/chromium/files/patch-components_feed_core_proto_v2_wire_version.proto +++ b/www/chromium/files/patch-components_feed_core_proto_v2_wire_version.proto @@ -1,13 +1,13 @@ ---- components/feed/core/proto/v2/wire/version.proto.orig 2021-04-14 18:40:59 UTC +--- components/feed/core/proto/v2/wire/version.proto.orig 2021-05-12 22:05:49 UTC +++ components/feed/core/proto/v2/wire/version.proto -@@ -11,8 +11,8 @@ option optimize_for = LITE_RUNTIME; - // Specification of an application or OS version. - // A version string typically looks like: 'major.minor.build.revision' - message Version { +@@ -25,8 +25,8 @@ message Version { + BETA = 3; + RELEASE = 4; + } - optional int32 major = 1; - optional int32 minor = 2; + optional int32 gmajor = 1; + optional int32 gminor = 2; optional int32 build = 3; optional int32 revision = 4; - + optional Architecture architecture = 5; diff --git a/www/chromium/files/patch-components_flags__ui_flags__state.cc b/www/chromium/files/patch-components_flags__ui_flags__state.cc index 9c586cf0e447..13ceab52451f 100644 --- a/www/chromium/files/patch-components_flags__ui_flags__state.cc +++ b/www/chromium/files/patch-components_flags__ui_flags__state.cc @@ -1,11 +1,11 @@ ---- components/flags_ui/flags_state.cc.orig 2021-04-14 18:40:59 UTC +--- components/flags_ui/flags_state.cc.orig 2021-05-12 22:05:49 UTC +++ components/flags_ui/flags_state.cc -@@ -688,7 +688,7 @@ int FlagsState::GetCurrentPlatform() { +@@ -633,7 +633,7 @@ int FlagsState::GetCurrentPlatform() { return kOsWin; #elif BUILDFLAG(IS_CHROMEOS_ASH) return kOsCrOS; -#elif (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ +#elif (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_FREEBSD) || \ defined(OS_OPENBSD) return kOsLinux; #elif defined(OS_ANDROID) diff --git a/www/chromium/files/patch-components_metrics_metrics__log.cc b/www/chromium/files/patch-components_metrics_metrics__log.cc index 7544dc255e61..5b271ad6e474 100644 --- a/www/chromium/files/patch-components_metrics_metrics__log.cc +++ b/www/chromium/files/patch-components_metrics_metrics__log.cc @@ -1,11 +1,11 @@ ---- components/metrics/metrics_log.cc.orig 2021-04-14 18:40:59 UTC +--- components/metrics/metrics_log.cc.orig 2021-05-12 22:05:49 UTC +++ components/metrics/metrics_log.cc -@@ -241,7 +241,7 @@ void MetricsLog::RecordCoreSystemProfile( +@@ -240,7 +240,7 @@ void MetricsLog::RecordCoreSystemProfile( // OperatingSystemVersion refers to the ChromeOS release version. #if BUILDFLAG(IS_CHROMEOS_ASH) os->set_kernel_version(base::SysInfo::KernelVersion()); -#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) // Linux operating system version is copied over into kernel version to be // consistent. os->set_kernel_version(base::SysInfo::OperatingSystemVersion()); diff --git a/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc b/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc index bde094f3653e..4275d94c4cb0 100644 --- a/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc +++ b/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc @@ -1,11 +1,11 @@ ---- components/network_session_configurator/browser/network_session_configurator.cc.orig 2021-04-14 18:40:59 UTC +--- components/network_session_configurator/browser/network_session_configurator.cc.orig 2021-05-12 22:05:50 UTC +++ components/network_session_configurator/browser/network_session_configurator.cc -@@ -802,7 +802,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C +@@ -788,7 +788,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C } #endif // #if !defined(OS_ANDROID) -#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) return net::URLRequestContextBuilder::HttpCacheParams::DISK_SIMPLE; #else return net::URLRequestContextBuilder::HttpCacheParams::DISK_BLOCKFILE; diff --git a/www/chromium/files/patch-components_os__crypt_os__crypt.h b/www/chromium/files/patch-components_os__crypt_os__crypt.h index ab52135364c9..9280628e7a8a 100644 --- a/www/chromium/files/patch-components_os__crypt_os__crypt.h +++ b/www/chromium/files/patch-components_os__crypt_os__crypt.h @@ -1,51 +1,51 @@ ---- components/os_crypt/os_crypt.h.orig 2021-04-14 18:40:59 UTC +--- components/os_crypt/os_crypt.h.orig 2021-05-12 22:05:50 UTC +++ components/os_crypt/os_crypt.h -@@ -18,9 +18,9 @@ +@@ -17,9 +17,9 @@ // 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) class KeyStorageLinux; -#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) #if defined(OS_WIN) || defined(OS_MAC) class PrefRegistrySimple; -@@ -39,16 +39,16 @@ class OSCrypt { +@@ -38,16 +38,16 @@ class OSCrypt { public: // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) // Set the configuration of OSCrypt. static COMPONENT_EXPORT(OS_CRYPT) void SetConfig( std::unique_ptr config); -#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if defined(OS_APPLE) || defined(OS_WIN) || \ - (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) + (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) // On Linux returns true iff the real secret key (not hardcoded one) is // available. On MacOS returns true if Keychain is available (for mock // Keychain it returns true if not using locked Keychain, false if using -@@ -142,7 +142,7 @@ class OSCrypt { +@@ -141,7 +141,7 @@ class OSCrypt { // 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) // For unit testing purposes, inject methods to be used. // |get_key_storage_mock| provides the desired |KeyStorage| implementation. // If the provider returns |nullptr|, a hardcoded password will be used. -@@ -157,6 +157,6 @@ void UseMockKeyStorageForTesting( +@@ -156,6 +156,6 @@ void UseMockKeyStorageForTesting( // Clears any caching and most lazy initialisations performed by the production // code. Should be used after any test which required a password. COMPONENT_EXPORT(OS_CRYPT) void ClearCacheForTesting(); -#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) #endif // COMPONENTS_OS_CRYPT_OS_CRYPT_H_ diff --git a/www/chromium/files/patch-components_paint__preview_browser_paint__preview__client.cc b/www/chromium/files/patch-components_paint__preview_browser_paint__preview__client.cc index 064fe0bc3cba..54290adcc3e4 100644 --- a/www/chromium/files/patch-components_paint__preview_browser_paint__preview__client.cc +++ b/www/chromium/files/patch-components_paint__preview_browser_paint__preview__client.cc @@ -1,13 +1,13 @@ ---- components/paint_preview/browser/paint_preview_client.cc.orig 2021-04-27 10:13:50 UTC +--- components/paint_preview/browser/paint_preview_client.cc.orig 2021-05-12 22:05:50 UTC +++ components/paint_preview/browser/paint_preview_client.cc -@@ -302,8 +302,8 @@ void PaintPreviewClient::CapturePaintPreview( +@@ -303,8 +303,8 @@ void PaintPreviewClient::CapturePaintPreview( metadata->set_url(url.spec()); metadata->set_version(kPaintPreviewVersion); auto* chromeVersion = metadata->mutable_chrome_version(); - chromeVersion->set_major(CHROME_VERSION_MAJOR); - chromeVersion->set_minor(CHROME_VERSION_MINOR); + chromeVersion->set_gmajor(CHROME_VERSION_MAJOR); + chromeVersion->set_gminor(CHROME_VERSION_MINOR); chromeVersion->set_build(CHROME_VERSION_BUILD); chromeVersion->set_patch(CHROME_VERSION_PATCH); document_data.callback = std::move(callback); diff --git a/www/chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc b/www/chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc index ba4543fe9658..5ab17d2b3c45 100644 --- a/www/chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc +++ b/www/chromium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc @@ -1,11 +1,11 @@ ---- components/policy/core/browser/policy_pref_mapping_test.cc.orig 2021-04-14 18:41:00 UTC +--- components/policy/core/browser/policy_pref_mapping_test.cc.orig 2021-05-12 22:05:50 UTC +++ components/policy/core/browser/policy_pref_mapping_test.cc -@@ -285,6 +285,8 @@ class PolicyTestCase { +@@ -279,6 +279,8 @@ class PolicyTestCase { const std::string os("chromeos"); - #elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) + #elif defined(OS_LINUX) const std::string os("linux"); +#elif defined(OS_FREEBSD) + const std::string os("freebsd"); #else #error "Unknown platform" #endif diff --git a/www/chromium/files/patch-components_policy_resources_policy__templates.json b/www/chromium/files/patch-components_policy_resources_policy__templates.json index 62dce3d515ac..13e80d1cc49c 100644 --- a/www/chromium/files/patch-components_policy_resources_policy__templates.json +++ b/www/chromium/files/patch-components_policy_resources_policy__templates.json @@ -1,74 +1,74 @@ ---- components/policy/resources/policy_templates.json.orig 2021-04-14 18:41:00 UTC +--- components/policy/resources/policy_templates.json.orig 2021-05-12 22:05:50 UTC +++ components/policy/resources/policy_templates.json -@@ -1230,7 +1230,7 @@ +@@ -1246,7 +1246,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], 'type': 'string', 'schema': { 'type': 'string' }, - 'supported_on': ['chrome.*:8-', 'chrome_os:11-', 'android:81-'], + 'supported_on': ['chrome.*:8-', 'chrome_os:11-', 'android:81-', 'chrome.freebsd:9-'], 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -1256,7 +1256,7 @@ +@@ -1272,7 +1272,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome.*:8-', 'chrome_os:11-'], + 'supported_on': ['chrome.*:8-', 'chrome_os:11-', 'chrome.freebsd:9-'], 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -1277,7 +1277,7 @@ +@@ -1293,7 +1293,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], 'type': 'string', 'schema': { 'type': 'string' }, - 'supported_on': ['chrome.*:58-', 'chrome_os:58-'], + 'supported_on': ['chrome.*:58-', 'chrome_os:58-', 'chrome.freebsd:9-'], 'features': { 'dynamic_refresh': True, 'per_profile': True, -@@ -4588,7 +4588,7 @@ +@@ -4604,7 +4604,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], 'type': 'string', 'schema': { 'type': 'string' }, - 'supported_on': ['chrome.linux:9-'], + 'supported_on': ['chrome.linux:9-', 'chrome.freebsd:9-'], 'features': { 'dynamic_refresh': False, 'per_profile': False, -@@ -4644,7 +4644,7 @@ +@@ -4660,7 +4660,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome.linux:63-','chrome.mac:63-','chrome_os:63-','android:63-','webview_android:63-'], + 'supported_on': ['chrome.linux:63-','chrome.mac:63-','chrome_os:63-','android:63-','webview_android:63-', 'chrome.freebsd:63-'], 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -8855,7 +8855,7 @@ +@@ -9103,7 +9103,7 @@ 'owners': ['file://net/cert/OWNERS', 'rsleevi@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome_os:30-', 'chrome.linux:30-', 'chrome.win:30-'], + 'supported_on': ['chrome_os:30-', 'chrome.linux:30-', 'chrome.win:30-', 'chrome.freebsd:30-'], 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -10466,7 +10466,7 @@ +@@ -10808,7 +10808,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome.win:19-', 'chrome.linux:19-'], + 'supported_on': ['chrome.win:19-', 'chrome.linux:19-', 'chrome.freebsd:19-'], 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -11264,7 +11264,7 @@ +@@ -11618,7 +11618,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome.win:31-', 'chrome.linux:31-', 'chrome_os:31-'], + 'supported_on': ['chrome.win:31-', 'chrome.linux:31-', 'chrome_os:31-', 'chrome.freebsd:31-'], 'features': { 'dynamic_refresh': True, 'per_profile': True, diff --git a/www/chromium/files/patch-components_previews_core_previews__features.cc b/www/chromium/files/patch-components_previews_core_previews__features.cc deleted file mode 100644 index a6f5fac89714..000000000000 --- a/www/chromium/files/patch-components_previews_core_previews__features.cc +++ /dev/null @@ -1,18 +0,0 @@ ---- components/previews/core/previews_features.cc.orig 2021-04-14 18:41:00 UTC -+++ components/previews/core/previews_features.cc -@@ -14,12 +14,12 @@ namespace features { - // are enabled are controlled by other features. - const base::Feature kPreviews { - "Previews", --#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - // Previews allowed for Android (but also allow on Linux for dev/debug). - base::FEATURE_ENABLED_BY_DEFAULT --#else // !defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#else // !defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - base::FEATURE_DISABLED_BY_DEFAULT --#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - }; - - // Provides slow page triggering parameters. diff --git a/www/chromium/files/patch-components_security__interstitials_content_captive__portal__blocking__page.cc b/www/chromium/files/patch-components_security__interstitials_content_captive__portal__blocking__page.cc index e81ef091f821..e654271973a2 100644 --- a/www/chromium/files/patch-components_security__interstitials_content_captive__portal__blocking__page.cc +++ b/www/chromium/files/patch-components_security__interstitials_content_captive__portal__blocking__page.cc @@ -1,11 +1,11 @@ ---- components/security_interstitials/content/captive_portal_blocking_page.cc.orig 2021-04-14 18:41:00 UTC +--- components/security_interstitials/content/captive_portal_blocking_page.cc.orig 2021-05-12 22:05:51 UTC +++ components/security_interstitials/content/captive_portal_blocking_page.cc -@@ -106,7 +106,7 @@ std::string CaptivePortalBlockingPage::GetWiFiSSID() c +@@ -108,7 +108,7 @@ std::string CaptivePortalBlockingPage::GetWiFiSSID() c wifi_service->GetConnectedNetworkSSID(&ssid, &error); if (!error.empty()) return std::string(); -#elif defined(OS_LINUX) || defined(OS_CHROMEOS) +#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) ssid = net::GetWifiSSID(); #elif defined(OS_ANDROID) ssid = net::android::GetWifiSSID(); diff --git a/www/chromium/files/patch-components_security__interstitials_content_utils.cc b/www/chromium/files/patch-components_security__interstitials_content_utils.cc index ca07e31da6ec..7386bcd6e406 100644 --- a/www/chromium/files/patch-components_security__interstitials_content_utils.cc +++ b/www/chromium/files/patch-components_security__interstitials_content_utils.cc @@ -1,11 +1,11 @@ ---- components/security_interstitials/content/utils.cc.orig 2021-04-14 18:41:00 UTC +--- components/security_interstitials/content/utils.cc.orig 2021-05-12 22:05:51 UTC +++ components/security_interstitials/content/utils.cc -@@ -32,7 +32,7 @@ void LaunchDateAndTimeSettings() { +@@ -33,7 +33,7 @@ void LaunchDateAndTimeSettings() { #if defined(OS_ANDROID) JNIEnv* env = base::android::AttachCurrentThread(); Java_DateAndTimeSettingsHelper_openDateAndTimeSettings(env); -#elif defined(OS_LINUX) || defined(OS_CHROMEOS) +#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) struct ClockCommand { const char* const pathname; const char* const argument; diff --git a/www/chromium/files/patch-components_startup__metric__utils_browser_startup__metric__utils.cc b/www/chromium/files/patch-components_startup__metric__utils_browser_startup__metric__utils.cc new file mode 100644 index 000000000000..78e3bb5c0e1e --- /dev/null +++ b/www/chromium/files/patch-components_startup__metric__utils_browser_startup__metric__utils.cc @@ -0,0 +1,20 @@ +--- components/startup_metric_utils/browser/startup_metric_utils.cc.orig 2021-06-11 09:43:41 UTC ++++ components/startup_metric_utils/browser/startup_metric_utils.cc +@@ -343,7 +343,7 @@ base::TimeTicks StartupTimeToTimeTicks(base::Time time + + // Enabling this logic on OS X causes a significant performance regression. + // https://crbug.com/601270 +-#if !defined(OS_APPLE) ++#if !defined(OS_APPLE) && !defined(OS_BSD) + static bool statics_initialized = false; + + base::ThreadPriority previous_priority = base::ThreadPriority::NORMAL; +@@ -357,7 +357,7 @@ base::TimeTicks StartupTimeToTimeTicks(base::Time time + static const base::Time time_base = base::Time::Now(); + static const base::TimeTicks trace_ticks_base = base::TimeTicks::Now(); + +-#if !defined(OS_APPLE) ++#if !defined(OS_APPLE) && !defined(OS_BSD) + if (!statics_initialized) { + base::PlatformThread::SetCurrentThreadPriority(previous_priority); + } diff --git a/www/chromium/files/patch-components_storage__monitor_removable__device__constants.h b/www/chromium/files/patch-components_storage__monitor_removable__device__constants.h index 332150b8a2fb..b724ec0aea63 100644 --- a/www/chromium/files/patch-components_storage__monitor_removable__device__constants.h +++ b/www/chromium/files/patch-components_storage__monitor_removable__device__constants.h @@ -1,11 +1,11 @@ ---- components/storage_monitor/removable_device_constants.h.orig 2021-04-14 18:41:00 UTC +--- components/storage_monitor/removable_device_constants.h.orig 2021-05-12 22:05:51 UTC +++ components/storage_monitor/removable_device_constants.h -@@ -15,7 +15,7 @@ namespace storage_monitor { +@@ -16,7 +16,7 @@ namespace storage_monitor { extern const char kFSUniqueIdPrefix[]; extern const char kVendorModelSerialPrefix[]; -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) extern const char kVendorModelVolumeStoragePrefix[]; #endif diff --git a/www/chromium/files/patch-components_sync__device__info_local__device__info__util.cc b/www/chromium/files/patch-components_sync__device__info_local__device__info__util.cc index c34b972840b0..0feeda6eff71 100644 --- a/www/chromium/files/patch-components_sync__device__info_local__device__info__util.cc +++ b/www/chromium/files/patch-components_sync__device__info_local__device__info__util.cc @@ -1,11 +1,11 @@ ---- components/sync_device_info/local_device_info_util.cc.orig 2021-04-14 18:41:01 UTC +--- components/sync_device_info/local_device_info_util.cc.orig 2021-05-12 22:05:51 UTC +++ components/sync_device_info/local_device_info_util.cc -@@ -53,7 +53,7 @@ std::string GetPersonalizableDeviceNameInternal(); +@@ -75,7 +75,7 @@ std::string GetPersonalizableDeviceNameInternal(); sync_pb::SyncEnums::DeviceType GetLocalDeviceType() { #if BUILDFLAG(IS_CHROMEOS_ASH) return sync_pb::SyncEnums_DeviceType_TYPE_CROS; -#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) return sync_pb::SyncEnums_DeviceType_TYPE_LINUX; #elif defined(OS_ANDROID) || defined(OS_IOS) return ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_TABLET diff --git a/www/chromium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc b/www/chromium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc index fd418dd48276..bda897b7422e 100644 --- a/www/chromium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc +++ b/www/chromium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc @@ -1,11 +1,11 @@ ---- components/url_formatter/spoof_checks/idn_spoof_checker.cc.orig 2021-04-14 18:41:02 UTC +--- components/url_formatter/spoof_checks/idn_spoof_checker.cc.orig 2021-05-12 22:05:51 UTC +++ components/url_formatter/spoof_checks/idn_spoof_checker.cc -@@ -292,7 +292,7 @@ IDNSpoofChecker::IDNSpoofChecker() { +@@ -291,7 +291,7 @@ IDNSpoofChecker::IDNSpoofChecker() { // The ideal fix would be to change the omnibox font used for Thai. In // that case, the Linux-only list should be revisited and potentially // removed. -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) "[ทนบพรหเแ๐ดลปฟม]", #else "[บพเแ๐]", diff --git a/www/chromium/files/patch-components_viz_common_features.cc b/www/chromium/files/patch-components_viz_common_features.cc index c5ef197121d9..05b7904dd702 100644 --- a/www/chromium/files/patch-components_viz_common_features.cc +++ b/www/chromium/files/patch-components_viz_common_features.cc @@ -1,11 +1,11 @@ ---- components/viz/common/features.cc.orig 2021-04-14 18:41:02 UTC +--- components/viz/common/features.cc.orig 2021-05-12 22:05:51 UTC +++ components/viz/common/features.cc -@@ -33,7 +33,7 @@ const base::Feature kEnableOverlayPrioritization { +@@ -38,7 +38,7 @@ const base::Feature kEnableOverlayPrioritization { const base::Feature kUseSkiaRenderer { "UseSkiaRenderer", #if defined(OS_WIN) || defined(OS_ANDROID) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ -- (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) -+ (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) || defined(OS_BSD) +- defined(OS_LINUX) ++ defined(OS_LINUX) || defined(OS_BSD) base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT diff --git a/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc b/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc index 3934521aaab0..0dc96a5c900e 100644 --- a/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc +++ b/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc @@ -1,20 +1,20 @@ ---- components/viz/service/display_embedder/software_output_surface.cc.orig 2021-04-14 18:41:02 UTC +--- components/viz/service/display_embedder/software_output_surface.cc.orig 2021-05-12 22:05:52 UTC +++ components/viz/service/display_embedder/software_output_surface.cc -@@ -115,7 +115,7 @@ void SoftwareOutputSurface::SwapBuffersCallback(base:: +@@ -114,7 +114,7 @@ void SoftwareOutputSurface::SwapBuffersCallback(base:: now.SnappedToNextTick(refresh_timebase_, refresh_interval_) - now; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) if (needs_swap_size_notifications_) client_->DidSwapWithSize(pixel_size); #endif -@@ -146,7 +146,7 @@ gfx::OverlayTransform SoftwareOutputSurface::GetDispla +@@ -145,7 +145,7 @@ gfx::OverlayTransform SoftwareOutputSurface::GetDispla // 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) void SoftwareOutputSurface::SetNeedsSwapSizeNotifications( bool needs_swap_size_notifications) { needs_swap_size_notifications_ = needs_swap_size_notifications; diff --git a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc index 5dbf44275bcc..0a5beadbd1fe 100644 --- a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc +++ b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc @@ -1,20 +1,20 @@ ---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2021-04-14 18:41:02 UTC +--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2021-05-12 22:05:52 UTC +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc -@@ -59,7 +59,7 @@ RootCompositorFrameSinkImpl::Create( +@@ -60,7 +60,7 @@ RootCompositorFrameSinkImpl::Create( // 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) // For X11, we need notify client about swap completion after resizing, so the // client can use it for synchronize with X11 WM. output_surface->SetNeedsSwapSizeNotifications(true); -@@ -476,7 +476,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw +@@ -479,7 +479,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw display_client_->DidCompleteSwapWithSize(pixel_size); // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) if (display_client_ && pixel_size != last_swap_pixel_size_) { last_swap_pixel_size_ = pixel_size; display_client_->DidCompleteSwapWithNewSize(last_swap_pixel_size_); diff --git a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h index 4fcdcab539b5..80181cf13beb 100644 --- a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h +++ b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h @@ -1,11 +1,11 @@ ---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2021-04-14 18:41:02 UTC +--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2021-05-12 22:05:52 UTC +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h -@@ -166,7 +166,7 @@ class RootCompositorFrameSinkImpl : public mojom::Comp +@@ -172,7 +172,7 @@ class RootCompositorFrameSinkImpl : public mojom::Comp // 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) gfx::Size last_swap_pixel_size_; #endif diff --git a/www/chromium/files/patch-content_app_content__main__runner__impl.cc b/www/chromium/files/patch-content_app_content__main__runner__impl.cc index 43e0ea1aa137..79d200357ac4 100644 --- a/www/chromium/files/patch-content_app_content__main__runner__impl.cc +++ b/www/chromium/files/patch-content_app_content__main__runner__impl.cc @@ -1,65 +1,65 @@ ---- content/app/content_main_runner_impl.cc.orig 2021-04-14 18:41:02 UTC +--- content/app/content_main_runner_impl.cc.orig 2021-05-12 22:05:52 UTC +++ content/app/content_main_runner_impl.cc -@@ -135,7 +135,7 @@ +@@ -138,7 +138,7 @@ #endif // OS_POSIX || OS_FUCHSIA -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "base/native_library.h" #include "base/rand_util.h" #include "content/public/common/zygote/sandbox_support_linux.h" -@@ -155,7 +155,7 @@ +@@ -158,7 +158,7 @@ #include "content/public/common/content_client.h" #endif -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #if BUILDFLAG(USE_ZYGOTE_HANDLE) #include "content/browser/sandbox_host_linux.h" -@@ -307,7 +307,7 @@ void InitializeZygoteSandboxForBrowserProcess( +@@ -311,7 +311,7 @@ void InitializeZygoteSandboxForBrowserProcess( } #endif // BUILDFLAG(USE_ZYGOTE_HANDLE) -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #if BUILDFLAG(ENABLE_PLUGINS) // Loads the (native) libraries but does not initialize them (i.e., does not -@@ -398,7 +398,7 @@ void PreSandboxInit() { +@@ -402,7 +402,7 @@ void PreSandboxInit() { } #endif // BUILDFLAG(USE_ZYGOTE_HANDLE) -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) mojo::ScopedMessagePipeHandle MaybeAcceptMojoInvitation() { const auto& command_line = *base::CommandLine::ForCurrentProcess(); -@@ -516,7 +516,7 @@ int RunZygote(ContentMainDelegate* delegate) { +@@ -533,7 +533,7 @@ int RunZygote(ContentMainDelegate* delegate) { delegate->ZygoteStarting(&zygote_fork_delegates); media::InitializeMediaLibrary(); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) PreSandboxInit(); #endif -@@ -916,7 +916,7 @@ int ContentMainRunnerImpl::Run(bool start_minimal_brow +@@ -928,7 +928,7 @@ int ContentMainRunnerImpl::Run(bool start_minimal_brow mojo::core::InitFeatures(); } -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // If dynamic Mojo Core is being used, ensure that it's loaded very early in // the child/zygote process, before any sandbox is initialized. The library // is not fully initialized with IPC support until a ChildProcess is later -@@ -926,7 +926,7 @@ int ContentMainRunnerImpl::Run(bool start_minimal_brow +@@ -938,7 +938,7 @@ int ContentMainRunnerImpl::Run(bool start_minimal_brow CHECK_EQ(mojo::LoadCoreLibrary(GetMojoCoreSharedLibraryPath()), MOJO_RESULT_OK); } -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) } MainFunctionParams main_params(command_line); diff --git a/www/chromium/files/patch-content_browser_BUILD.gn b/www/chromium/files/patch-content_browser_BUILD.gn index aa414dbc2e64..94516bd6ef97 100644 --- a/www/chromium/files/patch-content_browser_BUILD.gn +++ b/www/chromium/files/patch-content_browser_BUILD.gn @@ -1,18 +1,18 @@ ---- content/browser/BUILD.gn.orig 2021-04-14 18:41:02 UTC +--- content/browser/BUILD.gn.orig 2021-05-12 22:05:52 UTC +++ content/browser/BUILD.gn -@@ -2179,6 +2179,15 @@ source_set("browser") { +@@ -2222,6 +2222,15 @@ source_set("browser") { deps += [ "//third_party/speech-dispatcher" ] } + if (is_bsd) { + sources -= [ + "sandbox_host_linux.cc", + "sandbox_host_linux.h", + "sandbox_ipc_linux.cc", + "sandbox_ipc_linux.h", + ] + } + # ChromeOS also defines linux but their memory-monitors conflict. if (is_chromeos_ash) { sources += [ diff --git a/www/chromium/files/patch-content_browser_browser__main__loop.cc b/www/chromium/files/patch-content_browser_browser__main__loop.cc index a2a8d3a2c4f8..81386e0bfb77 100644 --- a/www/chromium/files/patch-content_browser_browser__main__loop.cc +++ b/www/chromium/files/patch-content_browser_browser__main__loop.cc @@ -1,38 +1,29 @@ ---- content/browser/browser_main_loop.cc.orig 2021-04-14 18:41:02 UTC +--- content/browser/browser_main_loop.cc.orig 2021-05-12 22:05:52 UTC +++ content/browser/browser_main_loop.cc -@@ -368,7 +368,7 @@ std::unique_ptr CreateMem - if (chromeos::switches::MemoryPressureHandlingEnabled()) - monitor = std::make_unique(); - #elif defined(OS_MAC) || defined(OS_WIN) || defined(OS_FUCHSIA) || \ -- ((defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ -+ defined(OS_BSD) || ((defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ - !BUILDFLAG(IS_CHROMECAST)) - monitor = std::make_unique(); - #endif @@ -562,7 +562,7 @@ int BrowserMainLoop::EarlyInitialization() { // Up the priority of the UI thread unless it was already high (since Mac // and recent versions of Android (O+) do this automatically). -#if !defined(OS_MAC) +#if !defined(OS_MAC) && !defined(OS_BSD) if (base::FeatureList::IsEnabled( features::kBrowserUseDisplayThreadPriority) && base::PlatformThread::GetCurrentThreadPriority() < @@ -572,7 +572,7 @@ int BrowserMainLoop::EarlyInitialization() { } #endif // !defined(OS_MAC) -#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ +#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ defined(OS_ANDROID) // We use quite a few file descriptors for our IPC as well as disk the disk // cache,and the default limit on the Mac is low (256), so bump it up. @@ -582,7 +582,7 @@ int BrowserMainLoop::EarlyInitialization() { // users can easily hit this limit with many open tabs. Bump up the limit to // an arbitrarily high number. See https://crbug.com/539567 base::IncreaseFdLimitTo(8192); -#endif // defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || +#endif // defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || // defined(OS_ANDROID) #if defined(OS_WIN) diff --git a/www/chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc b/www/chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc index b3bc16aa03de..7d1b61ffda88 100644 --- a/www/chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc +++ b/www/chromium/files/patch-content_browser_compositor_viz__process__transport__factory.cc @@ -1,11 +1,11 @@ ---- content/browser/compositor/viz_process_transport_factory.cc.orig 2021-04-14 18:41:02 UTC +--- content/browser/compositor/viz_process_transport_factory.cc.orig 2021-05-12 22:05:52 UTC +++ content/browser/compositor/viz_process_transport_factory.cc -@@ -111,7 +111,7 @@ class HostDisplayClient : public viz::HostDisplayClien +@@ -112,7 +112,7 @@ class HostDisplayClient : public viz::HostDisplayClien // viz::HostDisplayClient: // 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) void DidCompleteSwapWithNewSize(const gfx::Size& size) override { compositor_->OnCompleteSwapWithNewSize(size); } diff --git a/www/chromium/files/patch-content_browser_devtools_protocol_system__info__handler.cc b/www/chromium/files/patch-content_browser_devtools_protocol_system__info__handler.cc index 8ec1e4c32c84..f05bfe856d34 100644 --- a/www/chromium/files/patch-content_browser_devtools_protocol_system__info__handler.cc +++ b/www/chromium/files/patch-content_browser_devtools_protocol_system__info__handler.cc @@ -1,13 +1,13 @@ ---- content/browser/devtools/protocol/system_info_handler.cc.orig 2021-04-14 18:41:02 UTC +--- content/browser/devtools/protocol/system_info_handler.cc.orig 2021-05-12 22:05:52 UTC +++ content/browser/devtools/protocol/system_info_handler.cc -@@ -50,8 +50,8 @@ std::unique_ptr GfxSizeToSystemInfoS +@@ -51,8 +51,8 @@ std::unique_ptr GfxSizeToSystemInfoS // 1153667. // Windows builds need more time -- see Issue 873112 and 1004472. // ASAN builds need more time -- see Issue 1167875. -#if ((defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC)) && \ - !defined(NDEBUG)) || \ +#if ((defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD)) && \ + !defined(NDEBUG)) || \ - defined(OS_WIN) || defined(ADDRESS_SANITIZER) + defined(OS_WIN) || defined(ADDRESS_SANITIZER) || defined(USE_OZONE) const int kGPUInfoWatchdogTimeoutMs = 30000; #else diff --git a/www/chromium/files/patch-content_browser_download_download__manager__impl.cc b/www/chromium/files/patch-content_browser_download_download__manager__impl.cc index fc9cd8f87fde..2cd41c079f51 100644 --- a/www/chromium/files/patch-content_browser_download_download__manager__impl.cc +++ b/www/chromium/files/patch-content_browser_download_download__manager__impl.cc @@ -1,29 +1,29 @@ ---- content/browser/download/download_manager_impl.cc.orig 2021-04-14 18:41:02 UTC +--- content/browser/download/download_manager_impl.cc.orig 2021-05-12 22:05:52 UTC +++ content/browser/download/download_manager_impl.cc @@ -83,7 +83,7 @@ #include "third_party/blink/public/common/loader/referrer_utils.h" #include "third_party/blink/public/common/loader/throttling_url_loader.h" -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "base/nix/xdg_util.h" #endif -@@ -219,7 +219,7 @@ class DownloadItemFactoryImpl : public download::Downl +@@ -229,7 +229,7 @@ class DownloadItemFactoryImpl : public download::Downl } }; -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) base::FilePath GetTemporaryDownloadDirectory() { std::unique_ptr env(base::Environment::Create()); return base::nix::GetXDGDirectory(env.get(), "XDG_DATA_HOME", ".local/share"); -@@ -560,7 +560,7 @@ bool DownloadManagerImpl::InterceptDownload( +@@ -570,7 +570,7 @@ bool DownloadManagerImpl::InterceptDownload( base::FilePath DownloadManagerImpl::GetDefaultDownloadDirectory() { base::FilePath default_download_directory; -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // TODO(thomasanderson,crbug.com/784010): Remove this when all Linux // distros with versions of GTK lower than 3.14.7 are no longer // supported. This should happen when support for Ubuntu Trusty and diff --git a/www/chromium/files/patch-content_browser_gpu_compositor__util.cc b/www/chromium/files/patch-content_browser_gpu_compositor__util.cc index e9a75050187b..c1b41fea3c81 100644 --- a/www/chromium/files/patch-content_browser_gpu_compositor__util.cc +++ b/www/chromium/files/patch-content_browser_gpu_compositor__util.cc @@ -1,16 +1,16 @@ ---- content/browser/gpu/compositor_util.cc.orig 2021-04-14 18:41:02 UTC +--- content/browser/gpu/compositor_util.cc.orig 2021-05-12 22:05:52 UTC +++ content/browser/gpu/compositor_util.cc @@ -127,11 +127,11 @@ const GpuFeatureData GetGpuFeatureData( {"video_decode", SafeGetFeatureStatus(gpu_feature_info, gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE), --#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) +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) !base::FeatureList::IsEnabled(media::kVaapiVideoDecodeLinux), #else command_line.HasSwitch(switches::kDisableAcceleratedVideoDecode), --#endif // ((defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && -+#endif // ((defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) && - // !defined(OS_ANDROID) +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) DisableInfo::Problem( "Accelerated video decode has been disabled, either via blocklist, " + "about:flags or the command line."), diff --git a/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc b/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc index 09911906dfc1..aff9c080f205 100644 --- a/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc +++ b/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc @@ -1,22 +1,22 @@ ---- content/browser/gpu/gpu_process_host.cc.orig 2021-04-14 18:41:02 UTC +--- content/browser/gpu/gpu_process_host.cc.orig 2021-05-12 22:05:52 UTC +++ content/browser/gpu/gpu_process_host.cc -@@ -230,8 +230,8 @@ static const char* const kSwitchNames[] = { +@@ -231,8 +231,8 @@ static const char* const kSwitchNames[] = { sandbox::policy::switches::kNoSandbox, // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#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)) switches::kDisableDevShmUsage, #endif #if defined(OS_WIN) -@@ -1157,7 +1157,7 @@ bool GpuProcessHost::LaunchGpuProcess() { +@@ -1177,7 +1177,7 @@ bool GpuProcessHost::LaunchGpuProcess() { std::unique_ptr cmd_line = std::make_unique(base::CommandLine::NO_PROGRAM); #else -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) int child_flags = gpu_launcher.empty() ? ChildProcessHost::CHILD_ALLOW_SELF : ChildProcessHost::CHILD_NORMAL; #elif defined(OS_MAC) diff --git a/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc b/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc index 0b9765d2c928..42520b6c2554 100644 --- a/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc +++ b/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc @@ -1,11 +1,11 @@ ---- content/browser/ppapi_plugin_process_host.cc.orig 2021-04-14 18:41:02 UTC +--- content/browser/ppapi_plugin_process_host.cc.orig 2021-05-12 22:05:52 UTC +++ content/browser/ppapi_plugin_process_host.cc -@@ -303,7 +303,7 @@ bool PpapiPluginProcessHost::Init(const PepperPluginIn +@@ -302,7 +302,7 @@ bool PpapiPluginProcessHost::Init(const PepperPluginIn base::CommandLine::StringType plugin_launcher = browser_command_line.GetSwitchValueNative(switches::kPpapiPluginLauncher); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) int flags = plugin_launcher.empty() ? ChildProcessHost::CHILD_ALLOW_SELF : ChildProcessHost::CHILD_NORMAL; #else diff --git a/www/chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc b/www/chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc index 35f770df4755..a186c499b0e5 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc @@ -1,11 +1,11 @@ ---- content/browser/renderer_host/delegated_frame_host.cc.orig 2021-04-14 18:41:02 UTC +--- content/browser/renderer_host/delegated_frame_host.cc.orig 2021-05-12 22:05:52 UTC +++ content/browser/renderer_host/delegated_frame_host.cc -@@ -258,7 +258,7 @@ void DelegatedFrameHost::EmbedSurface( +@@ -259,7 +259,7 @@ void DelegatedFrameHost::EmbedSurface( if (!primary_surface_id || primary_surface_id->local_surface_id() != local_surface_id_) { -#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) // On Windows and Linux, we would like to produce new content as soon as // possible or the OS will create an additional black gutter. Until we can // block resize on surface synchronization on these platforms, we will not diff --git a/www/chromium/files/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc b/www/chromium/files/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc index ba4348fb7ff3..4aeed406d409 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc @@ -1,20 +1,20 @@ ---- content/browser/renderer_host/pepper/pepper_file_io_host.cc.orig 2021-04-14 18:41:02 UTC +--- content/browser/renderer_host/pepper/pepper_file_io_host.cc.orig 2021-05-12 22:05:52 UTC +++ content/browser/renderer_host/pepper/pepper_file_io_host.cc -@@ -437,7 +437,7 @@ void PepperFileIOHost::OnLocalFileOpened( +@@ -438,7 +438,7 @@ void PepperFileIOHost::OnLocalFileOpened( ppapi::host::ReplyMessageContext reply_context, const base::FilePath& path, base::File::Error error_code) { -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Quarantining a file before its contents are available is only supported on // Windows and Linux. if (!FileOpenForWrite(open_flags_) || error_code != base::File::FILE_OK) { -@@ -458,7 +458,7 @@ void PepperFileIOHost::OnLocalFileOpened( +@@ -472,7 +472,7 @@ void PepperFileIOHost::OnLocalFileOpened( #endif } -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) void PepperFileIOHost::OnLocalFileQuarantined( ppapi::host::ReplyMessageContext reply_context, const base::FilePath& path, diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc b/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc index c55da29665c1..83450a0db7a4 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc @@ -1,29 +1,29 @@ ---- content/browser/renderer_host/render_message_filter.cc.orig 2021-04-14 18:41:02 UTC +--- content/browser/renderer_host/render_message_filter.cc.orig 2021-05-12 22:05:52 UTC +++ content/browser/renderer_host/render_message_filter.cc -@@ -70,7 +70,7 @@ +@@ -68,7 +68,7 @@ #if defined(OS_MAC) #include "ui/accelerated_widget_mac/window_resize_helper_mac.h" #endif -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "base/linux_util.h" #include "base/threading/platform_thread.h" #endif -@@ -127,7 +127,7 @@ void RenderMessageFilter::GenerateFrameRoutingID( +@@ -116,7 +116,7 @@ void RenderMessageFilter::GenerateFrameRoutingID( std::move(callback).Run(routing_id, frame_token, devtools_frame_token); } -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) void RenderMessageFilter::SetThreadPriorityOnFileThread( base::PlatformThreadId ns_tid, base::ThreadPriority priority) { -@@ -148,7 +148,7 @@ void RenderMessageFilter::SetThreadPriorityOnFileThrea +@@ -137,7 +137,7 @@ void RenderMessageFilter::SetThreadPriorityOnFileThrea } #endif -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) void RenderMessageFilter::SetThreadPriority(int32_t ns_tid, base::ThreadPriority priority) { constexpr base::TaskTraits kTraits = { diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h b/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h index b7f7ebdee01f..458f27226819 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h +++ b/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h @@ -1,19 +1,19 @@ ---- content/browser/renderer_host/render_message_filter.h.orig 2021-04-14 18:41:02 UTC +--- content/browser/renderer_host/render_message_filter.h.orig 2021-05-12 22:05:52 UTC +++ content/browser/renderer_host/render_message_filter.h -@@ -79,14 +79,14 @@ class CONTENT_EXPORT RenderMessageFilter +@@ -77,14 +77,14 @@ class CONTENT_EXPORT RenderMessageFilter void GenerateRoutingID(GenerateRoutingIDCallback routing_id) override; void GenerateFrameRoutingID(GenerateFrameRoutingIDCallback callback) override; void HasGpuProcess(HasGpuProcessCallback callback) override; -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) void SetThreadPriority(int32_t ns_tid, base::ThreadPriority priority) override; #endif void OnResolveProxy(const GURL& url, IPC::Message* reply_msg); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) void SetThreadPriorityOnFileThread(base::PlatformThreadId ns_tid, base::ThreadPriority priority); #endif diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc index 727e7b949d2a..01fe8c07a94f 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc @@ -1,67 +1,67 @@ ---- content/browser/renderer_host/render_process_host_impl.cc.orig 2021-04-20 18:58:32 UTC +--- content/browser/renderer_host/render_process_host_impl.cc.orig 2021-05-12 22:05:52 UTC +++ content/browser/renderer_host/render_process_host_impl.cc -@@ -227,7 +227,7 @@ +@@ -223,7 +223,7 @@ #include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h" #endif -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include #include -@@ -1324,7 +1324,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = +@@ -1243,7 +1243,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = // to indicate failure and std::numeric_limits::max() to indicate // unlimited. size_t GetPlatformProcessLimit() { -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) struct rlimit limit; if (getrlimit(RLIMIT_NPROC, &limit) != 0) return kUnknownPlatformProcessLimit; -@@ -1335,7 +1335,7 @@ size_t GetPlatformProcessLimit() { +@@ -1254,7 +1254,7 @@ size_t GetPlatformProcessLimit() { #else // TODO(https://crbug.com/104689): Implement on other platforms. return kUnknownPlatformProcessLimit; -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) } #endif // !defined(OS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH) -@@ -1409,7 +1409,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public +@@ -1328,7 +1328,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public return; } -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) if (auto font_receiver = receiver.As()) { ConnectToFontService(std::move(font_receiver)); return; -@@ -1811,7 +1811,7 @@ bool RenderProcessHostImpl::Init() { +@@ -1748,7 +1748,7 @@ bool RenderProcessHostImpl::Init() { renderer_prefix = browser_command_line.GetSwitchValueNative(switches::kRendererCmdPrefix); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) int flags = renderer_prefix.empty() ? ChildProcessHost::CHILD_ALLOW_SELF : ChildProcessHost::CHILD_NORMAL; #elif defined(OS_MAC) -@@ -3225,8 +3225,8 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin +@@ -3176,8 +3176,8 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin switches::kDisableInProcessStackTraces, sandbox::policy::switches::kDisableSeccompFilterSandbox, sandbox::policy::switches::kNoSandbox, -#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)) switches::kDisableDevShmUsage, #endif #if defined(OS_MAC) -@@ -4868,6 +4868,8 @@ void RenderProcessHostImpl::OnProcessLaunched() { +@@ -4806,6 +4806,8 @@ void RenderProcessHostImpl::OnProcessLaunched() { // TODO(https://crbug.com/875933): Fix initial priority on Android to // reflect |priority_.is_background()|. DCHECK_EQ(blink::kLaunchingProcessIsBackgrounded, !priority_.visible); +#elif defined(OS_BSD) + priority_.visible = true; #else priority_.visible = !child_process_launcher_->GetProcess().IsProcessBackgrounded(); diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc b/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc index 67dd23c68afb..0f8ede625093 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc @@ -1,11 +1,11 @@ ---- content/browser/renderer_host/render_view_host_impl.cc.orig 2021-04-14 18:41:02 UTC +--- content/browser/renderer_host/render_view_host_impl.cc.orig 2021-05-12 22:05:52 UTC +++ content/browser/renderer_host/render_view_host_impl.cc -@@ -258,7 +258,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs( +@@ -259,7 +259,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs( display::win::ScreenWin::GetSystemMetricsInDIP(SM_CYVSCROLL); prefs->arrow_bitmap_width_horizontal_scroll_bar_in_dips = display::win::ScreenWin::GetSystemMetricsInDIP(SM_CXHSCROLL); -#elif defined(OS_LINUX) || defined(OS_CHROMEOS) +#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) prefs->system_font_family_name = gfx::Font().GetFontName(); #elif defined(OS_FUCHSIA) // Make Blink's "focus ring" invisible. The focus ring is a hairline border diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc index d290637741bc..88c5c15955f7 100644 --- a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc +++ b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc @@ -1,11 +1,11 @@ ---- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig 2021-04-14 18:41:02 UTC +--- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig 2021-05-12 22:05:52 UTC +++ content/browser/renderer_host/render_widget_host_view_event_handler.cc -@@ -708,7 +708,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand +@@ -714,7 +714,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand if (event->type() == ui::ET_MOUSE_EXITED) { if (mouse_locked || selection_popup) return false; -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Don't forward the mouse leave message which is received when the context // menu is displayed by the page. This confuses the page and causes state // changes. diff --git a/www/chromium/files/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc b/www/chromium/files/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc index a785c4bf8161..d40609313f5f 100644 --- a/www/chromium/files/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc +++ b/www/chromium/files/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc @@ -1,11 +1,11 @@ ---- content/browser/scheduler/responsiveness/jank_monitor_impl.cc.orig 2021-04-14 18:41:02 UTC +--- content/browser/scheduler/responsiveness/jank_monitor_impl.cc.orig 2021-05-12 22:05:52 UTC +++ content/browser/scheduler/responsiveness/jank_monitor_impl.cc -@@ -333,7 +333,7 @@ void JankMonitorImpl::ThreadExecutionState::DidRunTask +@@ -334,7 +334,7 @@ void JankMonitorImpl::ThreadExecutionState::DidRunTask // in context menus, among others). Simply ignore the mismatches for now. // See https://crbug.com/929813 for the details of why the mismatch // happens. -#if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && defined(USE_OZONE) +#if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) && defined(USE_OZONE) task_execution_metadata_.clear(); #endif return; diff --git a/www/chromium/files/patch-content_browser_utility__process__host.cc b/www/chromium/files/patch-content_browser_utility__process__host.cc index 6531331067bf..5e8c93642165 100644 --- a/www/chromium/files/patch-content_browser_utility__process__host.cc +++ b/www/chromium/files/patch-content_browser_utility__process__host.cc @@ -1,22 +1,22 @@ ---- content/browser/utility_process_host.cc.orig 2021-04-14 18:41:02 UTC +--- content/browser/utility_process_host.cc.orig 2021-05-12 22:05:52 UTC +++ content/browser/utility_process_host.cc -@@ -62,7 +62,7 @@ UtilityProcessHost::UtilityProcessHost() +@@ -67,7 +67,7 @@ UtilityProcessHost::UtilityProcessHost() UtilityProcessHost::UtilityProcessHost(std::unique_ptr client) : sandbox_type_(sandbox::policy::SandboxType::kUtility), -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) child_flags_(ChildProcessHost::CHILD_ALLOW_SELF), #else child_flags_(ChildProcessHost::CHILD_NORMAL), -@@ -231,8 +231,8 @@ bool UtilityProcessHost::StartProcess() { +@@ -240,8 +240,8 @@ bool UtilityProcessHost::StartProcess() { sandbox::policy::switches::kNoSandbox, // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#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)) switches::kDisableDevShmUsage, #endif #if defined(OS_MAC) diff --git a/www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc b/www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc index ab3cb1e85d21..1a6d9325a198 100644 --- a/www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc +++ b/www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc @@ -1,29 +1,29 @@ ---- content/browser/web_contents/web_contents_view_aura.cc.orig 2021-04-14 18:41:02 UTC +--- content/browser/web_contents/web_contents_view_aura.cc.orig 2021-05-12 22:05:52 UTC +++ content/browser/web_contents/web_contents_view_aura.cc -@@ -151,7 +151,7 @@ class WebDragSourceAura : public content::WebContentsO +@@ -152,7 +152,7 @@ class WebDragSourceAura : public content::WebContentsO DISALLOW_COPY_AND_ASSIGN(WebDragSourceAura); }; -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_BSD) // Fill out the OSExchangeData with a file contents, synthesizing a name if // necessary. void PrepareDragForFileContents(const DropData& drop_data, -@@ -234,7 +234,7 @@ void PrepareDragData(const DropData& drop_data, +@@ -235,7 +235,7 @@ void PrepareDragData(const DropData& drop_data, if (!drop_data.download_metadata.empty()) PrepareDragForDownload(drop_data, provider, web_contents); #endif -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_BSD) // We set the file contents before the URL because the URL also sets file // contents (to a .URL shortcut). We want to prefer file content data over // a shortcut so we add it first. -@@ -1209,7 +1209,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent* +@@ -1210,7 +1210,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent* // Linux window managers like to handle raise-on-click themselves. If we // raise-on-click manually, this may override user settings that prevent // focus-stealing. -#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_BSD) // It is possible for the web-contents to be destroyed while it is being // activated. Use a weak-ptr to track whether that happened or not. // More in https://crbug.com/1040725 diff --git a/www/chromium/files/patch-content_common_BUILD.gn b/www/chromium/files/patch-content_common_BUILD.gn index 0cf64fe695f9..b79fd5fbe007 100644 --- a/www/chromium/files/patch-content_common_BUILD.gn +++ b/www/chromium/files/patch-content_common_BUILD.gn @@ -1,36 +1,36 @@ ---- content/common/BUILD.gn.orig 2021-04-14 18:41:02 UTC +--- content/common/BUILD.gn.orig 2021-05-12 22:05:53 UTC +++ content/common/BUILD.gn -@@ -336,7 +336,7 @@ source_set("common") { +@@ -338,7 +338,7 @@ source_set("common") { sources -= [ "cursors/webcursor_aura.cc" ] } - if (is_linux || is_chromeos) { + if ((is_linux || is_chromeos) && !is_bsd) { sources += [ "common_sandbox_support_linux.cc", "sandbox_init_linux.cc", -@@ -352,6 +352,15 @@ source_set("common") { +@@ -354,6 +354,15 @@ source_set("common") { ] } + if (is_bsd) { + sources += [ + "common_sandbox_support_linux.cc", + ] + deps += [ + "//third_party/fontconfig", + ] + } + if (use_zygote_handle) { sources += [ "zygote/zygote_handle_impl_linux.h", -@@ -401,7 +410,7 @@ source_set("common") { +@@ -403,7 +412,7 @@ source_set("common") { } } -if (is_linux || is_chromeos) { +if ((is_linux || is_chromeos) && !is_bsd) { source_set("set_process_title_linux") { public = [ "set_process_title_linux.h" ] sources = [ "set_process_title_linux.cc" ] diff --git a/www/chromium/files/patch-content_gpu_gpu__main.cc b/www/chromium/files/patch-content_gpu_gpu__main.cc index f103239d22ec..8ad3aceeabd6 100644 --- a/www/chromium/files/patch-content_gpu_gpu__main.cc +++ b/www/chromium/files/patch-content_gpu_gpu__main.cc @@ -1,20 +1,20 @@ ---- content/gpu/gpu_main.cc.orig 2021-04-14 18:41:03 UTC +--- content/gpu/gpu_main.cc.orig 2021-05-12 22:05:53 UTC +++ content/gpu/gpu_main.cc -@@ -85,7 +85,7 @@ +@@ -87,7 +87,7 @@ #include "ui/gfx/x/x11_switches.h" // nogncheck #endif -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "content/gpu/gpu_sandbox_hook_linux.h" #include "content/public/common/sandbox_init.h" #include "sandbox/policy/linux/sandbox_linux.h" -@@ -306,7 +306,7 @@ int GpuMain(const MainFunctionParams& parameters) { +@@ -310,7 +310,7 @@ int GpuMain(const MainFunctionParams& parameters) { gpu_preferences.message_pump_type); } #endif -#elif defined(OS_LINUX) || defined(OS_CHROMEOS) +#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #error "Unsupported Linux platform." #elif defined(OS_MAC) // Cross-process CoreAnimation requires a CFRunLoop to function at all, and diff --git a/www/chromium/files/patch-content_public_common_content__constants.h b/www/chromium/files/patch-content_public_common_content__constants.h index 014b4ba01308..f59641fff434 100644 --- a/www/chromium/files/patch-content_public_common_content__constants.h +++ b/www/chromium/files/patch-content_public_common_content__constants.h @@ -1,11 +1,11 @@ ---- content/public/common/content_constants.h.orig 2021-04-14 18:41:03 UTC +--- content/public/common/content_constants.h.orig 2021-05-12 22:05:53 UTC +++ content/public/common/content_constants.h -@@ -64,7 +64,7 @@ CONTENT_EXPORT extern const char kCorsExemptPurposeHea +@@ -61,7 +61,7 @@ CONTENT_EXPORT extern const char kCorsExemptPurposeHea // it at run time. CONTENT_EXPORT std::string GetCorsExemptRequestedWithHeaderName(); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // The OOM score adj constants // The highest and lowest assigned OOM score adjustment (oom_score_adj) for // renderers and extensions used by the OomPriority Manager. diff --git a/www/chromium/files/patch-content_public_common_content__features.cc b/www/chromium/files/patch-content_public_common_content__features.cc index d0d8c43cfad8..4516a60d7ece 100644 --- a/www/chromium/files/patch-content_public_common_content__features.cc +++ b/www/chromium/files/patch-content_public_common_content__features.cc @@ -1,31 +1,31 @@ ---- content/public/common/content_features.cc.orig 2021-04-14 18:41:03 UTC +--- content/public/common/content_features.cc.orig 2021-05-12 22:05:53 UTC +++ content/public/common/content_features.cc @@ -50,7 +50,7 @@ const base::Feature kAudioServiceOutOfProcess { // TODO(crbug.com/1052397): Remove !IS_CHROMEOS_LACROS once lacros starts being // built with OS_CHROMEOS instead of OS_LINUX. #if defined(OS_WIN) || defined(OS_MAC) || \ - (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) + (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -817,8 +817,8 @@ const base::Feature kWebAssemblyThreads { +@@ -821,8 +821,8 @@ const base::Feature kWebAssemblyThreads { }; // Enable WebAssembly trap handler. -#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || \ - defined(OS_MAC)) && \ +#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_BSD) || \ + defined(OS_MAC)) && \ defined(ARCH_CPU_X86_64) const base::Feature kWebAssemblyTrapHandler{"WebAssemblyTrapHandler", base::FEATURE_ENABLED_BY_DEFAULT}; -@@ -840,7 +840,7 @@ const base::Feature kWebAuthCable { +@@ -844,7 +844,7 @@ const base::Feature kWebAuthCable { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. // If updating this, also update kWebAuthCableServerLink. -#if BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_LINUX) +#if BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_LINUX) || defined(OS_BSD) base::FEATURE_DISABLED_BY_DEFAULT #else base::FEATURE_ENABLED_BY_DEFAULT diff --git a/www/chromium/files/patch-content_public_common_content__switches.cc b/www/chromium/files/patch-content_public_common_content__switches.cc index b1ad5d4adac1..573b62c2e6be 100644 --- a/www/chromium/files/patch-content_public_common_content__switches.cc +++ b/www/chromium/files/patch-content_public_common_content__switches.cc @@ -1,11 +1,11 @@ ---- content/public/common/content_switches.cc.orig 2021-04-14 18:41:03 UTC +--- content/public/common/content_switches.cc.orig 2021-05-12 22:05:53 UTC +++ content/public/common/content_switches.cc -@@ -959,7 +959,7 @@ const char kEnableAutomation[] = "enable-automation"; +@@ -977,7 +977,7 @@ const char kEnableAutomation[] = "enable-automation"; // 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) // Allows sending text-to-speech requests to speech-dispatcher, a common // Linux speech service. Because it's buggy, the user must explicitly // enable it so that visiting a random webpage can't cause instability. diff --git a/www/chromium/files/patch-content_public_common_content__switches.h b/www/chromium/files/patch-content_public_common_content__switches.h index 64eaa34f08c2..7e04dd770eca 100644 --- a/www/chromium/files/patch-content_public_common_content__switches.h +++ b/www/chromium/files/patch-content_public_common_content__switches.h @@ -1,20 +1,11 @@ ---- content/public/common/content_switches.h.orig 2021-04-14 18:41:03 UTC +--- content/public/common/content_switches.h.orig 2021-05-12 22:05:53 UTC +++ content/public/common/content_switches.h -@@ -246,7 +246,7 @@ CONTENT_EXPORT extern const char kWebXrRuntimeOrientat - CONTENT_EXPORT extern const char kWebXrRuntimeOpenXr[]; - CONTENT_EXPORT extern const char kWebXrRuntimeWMR[]; - --#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) - CONTENT_EXPORT extern const char kEnableAcceleratedVideoDecode[]; - #endif - CONTENT_EXPORT extern const char kDisableAcceleratedVideoDecode[]; @@ -268,7 +268,7 @@ CONTENT_EXPORT extern const char kRendererWaitForJavaD // 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) CONTENT_EXPORT extern const char kEnableSpeechDispatcher[]; #endif diff --git a/www/chromium/files/patch-content_public_test_browser__test__base.cc b/www/chromium/files/patch-content_public_test_browser__test__base.cc index 74039cee9783..afc7c9b63882 100644 --- a/www/chromium/files/patch-content_public_test_browser__test__base.cc +++ b/www/chromium/files/patch-content_public_test_browser__test__base.cc @@ -1,13 +1,13 @@ ---- content/public/test/browser_test_base.cc.orig 2021-04-14 18:41:03 UTC +--- content/public/test/browser_test_base.cc.orig 2021-05-12 22:05:53 UTC +++ content/public/test/browser_test_base.cc -@@ -109,6 +109,10 @@ +@@ -110,6 +110,10 @@ #include "ui/views/test/event_generator_delegate_mac.h" #endif +#if defined(OS_FREEBSD) +#include +#endif + #if defined(OS_POSIX) #include "base/process/process_handle.h" #endif diff --git a/www/chromium/files/patch-content_renderer_render__process__impl.cc b/www/chromium/files/patch-content_renderer_render__process__impl.cc index e9bc758a00a9..655e69021770 100644 --- a/www/chromium/files/patch-content_renderer_render__process__impl.cc +++ b/www/chromium/files/patch-content_renderer_render__process__impl.cc @@ -1,20 +1,20 @@ ---- content/renderer/render_process_impl.cc.orig 2021-04-14 18:41:03 UTC +--- content/renderer/render_process_impl.cc.orig 2021-05-12 22:05:53 UTC +++ content/renderer/render_process_impl.cc -@@ -45,7 +45,7 @@ +@@ -47,7 +47,7 @@ #if defined(OS_WIN) #include "base/win/win_util.h" #endif -#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(ARCH_CPU_X86_64) +#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(ARCH_CPU_X86_64) #include "v8/include/v8-wasm-trap-handler-posix.h" #endif namespace { -@@ -186,7 +186,7 @@ RenderProcessImpl::RenderProcessImpl() +@@ -197,7 +197,7 @@ RenderProcessImpl::RenderProcessImpl() SetV8FlagIfNotFeature(features::kWebAssemblyTrapHandler, "--no-wasm-trap-handler"); -#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(ARCH_CPU_X86_64) +#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) && defined(ARCH_CPU_X86_64) if (base::FeatureList::IsEnabled(features::kWebAssemblyTrapHandler)) { - base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); - + if (command_line->HasSwitch(switches::kEnableCrashpad) || + command_line->HasSwitch(switches::kEnableCrashReporter) || diff --git a/www/chromium/files/patch-content_renderer_render__thread__impl.cc b/www/chromium/files/patch-content_renderer_render__thread__impl.cc index 0f906f81019b..4a6ee05f3dd8 100644 --- a/www/chromium/files/patch-content_renderer_render__thread__impl.cc +++ b/www/chromium/files/patch-content_renderer_render__thread__impl.cc @@ -1,52 +1,52 @@ ---- content/renderer/render_thread_impl.cc.orig 2021-04-14 18:41:03 UTC +--- content/renderer/render_thread_impl.cc.orig 2021-05-12 22:05:53 UTC +++ content/renderer/render_thread_impl.cc -@@ -175,7 +175,7 @@ +@@ -180,7 +180,7 @@ #if defined(OS_MAC) #include -#else +#elif !defined(OS_BSD) #include #endif -@@ -686,7 +686,7 @@ void RenderThreadImpl::Init() { - DCHECK(parsed_num_raster_threads) << string_value; - DCHECK_GT(num_raster_threads, 0); +@@ -714,7 +714,7 @@ void RenderThreadImpl::Init() { + compositor_thread_pipeline_.get())); + } -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) categorized_worker_pool_->SetBackgroundingCallback( main_thread_scheduler_->DefaultTaskRunner(), base::BindOnce( -@@ -709,7 +709,7 @@ void RenderThreadImpl::Init() { +@@ -737,7 +737,7 @@ void RenderThreadImpl::Init() { base::DiscardableMemoryAllocator::SetInstance( discardable_memory_allocator_.get()); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) if (base::FeatureList::IsEnabled( blink::features::kBlinkCompositorUseDisplayThreadPriority)) { render_message_filter()->SetThreadPriority( -@@ -1038,11 +1038,11 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1058,11 +1058,11 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: + const bool enable_video_accelerator = - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) base::FeatureList::IsEnabled(media::kVaapiVideoDecodeLinux) && #else !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode) && --#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) (gpu_channel_host->gpu_feature_info() .status_values[gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE] == gpu::kGpuFeatureStatusEnabled); -@@ -1052,7 +1052,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1072,7 +1072,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: !cmd_line->HasSwitch(switches::kDisableGpuMemoryBufferVideoFrames); #else cmd_line->HasSwitch(switches::kEnableGpuMemoryBufferVideoFrames); -#endif // defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || +#endif // defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // defined(OS_WIN) const bool enable_media_stream_gpu_memory_buffers = enable_gpu_memory_buffers && diff --git a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc index eb306a39ffd8..46c661ec0b16 100644 --- a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc +++ b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc @@ -1,47 +1,47 @@ ---- content/renderer/renderer_blink_platform_impl.cc.orig 2021-04-14 18:41:03 UTC +--- content/renderer/renderer_blink_platform_impl.cc.orig 2021-05-12 22:05:53 UTC +++ content/renderer/renderer_blink_platform_impl.cc @@ -102,7 +102,7 @@ #if defined(OS_MAC) #include "content/child/child_process_sandbox_support_impl_mac.h" -#elif defined(OS_LINUX) || defined(OS_CHROMEOS) +#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "content/child/child_process_sandbox_support_impl_linux.h" #endif -@@ -172,7 +172,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -171,7 +171,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( main_thread_scheduler_(main_thread_scheduler) { // RenderThread may not exist in some tests. if (RenderThreadImpl::current()) { -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) mojo::PendingRemote font_service; RenderThreadImpl::current()->BindHostReceiver( font_service.InitWithNewPipeAndPassReceiver()); -@@ -182,7 +182,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -181,7 +181,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( #endif } -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) if (sandboxEnabled()) { #if defined(OS_MAC) sandbox_support_ = std::make_unique(); -@@ -250,7 +250,7 @@ RendererBlinkPlatformImpl::WrapSharedURLLoaderFactory( +@@ -249,7 +249,7 @@ RendererBlinkPlatformImpl::WrapSharedURLLoaderFactory( /*terminate_sync_load_event=*/nullptr); } -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) void RendererBlinkPlatformImpl::SetDisplayThreadPriority( base::PlatformThreadId thread_id) { if (RenderThreadImpl* render_thread = RenderThreadImpl::current()) { -@@ -265,7 +265,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop +@@ -264,7 +264,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop } blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() { -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) return sandbox_support_.get(); #else // These platforms do not require sandbox support. diff --git a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h index 14c4c3130d0e..eb4e05bb9589 100644 --- a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h +++ b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h @@ -1,38 +1,38 @@ ---- content/renderer/renderer_blink_platform_impl.h.orig 2021-04-14 18:41:03 UTC +--- content/renderer/renderer_blink_platform_impl.h.orig 2021-05-12 22:05:53 UTC +++ content/renderer/renderer_blink_platform_impl.h @@ -29,7 +29,7 @@ #include "third_party/blink/public/mojom/cache_storage/cache_storage.mojom.h" #include "third_party/blink/public/mojom/loader/code_cache.mojom.h" -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "components/services/font/public/cpp/font_loader.h" // nogncheck #include "third_party/skia/include/core/SkRefCnt.h" // nogncheck #endif -@@ -184,7 +184,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -183,7 +183,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi const blink::WebURL& top_document_web_url) override; gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() override; blink::WebString ConvertIDNToUnicode(const blink::WebString& host) override; -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) void SetDisplayThreadPriority(base::PlatformThreadId thread_id) override; #endif blink::BlameContext* GetTopLevelBlameContext() override; -@@ -229,7 +229,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -230,7 +230,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi // Return the mojo interface for making CodeCache calls. blink::mojom::CodeCacheHost& GetCodeCacheHost(); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD) std::unique_ptr sandbox_support_; #endif -@@ -250,7 +250,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -251,7 +251,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi mojo::PendingRemote code_cache_host_remote_; mojo::SharedRemote code_cache_host_; -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) sk_sp font_loader_; #endif diff --git a/www/chromium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc b/www/chromium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc index a07a72ab0a1d..43c2b524d5ce 100644 --- a/www/chromium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc +++ b/www/chromium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc @@ -1,19 +1,23 @@ ---- content/renderer/renderer_main_platform_delegate_linux.cc.orig 2021-04-14 18:41:03 UTC +--- content/renderer/renderer_main_platform_delegate_linux.cc.orig 2021-06-09 22:14:02 UTC +++ content/renderer/renderer_main_platform_delegate_linux.cc -@@ -30,6 +30,7 @@ void RendererMainPlatformDelegate::PlatformUninitializ +@@ -30,6 +30,11 @@ void RendererMainPlatformDelegate::PlatformUninitializ } bool RendererMainPlatformDelegate::EnableSandbox() { -+#if !defined(OS_BSD) ++#if defined(OS_FREEBSD) ++ sandbox::policy::Sandbox::Initialize( ++ sandbox::policy::SandboxTypeFromCommandLine( ++ *base::CommandLine::ForCurrentProcess())); ++#else // The setuid sandbox is started in the zygote process: zygote_main_linux.cc // https://chromium.googlesource.com/chromium/src/+/master/docs/linux/suid_sandbox.md // -@@ -65,7 +66,7 @@ bool RendererMainPlatformDelegate::EnableSandbox() { +@@ -65,7 +70,7 @@ bool RendererMainPlatformDelegate::EnableSandbox() { CHECK_EQ(errno, EPERM); } #endif // __x86_64__ - -+#endif // ! OS_BSD ++#endif // OS_FREEBSD return true; } diff --git a/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc b/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc index f04f13236dd5..d8501b474102 100644 --- a/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc +++ b/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc @@ -1,20 +1,20 @@ ---- content/shell/browser/shell_browser_context.cc.orig 2021-04-14 18:41:03 UTC +--- content/shell/browser/shell_browser_context.cc.orig 2021-05-12 22:05:53 UTC +++ content/shell/browser/shell_browser_context.cc -@@ -31,7 +31,7 @@ +@@ -32,7 +32,7 @@ #if defined(OS_WIN) #include "base/base_paths_win.h" -#elif defined(OS_LINUX) || defined(OS_CHROMEOS) +#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "base/nix/xdg_util.h" #elif defined(OS_MAC) #include "base/base_paths_mac.h" -@@ -104,7 +104,7 @@ void ShellBrowserContext::InitWhileIOAllowed() { +@@ -105,7 +105,7 @@ void ShellBrowserContext::InitWhileIOAllowed() { #if defined(OS_WIN) CHECK(base::PathService::Get(base::DIR_LOCAL_APP_DATA, &path_)); path_ = path_.Append(std::wstring(L"content_shell")); -#elif defined(OS_LINUX) || defined(OS_CHROMEOS) +#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) std::unique_ptr env(base::Environment::Create()); base::FilePath config_dir( base::nix::GetXDGDirectory(env.get(), diff --git a/www/chromium/files/patch-content_test_BUILD.gn b/www/chromium/files/patch-content_test_BUILD.gn index 68a7738a609f..a42b25208fa2 100644 --- a/www/chromium/files/patch-content_test_BUILD.gn +++ b/www/chromium/files/patch-content_test_BUILD.gn @@ -1,37 +1,37 @@ ---- content/test/BUILD.gn.orig 2021-04-14 18:41:03 UTC +--- content/test/BUILD.gn.orig 2021-05-12 22:05:53 UTC +++ content/test/BUILD.gn -@@ -1476,10 +1476,12 @@ test("content_browsertests") { +@@ -1502,10 +1502,12 @@ test("content_browsertests") { } if (is_linux || is_chromeos) { - sources += [ - "../browser/utility_process_sandbox_browsertest.cc", - "../browser/zygote_host/zygote_browsertest.cc", - ] + if (!is_bsd) { + sources += [ + "../browser/utility_process_sandbox_browsertest.cc", + "../browser/zygote_host/zygote_browsertest.cc", + ] + } deps += [ "//ui/gfx:test_support" ] if (use_atk) { -@@ -1720,7 +1722,7 @@ static_library("run_all_unittests") { +@@ -1754,7 +1756,7 @@ static_library("run_all_unittests") { ":test_support", "//base/test:test_support", ] - if (is_linux || is_chromeos) { + if ((is_linux || is_chromeos) && !is_bsd) { deps += [ "//content/common:set_process_title_linux" ] } } -@@ -2558,7 +2560,7 @@ test("content_unittests") { +@@ -2613,7 +2615,7 @@ test("content_unittests") { deps += [ "//ui/gfx/x" ] } - if (is_linux || is_chromeos) { + if ((is_linux || is_chromeos) && !is_bsd) { sources += [ "../common/set_process_title_linux_unittest.cc" ] deps += [ "//content/common:set_process_title_linux" ] } diff --git a/www/chromium/files/patch-content_utility_BUILD.gn b/www/chromium/files/patch-content_utility_BUILD.gn index 73c5e592f36f..c65b8bd9cb49 100644 --- a/www/chromium/files/patch-content_utility_BUILD.gn +++ b/www/chromium/files/patch-content_utility_BUILD.gn @@ -1,11 +1,11 @@ ---- content/utility/BUILD.gn.orig 2021-04-14 18:41:03 UTC +--- content/utility/BUILD.gn.orig 2021-05-12 22:05:53 UTC +++ content/utility/BUILD.gn -@@ -93,7 +93,7 @@ source_set("utility") { +@@ -94,7 +94,7 @@ source_set("utility") { deps += [ "//services/proxy_resolver:lib" ] } - if (is_linux || is_chromeos) { + if ((is_linux || is_chromeos) && !is_bsd) { - deps += [ "//content/utility/speech:speech_recognition_sandbox_hook" ] - } - + deps += [ + "//content/utility/speech:speech_recognition_sandbox_hook", + "//printing:printing_sandbox_hook", diff --git a/www/chromium/files/patch-content_utility_utility__main.cc b/www/chromium/files/patch-content_utility_utility__main.cc new file mode 100644 index 000000000000..f85f6e097fff --- /dev/null +++ b/www/chromium/files/patch-content_utility_utility__main.cc @@ -0,0 +1,14 @@ +--- content/utility/utility_main.cc.orig 2021-06-11 14:43:47 UTC ++++ content/utility/utility_main.cc +@@ -89,6 +89,11 @@ int UtilityMain(const MainFunctionParams& parameters) + if (parameters.command_line.HasSwitch(switches::kUtilityStartupDialog)) + WaitForDebugger("Utility"); + ++#if defined(OS_FREEBSD) ++ sandbox::policy::Sandbox::Initialize( ++ sandbox::policy::SandboxTypeFromCommandLine(parameters.command_line)); ++#endif ++ + #if defined(OS_LINUX) || defined(OS_CHROMEOS) + // Initializes the sandbox before any threads are created. + // TODO(jorgelo): move this after GTK initialization when we enable a strict diff --git a/www/chromium/files/patch-device_fido_features.cc b/www/chromium/files/patch-device_fido_features.cc new file mode 100644 index 000000000000..0dcdbf16ab9b --- /dev/null +++ b/www/chromium/files/patch-device_fido_features.cc @@ -0,0 +1,11 @@ +--- device/fido/features.cc.orig 2021-06-11 09:50:47 UTC ++++ device/fido/features.cc +@@ -26,7 +26,7 @@ extern const base::Feature kWebAuthCableServerLink { + // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch + // of lacros-chrome is complete. + // If updating this, also update kWebAuthCable. +-#if BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_LINUX) || defined(OS_BSD) + base::FEATURE_DISABLED_BY_DEFAULT + #else + base::FEATURE_ENABLED_BY_DEFAULT diff --git a/www/chromium/files/patch-device_gamepad_gamepad__provider.cc b/www/chromium/files/patch-device_gamepad_gamepad__provider.cc index 0d8932315b42..02802f18f9d9 100644 --- a/www/chromium/files/patch-device_gamepad_gamepad__provider.cc +++ b/www/chromium/files/patch-device_gamepad_gamepad__provider.cc @@ -1,11 +1,11 @@ ---- device/gamepad/gamepad_provider.cc.orig 2021-04-14 18:41:03 UTC +--- device/gamepad/gamepad_provider.cc.orig 2021-05-12 22:05:53 UTC +++ device/gamepad/gamepad_provider.cc -@@ -149,7 +149,7 @@ void GamepadProvider::Initialize(std::unique_ptr("Gamepad polling thread"); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // On Linux, the data fetcher needs to watch file descriptors, so the message // loop needs to be a libevent loop. const base::MessagePumpType kMessageLoopType = base::MessagePumpType::IO; diff --git a/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc b/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc index 5b216c33754f..7761cf05d50d 100644 --- a/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc +++ b/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc @@ -1,35 +1,35 @@ ---- extensions/browser/api/messaging/message_service.cc.orig 2021-04-14 18:41:03 UTC +--- extensions/browser/api/messaging/message_service.cc.orig 2021-05-12 22:05:54 UTC +++ extensions/browser/api/messaging/message_service.cc -@@ -61,7 +61,7 @@ namespace { +@@ -63,7 +63,7 @@ namespace { const char kReceivingEndDoesntExistError[] = "Could not establish connection. Receiving end does not exist."; -#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) const char kMissingPermissionError[] = "Access to native messaging requires nativeMessaging permission."; -@@ -392,7 +392,7 @@ void MessageService::OpenChannelToNativeApp( +@@ -394,7 +394,7 @@ void MessageService::OpenChannelToNativeApp( if (!opener_port->IsValidPort()) return; -#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ defined(OS_CHROMEOS) bool has_permission = extension->permissions_data()->HasAPIPermission( - APIPermission::kNativeMessaging); -@@ -443,12 +443,12 @@ void MessageService::OpenChannelToNativeApp( + mojom::APIPermissionID::kNativeMessaging); +@@ -445,12 +445,12 @@ void MessageService::OpenChannelToNativeApp( channel->opener->IncrementLazyKeepaliveCount(); AddChannel(std::move(channel), receiver_port_id); -#else // !(defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || +#else // !(defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || // defined(OS_CHROMEOS)) const char kNativeMessagingNotSupportedError[] = "Native Messaging is not supported on this platform."; opener_port->DispatchOnDisconnect(kNativeMessagingNotSupportedError); -#endif // !(defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || +#endif // !(defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || // defined(OS_CHROMEOS)) } diff --git a/www/chromium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc b/www/chromium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc index c8f3b658a573..7118ec4f2cee 100644 --- a/www/chromium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc +++ b/www/chromium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc @@ -1,11 +1,11 @@ ---- extensions/browser/browser_context_keyed_service_factories.cc.orig 2021-04-14 18:41:04 UTC +--- extensions/browser/browser_context_keyed_service_factories.cc.orig 2021-05-12 22:05:54 UTC +++ extensions/browser/browser_context_keyed_service_factories.cc -@@ -84,7 +84,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() +@@ -86,7 +86,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() HidDeviceManager::GetFactoryInstance(); IdleManagerFactory::GetInstance(); ManagementAPI::GetFactoryInstance(); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || \ +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_BSD) || \ defined(OS_MAC) NetworkingPrivateEventRouterFactory::GetInstance(); #endif diff --git a/www/chromium/files/patch-extensions_common_api_runtime.json b/www/chromium/files/patch-extensions_common_api_runtime.json index b2c885919fd2..554c85e93aeb 100644 --- a/www/chromium/files/patch-extensions_common_api_runtime.json +++ b/www/chromium/files/patch-extensions_common_api_runtime.json @@ -1,11 +1,11 @@ ---- extensions/common/api/runtime.json.orig 2021-04-14 18:41:04 UTC +--- extensions/common/api/runtime.json.orig 2021-05-12 22:05:54 UTC +++ extensions/common/api/runtime.json -@@ -68,7 +68,7 @@ +@@ -77,7 +77,7 @@ "id": "PlatformOs", "type": "string", "description": "The operating system chrome is running on.", - "enum": ["mac", "win", "android", "cros", "linux", "openbsd"] + "enum": ["mac", "win", "android", "cros", "linux", "freebsd", "openbsd"] }, { "id": "PlatformArch", diff --git a/www/chromium/files/patch-extensions_common_stack__frame.cc b/www/chromium/files/patch-extensions_common_stack__frame.cc index b45ae71b4724..36b8c5a07d8c 100644 --- a/www/chromium/files/patch-extensions_common_stack__frame.cc +++ b/www/chromium/files/patch-extensions_common_stack__frame.cc @@ -1,14 +1,14 @@ ---- extensions/common/stack_frame.cc.orig 2021-04-14 18:41:04 UTC +--- extensions/common/stack_frame.cc.orig 2021-05-12 22:05:54 UTC +++ extensions/common/stack_frame.cc -@@ -7,7 +7,11 @@ +@@ -8,7 +8,11 @@ #include #include "base/strings/utf_string_conversions.h" +#if defined(OS_BSD) +#include +#else #include "third_party/re2/src/re2/re2.h" +#endif namespace extensions { diff --git a/www/chromium/files/patch-extensions_shell_BUILD.gn b/www/chromium/files/patch-extensions_shell_BUILD.gn index 2f0e0d0563fe..938c773a1866 100644 --- a/www/chromium/files/patch-extensions_shell_BUILD.gn +++ b/www/chromium/files/patch-extensions_shell_BUILD.gn @@ -1,31 +1,31 @@ ---- extensions/shell/BUILD.gn.orig 2021-04-14 18:41:04 UTC +--- extensions/shell/BUILD.gn.orig 2021-05-12 22:05:54 UTC +++ extensions/shell/BUILD.gn -@@ -208,16 +208,24 @@ source_set("app_shell_lib") { +@@ -209,16 +209,24 @@ source_set("app_shell_lib") { } if (is_linux || is_chromeos_lacros) { + if (!is_bsd) { + sources += [ + "app/shell_crash_reporter_client.cc", + "app/shell_crash_reporter_client.h", + ] + } sources += [ - "app/shell_crash_reporter_client.cc", - "app/shell_crash_reporter_client.h", "browser/api/file_system/shell_file_system_delegate.cc", "browser/api/file_system/shell_file_system_delegate.h", ] + if (!is_bsd) { + deps += [ + "//components/crash/core/app", + "//components/crash/core/common", + ] + } deps += [ "//build:branding_buildflags", - "//components/crash/core/app", - "//components/crash/core/common", "//components/upload_list", "//components/version_info:generate_version_info", ] diff --git a/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc b/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc index 3e59bf6e8629..b2ce122eaa29 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc @@ -1,17 +1,17 @@ ---- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2021-04-14 18:41:04 UTC +--- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2021-05-12 22:05:54 UTC +++ gpu/command_buffer/service/webgpu_decoder_impl.cc -@@ -810,12 +810,12 @@ error::Error WebGPUDecoderImpl::HandleRequestAdapter( +@@ -813,12 +813,12 @@ error::Error WebGPUDecoderImpl::HandleRequestAdapter( static_cast(c.request_adapter_serial); if (gr_context_type_ != GrContextType::kVulkan) { -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) SendAdapterProperties(request_adapter_serial, -1, nullptr, "WebGPU on Linux requires command-line flag " "--enable-features=Vulkan,UseSkiaRenderer"); return error::kNoError; -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) } int32_t requested_adapter_index = GetPreferredAdapterIndex(power_preference); diff --git a/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc b/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc index ffbabd17fd85..a61648c704e1 100644 --- a/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc +++ b/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc @@ -1,20 +1,20 @@ ---- gpu/command_buffer/tests/gl_test_utils.cc.orig 2021-04-14 18:41:04 UTC +--- gpu/command_buffer/tests/gl_test_utils.cc.orig 2021-05-12 22:05:54 UTC +++ gpu/command_buffer/tests/gl_test_utils.cc @@ -24,7 +24,7 @@ #include "ui/gl/gl_version_info.h" #include "ui/gl/init/gl_factory.h" -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "ui/gl/gl_image_native_pixmap.h" #endif -@@ -451,7 +451,7 @@ void GpuCommandBufferTestEGL::RestoreGLDefault() { +@@ -453,7 +453,7 @@ void GpuCommandBufferTestEGL::RestoreGLDefault() { window_system_binding_info_ = gl::GLWindowSystemBindingInfo(); } -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) scoped_refptr GpuCommandBufferTestEGL::CreateGLImageNativePixmap(gfx::BufferFormat format, gfx::Size size, diff --git a/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc b/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc index 6477ee7614bc..52e2fa773534 100644 --- a/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc +++ b/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc @@ -1,47 +1,47 @@ ---- gpu/ipc/common/gpu_memory_buffer_support.cc.orig 2021-04-14 18:41:04 UTC +--- gpu/ipc/common/gpu_memory_buffer_support.cc.orig 2021-05-12 22:05:54 UTC +++ gpu/ipc/common/gpu_memory_buffer_support.cc -@@ -16,7 +16,7 @@ +@@ -17,7 +17,7 @@ #include "gpu/ipc/common/gpu_memory_buffer_impl_io_surface.h" #endif -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "ui/gfx/client_native_pixmap_factory.h" #include "ui/gfx/linux/client_native_pixmap_factory_dmabuf.h" #endif -@@ -26,7 +26,7 @@ +@@ -27,7 +27,7 @@ #include "ui/ozone/public/ozone_platform.h" #endif -#if defined(USE_OZONE) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(USE_OZONE) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "gpu/ipc/common/gpu_memory_buffer_impl_native_pixmap.h" #endif -@@ -52,7 +52,7 @@ GpuMemoryBufferSupport::GpuMemoryBufferSupport() { +@@ -53,7 +53,7 @@ GpuMemoryBufferSupport::GpuMemoryBufferSupport() { return; } #endif -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) client_native_pixmap_factory_.reset( gfx::CreateClientNativePixmapFactoryDmabuf()); #endif -@@ -66,7 +66,7 @@ GpuMemoryBufferSupport::GetNativeGpuMemoryBufferType() +@@ -67,7 +67,7 @@ GpuMemoryBufferSupport::GetNativeGpuMemoryBufferType() return gfx::IO_SURFACE_BUFFER; #elif defined(OS_ANDROID) return gfx::ANDROID_HARDWARE_BUFFER; -#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(USE_OZONE) +#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || defined(USE_OZONE) return gfx::NATIVE_PIXMAP; #elif defined(OS_WIN) return gfx::DXGI_SHARED_HANDLE; -@@ -201,7 +201,7 @@ GpuMemoryBufferSupport::CreateGpuMemoryBufferImplFromH +@@ -207,7 +207,7 @@ GpuMemoryBufferSupport::CreateGpuMemoryBufferImplFromH return GpuMemoryBufferImplIOSurface::CreateFromHandle( std::move(handle), size, format, usage, std::move(callback)); #endif -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(USE_OZONE) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || defined(USE_OZONE) case gfx::NATIVE_PIXMAP: return GpuMemoryBufferImplNativePixmap::CreateFromHandle( client_native_pixmap_factory(), std::move(handle), size, format, diff --git a/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.h b/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.h index 8f895634741d..7d0ddf6c952d 100644 --- a/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.h +++ b/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.h @@ -1,29 +1,29 @@ ---- gpu/ipc/common/gpu_memory_buffer_support.h.orig 2021-04-14 18:41:04 UTC +--- gpu/ipc/common/gpu_memory_buffer_support.h.orig 2021-05-12 22:05:54 UTC +++ gpu/ipc/common/gpu_memory_buffer_support.h -@@ -16,7 +16,7 @@ +@@ -18,7 +18,7 @@ #include "ui/gfx/geometry/size.h" #include "ui/gfx/gpu_memory_buffer.h" -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(USE_OZONE) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || defined(USE_OZONE) namespace gfx { class ClientNativePixmapFactory; } -@@ -38,7 +38,7 @@ class GPU_EXPORT GpuMemoryBufferSupport { +@@ -42,7 +42,7 @@ class GPU_EXPORT GpuMemoryBufferSupport { bool IsNativeGpuMemoryBufferConfigurationSupported(gfx::BufferFormat format, gfx::BufferUsage usage); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(USE_OZONE) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || defined(USE_OZONE) gfx::ClientNativePixmapFactory* client_native_pixmap_factory() { return client_native_pixmap_factory_.get(); } -@@ -62,7 +62,7 @@ class GPU_EXPORT GpuMemoryBufferSupport { - GpuMemoryBufferImpl::DestructionCallback callback); +@@ -70,7 +70,7 @@ class GPU_EXPORT GpuMemoryBufferSupport { + scoped_refptr pool = nullptr); private: -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(USE_OZONE) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || defined(USE_OZONE) std::unique_ptr client_native_pixmap_factory_; #endif diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc index 5034c5008f3b..d33ef4bee500 100644 --- a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc +++ b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc @@ -1,137 +1,137 @@ ---- gpu/ipc/service/gpu_init.cc.orig 2021-04-14 18:41:04 UTC +--- gpu/ipc/service/gpu_init.cc.orig 2021-05-12 22:05:54 UTC +++ gpu/ipc/service/gpu_init.cc -@@ -108,7 +108,7 @@ void InitializePlatformOverlaySettings(GPUInfo* gpu_in +@@ -118,7 +118,7 @@ void InitializePlatformOverlaySettings(GPUInfo* gpu_in } #if BUILDFLAG(IS_CHROMEOS_LACROS) || \ - (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) + (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) || defined(OS_BSD) bool CanAccessNvidiaDeviceFile() { bool res = true; base::ScopedBlockingCall scoped_blocking_call(FROM_HERE, -@@ -119,7 +119,7 @@ bool CanAccessNvidiaDeviceFile() { +@@ -129,7 +129,7 @@ bool CanAccessNvidiaDeviceFile() { } return res; } -#endif // BUILDFLAG(IS_CHROMEOS_LACROS) || (defined(OS_LINUX) && +#endif // BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) || (defined(OS_LINUX) && // !BUILDFLAG(IS_CHROMECAST)) class GpuWatchdogInit { -@@ -206,7 +206,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -216,7 +216,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL device_perf_info_ = device_perf_info; } -#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) if (gpu_info_.gpu.vendor_id == 0x10de && // NVIDIA gpu_info_.gpu.driver_vendor == "NVIDIA" && !CanAccessNvidiaDeviceFile()) return false; -@@ -258,7 +258,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -268,7 +268,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL delayed_watchdog_enable = true; #endif -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // PreSandbox is mainly for resource handling and not related to the GPU // driver, it doesn't need the GPU watchdog. The loadLibrary may take long // time that killing and restarting the GPU process will not help. -@@ -298,7 +298,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -308,7 +308,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } bool attempted_startsandbox = false; -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // On Chrome OS ARM Mali, GPU driver userspace creates threads when // initializing a GL context, so start the sandbox early. // TODO(zmo): Need to collect OS version before this. -@@ -307,7 +307,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -317,7 +317,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL watchdog_thread_.get(), &gpu_info_, gpu_preferences_); attempted_startsandbox = true; } -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) base::TimeTicks before_initialize_one_off = base::TimeTicks::Now(); -@@ -345,7 +345,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -359,7 +359,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } if (gl_initialized && gl_use_swiftshader_ && gl::GetGLImplementation() != gl::kGLImplementationSwiftShaderGL) { -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " << "on Linux"; return false; -@@ -353,7 +353,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -367,7 +367,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL SaveHardwareGpuInfoAndGpuFeatureInfo(); gl::init::ShutdownGL(true); gl_initialized = false; -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) } if (!gl_initialized) { -@@ -379,7 +379,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -393,7 +393,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } } -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // The ContentSandboxHelper is currently the only one implementation of // GpuSandboxHelper and it has no dependency. Except on Linux where // VaapiWrapper checks the GL implementation to determine which display -@@ -444,7 +444,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -458,7 +458,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL command_line, gpu_feature_info_, gpu_preferences_.disable_software_rasterizer, false); if (gl_use_swiftshader_) { -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " << "on Linux"; return false; -@@ -459,7 +459,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -473,7 +473,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL << "failed"; return false; } -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) } } else { // gl_use_swiftshader_ == true switch (gpu_preferences_.use_vulkan) { -@@ -535,7 +535,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -549,7 +549,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Driver may create a compatibility profile context when collect graphics // information on Linux platform. Try to collect graphics information // based on core profile context after disabling platform extensions. -@@ -554,7 +554,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -568,7 +568,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL return false; } } -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) if (gl_use_swiftshader_) { AdjustInfoToSwiftShader(); -@@ -737,7 +737,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -755,7 +755,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Driver may create a compatibility profile context when collect graphics // information on Linux platform. Try to collect graphics information // based on core profile context after disabling platform extensions. -@@ -758,7 +758,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -776,7 +776,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c } } } -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) if (gl_use_swiftshader_) { AdjustInfoToSwiftShader(); diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h b/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h index 8c94f80eaf0a..21af3b363abf 100644 --- a/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h +++ b/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h @@ -1,20 +1,20 @@ ---- gpu/ipc/service/gpu_watchdog_thread.h.orig 2021-04-14 18:41:04 UTC +--- gpu/ipc/service/gpu_watchdog_thread.h.orig 2021-05-12 22:05:54 UTC +++ gpu/ipc/service/gpu_watchdog_thread.h -@@ -198,7 +198,7 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThread : publi +@@ -199,7 +199,7 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThread bool WithinOneMinFromPowerResumed(); bool WithinOneMinFromForegrounded(); -#if defined(USE_X11) +#if defined(USE_X11) && !defined(OS_BSD) void UpdateActiveTTY(); #endif // The watchdog continues when it's not on the TTY of our host X11 server. -@@ -270,7 +270,7 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThread : publi +@@ -271,7 +271,7 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThread bool less_than_full_thread_time_after_capped_ = false; #endif -#if defined(USE_X11) +#if defined(USE_X11) && !defined(OS_BSD) FILE* tty_file_ = nullptr; int host_tty_ = -1; int active_tty_ = -1; diff --git a/www/chromium/files/patch-gpu_vulkan_generate__bindings.py b/www/chromium/files/patch-gpu_vulkan_generate__bindings.py new file mode 100644 index 000000000000..edd72c62d052 --- /dev/null +++ b/www/chromium/files/patch-gpu_vulkan_generate__bindings.py @@ -0,0 +1,29 @@ +--- gpu/vulkan/generate_bindings.py.orig 2021-06-11 09:51:44 UTC ++++ gpu/vulkan/generate_bindings.py +@@ -183,7 +183,7 @@ VULKAN_DEVICE_FUNCTIONS = [ + ] + }, + { +- 'ifdef': 'defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)', ++ 'ifdef': 'defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD)', + 'extension': 'VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME', + 'functions': [ + 'vkGetSemaphoreFdKHR', +@@ -199,7 +199,7 @@ VULKAN_DEVICE_FUNCTIONS = [ + ] + }, + { +- 'ifdef': 'defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)', ++ 'ifdef': 'defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD)', + 'extension': 'VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME', + 'functions': [ + 'vkGetMemoryFdKHR', +@@ -250,7 +250,7 @@ VULKAN_DEVICE_FUNCTIONS = [ + ] + }, + { +- 'ifdef': 'defined(OS_LINUX) || defined(OS_CHROMEOS)', ++ 'ifdef': 'defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)', + 'extension': 'VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_EXTENSION_NAME', + 'functions': [ + 'vkGetImageDrmFormatModifierPropertiesEXT', diff --git a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h index 39559fbe2177..bfa3f2afe9fe 100644 --- a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h +++ b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h @@ -1,96 +1,96 @@ ---- gpu/vulkan/vulkan_function_pointers.h.orig 2021-04-14 18:41:04 UTC +--- gpu/vulkan/vulkan_function_pointers.h.orig 2021-05-12 22:05:54 UTC +++ gpu/vulkan/vulkan_function_pointers.h @@ -241,10 +241,10 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers vkGetAndroidHardwareBufferPropertiesANDROID; #endif // defined(OS_ANDROID) -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) VulkanFunction vkGetSemaphoreFdKHR; VulkanFunction vkImportSemaphoreFdKHR; -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) #if defined(OS_WIN) VulkanFunction vkGetSemaphoreWin32HandleKHR; @@ -252,10 +252,10 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers vkImportSemaphoreWin32HandleKHR; #endif // defined(OS_WIN) -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) VulkanFunction vkGetMemoryFdKHR; VulkanFunction vkGetMemoryFdPropertiesKHR; -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) #if defined(OS_WIN) VulkanFunction vkGetMemoryWin32HandleKHR; @@ -292,10 +292,10 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers VulkanFunction vkGetSwapchainImagesKHR; VulkanFunction vkQueuePresentKHR; -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) VulkanFunction vkGetImageDrmFormatModifierPropertiesEXT; -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) }; } // namespace gpu @@ -997,7 +997,7 @@ ALWAYS_INLINE VkResult vkGetAndroidHardwareBufferPrope } #endif // defined(OS_ANDROID) -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) ALWAYS_INLINE VkResult vkGetSemaphoreFdKHR(VkDevice device, const VkSemaphoreGetFdInfoKHR* pGetFdInfo, @@ -1011,7 +1011,7 @@ ALWAYS_INLINE VkResult vkImportSemaphoreFdKHR( return gpu::GetVulkanFunctionPointers()->vkImportSemaphoreFdKHR( device, pImportSemaphoreFdInfo); } -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) #if defined(OS_WIN) ALWAYS_INLINE VkResult vkGetSemaphoreWin32HandleKHR( @@ -1030,7 +1030,7 @@ vkImportSemaphoreWin32HandleKHR(VkDevice device, } #endif // defined(OS_WIN) -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) ALWAYS_INLINE VkResult vkGetMemoryFdKHR(VkDevice device, const VkMemoryGetFdInfoKHR* pGetFdInfo, int* pFd) { @@ -1045,7 +1045,7 @@ vkGetMemoryFdPropertiesKHR(VkDevice device, return gpu::GetVulkanFunctionPointers()->vkGetMemoryFdPropertiesKHR( device, handleType, fd, pMemoryFdProperties); } -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) #if defined(OS_WIN) ALWAYS_INLINE VkResult vkGetMemoryWin32HandleKHR( -@@ -1125,7 +1125,7 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue +@@ -1140,7 +1140,7 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue pPresentInfo); } -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierPropertiesEXT( VkDevice device, VkImage image, -@@ -1133,6 +1133,6 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierProp +@@ -1148,6 +1148,6 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierProp return gpu::GetVulkanFunctionPointers() ->vkGetImageDrmFormatModifierPropertiesEXT(device, image, pProperties); } -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) -#endif // GPU_VULKAN_VULKAN_FUNCTION_POINTERS_H_ \ No newline at end of file +#endif // GPU_VULKAN_VULKAN_FUNCTION_POINTERS_H_ diff --git a/www/chromium/files/patch-headless_BUILD.gn b/www/chromium/files/patch-headless_BUILD.gn index f4ad1aa8d950..99d736cf614e 100644 --- a/www/chromium/files/patch-headless_BUILD.gn +++ b/www/chromium/files/patch-headless_BUILD.gn @@ -1,38 +1,38 @@ ---- headless/BUILD.gn.orig 2021-04-14 18:41:04 UTC +--- headless/BUILD.gn.orig 2021-05-12 22:05:54 UTC +++ headless/BUILD.gn -@@ -272,7 +272,7 @@ source_set("headless_shared_sources") { +@@ -290,7 +290,7 @@ source_set("headless_shared_sources") { sources += generated_devtools_api sources += get_target_outputs(":protocol_sources") - if (!is_fuchsia) { + if (!is_fuchsia && !is_bsd) { sources += [ "lib/headless_crash_reporter_client.cc", "lib/headless_crash_reporter_client.h", -@@ -291,7 +291,7 @@ source_set("headless_shared_sources") { +@@ -309,7 +309,7 @@ source_set("headless_shared_sources") { "//url", ] - if (!is_fuchsia) { + if (!is_fuchsia && !is_bsd) { deps += [ "//components/crash/content/browser" ] } if (is_component_build && is_win) { -@@ -461,7 +461,7 @@ component("headless_non_renderer") { +@@ -487,7 +487,7 @@ component("headless_non_renderer") { "//v8", ] - if (!is_fuchsia) { + if (!is_fuchsia && !is_bsd) { deps += [ "//components/crash/content/browser" ] } if (is_win) { -@@ -778,7 +778,7 @@ static_library("headless_shell_lib") { +@@ -808,7 +808,7 @@ static_library("headless_shell_lib") { public_deps += [ ":headless_non_renderer" ] } - if (!is_fuchsia) { + if (!is_fuchsia && !is_bsd) { deps += [ "//components/crash/content/browser" ] } diff --git a/www/chromium/files/patch-headless_lib_browser_headless__browser__main__parts.h b/www/chromium/files/patch-headless_lib_browser_headless__browser__main__parts.h index 71952e20cf77..9cdfcbad4d43 100644 --- a/www/chromium/files/patch-headless_lib_browser_headless__browser__main__parts.h +++ b/www/chromium/files/patch-headless_lib_browser_headless__browser__main__parts.h @@ -1,11 +1,11 @@ ---- headless/lib/browser/headless_browser_main_parts.h.orig 2021-04-14 18:41:04 UTC +--- headless/lib/browser/headless_browser_main_parts.h.orig 2021-05-12 22:05:54 UTC +++ headless/lib/browser/headless_browser_main_parts.h -@@ -37,7 +37,7 @@ class HeadlessBrowserMainParts : public content::Brows - #if defined(OS_MAC) +@@ -46,7 +46,7 @@ class HeadlessBrowserMainParts : public content::Brows void PreMainMessageLoopStart() override; + device::GeolocationSystemPermissionManager* GetLocationPermissionManager(); #endif -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) void PostMainMessageLoopStart() override; #endif void QuitMainMessageLoop(); diff --git a/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc b/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc index c55dc75175ab..5c878606ed24 100644 --- a/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc +++ b/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.cc @@ -1,11 +1,11 @@ ---- headless/lib/browser/headless_content_browser_client.cc.orig 2021-04-14 18:41:04 UTC +--- headless/lib/browser/headless_content_browser_client.cc.orig 2021-05-12 22:05:54 UTC +++ headless/lib/browser/headless_content_browser_client.cc -@@ -279,7 +279,7 @@ void HeadlessContentBrowserClient::AppendExtraCommandL +@@ -280,7 +280,7 @@ void HeadlessContentBrowserClient::AppendExtraCommandL process_type, child_process_id); } -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Processes may only query perf_event_open with the BPF sandbox disabled. if (old_command_line.HasSwitch(::switches::kEnableThreadInstructionCount) && old_command_line.HasSwitch(sandbox::policy::switches::kNoSandbox)) { diff --git a/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc b/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc index ec8d229f0175..a32036194727 100644 --- a/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc +++ b/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc @@ -1,20 +1,11 @@ ---- headless/lib/headless_content_main_delegate.cc.orig 2021-04-14 18:41:04 UTC +--- headless/lib/headless_content_main_delegate.cc.orig 2021-05-12 22:05:54 UTC +++ headless/lib/headless_content_main_delegate.cc -@@ -326,7 +326,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( +@@ -323,7 +323,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( const base::CommandLine& command_line) { if (command_line.HasSwitch(::switches::kDisableBreakpad)) return; -#if defined(OS_FUCHSIA) +#if defined(OS_FUCHSIA) || defined(OS_BSD) // TODO(fuchsia): Implement this when crash reporting/Breakpad are available // in Fuchsia. (crbug.com/753619) NOTIMPLEMENTED(); -@@ -355,7 +355,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( - crash_reporter::InitializeCrashpadWithEmbeddedHandler( - process_type.empty(), process_type, "", base::FilePath()); - #endif // defined(HEADLESS_USE_BREAKPAD) --#endif // defined(OS_FUCHSIA) -+#endif // defined(OS_FUCHSIA) || defined(OS_BSD) - } - - diff --git a/www/chromium/files/patch-ipc_ipc__message__utils.cc b/www/chromium/files/patch-ipc_ipc__message__utils.cc index 0d39a926accb..6c36c7ed5a1c 100644 --- a/www/chromium/files/patch-ipc_ipc__message__utils.cc +++ b/www/chromium/files/patch-ipc_ipc__message__utils.cc @@ -1,11 +1,11 @@ ---- ipc/ipc_message_utils.cc.orig 2021-04-14 18:41:05 UTC +--- ipc/ipc_message_utils.cc.orig 2021-05-12 22:05:55 UTC +++ ipc/ipc_message_utils.cc -@@ -362,7 +362,7 @@ void ParamTraits::Log(const param_type& +@@ -361,7 +361,7 @@ void ParamTraits::Log(const param_type& l->append(base::NumberToString(p)); } -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ defined(OS_FUCHSIA) || (defined(OS_ANDROID) && defined(ARCH_CPU_64_BITS)) void ParamTraits::Log(const param_type& p, std::string* l) { l->append(base::NumberToString(p)); diff --git a/www/chromium/files/patch-ipc_ipc__message__utils.h b/www/chromium/files/patch-ipc_ipc__message__utils.h index ea4f9b006b89..2b9e9b6c5654 100644 --- a/www/chromium/files/patch-ipc_ipc__message__utils.h +++ b/www/chromium/files/patch-ipc_ipc__message__utils.h @@ -1,11 +1,11 @@ ---- ipc/ipc_message_utils.h.orig 2021-04-14 18:41:05 UTC +--- ipc/ipc_message_utils.h.orig 2021-05-12 22:05:55 UTC +++ ipc/ipc_message_utils.h -@@ -209,7 +209,7 @@ struct ParamTraits { +@@ -207,7 +207,7 @@ struct ParamTraits { // 3) Android 64 bit and Fuchsia also have int64_t typedef'd to long. // Since we want to support Android 32<>64 bit IPC, as long as we don't have // these traits for 32 bit ARM then that'll catch any errors. -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ defined(OS_FUCHSIA) || (defined(OS_ANDROID) && defined(ARCH_CPU_64_BITS)) template <> struct ParamTraits { diff --git a/www/chromium/files/patch-media_audio_audio__input__device.cc b/www/chromium/files/patch-media_audio_audio__input__device.cc index ca9415f3efbe..7f12cbe4c484 100644 --- a/www/chromium/files/patch-media_audio_audio__input__device.cc +++ b/www/chromium/files/patch-media_audio_audio__input__device.cc @@ -1,11 +1,11 @@ ---- media/audio/audio_input_device.cc.orig 2021-04-14 18:41:05 UTC +--- media/audio/audio_input_device.cc.orig 2021-05-12 22:05:55 UTC +++ media/audio/audio_input_device.cc -@@ -253,7 +253,7 @@ void AudioInputDevice::OnStreamCreated( +@@ -254,7 +254,7 @@ void AudioInputDevice::OnStreamCreated( // here. See comments in AliveChecker and PowerObserverHelper for details and // todos. if (detect_dead_stream_ == DeadStreamDetection::kEnabled) { -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) const bool stop_at_first_alive_notification = true; const bool pause_check_during_suspend = false; #else diff --git a/www/chromium/files/patch-media_base_media__switches.cc b/www/chromium/files/patch-media_base_media__switches.cc index bac850f88c2f..08d6e8514ebf 100644 --- a/www/chromium/files/patch-media_base_media__switches.cc +++ b/www/chromium/files/patch-media_base_media__switches.cc @@ -1,38 +1,38 @@ ---- media/base/media_switches.cc.orig 2021-04-20 18:58:34 UTC +--- media/base/media_switches.cc.orig 2021-05-12 22:05:55 UTC +++ media/base/media_switches.cc -@@ -375,7 +375,7 @@ const base::Feature kGav1VideoDecoder{"Gav1VideoDecode +@@ -379,7 +379,7 @@ const base::Feature kGav1VideoDecoder{"Gav1VideoDecode // Show toolbar button that opens dialog for controlling media sessions. const base::Feature kGlobalMediaControls { "GlobalMediaControls", -#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ BUILDFLAG(IS_CHROMEOS_LACROS) base::FEATURE_ENABLED_BY_DEFAULT #else -@@ -417,7 +417,7 @@ const base::Feature kGlobalMediaControlsOverlayControl +@@ -421,7 +421,7 @@ const base::Feature kGlobalMediaControlsOverlayControl // Show picture-in-picture button in Global Media Controls. const base::Feature kGlobalMediaControlsPictureInPicture { "GlobalMediaControlsPictureInPicture", -#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \ +#if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || defined(OS_BSD) || \ BUILDFLAG(IS_CHROMEOS_LACROS) base::FEATURE_ENABLED_BY_DEFAULT #else -@@ -461,7 +461,7 @@ const base::Feature kUnifiedAutoplay{"UnifiedAutoplay" +@@ -463,7 +463,7 @@ const base::Feature kUseR16Texture{"use-r16-texture", + const base::Feature kUnifiedAutoplay{"UnifiedAutoplay", + base::FEATURE_ENABLED_BY_DEFAULT}; - // 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) +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) // Enable vaapi video decoding on linux. This is already enabled by default on // chromeos, but needs an experiment on linux. const base::Feature kVaapiVideoDecodeLinux{"VaapiVideoDecoder", -@@ -469,7 +469,7 @@ const base::Feature kVaapiVideoDecodeLinux{"VaapiVideo +@@ -471,7 +471,7 @@ const base::Feature kVaapiVideoDecodeLinux{"VaapiVideo const base::Feature kVaapiVideoEncodeLinux{"VaapiVideoEncoder", base::FEATURE_DISABLED_BY_DEFAULT}; --#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) // Enable VA-API hardware decode acceleration for AV1. const base::Feature kVaapiAV1Decoder{"VaapiAV1Decoder", diff --git a/www/chromium/files/patch-media_base_media__switches.h b/www/chromium/files/patch-media_base_media__switches.h index ad0568ac2cca..da7306901b73 100644 --- a/www/chromium/files/patch-media_base_media__switches.h +++ b/www/chromium/files/patch-media_base_media__switches.h @@ -1,15 +1,15 @@ ---- media/base/media_switches.h.orig 2021-04-22 08:21:12 UTC +--- media/base/media_switches.h.orig 2021-05-12 22:05:55 UTC +++ media/base/media_switches.h -@@ -183,10 +183,10 @@ MEDIA_EXPORT extern const base::Feature kUseR16Texture +@@ -179,10 +179,10 @@ MEDIA_EXPORT extern const base::Feature kUseFakeDevice + MEDIA_EXPORT extern const base::Feature kUseMediaHistoryStore; + MEDIA_EXPORT extern const base::Feature kUseR16Texture; MEDIA_EXPORT extern const base::Feature kUseSodaForLiveCaption; - // 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) +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) MEDIA_EXPORT extern const base::Feature kVaapiVideoDecodeLinux; MEDIA_EXPORT extern const base::Feature kVaapiVideoEncodeLinux; --#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || defined(OS_BSD) +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) MEDIA_EXPORT extern const base::Feature kVaapiAV1Decoder; MEDIA_EXPORT extern const base::Feature kVaapiLowPowerEncoderGen9x; MEDIA_EXPORT extern const base::Feature kVaapiEnforceVideoMinMaxResolution; diff --git a/www/chromium/files/patch-media_base_video__frame.cc b/www/chromium/files/patch-media_base_video__frame.cc index 1ab438e00ca8..c3857eb28113 100644 --- a/www/chromium/files/patch-media_base_video__frame.cc +++ b/www/chromium/files/patch-media_base_video__frame.cc @@ -1,83 +1,83 @@ ---- media/base/video_frame.cc.orig 2021-04-14 18:41:05 UTC +--- media/base/video_frame.cc.orig 2021-05-12 22:05:55 UTC +++ media/base/video_frame.cc @@ -60,7 +60,7 @@ std::string VideoFrame::StorageTypeToString( return "OWNED_MEMORY"; case VideoFrame::STORAGE_SHMEM: return "SHMEM"; -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) case VideoFrame::STORAGE_DMABUFS: return "DMABUFS"; #endif @@ -77,7 +77,7 @@ std::string VideoFrame::StorageTypeToString( // static bool VideoFrame::IsStorageTypeMappable(VideoFrame::StorageType storage_type) { return -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // This is not strictly needed but makes explicit that, at VideoFrame // level, DmaBufs are not mappable from userspace. storage_type != VideoFrame::STORAGE_DMABUFS && @@ -265,7 +265,7 @@ static base::Optional GetDefaultLayo return VideoFrameLayout::CreateWithPlanes(format, coded_size, planes); } -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // This class allows us to embed a vector into a scoped_refptr, and // thus to have several VideoFrames share the same set of DMABUF FDs. class VideoFrame::DmabufHolder @@ -283,7 +283,7 @@ class VideoFrame::DmabufHolder friend class base::RefCountedThreadSafe; ~DmabufHolder() = default; }; -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // static bool VideoFrame::IsValidConfig(VideoPixelFormat format, -@@ -628,7 +628,7 @@ scoped_refptr VideoFrame::WrapExternalGpuM +@@ -623,7 +623,7 @@ scoped_refptr VideoFrame::WrapExternalGpuM for (size_t i = 0; i < num_planes; ++i) planes[i].stride = gpu_memory_buffer->stride(i); uint64_t modifier = gfx::NativePixmapHandle::kNoModifier; -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) if (gpu_memory_buffer->GetType() == gfx::NATIVE_PIXMAP) { const auto gmb_handle = gpu_memory_buffer->CloneHandle(); if (gmb_handle.is_null() || -@@ -673,7 +673,7 @@ scoped_refptr VideoFrame::WrapExternalGpuM +@@ -668,7 +668,7 @@ scoped_refptr VideoFrame::WrapExternalGpuM return frame; } -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // static scoped_refptr VideoFrame::WrapExternalDmabufs( const VideoFrameLayout& layout, -@@ -896,7 +896,7 @@ scoped_refptr VideoFrame::WrapVideoFrame( +@@ -891,7 +891,7 @@ scoped_refptr VideoFrame::WrapVideoFrame( } } -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) DCHECK(frame->dmabuf_fds_); // If there are any |dmabuf_fds_| plugged in, we should refer them too. wrapping_frame->dmabuf_fds_ = frame->dmabuf_fds_; -@@ -1246,7 +1246,7 @@ const gpu::MailboxHolder& VideoFrame::mailbox_holder( +@@ -1242,7 +1242,7 @@ const gpu::MailboxHolder& VideoFrame::mailbox_holder( : mailbox_holders_[texture_index]; } -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) const std::vector& VideoFrame::DmabufFds() const { DCHECK_EQ(storage_type_, STORAGE_DMABUFS); -@@ -1331,7 +1331,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout, +@@ -1327,7 +1327,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout, storage_type_(storage_type), visible_rect_(Intersection(visible_rect, gfx::Rect(layout.coded_size()))), natural_size_(natural_size), -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) dmabuf_fds_(base::MakeRefCounted()), #endif timestamp_(timestamp), diff --git a/www/chromium/files/patch-media_base_video__frame.h b/www/chromium/files/patch-media_base_video__frame.h index 9dc8c9cc45b1..68b0710d80ba 100644 --- a/www/chromium/files/patch-media_base_video__frame.h +++ b/www/chromium/files/patch-media_base_video__frame.h @@ -1,50 +1,50 @@ ---- media/base/video_frame.h.orig 2021-04-14 18:41:05 UTC +--- media/base/video_frame.h.orig 2021-05-12 22:05:55 UTC +++ media/base/video_frame.h @@ -40,9 +40,9 @@ #include "base/mac/scoped_cftyperef.h" #endif // defined(OS_MAC) -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "base/files/scoped_file.h" -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) namespace gfx { class GpuMemoryBuffer; @@ -82,7 +82,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte STORAGE_UNOWNED_MEMORY = 2, // External, non owned data pointers. STORAGE_OWNED_MEMORY = 3, // VideoFrame has allocated its own data buffer. STORAGE_SHMEM = 4, // Backed by unsafe (writable) shared memory. -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // TODO(mcasas): Consider turning this type into STORAGE_NATIVE // based on the idea of using this same enum value for both DMA // buffers on Linux and CVPixelBuffers on Mac (which currently use @@ -259,7 +259,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte ReleaseMailboxCB mailbox_holder_release_cb, base::TimeDelta timestamp); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Wraps provided dmabufs // (https://www.kernel.org/doc/html/latest/driver-api/dma-buf.html) with a // VideoFrame. The frame will take ownership of |dmabuf_fds|, and will @@ -515,7 +515,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte // mailbox, the caller must wait for the included sync point. const gpu::MailboxHolder& mailbox_holder(size_t texture_index) const; -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Returns a vector containing the backing DmaBufs for this frame. The number // of returned DmaBufs will be equal or less than the number of planes of // the frame. If there are less, this means that the last FD contains the -@@ -699,7 +699,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -697,7 +697,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte // GPU memory buffer, if this frame is STORAGE_GPU_MEMORY_BUFFER. std::unique_ptr gpu_memory_buffer_; -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) class DmabufHolder; // Dmabufs for the frame, used when storage is STORAGE_DMABUFS. Size is either diff --git a/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc b/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc index 7035452c0a2f..862dabf52fb0 100644 --- a/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc +++ b/www/chromium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc @@ -1,26 +1,26 @@ ---- media/capture/video/linux/v4l2_capture_delegate.cc.orig 2021-04-14 18:41:05 UTC +--- media/capture/video/linux/v4l2_capture_delegate.cc.orig 2021-05-12 22:05:55 UTC +++ media/capture/video/linux/v4l2_capture_delegate.cc @@ -4,8 +4,10 @@ #include "media/capture/video/linux/v4l2_capture_delegate.h" +#if !defined(OS_BSD) #include #include +#endif #include #include #include -@@ -24,10 +26,10 @@ +@@ -25,10 +27,10 @@ using media::mojom::MeteringMode; -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) +// #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) // 16 bit depth, Realsense F200. #define V4L2_PIX_FMT_Z16 v4l2_fourcc('Z', '1', '6', ' ') -#endif +// #endif // TODO(aleksandar.stojiljkovic): Wrap this with kernel version check once the // format is introduced to kernel. diff --git a/www/chromium/files/patch-media_media__options.gni b/www/chromium/files/patch-media_media__options.gni index 23e945736691..8303f4963f63 100644 --- a/www/chromium/files/patch-media_media__options.gni +++ b/www/chromium/files/patch-media_media__options.gni @@ -1,12 +1,12 @@ ---- media/media_options.gni.orig 2021-04-14 18:41:05 UTC +--- media/media_options.gni.orig 2021-05-12 22:05:56 UTC +++ media/media_options.gni -@@ -124,6 +124,9 @@ declare_args() { +@@ -94,6 +94,9 @@ declare_args() { # Enables runtime selection of ALSA library for audio. use_alsa = false + # Enable runtime selection of sndio(7) + use_sndio = false + # Alsa should be used on non-Android, non-Mac POSIX systems. # Alsa should be used on desktop Chromecast and audio-only Chromecast builds. if (is_posix && !is_android && !is_mac && diff --git a/www/chromium/files/patch-media_mojo_clients_mojo__video__encode__accelerator.cc b/www/chromium/files/patch-media_mojo_clients_mojo__video__encode__accelerator.cc deleted file mode 100644 index 516797961fc1..000000000000 --- a/www/chromium/files/patch-media_mojo_clients_mojo__video__encode__accelerator.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- media/mojo/clients/mojo_video_encode_accelerator.cc.orig 2021-04-14 18:41:05 UTC -+++ media/mojo/clients/mojo_video_encode_accelerator.cc -@@ -134,7 +134,7 @@ void MojoVideoEncodeAccelerator::Encode(scoped_refptr< - DCHECK_EQ(num_planes, frame->layout().num_planes()); - DCHECK(vea_.is_bound()); - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - // TODO(crbug.com/1003197): Remove this once we stop supporting STORAGE_DMABUF - // in VideoEncodeAccelerator. - if (frame->storage_type() == VideoFrame::STORAGE_DMABUFS) { diff --git a/www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc b/www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc index c8c9a0dd8205..9a91f584166f 100644 --- a/www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc +++ b/www/chromium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc @@ -1,32 +1,14 @@ ---- media/mojo/mojom/video_frame_mojom_traits.cc.orig 2021-04-14 18:41:05 UTC +--- media/mojo/mojom/video_frame_mojom_traits.cc.orig 2021-05-12 22:05:56 UTC +++ media/mojo/mojom/video_frame_mojom_traits.cc @@ -21,9 +21,9 @@ #include "ui/gfx/mojom/color_space_mojom_traits.h" #include "ui/gfx/mojom/hdr_metadata_mojom_traits.h" -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "base/posix/eintr_wrapper.h" -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) namespace mojo { -@@ -63,7 +63,7 @@ media::mojom::VideoFrameDataPtr MakeVideoFrameData( - std::move(offsets))); - } - --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - if (input->storage_type() == media::VideoFrame::STORAGE_DMABUFS) { - std::vector dmabuf_fds; - -@@ -167,7 +167,7 @@ bool StructTraitsHasTextures(); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) is_software_backed_video_frame &= !video_frame->HasDmaBufs(); #endif diff --git a/www/chromium/files/patch-media_video_video__encode__accelerator__adapter.cc b/www/chromium/files/patch-media_video_video__encode__accelerator__adapter.cc index 3666f1b3fa2c..766aa7f3e841 100644 --- a/www/chromium/files/patch-media_video_video__encode__accelerator__adapter.cc +++ b/www/chromium/files/patch-media_video_video__encode__accelerator__adapter.cc @@ -1,20 +1,20 @@ ---- media/video/video_encode_accelerator_adapter.cc.orig 2021-04-14 18:41:06 UTC +--- media/video/video_encode_accelerator_adapter.cc.orig 2021-05-12 22:05:56 UTC +++ media/video/video_encode_accelerator_adapter.cc -@@ -56,7 +56,7 @@ VideoEncodeAccelerator::Config SetUpVeaConfig( +@@ -67,7 +67,7 @@ VideoEncodeAccelerator::Config SetUpVeaConfig( if (is_rgb) config.input_format = PIXEL_FORMAT_I420; -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) if (storage_type == VideoFrame::STORAGE_DMABUFS || storage_type == VideoFrame::STORAGE_GPU_MEMORY_BUFFER) { if (is_rgb) -@@ -198,7 +198,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal +@@ -209,7 +209,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal auto vea_config = SetUpVeaConfig(profile_, options_, format, first_frame->storage_type()); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Linux/ChromeOS require a special configuration to use dmabuf storage. // We need to keep sending frames the same way the first frame was sent. // Other platforms will happily mix GpuMemoryBuffer storage with regular diff --git a/www/chromium/files/patch-media_video_video__encode__accelerator__adapter__test.cc b/www/chromium/files/patch-media_video_video__encode__accelerator__adapter__test.cc index b64899acaad5..9ec416f93d34 100644 --- a/www/chromium/files/patch-media_video_video__encode__accelerator__adapter__test.cc +++ b/www/chromium/files/patch-media_video_video__encode__accelerator__adapter__test.cc @@ -1,11 +1,11 @@ ---- media/video/video_encode_accelerator_adapter_test.cc.orig 2021-04-14 18:41:06 UTC +--- media/video/video_encode_accelerator_adapter_test.cc.orig 2021-05-12 22:05:56 UTC +++ media/video/video_encode_accelerator_adapter_test.cc -@@ -285,7 +285,7 @@ TEST_P(VideoEncodeAcceleratorAdapterTest, TwoFramesRes +@@ -329,7 +329,7 @@ TEST_P(VideoEncodeAcceleratorAdapterTest, TwoFramesRes vea()->SetEncodingCallback(base::BindLambdaForTesting( [&](BitstreamBuffer&, bool keyframe, scoped_refptr frame) { -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) EXPECT_EQ(frame->format(), IsYuvPlanar(pixel_format) ? pixel_format : PIXEL_FORMAT_I420); #else diff --git a/www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd b/www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd index 9b202bd0a184..dd62f0f480c3 100644 --- a/www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd +++ b/www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd @@ -1,11 +1,11 @@ ---- mojo/public/js/mojo_bindings_resources.grd.orig 2021-04-14 18:41:06 UTC +--- mojo/public/js/mojo_bindings_resources.grd.orig 2021-05-12 22:05:56 UTC +++ mojo/public/js/mojo_bindings_resources.grd -@@ -85,7 +85,7 @@ +@@ -90,7 +90,7 @@ use_base_dir="false" resource_path="mojo/mojo/public/mojom/base/unguessable_token.mojom-webui.js" type="BINDATA" /> - + (); -#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) std::unique_ptr linux_config_service( new ProxyConfigServiceLinux()); diff --git a/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc b/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc index 62f02ab5af67..09d20182d1b7 100644 --- a/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc +++ b/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc @@ -1,39 +1,39 @@ ---- net/proxy_resolution/proxy_config_service_linux.cc.orig 2021-04-14 18:41:07 UTC +--- net/proxy_resolution/proxy_config_service_linux.cc.orig 2021-05-12 22:05:57 UTC +++ net/proxy_resolution/proxy_config_service_linux.cc @@ -6,7 +6,9 @@ #include #include +#if !defined(OS_BSD) #include +#endif #include #include -@@ -511,6 +513,7 @@ int StringToIntOrDefault(base::StringPiece value, int +@@ -512,6 +514,7 @@ int StringToIntOrDefault(base::StringPiece value, int return default_value; } +#if !defined(OS_BSD) // This is the KDE version that reads kioslaverc and simulates gsettings. // Doing this allows the main Delegate code, as well as the unit tests // for it, to stay the same - and the settings map fairly well besides. -@@ -1001,6 +1004,7 @@ class SettingGetterImplKDE : public ProxyConfigService +@@ -1002,6 +1005,7 @@ class SettingGetterImplKDE : public ProxyConfigService DISALLOW_COPY_AND_ASSIGN(SettingGetterImplKDE); }; +#endif } // namespace -@@ -1215,8 +1219,10 @@ ProxyConfigServiceLinux::Delegate::Delegate( +@@ -1216,8 +1220,10 @@ ProxyConfigServiceLinux::Delegate::Delegate( case base::nix::DESKTOP_ENVIRONMENT_KDE3: case base::nix::DESKTOP_ENVIRONMENT_KDE4: case base::nix::DESKTOP_ENVIRONMENT_KDE5: +#if !defined(OS_BSD) setting_getter_.reset(new SettingGetterImplKDE(env_var_getter_.get())); break; +#endif case base::nix::DESKTOP_ENVIRONMENT_XFCE: case base::nix::DESKTOP_ENVIRONMENT_OTHER: break; diff --git a/www/chromium/files/patch-net_socket_socket__posix.cc b/www/chromium/files/patch-net_socket_socket__posix.cc index 90d202cdff7d..d2c0cc92a099 100644 --- a/www/chromium/files/patch-net_socket_socket__posix.cc +++ b/www/chromium/files/patch-net_socket_socket__posix.cc @@ -1,11 +1,11 @@ ---- net/socket/socket_posix.cc.orig 2021-04-14 18:41:07 UTC +--- net/socket/socket_posix.cc.orig 2021-05-12 22:05:57 UTC +++ net/socket/socket_posix.cc -@@ -517,7 +517,7 @@ void SocketPosix::ReadCompleted() { +@@ -519,7 +519,7 @@ void SocketPosix::ReadCompleted() { } int SocketPosix::DoWrite(IOBuffer* buf, int buf_len) { -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) // Disable SIGPIPE for this write. Although Chromium globally disables // SIGPIPE, the net stack may be used in other consumers which do not do // this. MSG_NOSIGNAL is a Linux-only API. On OS X, this is a setsockopt on diff --git a/www/chromium/files/patch-net_socket_tcp__socket__posix.cc b/www/chromium/files/patch-net_socket_tcp__socket__posix.cc index f65487be3e58..619ba508bae1 100644 --- a/www/chromium/files/patch-net_socket_tcp__socket__posix.cc +++ b/www/chromium/files/patch-net_socket_tcp__socket__posix.cc @@ -1,20 +1,20 @@ ---- net/socket/tcp_socket_posix.cc.orig 2021-04-14 18:41:07 UTC +--- net/socket/tcp_socket_posix.cc.orig 2021-05-12 22:05:57 UTC +++ net/socket/tcp_socket_posix.cc -@@ -88,6 +88,17 @@ bool SetTCPKeepAlive(int fd, bool enable, int delay) { +@@ -90,6 +90,17 @@ bool SetTCPKeepAlive(int fd, bool enable, int delay) { PLOG(ERROR) << "Failed to set TCP_KEEPALIVE on fd: " << fd; return false; } +#elif defined(OS_BSD) + // Set seconds until first TCP keep alive. + if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &delay, sizeof(delay))) { + PLOG(ERROR) << "Failed to set TCP_KEEPIDLE on fd: " << fd; + return false; + } + // Set seconds between TCP keep alives. + if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &delay, sizeof(delay))) { + PLOG(ERROR) << "Failed to set TCP_KEEPINTVL on fd: " << fd; + return false; + } #endif return true; } diff --git a/www/chromium/files/patch-net_socket_udp__socket__posix.cc b/www/chromium/files/patch-net_socket_udp__socket__posix.cc index cb7c299019b5..bf286e78bd68 100644 --- a/www/chromium/files/patch-net_socket_udp__socket__posix.cc +++ b/www/chromium/files/patch-net_socket_udp__socket__posix.cc @@ -1,82 +1,82 @@ ---- net/socket/udp_socket_posix.cc.orig 2021-04-14 18:41:07 UTC +--- net/socket/udp_socket_posix.cc.orig 2021-05-12 22:05:57 UTC +++ net/socket/udp_socket_posix.cc -@@ -72,6 +72,32 @@ const int kActivityMonitorMinimumSamplesForThroughputE +@@ -74,6 +74,32 @@ const int kActivityMonitorMinimumSamplesForThroughputE const base::TimeDelta kActivityMonitorMsThreshold = base::TimeDelta::FromMilliseconds(100); +#if defined(OS_BSD) +int GetIPv4AddressFromIndex(int socket, uint32_t index, uint32_t* address) { + if (!index) { + *address = htonl(INADDR_ANY); + return OK; + } + + sockaddr_in* result = nullptr; + + ifreq ifr; + ifr.ifr_addr.sa_family = AF_INET; + if (!if_indextoname(index, ifr.ifr_name)) + return MapSystemError(errno); + int rv = ioctl(socket, SIOCGIFADDR, &ifr); + if (rv == -1) + return MapSystemError(errno); + result = reinterpret_cast(&ifr.ifr_addr); + + if (!result) + return ERR_ADDRESS_INVALID; + + *address = result->sin_addr.s_addr; + return OK; +} +#endif + #if defined(OS_MAC) // On OSX the file descriptor is guarded to detect the cause of -@@ -631,13 +657,13 @@ int UDPSocketPosix::SetDoNotFragment() { +@@ -622,13 +648,13 @@ int UDPSocketPosix::SetDoNotFragment() { } void UDPSocketPosix::SetMsgConfirm(bool confirm) { -#if !defined(OS_APPLE) +#if !defined(OS_APPLE) && !defined(OS_BSD) if (confirm) { sendto_flags_ |= MSG_CONFIRM; } else { sendto_flags_ &= ~MSG_CONFIRM; } -#endif // !defined(OS_APPLE) +#endif // !defined(OS_APPLE) && !defined(OS_BSD) } int UDPSocketPosix::AllowAddressReuse() { -@@ -926,7 +952,11 @@ int UDPSocketPosix::SetMulticastOptions() { +@@ -920,7 +946,11 @@ int UDPSocketPosix::SetMulticastOptions() { mreq.imr_ifindex = multicast_interface_; mreq.imr_address.s_addr = htonl(INADDR_ANY); int rv = setsockopt(socket_, IPPROTO_IP, IP_MULTICAST_IF, +#if defined(OS_BSD) + reinterpret_cast(&mreq.imr_address.s_addr), sizeof(mreq.imr_address.s_addr)); +#else reinterpret_cast(&mreq), sizeof(mreq)); +#endif if (rv) return MapSystemError(errno); break; -@@ -1027,9 +1057,18 @@ int UDPSocketPosix::LeaveGroup(const IPAddress& group_ +@@ -1021,9 +1051,18 @@ int UDPSocketPosix::LeaveGroup(const IPAddress& group_ case IPAddress::kIPv4AddressSize: { if (addr_family_ != AF_INET) return ERR_ADDRESS_INVALID; +#if defined(OS_BSD) + ip_mreq mreq = {}; + int error = GetIPv4AddressFromIndex(socket_, multicast_interface_, + &mreq.imr_interface.s_addr); + + if (error != OK) + return error; +#else ip_mreqn mreq = {}; mreq.imr_ifindex = multicast_interface_; mreq.imr_address.s_addr = INADDR_ANY; +#endif memcpy(&mreq.imr_multiaddr, group_address.bytes().data(), IPAddress::kIPv4AddressSize); int rv = setsockopt(socket_, IPPROTO_IP, IP_DROP_MEMBERSHIP, diff --git a/www/chromium/files/patch-net_socket_unix__domain__client__socket__posix.cc b/www/chromium/files/patch-net_socket_unix__domain__client__socket__posix.cc index 00a50ef6cd49..e1e396a16bfb 100644 --- a/www/chromium/files/patch-net_socket_unix__domain__client__socket__posix.cc +++ b/www/chromium/files/patch-net_socket_unix__domain__client__socket__posix.cc @@ -1,11 +1,11 @@ ---- net/socket/unix_domain_client_socket_posix.cc.orig 2021-04-14 18:41:07 UTC +--- net/socket/unix_domain_client_socket_posix.cc.orig 2021-05-12 22:05:57 UTC +++ net/socket/unix_domain_client_socket_posix.cc -@@ -57,7 +57,7 @@ bool UnixDomainClientSocket::FillAddress(const std::st +@@ -59,7 +59,7 @@ bool UnixDomainClientSocket::FillAddress(const std::st return true; } -#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Convert the path given into abstract socket name. It must start with // the '\0' character, so we are adding it. |addr_len| must specify the // length of the structure exactly, as potentially the socket name may diff --git a/www/chromium/files/patch-net_url__request_url__request__context__builder.cc b/www/chromium/files/patch-net_url__request_url__request__context__builder.cc index 8cad991131dc..8cb672cc38d1 100644 --- a/www/chromium/files/patch-net_url__request_url__request__context__builder.cc +++ b/www/chromium/files/patch-net_url__request_url__request__context__builder.cc @@ -1,20 +1,20 @@ ---- net/url_request/url_request_context_builder.cc.orig 2021-04-14 18:41:07 UTC +--- net/url_request/url_request_context_builder.cc.orig 2021-05-12 22:05:58 UTC +++ net/url_request/url_request_context_builder.cc -@@ -484,7 +484,7 @@ std::unique_ptr URLRequestContextBu +@@ -485,7 +485,7 @@ std::unique_ptr URLRequestContextBu } if (!proxy_resolution_service_) { -#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID) +#if !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID) && !defined(OS_BSD) // TODO(willchan): Switch to using this code when // ConfiguredProxyResolutionService::CreateSystemProxyConfigService()'s // signature doesn't suck. -@@ -493,7 +493,7 @@ std::unique_ptr URLRequestContextBu +@@ -494,7 +494,7 @@ std::unique_ptr URLRequestContextBu ConfiguredProxyResolutionService::CreateSystemProxyConfigService( base::ThreadTaskRunnerHandle::Get().get()); } -#endif // !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID) +#endif // !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID) && !defined(OS_BSD) proxy_resolution_service_ = CreateProxyResolutionService( std::move(proxy_config_service_), context.get(), context->host_resolver(), context->network_delegate(), diff --git a/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc b/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc index 6aaa23eb3215..5f7c80253a9d 100644 --- a/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc +++ b/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc @@ -1,56 +1,56 @@ ---- pdf/pdfium/pdfium_engine.cc.orig 2021-04-14 18:41:07 UTC +--- pdf/pdfium/pdfium_engine.cc.orig 2021-05-12 22:05:58 UTC +++ pdf/pdfium/pdfium_engine.cc -@@ -75,7 +75,7 @@ +@@ -77,7 +77,7 @@ #include "v8/include/cppgc/platform.h" #endif -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "pdf/pdfium/pdfium_font_linux.h" #endif -@@ -510,7 +510,7 @@ void InitializeSDK(bool enable_v8) { +@@ -511,7 +511,7 @@ void InitializeSDK(bool enable_v8) { FPDF_InitLibraryWithConfig(&config); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) InitializeLinuxFontMapper(); #endif -@@ -541,7 +541,7 @@ PDFiumEngine::PDFiumEngine(PDFEngine::Client* client, +@@ -542,7 +542,7 @@ PDFiumEngine::PDFiumEngine(PDFEngine::Client* client, IFSDK_PAUSE::user = nullptr; IFSDK_PAUSE::NeedToPauseNow = Pause_NeedToPauseNow; -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // PreviewModeClient does not know its pp::Instance. SetLastInstance(client_->GetPluginInstance()); #endif -@@ -998,7 +998,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesAsRasterPdf( +@@ -999,7 +999,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesAsRasterPdf( KillFormFocus(); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) SetLastInstance(client_->GetPluginInstance()); #endif @@ -3132,7 +3132,7 @@ bool PDFiumEngine::ContinuePaint(int progressive_index DCHECK_LT(static_cast(progressive_index), progressive_paints_.size()); last_progressive_start_time_ = base::Time::Now(); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) SetLastInstance(client_->GetPluginInstance()); #endif @@ -3620,7 +3620,7 @@ void PDFiumEngine::SetCurrentPage(int index) { FORM_DoPageAAction(old_page, form(), FPDFPAGE_AACTION_CLOSE); } most_visible_page_ = index; -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) SetLastInstance(client_->GetPluginInstance()); #endif if (most_visible_page_ != -1 && called_do_document_action_) { diff --git a/www/chromium/files/patch-ppapi_proxy_file__io__resource.cc b/www/chromium/files/patch-ppapi_proxy_file__io__resource.cc index 61cf4a2909c9..7d03ed8b6362 100644 --- a/www/chromium/files/patch-ppapi_proxy_file__io__resource.cc +++ b/www/chromium/files/patch-ppapi_proxy_file__io__resource.cc @@ -1,48 +1,48 @@ ---- ppapi/proxy/file_io_resource.cc.orig 2021-04-14 18:41:07 UTC +--- ppapi/proxy/file_io_resource.cc.orig 2021-05-12 22:05:58 UTC +++ ppapi/proxy/file_io_resource.cc -@@ -284,17 +284,19 @@ int32_t FileIOResource::Write(int64_t offset, +@@ -282,17 +282,19 @@ int32_t FileIOResource::Write(int64_t offset, if (check_quota_) { int64_t increase = 0; - uint64_t max_offset = 0; + uint64_t _max_offset = 0; + // (rene) avoid name collission with /usr/include/vm/vm_map.h on FreeBSD + // which also defines max_offset bool append = (open_flags_ & PP_FILEOPENFLAG_APPEND) != 0; if (append) { increase = bytes_to_write; } else { - uint64_t max_offset = offset + bytes_to_write; - if (max_offset > + uint64_t _max_offset = offset + bytes_to_write; + if (_max_offset > static_cast(std::numeric_limits::max())) { return PP_ERROR_FAILED; // amount calculation would overflow. } - increase = static_cast(max_offset) - max_written_offset_; + increase = static_cast(_max_offset) - max_written_offset_; } if (increase > 0) { -@@ -314,7 +316,7 @@ int32_t FileIOResource::Write(int64_t offset, +@@ -312,7 +314,7 @@ int32_t FileIOResource::Write(int64_t offset, if (append) append_mode_write_amount_ += bytes_to_write; else - max_written_offset_ = max_offset; + max_written_offset_ = _max_offset; } } return WriteValidated(offset, buffer, bytes_to_write, callback); -@@ -590,9 +592,9 @@ void FileIOResource::OnRequestWriteQuotaComplete( +@@ -588,9 +590,9 @@ void FileIOResource::OnRequestWriteQuotaComplete( } else { DCHECK_LE(offset + bytes_to_write - max_written_offset_, granted); - int64_t max_offset = offset + bytes_to_write; - if (max_written_offset_ < max_offset) - max_written_offset_ = max_offset; + int64_t _max_offset = offset + bytes_to_write; + if (max_written_offset_ < _max_offset) + max_written_offset_ = _max_offset; } if (callback->is_blocking()) { diff --git a/www/chromium/files/patch-printing_BUILD.gn b/www/chromium/files/patch-printing_BUILD.gn new file mode 100644 index 000000000000..1969545fbf08 --- /dev/null +++ b/www/chromium/files/patch-printing_BUILD.gn @@ -0,0 +1,20 @@ +--- printing/BUILD.gn.orig 2021-06-10 12:12:00 UTC ++++ printing/BUILD.gn +@@ -48,7 +48,7 @@ if (use_cups_ipp && is_chromeos_ash) { + } + } + +-if (is_linux || is_chromeos) { ++if ((is_linux || is_chromeos) && !is_bsd) { + source_set("printing_sandbox_hook") { + sources = [ + "sandbox/print_backend_sandbox_hook_linux.cc", +@@ -297,7 +297,7 @@ component("printing") { + ] + } + +- if (is_linux || is_chromeos) { ++ if ((is_linux || is_chromeos) && !is_bsd) { + deps += [ ":printing_sandbox_hook" ] + } + } diff --git a/www/chromium/files/patch-printing_backend_cups__helper.cc b/www/chromium/files/patch-printing_backend_cups__helper.cc new file mode 100644 index 000000000000..6f3d809262b3 --- /dev/null +++ b/www/chromium/files/patch-printing_backend_cups__helper.cc @@ -0,0 +1,38 @@ +--- printing/backend/cups_helper.cc.orig 2021-06-10 11:43:23 UTC ++++ printing/backend/cups_helper.cc +@@ -24,7 +24,7 @@ + #include "printing/units.h" + #include "url/gurl.h" + +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) + #include + + #include "base/files/scoped_file.h" +@@ -578,7 +578,7 @@ bool ParsePpdCapabilities(cups_dest_t* dest, + base::StringPiece printer_capabilities, + PrinterSemanticCapsAndDefaults* printer_info) { + base::FilePath ppd_file_path; +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) + // A file created while in a sandbox will be automatically deleted once all + // handles to it have been closed. This precludes the use of multiple + // operations against a file path. +@@ -625,7 +625,7 @@ bool ParsePpdCapabilities(cups_dest_t* dest, + ppd_status_t ppd_status = ppdLastError(&line); + LOG(ERROR) << "Failed to open PDD file: error " << ppd_status << " at line " + << line << ", " << ppdErrorString(ppd_status); +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) + if (ppd_status != PPD_FILE_OPEN_ERROR) { + // When the error is not from opening the file then the CUPS library + // internals will have already closed the file descriptor. It is +@@ -716,7 +716,7 @@ bool ParsePpdCapabilities(cups_dest_t* dest, + } + + ppdClose(ppd); +-#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) + // The CUPS library internals close the file descriptor upon successfully + // reading it. Explicitly release the `ScopedFD` to prevent a crash caused + // by a bad file descriptor. diff --git a/www/chromium/files/patch-printing_print__settings.h b/www/chromium/files/patch-printing_print__settings.h index 9eb75a7a383a..1c333b09ad0d 100644 --- a/www/chromium/files/patch-printing_print__settings.h +++ b/www/chromium/files/patch-printing_print__settings.h @@ -1,56 +1,56 @@ ---- printing/print_settings.h.orig 2021-04-14 18:41:07 UTC +--- printing/print_settings.h.orig 2021-05-12 22:05:58 UTC +++ printing/print_settings.h -@@ -20,11 +20,11 @@ +@@ -19,11 +19,11 @@ #include "ui/gfx/geometry/rect.h" #include "ui/gfx/geometry/size.h" -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include #include "base/values.h" -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) namespace printing { -@@ -81,9 +81,9 @@ class PRINTING_EXPORT PrintSettings { +@@ -80,9 +80,9 @@ class PRINTING_EXPORT PrintSettings { } }; -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) using AdvancedSettings = std::map; -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) PrintSettings(); PrintSettings(const PrintSettings&) = delete; -@@ -222,12 +222,12 @@ class PRINTING_EXPORT PrintSettings { +@@ -221,12 +221,12 @@ class PRINTING_EXPORT PrintSettings { pages_per_sheet_ = pages_per_sheet; } -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) AdvancedSettings& advanced_settings() { return advanced_settings_; } const AdvancedSettings& advanced_settings() const { return advanced_settings_; } -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #if BUILDFLAG(IS_CHROMEOS_ASH) void set_send_user_info(bool send_user_info) { -@@ -321,10 +321,10 @@ class PRINTING_EXPORT PrintSettings { +@@ -320,10 +320,10 @@ class PRINTING_EXPORT PrintSettings { // Number of pages per sheet. int pages_per_sheet_; -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Advanced settings. AdvancedSettings advanced_settings_; -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #if BUILDFLAG(IS_CHROMEOS_ASH) // Whether to send user info. diff --git a/www/chromium/files/patch-remoting_host_chromoting__host__context.cc b/www/chromium/files/patch-remoting_host_chromoting__host__context.cc new file mode 100644 index 000000000000..8f081a2ab251 --- /dev/null +++ b/www/chromium/files/patch-remoting_host_chromoting__host__context.cc @@ -0,0 +1,16 @@ +--- remoting/host/chromoting_host_context.cc.orig 2021-06-10 11:44:05 UTC ++++ remoting/host/chromoting_host_context.cc +@@ -139,11 +139,11 @@ std::unique_ptr ChromotingHostC + // on a UI thread. + scoped_refptr input_task_runner = + AutoThread::CreateWithType("ChromotingInputThread", ui_task_runner, +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + base::MessagePumpType::UI); + #else + base::MessagePumpType::IO); +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + return base::WrapUnique(new ChromotingHostContext( + ui_task_runner, audio_task_runner, file_task_runner, input_task_runner, diff --git a/www/chromium/files/patch-remoting_host_host__attributes.cc b/www/chromium/files/patch-remoting_host_host__attributes.cc index 3bcdcaf2f0aa..3560ed2ad39c 100644 --- a/www/chromium/files/patch-remoting_host_host__attributes.cc +++ b/www/chromium/files/patch-remoting_host_host__attributes.cc @@ -1,11 +1,11 @@ ---- remoting/host/host_attributes.cc.orig 2021-04-14 18:41:08 UTC +--- remoting/host/host_attributes.cc.orig 2021-05-12 22:05:58 UTC +++ remoting/host/host_attributes.cc -@@ -120,7 +120,7 @@ std::string GetHostAttributes() { +@@ -122,7 +122,7 @@ std::string GetHostAttributes() { media::InitializeMediaFoundation()) { result.push_back("HWEncoder"); } -#elif defined(OS_LINUX) || defined(OS_CHROMEOS) +#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) result.push_back("HWEncoder"); #endif diff --git a/www/chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc b/www/chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc index 486f5b55edb6..4812b1888918 100644 --- a/www/chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc +++ b/www/chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc @@ -1,35 +1,82 @@ ---- remoting/host/it2me/it2me_native_messaging_host_main.cc.orig 2021-04-14 18:41:08 UTC +--- remoting/host/it2me/it2me_native_messaging_host_main.cc.orig 2021-05-12 22:05:58 UTC +++ remoting/host/it2me/it2me_native_messaging_host_main.cc -@@ -30,12 +30,12 @@ +@@ -30,13 +30,13 @@ #include "remoting/host/switches.h" #include "remoting/host/usage_stats_consent.h" -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include #include "base/linux_util.h" #include "ui/events/platform/x11/x11_event_source.h" + #include "ui/gfx/x/xlib_support.h" -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #if defined(OS_APPLE) #include "base/mac/mac_util.h" -@@ -114,7 +114,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv +@@ -76,11 +76,11 @@ bool CurrentProcessHasUiAccess() { + // Creates a It2MeNativeMessagingHost instance, attaches it to stdin/stdout and + // runs the task executor until It2MeNativeMessagingHost signals shutdown. + int It2MeNativeMessagingHostMain(int argc, char** argv) { +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + // Initialize Xlib for multi-threaded use, allowing non-Chromium code to + // use X11 safely (such as the WebRTC capturer, GTK ...) + x11::InitXlib(); +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + // This object instance is required by Chrome code (such as + // SingleThreadTaskExecutor). +@@ -121,7 +121,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv remoting::LoadResources(""); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - // Create an X11EventSource so the global X11 connection - // (x11::Connection::Get()) can dispatch X events. - auto event_source = -@@ -132,7 +132,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv + // Required for any calls into GTK functions, such as the Disconnect and + // Continue windows. Calling with nullptr arguments because we don't have + // any command line arguments for gtk to consume. +@@ -134,7 +134,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv // Need to prime the host OS version value for linux to prevent IO on the // network thread. base::GetLinuxDistro() caches the result. base::GetLinuxDistro(); -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) base::File read_file; base::File write_file; +@@ -253,7 +253,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv + std::unique_ptr policy_watcher = + PolicyWatcher::CreateWithTaskRunner(context->file_task_runner()); + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + // Create an X11EventSource on all UI threads, so the global X11 connection + // (x11::Connection::Get()) can dispatch X events. + auto event_source = +@@ -262,7 +262,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv + input_task_runner->PostTask(FROM_HERE, base::BindOnce([]() { + new ui::X11EventSource(x11::Connection::Get()); + })); +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + std::unique_ptr host( + new It2MeNativeMessagingHost(is_process_elevated_, +@@ -275,11 +275,11 @@ int It2MeNativeMessagingHostMain(int argc, char** argv + // Run the loop until channel is alive. + run_loop.Run(); + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + input_task_runner->PostTask(FROM_HERE, base::BindOnce([]() { + delete ui::X11EventSource::GetInstance(); + })); +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + // Block until tasks blocking shutdown have completed their execution. + base::ThreadPoolInstance::Get()->Shutdown(); diff --git a/www/chromium/files/patch-remoting_host_me2me__desktop__environment.cc b/www/chromium/files/patch-remoting_host_me2me__desktop__environment.cc index 220603bdb00d..a593c82d7abc 100644 --- a/www/chromium/files/patch-remoting_host_me2me__desktop__environment.cc +++ b/www/chromium/files/patch-remoting_host_me2me__desktop__environment.cc @@ -1,11 +1,11 @@ ---- remoting/host/me2me_desktop_environment.cc.orig 2021-04-14 18:41:08 UTC +--- remoting/host/me2me_desktop_environment.cc.orig 2021-05-12 22:05:58 UTC +++ remoting/host/me2me_desktop_environment.cc -@@ -130,7 +130,7 @@ bool Me2MeDesktopEnvironment::InitializeSecurity( +@@ -131,7 +131,7 @@ bool Me2MeDesktopEnvironment::InitializeSecurity( // Otherwise, if the session is shared with the local user start monitoring // the local input and create the in-session UI. -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) bool want_user_interface = false; #elif defined(OS_APPLE) // Don't try to display any UI on top of the system's login screen as this diff --git a/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc b/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc index abcc2d84678c..0eb49af0ad5f 100644 --- a/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc +++ b/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc @@ -1,87 +1,120 @@ ---- remoting/host/remoting_me2me_host.cc.orig 2021-04-14 18:41:08 UTC +--- remoting/host/remoting_me2me_host.cc.orig 2021-05-12 22:05:58 UTC +++ remoting/host/remoting_me2me_host.cc -@@ -120,14 +120,14 @@ +@@ -119,7 +119,7 @@ #include "remoting/host/mac/permission_utils.h" #endif // defined(OS_APPLE) -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include #include "base/linux_util.h" - #include "remoting/host/audio_capturer_linux.h" +@@ -127,7 +127,7 @@ #include "remoting/host/linux/certificate_watcher.h" #include "ui/events/platform/x11/x11_event_source.h" + #include "ui/gfx/x/xlib_support.h" -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #if defined(OS_WIN) #include @@ -162,11 +162,11 @@ const char kApplicationName[] = "chromoting"; const char kStdinConfigPath[] = "-"; #endif // !defined(REMOTING_MULTI_PROCESS) -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // The command line switch used to pass name of the pipe to capture audio on // linux. const char kAudioPipeSwitchName[] = "audio-pipe-name"; -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #if defined(OS_POSIX) // The command line switch used to pass name of the unix domain socket used to @@ -359,7 +359,7 @@ class HostProcess : public ConfigWatcher::Delegate, std::unique_ptr context_; -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Watch for certificate changes and kill the host when changes occur std::unique_ptr cert_watcher_; #endif @@ -772,7 +772,7 @@ void HostProcess::CreateAuthenticatorFactory() { DCHECK(third_party_auth_config_.token_url.is_valid()); DCHECK(third_party_auth_config_.token_validation_url.is_valid()); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) if (!cert_watcher_) { cert_watcher_ = std::make_unique( base::BindRepeating(&HostProcess::ShutdownHost, this, @@ -861,7 +861,7 @@ void HostProcess::StartOnUiThread() { base::BindRepeating(&HostProcess::OnPolicyUpdate, base::Unretained(this)), base::BindRepeating(&HostProcess::OnPolicyError, base::Unretained(this))); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // If an audio pipe is specific on the command-line then initialize // AudioCapturerLinux to capture from it. base::FilePath audio_pipe_name = base::CommandLine::ForCurrentProcess()-> @@ -870,7 +870,7 @@ void HostProcess::StartOnUiThread() { remoting::AudioCapturerLinux::InitializePipeReader( context_->audio_task_runner(), audio_pipe_name); } -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #if defined(OS_POSIX) base::FilePath security_key_socket_name = @@ -919,7 +919,7 @@ void HostProcess::ShutdownOnUiThread() { // It is now safe for the HostProcess to be deleted. self_ = nullptr; -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Cause the global AudioPipeReader to be freed, otherwise the audio // thread will remain in-use and prevent the process from exiting. // TODO(wez): DesktopEnvironmentFactory should own the pipe reader. @@ -1763,7 +1763,7 @@ void HostProcess::OnCrash(const std::string& function_ int HostProcessMain() { HOST_LOG << "Starting host process: version " << STRINGIZE(VERSION); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - std::unique_ptr event_source; - if (!base::CommandLine::ForCurrentProcess()->HasSwitch( - kReportOfflineReasonSwitchName)) { + // Initialize Xlib for multi-threaded use, allowing non-Chromium code to + // use X11 safely (such as the WebRTC capturer, GTK ...) + x11::InitXlib(); +@@ -1800,7 +1800,7 @@ int HostProcessMain() { + std::unique_ptr network_change_notifier( + net::NetworkChangeNotifier::CreateIfNeeded()); + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + // Create an X11EventSource on all UI threads, so the global X11 connection + // (x11::Connection::Get()) can dispatch X events. + auto event_source = +@@ -1809,7 +1809,7 @@ int HostProcessMain() { + input_task_runner->PostTask(FROM_HERE, base::BindOnce([]() { + new ui::X11EventSource(x11::Connection::Get()); + })); +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + // Create & start the HostProcess using these threads. + // TODO(wez): The HostProcess holds a reference to itself until Shutdown(). +@@ -1822,11 +1822,11 @@ int HostProcessMain() { + // Run the main (also UI) task executor until the host no longer needs it. + run_loop.Run(); + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + input_task_runner->PostTask(FROM_HERE, base::BindOnce([]() { + delete ui::X11EventSource::GetInstance(); + })); +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + // Block until tasks blocking shutdown have completed their execution. + base::ThreadPoolInstance::Get()->Shutdown(); diff --git a/www/chromium/files/patch-remoting_resources_remoting__strings.grd b/www/chromium/files/patch-remoting_resources_remoting__strings.grd index e35cb70cca9f..0f4f3c397925 100644 --- a/www/chromium/files/patch-remoting_resources_remoting__strings.grd +++ b/www/chromium/files/patch-remoting_resources_remoting__strings.grd @@ -1,20 +1,20 @@ ---- remoting/resources/remoting_strings.grd.orig 2021-04-14 18:41:08 UTC +--- remoting/resources/remoting_strings.grd.orig 2021-05-12 22:05:58 UTC +++ remoting/resources/remoting_strings.grd -@@ -886,7 +886,7 @@ If '$3org.chromium. +@@ -894,7 +894,7 @@ If '$3org.chromium. Open Screen Recording Preferences - + Select a session to launch within your Chrome Remote Desktop environment. (Note that some session types may not support running within Chrome Remote Desktop and on the local console simultaneously.) -@@ -902,7 +902,7 @@ If '$3org.chromium. +@@ -910,7 +910,7 @@ If '$3org.chromium. Launch the default XSession - + diff --git a/www/chromium/files/patch-remoting_test_it2me__standalone__host.cc b/www/chromium/files/patch-remoting_test_it2me__standalone__host.cc index 9451cab2e91e..8d99e94b6dea 100644 --- a/www/chromium/files/patch-remoting_test_it2me__standalone__host.cc +++ b/www/chromium/files/patch-remoting_test_it2me__standalone__host.cc @@ -1,11 +1,11 @@ ---- remoting/test/it2me_standalone_host.cc.orig 2021-04-14 18:41:08 UTC +--- remoting/test/it2me_standalone_host.cc.orig 2021-05-12 22:05:58 UTC +++ remoting/test/it2me_standalone_host.cc -@@ -49,7 +49,7 @@ It2MeStandaloneHost::It2MeStandaloneHost() +@@ -50,7 +50,7 @@ It2MeStandaloneHost::It2MeStandaloneHost() context_->ui_task_runner()), connection_(base::WrapUnique(new testing::NiceMock())), session_jid_(kSessionJid), -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // We cannot support audio capturing for linux, since a pipe name is // needed to initialize AudioCapturerLinux. config_(protocol::SessionConfig::ForTest()), diff --git a/www/chromium/files/patch-sandbox_policy_BUILD.gn b/www/chromium/files/patch-sandbox_policy_BUILD.gn index d7ba17045504..39e06988de6a 100644 --- a/www/chromium/files/patch-sandbox_policy_BUILD.gn +++ b/www/chromium/files/patch-sandbox_policy_BUILD.gn @@ -1,11 +1,27 @@ ---- sandbox/policy/BUILD.gn.orig 2021-04-14 18:41:08 UTC +--- sandbox/policy/BUILD.gn.orig 2021-06-09 22:14:06 UTC +++ sandbox/policy/BUILD.gn @@ -29,7 +29,7 @@ component("policy") { "//sandbox:common", ] public_deps = [] - if (is_linux || is_chromeos) { + if ((is_linux || is_chromeos) && !is_bsd) { sources += [ "linux/bpf_audio_policy_linux.cc", "linux/bpf_audio_policy_linux.h", +@@ -78,6 +78,15 @@ component("policy") { + "//sandbox/linux:sandbox_services", + "//sandbox/linux:seccomp_bpf", + "//sandbox/linux:suid_sandbox_client", ++ ] ++ } ++ if (is_bsd) { ++ sources += [ ++ "freebsd/sandbox_freebsd.h", ++ "freebsd/sandbox_freebsd.cc", ++ ] ++ deps += [ ++ "//sandbox:sandbox_buildflags", + ] + } + if (is_chromeos_ash) { diff --git a/www/chromium/files/patch-sandbox_policy_sandbox.cc b/www/chromium/files/patch-sandbox_policy_sandbox.cc new file mode 100644 index 000000000000..855f4344dff6 --- /dev/null +++ b/www/chromium/files/patch-sandbox_policy_sandbox.cc @@ -0,0 +1,35 @@ +--- sandbox/policy/sandbox.cc.orig 2021-06-11 14:21:39 UTC ++++ sandbox/policy/sandbox.cc +@@ -12,6 +12,10 @@ + #include "base/android/jni_android.h" + #endif // defined(OS_ANDROID) + ++#if defined(OS_FREEBSD) ++#include "sandbox/policy/freebsd/sandbox_freebsd.h" ++#endif // defined(OS_FREEBSD) ++ + #if defined(OS_LINUX) || defined(OS_CHROMEOS) + #include "sandbox/policy/linux/sandbox_linux.h" + #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +@@ -29,6 +33,12 @@ + namespace sandbox { + namespace policy { + ++#if defined(OS_FREEBSD) ++bool Sandbox::Initialize(SandboxType sandbox_type) { ++ return SandboxFreeBSD::GetInstance()->InitializeSandbox(sandbox_type); ++} ++#endif // defined(OS_FREEBSD) ++ + #if defined(OS_LINUX) || defined(OS_CHROMEOS) + bool Sandbox::Initialize(SandboxType sandbox_type, + SandboxLinux::PreSandboxHook hook, +@@ -89,6 +99,8 @@ bool Sandbox::IsProcessSandboxed() { + base::android::MethodID::Get( + env, process_class.obj(), "isIsolated", "()Z"); + return env->CallStaticBooleanMethod(process_class.obj(), is_isolated); ++#elif defined(OS_FREEBSD) ++ return SandboxFreeBSD::GetInstance()->IsSandboxed(); + #elif defined(OS_FUCHSIA) + // TODO(https://crbug.com/1071420): Figure out what to do here. Process + // launching controls the sandbox and there are no ambient capabilities, so diff --git a/www/chromium/files/patch-sandbox_policy_sandbox.h b/www/chromium/files/patch-sandbox_policy_sandbox.h new file mode 100644 index 000000000000..25dabef67f29 --- /dev/null +++ b/www/chromium/files/patch-sandbox_policy_sandbox.h @@ -0,0 +1,24 @@ +--- sandbox/policy/sandbox.h.orig 2021-06-11 14:23:34 UTC ++++ sandbox/policy/sandbox.h +@@ -9,6 +9,10 @@ + #include "sandbox/policy/export.h" + #include "sandbox/policy/sandbox_type.h" + ++#if defined(OS_FREEBSD) ++#include "sandbox/policy/freebsd/sandbox_freebsd.h" ++#endif ++ + #if defined(OS_LINUX) || defined(OS_CHROMEOS) + #include "sandbox/policy/linux/sandbox_linux.h" + #endif +@@ -30,6 +34,10 @@ namespace policy { + + class SANDBOX_POLICY_EXPORT Sandbox { + public: ++#if defined(OS_FREEBSD) ++ static bool Initialize(SandboxType sandbox_type); ++#endif // defined(OS_FREEBSD) ++ + #if defined(OS_LINUX) || defined(OS_CHROMEOS) + static bool Initialize(SandboxType sandbox_type, + SandboxLinux::PreSandboxHook hook, diff --git a/www/chromium/files/patch-sandbox_policy_switches.cc b/www/chromium/files/patch-sandbox_policy_switches.cc index 741c6e218282..7ef50037534f 100644 --- a/www/chromium/files/patch-sandbox_policy_switches.cc +++ b/www/chromium/files/patch-sandbox_policy_switches.cc @@ -1,11 +1,11 @@ ---- sandbox/policy/switches.cc.orig 2021-04-14 18:41:08 UTC +--- sandbox/policy/switches.cc.orig 2021-05-12 22:05:58 UTC +++ sandbox/policy/switches.cc -@@ -82,7 +82,7 @@ const char kGpuSandboxFailuresFatal[] = "gpu-sandbox-f +@@ -83,7 +83,7 @@ const char kGpuSandboxFailuresFatal[] = "gpu-sandbox-f // Meant to be used as a browser-level switch for testing purposes only. const char kNoSandbox[] = "no-sandbox"; -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Instructs the zygote to launch without a sandbox. Processes forked from this // type of zygote will apply their own custom sandboxes later. const char kNoZygoteSandbox[] = "no-zygote-sandbox"; diff --git a/www/chromium/files/patch-sandbox_policy_switches.h b/www/chromium/files/patch-sandbox_policy_switches.h index 89a43bb5bacb..bbb515944cf3 100644 --- a/www/chromium/files/patch-sandbox_policy_switches.h +++ b/www/chromium/files/patch-sandbox_policy_switches.h @@ -1,11 +1,11 @@ ---- sandbox/policy/switches.h.orig 2021-04-14 18:41:08 UTC +--- sandbox/policy/switches.h.orig 2021-05-12 22:05:58 UTC +++ sandbox/policy/switches.h -@@ -54,7 +54,7 @@ SANDBOX_POLICY_EXPORT extern const char kDisableSetuid +@@ -55,7 +55,7 @@ SANDBOX_POLICY_EXPORT extern const char kDisableSetuid SANDBOX_POLICY_EXPORT extern const char kGpuSandboxAllowSysVShm[]; SANDBOX_POLICY_EXPORT extern const char kGpuSandboxFailuresFatal[]; SANDBOX_POLICY_EXPORT extern const char kNoSandbox[]; -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) SANDBOX_POLICY_EXPORT extern const char kNoZygoteSandbox[]; #endif #if defined(OS_WIN) diff --git a/www/chromium/files/patch-services_audio_BUILD.gn b/www/chromium/files/patch-services_audio_BUILD.gn index 440e85364eb3..83a114c79175 100644 --- a/www/chromium/files/patch-services_audio_BUILD.gn +++ b/www/chromium/files/patch-services_audio_BUILD.gn @@ -1,11 +1,11 @@ ---- services/audio/BUILD.gn.orig 2021-04-14 18:41:08 UTC +--- services/audio/BUILD.gn.orig 2021-05-12 22:05:58 UTC +++ services/audio/BUILD.gn -@@ -75,7 +75,7 @@ source_set("audio") { +@@ -76,7 +76,7 @@ source_set("audio") { "//services/audio/public/mojom", ] - if (is_linux || is_chromeos) { + if ((is_linux || is_chromeos) && !is_bsd) { sources += [ "audio_sandbox_hook_linux.cc", "audio_sandbox_hook_linux.h", diff --git a/www/chromium/files/patch-services_device_hid_hid__service.cc b/www/chromium/files/patch-services_device_hid_hid__service.cc index 5dbb60326b74..2b5f535f82d7 100644 --- a/www/chromium/files/patch-services_device_hid_hid__service.cc +++ b/www/chromium/files/patch-services_device_hid_hid__service.cc @@ -1,20 +1,20 @@ ---- services/device/hid/hid_service.cc.orig 2021-04-14 18:41:08 UTC +--- services/device/hid/hid_service.cc.orig 2021-05-12 22:05:58 UTC +++ services/device/hid/hid_service.cc @@ -18,6 +18,8 @@ #if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(USE_UDEV) #include "services/device/hid/hid_service_linux.h" +#elif defined(OS_FREEBSD) +#include "services/device/hid/hid_service_freebsd.h" #elif defined(OS_MAC) #include "services/device/hid/hid_service_mac.h" #elif defined(OS_WIN) -@@ -58,6 +60,8 @@ constexpr base::TaskTraits HidService::kBlockingTaskTr +@@ -61,6 +63,8 @@ constexpr base::TaskTraits HidService::kBlockingTaskTr std::unique_ptr HidService::Create() { #if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(USE_UDEV) return base::WrapUnique(new HidServiceLinux()); +#elif defined(OS_FREEBSD) + return base::WrapUnique(new HidServiceFreeBSD()); #elif defined(OS_MAC) return base::WrapUnique(new HidServiceMac()); #elif defined(OS_WIN) diff --git a/www/chromium/files/patch-services_device_hid_hid__service__freebsd.cc b/www/chromium/files/patch-services_device_hid_hid__service__freebsd.cc index 67e5b8a7abbc..4c6d4a904196 100644 --- a/www/chromium/files/patch-services_device_hid_hid__service__freebsd.cc +++ b/www/chromium/files/patch-services_device_hid_hid__service__freebsd.cc @@ -1,393 +1,394 @@ ---- services/device/hid/hid_service_freebsd.cc.orig 2021-04-21 12:19:19 UTC +--- services/device/hid/hid_service_freebsd.cc.orig 2021-06-10 13:30:27 UTC +++ services/device/hid/hid_service_freebsd.cc -@@ -0,0 +1,390 @@ +@@ -0,0 +1,391 @@ +// 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. + +#include "services/device/hid/hid_service_freebsd.h" + +#include +#include +#include +#include + +#include +#include +#include + +#include "base/bind.h" +#include "base/files/file_descriptor_watcher_posix.h" +#include "base/files/file_enumerator.h" +#include "base/files/file_util.h" +#include "base/files/file.h" +#include "base/location.h" +#include "base/logging.h" +#include "base/posix/eintr_wrapper.h" +#include "base/single_thread_task_runner.h" +#include "base/stl_util.h" +#include "base/strings/pattern.h" +#include "base/strings/stringprintf.h" +#include "base/strings/sys_string_conversions.h" +#include "base/strings/string_util.h" +#include "base/strings/string_split.h" +#include "base/task/post_task.h" ++#include "base/task/thread_pool.h" +#include "base/threading/scoped_blocking_call.h" +#include "base/threading/thread_task_runner_handle.h" +#include "base/threading/thread_restrictions.h" +#include "components/device_event_log/device_event_log.h" +#include "services/device/hid/hid_connection_freebsd.h" + +const int kMaxPermissionChecks = 5; + +namespace device { + +struct HidServiceFreeBSD::ConnectParams { + ConnectParams(scoped_refptr device_info, + bool allow_protected_reports, + ConnectCallback callback) + : device_info(std::move(device_info)), + allow_protected_reports(allow_protected_reports), + callback(std::move(callback)), + task_runner(base::ThreadTaskRunnerHandle::Get()), + blocking_task_runner( + base::ThreadPool::CreateSequencedTaskRunner(kBlockingTaskTraits)) {} + ~ConnectParams() {} + + scoped_refptr device_info; + bool allow_protected_reports; + ConnectCallback callback; + scoped_refptr task_runner; + scoped_refptr blocking_task_runner; + base::ScopedFD fd; +}; + +class HidServiceFreeBSD::BlockingTaskRunnerHelper { + public: + BlockingTaskRunnerHelper(base::WeakPtr service) + : service_(std::move(service)), + task_runner_(base::ThreadTaskRunnerHandle::Get()) { + DETACH_FROM_SEQUENCE(sequence_checker_); + + timer_.reset(new base::RepeatingTimer()); + devd_buffer_ = new net::IOBufferWithSize(1024); + } + + ~BlockingTaskRunnerHelper() { + } + + void Start() { + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); + + const base::FilePath kDevRoot("/dev"); + const std::string kUHIDPattern("/dev/uhid*"); + + base::FileEnumerator enumerator(kDevRoot, false, base::FileEnumerator::FILES); + do { + const base::FilePath next_device_path(enumerator.Next()); + const std::string next_device = next_device_path.value(); + if (next_device.empty()) + break; + + if (base::MatchPattern(next_device, kUHIDPattern)) + OnDeviceAdded(next_device.substr(5)); + } while (true); + + SetupDevdMonitor(); + + task_runner_->PostTask( + FROM_HERE, + base::Bind(&HidServiceFreeBSD::FirstEnumerationComplete, service_)); + } + + bool HaveReadWritePermissions(std::string device_id) { + std::string device_node = "/dev/" + device_id; + base::internal::AssertBlockingAllowed(); + + base::FilePath device_path(device_node); + base::File device_file; + int flags = + base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_WRITE; + device_file.Initialize(device_path, flags); + if (!device_file.IsValid()) + return false; + + return true; + } + + void OnDeviceAdded(std::string device_id) { + base::ScopedBlockingCall scoped_blocking_call( + FROM_HERE, base::BlockingType::MAY_BLOCK); + std::string device_node = "/dev/" + device_id; + uint16_t vendor_id = 0xffff; + uint16_t product_id = 0xffff; + std::string product_name = ""; + std::string serial_number = ""; + + std::vector report_descriptor; + + base::internal::AssertBlockingAllowed(); + + base::FilePath device_path(device_node); + base::File device_file; + int flags = + base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_WRITE; + device_file.Initialize(device_path, flags); + if (!device_file.IsValid()) { + HID_LOG(ERROR) << "Failed to open '" << device_node + << "': " + << base::File::ErrorToString(device_file.error_details()); + return; + } + + base::ScopedFD fd; + fd.reset(device_file.TakePlatformFile()); + + struct usb_gen_descriptor ugd; + ugd.ugd_data = NULL; + ugd.ugd_maxlen = 0xffff; + int result = HANDLE_EINTR( + ioctl(fd.get(), USB_GET_REPORT_DESC, &ugd)); + + if (result < 0) { + HID_LOG(ERROR) << "Failed to get report descriptor size"; + return; + } + + report_descriptor.resize(ugd.ugd_actlen); + + ugd.ugd_data = report_descriptor.data(); + ugd.ugd_maxlen = ugd.ugd_actlen; + result = HANDLE_EINTR( + ioctl(fd.get(), USB_GET_REPORT_DESC, &ugd)); + + if (result < 0) { + HID_LOG(ERROR) << "Failed to get report descriptor"; + return; + } + + scoped_refptr device_info(new HidDeviceInfo( + device_id, + /*physical_device_id*/"", + vendor_id, + product_id, + product_name, + serial_number, + device::mojom::HidBusType::kHIDBusTypeUSB, + report_descriptor, + device_node)); + + task_runner_->PostTask(FROM_HERE, base::BindOnce(&HidServiceFreeBSD::AddDevice, + service_, device_info)); + } + + void OnDeviceRemoved(std::string device_id) { + base::ScopedBlockingCall scoped_blocking_call( + FROM_HERE, base::BlockingType::MAY_BLOCK); + task_runner_->PostTask( + FROM_HERE, base::Bind(&HidServiceFreeBSD::RemoveDevice, service_, + device_id)); + } + + private: + + void CheckPendingPermissionChange() { + base::internal::AssertBlockingAllowed(); + std::map::iterator it; + for (it = permissions_checks_attempts_.begin(); it != permissions_checks_attempts_.end();) { + std::string device_name = it->first; + bool keep = true; + if (HaveReadWritePermissions(device_name)) { + OnDeviceAdded(device_name); + keep = false; + } + else if (it->second-- <= 0) { + HID_LOG(ERROR) << "Still don't have write permissions to '" << device_name + << "' after " << kMaxPermissionChecks << " attempts"; + keep = false; + } + + if (keep) + ++it; + else + permissions_checks_attempts_.erase(it++); + } + + if (permissions_checks_attempts_.empty()) + timer_->Stop(); + } + + void SetupDevdMonitor() { + base::internal::AssertBlockingAllowed(); + + int devd_fd = socket(AF_UNIX, SOCK_SEQPACKET, 0); + if (devd_fd < 0) + return; + + struct sockaddr_un sa; + + sa.sun_family = AF_UNIX; + strlcpy(sa.sun_path, "/var/run/devd.seqpacket.pipe", sizeof(sa.sun_path)); + if (connect(devd_fd, (struct sockaddr *) &sa, sizeof(sa)) < 0) { + close(devd_fd); + return; + } + + devd_fd_.reset(devd_fd); + file_watcher_ = base::FileDescriptorWatcher::WatchReadable( + devd_fd_.get(), base::Bind(&BlockingTaskRunnerHelper::OnDevdMessageCanBeRead, + base::Unretained(this))); + } + + void OnDevdMessageCanBeRead() { + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); + ssize_t bytes_read = HANDLE_EINTR(recv(devd_fd_.get(), devd_buffer_->data(), + devd_buffer_->size() - 1, MSG_WAITALL)); + if (bytes_read < 0) { + if (errno != EAGAIN) { + HID_LOG(ERROR) << "Read failed"; + file_watcher_.reset(); + } + return; + } + + devd_buffer_->data()[bytes_read] = 0; + char *data = devd_buffer_->data(); + // It may take some time for devd to change permissions + // on /dev/uhidX node. So do not fail immediately if + // open fail. Retry each second for kMaxPermissionChecks + // times before giving up entirely + if (base::StartsWith(data, "+uhid", base::CompareCase::SENSITIVE)) { + std::vector parts = base::SplitString( + data, " ", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); + if (!parts.empty()) { + std::string device_name = parts[0].substr(1); // skip '+' + if (HaveReadWritePermissions(device_name)) + OnDeviceAdded(parts[0].substr(1)); + else { + // Do not re-add to checks + if (permissions_checks_attempts_.find(device_name) == permissions_checks_attempts_.end()) { + permissions_checks_attempts_.insert(std::pair(device_name, kMaxPermissionChecks)); + timer_->Start(FROM_HERE, base::TimeDelta::FromSeconds(1), + this, &BlockingTaskRunnerHelper::CheckPendingPermissionChange); + } + } + } + } + + if (base::StartsWith(data, "-uhid", base::CompareCase::SENSITIVE)) { + std::vector parts = base::SplitString( + data, " ", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); + if (!parts.empty()) { + std::string device_name = parts[0].substr(1); // skip '-' + auto it = permissions_checks_attempts_.find(device_name); + if (it != permissions_checks_attempts_.end()) { + permissions_checks_attempts_.erase(it); + if (permissions_checks_attempts_.empty()) + timer_->Stop(); + } + OnDeviceRemoved(parts[0].substr(1)); + } + } + } + + SEQUENCE_CHECKER(sequence_checker_); + + // This weak pointer is only valid when checked on this task runner. + base::WeakPtr service_; + scoped_refptr task_runner_; + std::unique_ptr file_watcher_; + std::unique_ptr timer_; + base::ScopedFD devd_fd_; + scoped_refptr devd_buffer_; + std::map permissions_checks_attempts_; + + DISALLOW_COPY_AND_ASSIGN(BlockingTaskRunnerHelper); +}; + +HidServiceFreeBSD::HidServiceFreeBSD() + : blocking_task_runner_( + base::ThreadPool::CreateSequencedTaskRunner(kBlockingTaskTraits)), + helper_(nullptr, base::OnTaskRunnerDeleter(blocking_task_runner_)) { + helper_.reset(new BlockingTaskRunnerHelper(weak_factory_.GetWeakPtr())); + blocking_task_runner_->PostTask( + FROM_HERE, + base::BindOnce(&BlockingTaskRunnerHelper::Start, base::Unretained(helper_.get()))); +} + +HidServiceFreeBSD::~HidServiceFreeBSD() { + blocking_task_runner_->DeleteSoon(FROM_HERE, helper_.release()); +} + +base::WeakPtr HidServiceFreeBSD::GetWeakPtr() { + return weak_factory_.GetWeakPtr(); +} + +// static +void HidServiceFreeBSD::OpenOnBlockingThread( + std::unique_ptr params) { + base::ScopedBlockingCall scoped_blocking_call( + FROM_HERE, base::BlockingType::MAY_BLOCK); + scoped_refptr task_runner = params->task_runner; + + base::FilePath device_path(params->device_info->device_node()); + base::File device_file; + int flags = + base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_WRITE; + device_file.Initialize(device_path, flags); + if (!device_file.IsValid()) { + HID_LOG(EVENT) << "Failed to open '" << params->device_info->device_node() + << "': " + << base::File::ErrorToString(device_file.error_details()); + task_runner->PostTask(FROM_HERE, + base::BindOnce(std::move(params->callback), nullptr)); + return; + } + params->fd.reset(device_file.TakePlatformFile()); + task_runner->PostTask(FROM_HERE, base::BindOnce(&HidServiceFreeBSD::FinishOpen, + std::move(params))); +} + +void HidServiceFreeBSD::Connect(const std::string& device_guid, + bool allow_protected_reports, + ConnectCallback callback) { + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); + + const auto& map_entry = devices().find(device_guid); + if (map_entry == devices().end()) { + base::ThreadTaskRunnerHandle::Get()->PostTask( + FROM_HERE, base::BindOnce(std::move(callback), nullptr)); + return; + } + + scoped_refptr device_info = map_entry->second; + + auto params = std::make_unique(device_info, + allow_protected_reports, + std::move(callback)); + scoped_refptr blocking_task_runner = + params->blocking_task_runner; + + blocking_task_runner->PostTask( + FROM_HERE, base::BindOnce(&HidServiceFreeBSD::OpenOnBlockingThread, + std::move(params))); +} + +// static +void HidServiceFreeBSD::FinishOpen(std::unique_ptr params) { + DCHECK(params->fd.is_valid()); + + if (!base::SetNonBlocking(params->fd.get())) { + HID_PLOG(ERROR) << "Failed to set the non-blocking flag on the device fd"; + std::move(params->callback).Run(nullptr); + } + + std::move(params->callback).Run(base::MakeRefCounted( + std::move(params->device_info), + std::move(params->fd), + std::move(params->blocking_task_runner), + params->allow_protected_reports + )); +} + +} // namespace device diff --git a/www/chromium/files/patch-services_network_BUILD.gn b/www/chromium/files/patch-services_network_BUILD.gn index ef9fe8ceb7d1..25f4ab14f1d0 100644 --- a/www/chromium/files/patch-services_network_BUILD.gn +++ b/www/chromium/files/patch-services_network_BUILD.gn @@ -1,19 +1,20 @@ ---- services/network/BUILD.gn.orig 2021-04-14 18:41:08 UTC +--- services/network/BUILD.gn.orig 2021-06-09 22:14:06 UTC +++ services/network/BUILD.gn -@@ -273,9 +273,15 @@ component("network_service") { - ] - } +@@ -249,7 +249,7 @@ component("network_service") { + "//url", + ] - if (is_linux || is_chromeos) { -+ if ((is_linux && !is_bsd) || is_chromeos) { - deps += [ - "//sandbox/linux:sandbox_services", -+ "//sandbox/policy", -+ ] -+ } -+ -+ if (is_bsd) { -+ deps += [ - "//sandbox/policy", - ] ++ if ((is_linux || is_chromeos) && !is_bsd) { + deps += [ ":network_sandbox_hook" ] } + +@@ -282,7 +282,7 @@ component("network_service") { + defines = [ "IS_NETWORK_SERVICE_IMPL" ] + } + +-if (is_linux || is_chromeos) { ++if ((is_linux || is_chromeos) && !is_bsd) { + source_set("network_sandbox_hook") { + sources = [ + "network_sandbox_hook_linux.cc", diff --git a/www/chromium/files/patch-services_network_network__context.cc b/www/chromium/files/patch-services_network_network__context.cc new file mode 100644 index 000000000000..3babf4cacbec --- /dev/null +++ b/www/chromium/files/patch-services_network_network__context.cc @@ -0,0 +1,11 @@ +--- services/network/network_context.cc.orig 2021-06-11 09:55:35 UTC ++++ services/network/network_context.cc +@@ -2331,7 +2331,7 @@ NetworkContext::MakeSessionCleanupCookieStore() const + + net::CookieCryptoDelegate* crypto_delegate = nullptr; + if (params_->enable_encrypted_cookies) { +-#if (defined(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ ++#if (defined(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) && \ + !BUILDFLAG(IS_CHROMECAST) + DCHECK(network_service_->os_crypt_config_set()) + << "NetworkService::SetCryptConfig must be called before creating a " diff --git a/www/chromium/files/patch-services_network_network__sandbox__hook__linux.cc b/www/chromium/files/patch-services_network_network__sandbox__hook__linux.cc index e8f0b279a302..e91ce1f04653 100644 --- a/www/chromium/files/patch-services_network_network__sandbox__hook__linux.cc +++ b/www/chromium/files/patch-services_network_network__sandbox__hook__linux.cc @@ -1,18 +1,18 @@ ---- services/network/network_sandbox_hook_linux.cc.orig 2021-04-14 18:41:08 UTC +--- services/network/network_sandbox_hook_linux.cc.orig 2021-05-12 22:05:58 UTC +++ services/network/network_sandbox_hook_linux.cc -@@ -14,6 +14,7 @@ using sandbox::syscall_broker::MakeBrokerCommandSet; - namespace network { +@@ -32,6 +32,7 @@ std::vector GetNetworkFilePermis + } bool NetworkPreSandboxHook(sandbox::policy::SandboxLinux::Options options) { +#if !defined(OS_BSD) auto* instance = sandbox::policy::SandboxLinux::GetInstance(); - // TODO(tsepez): remove universal permission under filesytem root. -@@ -32,6 +33,7 @@ bool NetworkPreSandboxHook(sandbox::policy::SandboxLin + instance->StartBrokerProcess( +@@ -39,6 +40,7 @@ bool NetworkPreSandboxHook(sandbox::policy::SandboxLin sandbox::policy::SandboxLinux::PreSandboxHook(), options); instance->EngageNamespaceSandboxIfPossible(); +#endif // defined(OS_BSD) return true; } diff --git a/www/chromium/files/patch-services_network_network__service.cc b/www/chromium/files/patch-services_network_network__service.cc index 754d56ea49f2..853383a096db 100644 --- a/www/chromium/files/patch-services_network_network__service.cc +++ b/www/chromium/files/patch-services_network_network__service.cc @@ -1,20 +1,20 @@ ---- services/network/network_service.cc.orig 2021-04-14 18:41:08 UTC +--- services/network/network_service.cc.orig 2021-05-12 22:05:58 UTC +++ services/network/network_service.cc -@@ -72,7 +72,7 @@ +@@ -71,7 +71,7 @@ #include "third_party/boringssl/src/include/openssl/cpu.h" #endif -#if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ +#if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) && \ !BUILDFLAG(IS_CHROMECAST) #include "components/os_crypt/key_storage_config_linux.h" #endif -@@ -661,7 +661,7 @@ void NetworkService::OnCertDBChanged() { +@@ -614,7 +614,7 @@ void NetworkService::OnCertDBChanged() { net::CertDatabase::GetInstance()->NotifyObserversCertDBChanged(); } -#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) void NetworkService::SetCryptConfig(mojom::CryptConfigPtr crypt_config) { #if !BUILDFLAG(IS_CHROMECAST) DCHECK(!os_crypt_config_set_); diff --git a/www/chromium/files/patch-services_network_network__service.h b/www/chromium/files/patch-services_network_network__service.h index bc692c905b57..4e8c46106889 100644 --- a/www/chromium/files/patch-services_network_network__service.h +++ b/www/chromium/files/patch-services_network_network__service.h @@ -1,11 +1,11 @@ ---- services/network/network_service.h.orig 2021-04-14 18:41:08 UTC +--- services/network/network_service.h.orig 2021-05-12 22:05:58 UTC +++ services/network/network_service.h -@@ -193,7 +193,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService +@@ -155,7 +155,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService base::span crl_set, mojom::NetworkService::UpdateCRLSetCallback callback) override; void OnCertDBChanged() override; -#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) void SetCryptConfig(mojom::CryptConfigPtr crypt_config) override; #endif #if defined(OS_WIN) || defined(OS_MAC) diff --git a/www/chromium/files/patch-services_service__manager_public_cpp_service__executable_service__executable__environment.cc b/www/chromium/files/patch-services_service__manager_public_cpp_service__executable_service__executable__environment.cc new file mode 100644 index 000000000000..9e5ad7e849ea --- /dev/null +++ b/www/chromium/files/patch-services_service__manager_public_cpp_service__executable_service__executable__environment.cc @@ -0,0 +1,16 @@ +--- services/service_manager/public/cpp/service_executable/service_executable_environment.cc.orig 2021-06-11 15:03:35 UTC ++++ services/service_manager/public/cpp/service_executable/service_executable_environment.cc +@@ -50,6 +50,13 @@ ServiceExecutableEnvironment::ServiceExecutableEnviron + sandbox::policy::switches::kServiceSandboxType)), + sandbox::policy::SandboxLinux::PreSandboxHook(), sandbox_options); + } ++#elif defined(OS_FREEBSD) ++ if (command_line.HasSwitch(sandbox::policy::switches::kServiceSandboxType)) { ++ sandbox::policy::Sandbox::Initialize( ++ sandbox::policy::UtilitySandboxTypeFromString( ++ command_line.GetSwitchValueASCII( ++ sandbox::policy::switches::kServiceSandboxType))); ++ } + #endif + + mojo::core::Init(); diff --git a/www/chromium/files/patch-services_tracing_public_cpp_perfetto_perfetto__config.cc b/www/chromium/files/patch-services_tracing_public_cpp_perfetto_perfetto__config.cc new file mode 100644 index 000000000000..eea94a36b2c6 --- /dev/null +++ b/www/chromium/files/patch-services_tracing_public_cpp_perfetto_perfetto__config.cc @@ -0,0 +1,11 @@ +--- services/tracing/public/cpp/perfetto/perfetto_config.cc.orig 2021-06-11 09:57:05 UTC ++++ services/tracing/public/cpp/perfetto/perfetto_config.cc +@@ -88,7 +88,7 @@ void AddDataSourceConfigs( + // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is + // complete. + #if BUILDFLAG(IS_CHROMEOS_ASH) || \ +- (BUILDFLAG(IS_CHROMECAST) && defined(OS_LINUX)) ++ (BUILDFLAG(IS_CHROMECAST) && (defined(OS_LINUX) || defined(OS_BSD))) + if (source_names.empty() || + source_names.count(tracing::mojom::kSystemTraceDataSourceName) == 1) { + AddDataSourceConfig( diff --git a/www/chromium/files/patch-services_tracing_public_cpp_perfetto_trace__time.cc b/www/chromium/files/patch-services_tracing_public_cpp_perfetto_trace__time.cc index 2f60feac6aac..4376cbccdf35 100644 --- a/www/chromium/files/patch-services_tracing_public_cpp_perfetto_trace__time.cc +++ b/www/chromium/files/patch-services_tracing_public_cpp_perfetto_trace__time.cc @@ -1,24 +1,18 @@ ---- services/tracing/public/cpp/perfetto/trace_time.cc.orig 2021-04-14 18:41:08 UTC +--- services/tracing/public/cpp/perfetto/trace_time.cc.orig 2021-06-14 15:19:11 UTC +++ services/tracing/public/cpp/perfetto/trace_time.cc -@@ -12,14 +12,18 @@ namespace tracing { +@@ -12,10 +12,14 @@ namespace tracing { int64_t TraceBootTicksNow() { // On Windows and Mac, TRACE_TIME_TICKS_NOW() behaves like boottime already. -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) || \ ++#if defined(OS_BSD) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ defined(OS_FUCHSIA) struct timespec ts; -+ int res = clock_gettime(CLOCK_UPTIME, &ts); +#if defined(OS_BSD) ++ int res = clock_gettime(CLOCK_MONOTONIC, &ts); +#else int res = clock_gettime(CLOCK_BOOTTIME, &ts); +#endif if (res != -1) return static_cast(perfetto::base::FromPosixTimespec(ts).count()); #endif - return TRACE_TIME_TICKS_NOW().since_origin().InNanoseconds(); - } - --} // namespace tracing -\ No newline at end of file -+} // namespace tracing diff --git a/www/chromium/files/patch-services_tracing_public_cpp_perfetto_trace__time.h b/www/chromium/files/patch-services_tracing_public_cpp_perfetto_trace__time.h new file mode 100644 index 000000000000..7e4adcc80d27 --- /dev/null +++ b/www/chromium/files/patch-services_tracing_public_cpp_perfetto_trace__time.h @@ -0,0 +1,11 @@ +--- services/tracing/public/cpp/perfetto/trace_time.h.orig 2021-06-11 09:59:43 UTC ++++ services/tracing/public/cpp/perfetto/trace_time.h +@@ -10,7 +10,7 @@ + + namespace tracing { + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ ++#if defined(OS_BSD) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ + defined(OS_FUCHSIA) + // Linux, Android, and Fuchsia all use CLOCK_MONOTONIC. See crbug.com/166153 + // about efforts to unify base::TimeTicks across all platforms. diff --git a/www/chromium/files/patch-services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc b/www/chromium/files/patch-services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc index f54db5792902..78f33bf35441 100644 --- a/www/chromium/files/patch-services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc +++ b/www/chromium/files/patch-services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc @@ -1,11 +1,11 @@ ---- services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc.orig 2021-04-14 18:41:08 UTC +--- services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc.orig 2021-05-12 22:05:58 UTC +++ services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc -@@ -625,7 +625,7 @@ void TracingSamplerProfiler::TracingProfileBuilder::Sa +@@ -630,7 +630,7 @@ void TracingSamplerProfiler::TracingProfileBuilder::Sa // static void TracingSamplerProfiler::MangleModuleIDIfNeeded(std::string* module_id) { -#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Linux ELF module IDs are 160bit integers, which we need to mangle // down to 128bit integers to match the id that Breakpad outputs. // Example on version '66.0.3359.170' x64: diff --git a/www/chromium/files/patch-third__party_angle_BUILD.gn b/www/chromium/files/patch-third__party_angle_BUILD.gn index cffa0452aadd..5f100d7f1765 100644 --- a/www/chromium/files/patch-third__party_angle_BUILD.gn +++ b/www/chromium/files/patch-third__party_angle_BUILD.gn @@ -1,19 +1,19 @@ ---- third_party/angle/BUILD.gn.orig 2021-04-14 18:42:57 UTC +--- third_party/angle/BUILD.gn.orig 2021-05-12 22:13:33 UTC +++ third_party/angle/BUILD.gn -@@ -200,7 +200,7 @@ config("extra_warnings") { +@@ -201,7 +201,7 @@ config("extra_warnings") { "-Wunreachable-code", "-Wshorten-64-to-32", ] - if (!use_xcode_clang) { + if (!use_xcode_clang && !is_bsd) { # Mac catalyst uses a clang version that doesn't have these. cflags += [ "-Wdeprecated-copy", -@@ -439,6 +439,7 @@ angle_static_library("angle_gpu_info_util") { +@@ -454,6 +454,7 @@ angle_static_library("angle_gpu_info_util") { "X11", "Xi", "Xext", + "GL", ] } } diff --git a/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.cpp b/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.cpp index f16adbad5b3d..153258696df0 100644 --- a/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.cpp +++ b/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.cpp @@ -1,52 +1,52 @@ ---- third_party/angle/src/libANGLE/renderer/driver_utils.cpp.orig 2021-04-14 18:42:58 UTC +--- third_party/angle/src/libANGLE/renderer/driver_utils.cpp.orig 2021-05-12 22:13:33 UTC +++ third_party/angle/src/libANGLE/renderer/driver_utils.cpp @@ -17,7 +17,7 @@ # include #endif -#if defined(ANGLE_PLATFORM_LINUX) +#if defined(ANGLE_PLATFORM_POSIX) # include #endif -@@ -226,7 +226,7 @@ OSVersion GetMacOSVersion() +@@ -230,7 +230,7 @@ OSVersion GetMacOSVersion() } #endif -#if defined(ANGLE_PLATFORM_LINUX) +#if defined(ANGLE_PLATFORM_POSIX) bool ParseLinuxOSVersion(const char *version, int *major, int *minor, int *patch) { errno = 0; // reset global error flag. -@@ -238,6 +238,14 @@ bool ParseLinuxOSVersion(const char *version, int *maj +@@ -242,6 +242,14 @@ bool ParseLinuxOSVersion(const char *version, int *maj } *minor = static_cast(strtol(next + 1, &next, 10)); +#if defined(__FreeBSD__) + if (next == nullptr || *next != '-' || errno != 0) + { + return false; + } + + *patch = 0; +#else if (next == nullptr || *next != '.' || errno != 0) { return false; -@@ -248,6 +256,7 @@ bool ParseLinuxOSVersion(const char *version, int *maj +@@ -252,6 +260,7 @@ bool ParseLinuxOSVersion(const char *version, int *maj { return false; } +#endif return true; } -@@ -255,7 +264,7 @@ bool ParseLinuxOSVersion(const char *version, int *maj +@@ -259,7 +268,7 @@ bool ParseLinuxOSVersion(const char *version, int *maj OSVersion GetLinuxOSVersion() { -#if defined(ANGLE_PLATFORM_LINUX) +#if defined(ANGLE_PLATFORM_POSIX) struct utsname uname_info; if (uname(&uname_info) != 0) { diff --git a/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h b/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h index 432f7359823d..7764d946b3ed 100644 --- a/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h +++ b/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h @@ -1,11 +1,11 @@ ---- third_party/angle/src/libANGLE/renderer/driver_utils.h.orig 2021-04-14 18:42:58 UTC +--- third_party/angle/src/libANGLE/renderer/driver_utils.h.orig 2021-05-12 22:13:33 UTC +++ third_party/angle/src/libANGLE/renderer/driver_utils.h -@@ -158,7 +158,7 @@ inline bool IsWindows() +@@ -165,7 +165,7 @@ inline bool IsWindows() inline bool IsLinux() { -#if defined(ANGLE_PLATFORM_LINUX) +#if defined(ANGLE_PLATFORM_POSIX) return true; #else return false; diff --git a/www/chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h b/www/chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h index 13b2d3b641a3..fda961a3c939 100644 --- a/www/chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h +++ b/www/chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h @@ -1,11 +1,11 @@ ---- third_party/blink/public/common/renderer_preferences/renderer_preferences.h.orig 2021-04-14 18:41:09 UTC +--- third_party/blink/public/common/renderer_preferences/renderer_preferences.h.orig 2021-05-12 22:06:00 UTC +++ third_party/blink/public/common/renderer_preferences/renderer_preferences.h -@@ -49,7 +49,7 @@ struct BLINK_COMMON_EXPORT RendererPreferences { +@@ -50,7 +50,7 @@ struct BLINK_COMMON_EXPORT RendererPreferences { bool webrtc_allow_legacy_tls_protocols{false}; UserAgentOverride user_agent_override; std::string accept_languages; -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) std::string system_font_family_name; #endif #if defined(OS_WIN) diff --git a/www/chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h b/www/chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h index b50010ebedf6..caf2ae4e539b 100644 --- a/www/chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h +++ b/www/chromium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences__mojom__traits.h @@ -1,11 +1,11 @@ ---- third_party/blink/public/common/renderer_preferences/renderer_preferences_mojom_traits.h.orig 2021-04-14 18:41:09 UTC +--- third_party/blink/public/common/renderer_preferences/renderer_preferences_mojom_traits.h.orig 2021-05-12 22:06:00 UTC +++ third_party/blink/public/common/renderer_preferences/renderer_preferences_mojom_traits.h -@@ -154,7 +154,7 @@ struct BLINK_COMMON_EXPORT +@@ -157,7 +157,7 @@ struct BLINK_COMMON_EXPORT return data.accept_languages; } -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) static const std::string& system_font_family_name( const ::blink::RendererPreferences& data) { return data.system_font_family_name; diff --git a/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc b/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc index ede6562c0a84..2069ac9aee7e 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc @@ -1,34 +1,34 @@ ---- third_party/blink/renderer/controller/blink_initializer.cc.orig 2021-04-14 18:41:09 UTC +--- third_party/blink/renderer/controller/blink_initializer.cc.orig 2021-05-12 22:06:00 UTC +++ third_party/blink/renderer/controller/blink_initializer.cc -@@ -67,11 +67,11 @@ +@@ -66,11 +66,11 @@ #include "third_party/blink/renderer/controller/oom_intervention_impl.h" #endif -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "third_party/blink/renderer/controller/memory_usage_monitor_posix.h" #endif -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) || \ defined(OS_MAC) || defined(OS_WIN) #include "third_party/blink/renderer/controller/highest_pmf_reporter.h" #include "third_party/blink/renderer/controller/user_level_memory_pressure_signal_generator.h" -@@ -153,7 +153,7 @@ void InitializeCommon(Platform* platform, mojo::Binder +@@ -147,7 +147,7 @@ void InitializeCommon(Platform* platform, mojo::Binder CrashMemoryMetricsReporterImpl::Instance(); #endif -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) || \ defined(OS_MAC) || defined(OS_WIN) // Initialize UserLevelMemoryPressureSignalGenerator so it starts monitoring. if (UserLevelMemoryPressureSignalGenerator::Enabled()) -@@ -218,7 +218,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder +@@ -212,7 +212,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder main_thread->GetTaskRunner()); #endif -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) binders.Add(ConvertToBaseRepeatingCallback( CrossThreadBindRepeating(&MemoryUsageMonitorPosix::Bind)), main_thread->GetTaskRunner()); diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc b/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc index 76ede5d3bde4..4ceedb20724a 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc @@ -1,26 +1,26 @@ ---- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2021-04-14 18:41:09 UTC +--- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2021-05-24 22:05:45 UTC +++ third_party/blink/renderer/core/exported/web_view_impl.cc @@ -414,7 +414,7 @@ SkFontHinting RendererPreferencesToSkiaHinting( const blink::RendererPreferences& prefs) { // 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) if (!prefs.should_antialias_text) { // When anti-aliasing is off, GTK maps all non-zero hinting settings to // 'Normal' hinting so we do the same. Otherwise, folks who have 'Slight' -@@ -3085,12 +3085,12 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs +@@ -3089,12 +3089,12 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs renderer_preferences_.use_subpixel_positioning); // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. -#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) if (!renderer_preferences_.system_font_family_name.empty()) { WebFontRenderStyle::SetSystemFontFamily(blink::WebString::FromUTF8( renderer_preferences_.system_font_family_name)); } -#endif // (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && +#endif // (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) && // !defined(OS_ANDROID) #endif // defined(OS_WIN) #endif // !defined(OS_MAC) diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc b/www/chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc index dc4d5203cd72..9ce59642a1b0 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc @@ -1,20 +1,20 @@ ---- third_party/blink/renderer/core/frame/web_frame_test.cc.orig 2021-04-22 08:28:10 UTC +--- third_party/blink/renderer/core/frame/web_frame_test.cc.orig 2021-05-12 22:06:00 UTC +++ third_party/blink/renderer/core/frame/web_frame_test.cc -@@ -6053,7 +6053,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) { +@@ -6057,7 +6057,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) { EXPECT_EQ(64, ComputeOffset(layout_object, 1000, 1000)); } -#if !defined(OS_MAC) && !defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if !defined(OS_MAC) && !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_BSD) TEST_F(WebFrameTest, SelectRangeStaysHorizontallyAlignedWhenMoved) { RegisterMockedHttpURLLoad("move_caret.html"); -@@ -6427,7 +6427,7 @@ TEST_P(CompositedSelectionBoundsTest, Editable) { - TEST_P(CompositedSelectionBoundsTest, EditableDiv) { - RunTest("composited_selection_bounds_editable_div.html"); +@@ -6426,7 +6426,7 @@ TEST_P(CompositedSelectionBoundsTest, SVGBasic) { + TEST_P(CompositedSelectionBoundsTest, SVGTextWithFragments) { + RunTest("composited_selection_bounds_svg_text_with_fragments.html"); } --#if defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #if !defined(OS_ANDROID) TEST_P(CompositedSelectionBoundsTest, Input) { - // This test does not yet pass in CAP due to handling of + RunTest("composited_selection_bounds_input.html"); diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc b/www/chromium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc index 79bc647f5dfd..759373a357e0 100644 --- a/www/chromium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc +++ b/www/chromium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc @@ -1,11 +1,11 @@ ---- third_party/blink/renderer/core/html/forms/internal_popup_menu.cc.orig 2021-04-14 18:41:09 UTC +--- third_party/blink/renderer/core/html/forms/internal_popup_menu.cc.orig 2021-05-12 22:06:00 UTC +++ third_party/blink/renderer/core/html/forms/internal_popup_menu.cc -@@ -156,7 +156,7 @@ class InternalPopupMenu::ItemIterationContext { +@@ -154,7 +154,7 @@ class InternalPopupMenu::ItemIterationContext { is_in_group_(false), buffer_(buffer) { DCHECK(buffer_); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // On other platforms, the