Index: head/www/chromium/Makefile =================================================================== --- head/www/chromium/Makefile (revision 504140) +++ head/www/chromium/Makefile (revision 504141) @@ -1,341 +1,342 @@ # Created by: Florent Thoumie # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 74.0.3729.169 +PORTVERSION= 75.0.3770.80 CATEGORIES?= www MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ LOCAL/cpm/chromium/:fonts DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER?= chromium@FreeBSD.org COMMENT?= Google web browser based on WebKit LICENSE= BSD3CLAUSE LGPL21 MPL11 LICENSE_COMB= multi BUILD_DEPENDS= bash:shells/bash \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${PY_FLAVOR} \ .if !defined(GN_ONLY) BUILD_DEPENDS+= gperf:devel/gperf \ yasm:devel/yasm \ ffmpeg>=3.2.2,1:multimedia/ffmpeg \ flock:sysutils/flock \ node:www/node \ ${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} .endif .if !defined(GN_ONLY) 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 RUN_DEPENDS= xdg-open:devel/xdg-utils \ noto-basic>0:x11-fonts/noto-basic 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 .endif .if defined(GN_ONLY) USES= compiler:c++14-lang dos2unix localbase:ldflags ninja pkgconfig \ python:2.7,build shebangfix tar:xz .else USES= bison cpe desktop-file-utils dos2unix gl gnome jpeg localbase:ldflags \ ninja perl5 pkgconfig python:2.7,build shebangfix tar:xz .endif MAKE_ARGS= -C out/${BUILDTYPE} BINARY_ALIAS= python=${PYTHON_CMD} DOS2UNIX_FILES= third_party/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h .if !defined(GN_ONLY) CPE_VENDOR= google CPE_PRODUCT= chrome USE_GL= gl USE_LDCONFIG= ${DATADIR} USE_PERL5= build USE_XORG= x11 xcb xcomposite xcursor xext xdamage xfixes xi \ xorgproto xrandr xrender xscrnsaver xtst USE_GNOME= atk dconf glib20 gtk30 libxml2 libxslt SHEBANG_FILES= chrome/tools/build/linux/chrome-wrapper ALL_TARGET= chrome INSTALLS_ICONS= yes .endif 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_nacl=false \ enable_one_click_signin=true \ enable_remoting=false \ fieldtrial_testing_like_official_build=true \ is_clang=true \ jumbo_file_merge_limit=8 \ toolkit_views=true \ treat_warnings_as_errors=false \ use_allocator="none" \ use_allocator_shim=false \ use_aura=true \ use_bundled_fontconfig=false \ use_custom_libcxx=false \ use_gnome_keyring=false \ use_jumbo_build=true \ 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" \ google_default_client_id="996322985003.apps.googleusercontent.com" \ google_default_client_secret="IR1za9-1VK0zZ0f_O8MVFicn" .if !defined(GN_ONLY) SUB_FILES= chromium-browser.desktop chrome pkg-message SUB_LIST+= COMMENT="${COMMENT}" OPTIONS_DEFINE= CODECS CUPS DEBUG DRIVER KERBEROS TEST CODECS_DESC= Compile and enable patented codecs like H.264 DRIVER_DESC= Install chromedriver OPTIONS_GROUP= AUDIO OPTIONS_GROUP_AUDIO= ALSA PULSEAUDIO SNDIO OPTIONS_DEFAULT= ALSA CODECS CUPS DRIVER KERBEROS OPTIONS_SUB= yes 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 \ GN_ARGS+=enable_hevc_demuxing=true CODECS_VARS_OFF= GN_ARGS+=ffmpeg_branding="Chromium" \ GN_ARGS+=proprietary_codecs=false \ GN_ARGS+=enable_hevc_demuxing=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="lots of free disk space (~ 13GB)" 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 \ - GN_ARGS+=remove_webcore_debug_symbols=true \ WANTSPACE="a fair amount of free disk space (~ 6.5GB)" DRIVER_MAKE_ARGS= chromedriver KERBEROS_VARS= GN_ARGS+=use_kerberos=true KERBEROS_VARS_OFF= GN_ARGS+=use_kerberos=false 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 .endif .include "Makefile.tests" TEST_ALL_TARGET= ${TEST_TARGETS} TEST_DISTFILES= ${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX} \ test_fonts${EXTRACT_SUFX}:fonts .include # 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 .if !defined(GN_ONLY) JAVA_BUILD= yes JAVA_VERSION= 1.8 USE_JAVA= yes .endif # 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 .if !defined(GN_ONLY) pre-everything:: @${ECHO_MSG} @${ECHO_MSG} "To build Chromium, you should have around 2GB of memory" @${ECHO_MSG} "and ${WANTSPACE}." @${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: @${REINPLACE_CMD} -e 's|@@PACKAGE@@|chromium|' \ -e 's|@@MENUNAME@@|Chromium Web Browser|' \ ${WRKSRC}/chrome/app/resources/manpage.1.in post-patch-SNDIO-on: @${MKDIR} ${WRKSRC}/media/audio/sndio ${WRKSRC}/media/audio/openbsd @${CP} ${FILESDIR}/sndio_output.* ${WRKSRC}/media/audio/sndio @${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 freetype harfbuzz-ng libdrm libusb libwebp libxml libxslt openh264 opus snappy yasm || ${FALSE} .endif 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} .if !defined(GN_ONLY) 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 .endif 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 .if !defined(GN_ONLY) do-install: @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_MAN} ${WRKSRC}/chrome/app/resources/manpage.1.in \ ${STAGEDIR}${MANPREFIX}/man/man1/chrome.1 .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 icudtl.dat mksnapshot natives_blob.bin 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 .for f in libEGL.so libGLESv2.so ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR} .endfor # SwiftShader .if ${ARCH} != aarch64 @${MKDIR} ${STAGEDIR}${DATADIR}/swiftshader .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_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/character_data_generator \ ${STAGEDIR}${DATADIR} post-install-DRIVER-on: ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chromedriver \ ${STAGEDIR}${PREFIX}/bin .endif .include Index: head/www/chromium/distinfo =================================================================== --- head/www/chromium/distinfo (revision 504140) +++ head/www/chromium/distinfo (revision 504141) @@ -1,7 +1,7 @@ -TIMESTAMP = 1559408741 -SHA256 (chromium-74.0.3729.169.tar.xz) = 070f0210017f54b65264f88726431da7582e36a04caa673fe50662e8b41a0cb4 -SIZE (chromium-74.0.3729.169.tar.xz) = 749495820 -SHA256 (chromium-74.0.3729.169-testdata.tar.xz) = b0799bd6f9854778397e8946b6e02ad409e5ad305547e8ee5cf8865f04e91945 -SIZE (chromium-74.0.3729.169-testdata.tar.xz) = 350168484 +TIMESTAMP = 1559766977 +SHA256 (chromium-75.0.3770.80.tar.xz) = da828bc8d887821380b461abfbbd0e17538c211d56f240f03711b918c77a66d6 +SIZE (chromium-75.0.3770.80.tar.xz) = 707985016 +SHA256 (chromium-75.0.3770.80-testdata.tar.xz) = baacaa2e67df853aa4c8550da5e533a6d5c41ad31c6bf2e9588364831791ba4a +SIZE (chromium-75.0.3770.80-testdata.tar.xz) = 351066708 SHA256 (test_fonts.tar.xz) = cf9cbe3b7f1c4c42d426bddc65ec178d333ad7e205a36fe0a606a3c0c545ece1 SIZE (test_fonts.tar.xz) = 200040 Index: head/www/chromium/files/patch-components_services_font_font__service__app.cc =================================================================== --- head/www/chromium/files/patch-components_services_font_font__service__app.cc (revision 504140) +++ head/www/chromium/files/patch-components_services_font_font__service__app.cc (nonexistent) @@ -1,11 +0,0 @@ ---- components/services/font/font_service_app.cc.orig 2019-04-30 22:22:43 UTC -+++ components/services/font/font_service_app.cc -@@ -21,7 +21,7 @@ - #include "components/services/font/ppapi_fontconfig_matching.h" // nogncheck - #endif - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - #include "base/test/fontconfig_util_linux.h" - #endif - Property changes on: head/www/chromium/files/patch-components_services_font_font__service__app.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/patch-ui_base_ime_input__method__initializer.cc =================================================================== --- head/www/chromium/files/patch-ui_base_ime_input__method__initializer.cc (revision 504140) +++ head/www/chromium/files/patch-ui_base_ime_input__method__initializer.cc (nonexistent) @@ -1,38 +0,0 @@ ---- ui/base/ime/input_method_initializer.cc.orig 2019-03-11 22:01:19 UTC -+++ ui/base/ime/input_method_initializer.cc -@@ -8,7 +8,7 @@ - - #if defined(OS_CHROMEOS) - #include "ui/base/ime/ime_bridge.h" --#elif defined(USE_AURA) && defined(OS_LINUX) -+#elif defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD)) - #include "base/logging.h" - #include "ui/base/ime/linux/fake_input_method_context_factory.h" - #elif defined(OS_WIN) -@@ -18,7 +18,7 @@ - - namespace { - --#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX) -+#if !defined(OS_CHROMEOS) && defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD)) - const ui::LinuxInputMethodContextFactory* - g_linux_input_method_context_factory_for_testing; - #endif -@@ -46,7 +46,7 @@ void ShutdownInputMethod() { - void InitializeInputMethodForTesting() { - #if defined(OS_CHROMEOS) - IMEBridge::Initialize(); --#elif defined(USE_AURA) && defined(OS_LINUX) -+#elif defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD)) - if (!g_linux_input_method_context_factory_for_testing) - g_linux_input_method_context_factory_for_testing = - new FakeInputMethodContextFactory(); -@@ -67,7 +67,7 @@ void InitializeInputMethodForTesting() { - void ShutdownInputMethodForTesting() { - #if defined(OS_CHROMEOS) - IMEBridge::Shutdown(); --#elif defined(USE_AURA) && defined(OS_LINUX) -+#elif defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD)) - const LinuxInputMethodContextFactory* factory = - LinuxInputMethodContextFactory::instance(); - CHECK(!factory || factory == g_linux_input_method_context_factory_for_testing) Property changes on: head/www/chromium/files/patch-ui_base_ime_input__method__initializer.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/patch-components_sync_device__info_local__device__info__provider__impl.cc =================================================================== --- head/www/chromium/files/patch-components_sync_device__info_local__device__info__provider__impl.cc (revision 504140) +++ head/www/chromium/files/patch-components_sync_device__info_local__device__info__provider__impl.cc (nonexistent) @@ -1,11 +0,0 @@ ---- components/sync/device_info/local_device_info_provider_impl.cc.orig 2019-03-17 18:30:00 UTC -+++ components/sync/device_info/local_device_info_provider_impl.cc -@@ -15,7 +15,7 @@ namespace { - sync_pb::SyncEnums::DeviceType GetLocalDeviceType(bool is_tablet) { - #if defined(OS_CHROMEOS) - return sync_pb::SyncEnums_DeviceType_TYPE_CROS; --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) - return sync_pb::SyncEnums_DeviceType_TYPE_LINUX; - #elif defined(OS_ANDROID) || defined(OS_IOS) - return is_tablet ? sync_pb::SyncEnums_DeviceType_TYPE_TABLET Property changes on: head/www/chromium/files/patch-components_sync_device__info_local__device__info__provider__impl.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/patch-net_third__party_quic_platform_impl_quic__ip__address__impl.cc =================================================================== --- head/www/chromium/files/patch-net_third__party_quic_platform_impl_quic__ip__address__impl.cc (revision 504140) +++ head/www/chromium/files/patch-net_third__party_quic_platform_impl_quic__ip__address__impl.cc (nonexistent) @@ -1,10 +0,0 @@ ---- net/third_party/quic/platform/impl/quic_ip_address_impl.cc.orig 2019-03-11 22:01:01 UTC -+++ net/third_party/quic/platform/impl/quic_ip_address_impl.cc -@@ -13,6 +13,7 @@ - #include - #elif defined(OS_POSIX) || defined(OS_FUCHSIA) - #include -+#include - #endif - - using std::string; Property changes on: head/www/chromium/files/patch-net_third__party_quic_platform_impl_quic__ip__address__impl.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/patch-chrome_browser_policy_machine__level__user__cloud__policy__controller.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_policy_machine__level__user__cloud__policy__controller.cc (revision 504140) +++ head/www/chromium/files/patch-chrome_browser_policy_machine__level__user__cloud__policy__controller.cc (nonexistent) @@ -1,20 +0,0 @@ ---- chrome/browser/policy/machine_level_user_cloud_policy_controller.cc.orig 2019-03-11 22:00:53 UTC -+++ chrome/browser/policy/machine_level_user_cloud_policy_controller.cc -@@ -65,7 +65,7 @@ bool IsMachineLevelUserCloudPolicyEnabled() { - #endif - } - --#if defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) - void CleanupUnusedPolicyDirectory() { - std::string enrollment_token = - BrowserDMTokenStorage::Get()->RetrieveEnrollmentToken(); -@@ -124,7 +124,7 @@ MachineLevelUserCloudPolicyController::CreatePolicyMan - void MachineLevelUserCloudPolicyController::Init( - PrefService* local_state, - scoped_refptr url_loader_factory) { --#if defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) - // This is a function that removes the directory we accidentally create due to - // crbug.com/880870. The directory is only removed when it's empty and - // enrollment token doesn't exist. This function is expected to be removed Property changes on: head/www/chromium/files/patch-chrome_browser_policy_machine__level__user__cloud__policy__controller.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/patch-chrome_browser_ui_webui_settings_md__settings__localized__strings__provider.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_ui_webui_settings_md__settings__localized__strings__provider.cc (revision 504140) +++ head/www/chromium/files/patch-chrome_browser_ui_webui_settings_md__settings__localized__strings__provider.cc (nonexistent) @@ -1,20 +0,0 @@ ---- chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc.orig 2019-04-30 22:22:37 UTC -+++ chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc -@@ -550,7 +550,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht - {"enterCustomWebAddress", IDS_SETTINGS_ENTER_CUSTOM_WEB_ADDRESS}, - {"homeButtonDisabled", IDS_SETTINGS_HOME_BUTTON_DISABLED}, - {"themes", IDS_SETTINGS_THEMES}, --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) - {"systemTheme", IDS_SETTINGS_SYSTEM_THEME}, - {"useSystemTheme", IDS_SETTINGS_USE_SYSTEM_THEME}, - {"classicTheme", IDS_SETTINGS_CLASSIC_THEME}, -@@ -568,7 +568,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht - {"openWallpaperApp", IDS_SETTINGS_OPEN_WALLPAPER_APP}, - {"setWallpaper", IDS_SETTINGS_SET_WALLPAPER}, - #endif --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) - {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS}, - #endif - #if defined(OS_MACOSX) Property changes on: head/www/chromium/files/patch-chrome_browser_ui_webui_settings_md__settings__localized__strings__provider.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_assertions.cc =================================================================== --- head/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_assertions.cc (revision 504140) +++ head/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_assertions.cc (nonexistent) @@ -1,11 +0,0 @@ ---- third_party/blink/renderer/platform/wtf/assertions.cc.orig 2019-03-11 22:01:04 UTC -+++ third_party/blink/renderer/platform/wtf/assertions.cc -@@ -48,7 +48,7 @@ - #include - #endif - --#if defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(__UCLIBC__)) -+#if defined(OS_MACOSX) || ((defined(OS_LINUX) || defined(OS_BSD)) && !defined(__UCLIBC__)) - #include - #include - #include Property changes on: head/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_assertions.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_BUILD.gn =================================================================== --- head/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_BUILD.gn (revision 504140) +++ head/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_BUILD.gn (nonexistent) @@ -1,16 +0,0 @@ ---- third_party/blink/renderer/platform/wtf/BUILD.gn.orig 2019-04-30 22:23:03 UTC -+++ third_party/blink/renderer/platform/wtf/BUILD.gn -@@ -268,8 +268,12 @@ jumbo_component("wtf") { - if (is_android) { - libs = [ "log" ] - } -- if (is_linux) { -+ if (is_linux && !is_bsd) { - libs = [ "dl" ] -+ } -+ -+ if (is_bsd) { -+ libs = [ "execinfo" ] - } - - if (is_mac) { Property changes on: head/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_BUILD.gn ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/patch-fix-gn-74 =================================================================== --- head/www/chromium/files/patch-fix-gn-74 (revision 504140) +++ head/www/chromium/files/patch-fix-gn-74 (nonexistent) @@ -1,716 +0,0 @@ ---- tools/gn/build/gen.py.orig 2019-06-01 16:49:59 UTC -+++ tools/gn/build/gen.py -@@ -530,6 +530,7 @@ def WriteGNNinja(path, platform, host, options): - 'tools/gn/setup.cc', - 'tools/gn/source_dir.cc', - 'tools/gn/source_file.cc', -+ 'tools/gn/source_file_type.cc', - 'tools/gn/standard_out.cc', - 'tools/gn/string_utils.cc', - 'tools/gn/substitution_list.cc', ---- tools/gn/tools/gn/binary_target_generator.cc.orig 2019-05-21 22:00:02 UTC -+++ tools/gn/tools/gn/binary_target_generator.cc -@@ -68,38 +68,6 @@ void BinaryTargetGenerator::DoRun() { - return; - } - --bool BinaryTargetGenerator::FillSources() { -- bool ret = TargetGenerator::FillSources(); -- for (std::size_t i = 0; i < target_->sources().size(); ++i) { -- const auto& source = target_->sources()[i]; -- switch (source.type()) { -- case SourceFile::SOURCE_CPP: -- case SourceFile::SOURCE_H: -- case SourceFile::SOURCE_C: -- case SourceFile::SOURCE_M: -- case SourceFile::SOURCE_MM: -- case SourceFile::SOURCE_S: -- case SourceFile::SOURCE_ASM: -- case SourceFile::SOURCE_O: -- // These are allowed. -- break; -- case SourceFile::SOURCE_RC: -- case SourceFile::SOURCE_DEF: -- case SourceFile::SOURCE_RS: -- case SourceFile::SOURCE_GO: -- case SourceFile::SOURCE_UNKNOWN: -- case SourceFile::SOURCE_NUMTYPES: -- *err_ = -- Err(scope_->GetValue(variables::kSources, true)->list_value()[i], -- std::string("Only source, header, and object files belong in " -- "the sources of a ") + -- Target::GetStringForOutputType(target_->output_type()) + -- ". " + source.value() + " is not one of the valid types."); -- } -- } -- return ret; --} -- - bool BinaryTargetGenerator::FillCompleteStaticLib() { - if (target_->output_type() == Target::STATIC_LIBRARY) { - const Value* value = scope_->GetValue(variables::kCompleteStaticLib, true); ---- tools/gn/tools/gn/binary_target_generator.h.orig 2019-05-21 22:00:02 UTC -+++ tools/gn/tools/gn/binary_target_generator.h -@@ -22,7 +22,6 @@ class BinaryTargetGenerator : public TargetGenerator { - - protected: - void DoRun() override; -- bool FillSources() override; - - private: - bool FillCompleteStaticLib(); ---- tools/gn/tools/gn/c_tool.h.orig 2019-05-21 22:00:02 UTC -+++ tools/gn/tools/gn/c_tool.h -@@ -12,6 +12,7 @@ - #include "tools/gn/label.h" - #include "tools/gn/label_ptr.h" - #include "tools/gn/scope.h" -+#include "tools/gn/source_file_type.h" - #include "tools/gn/substitution_list.h" - #include "tools/gn/substitution_pattern.h" - #include "tools/gn/tool.h" ---- tools/gn/tools/gn/compile_commands_writer.cc.orig 2019-05-21 22:00:02 UTC -+++ tools/gn/tools/gn/compile_commands_writer.cc -@@ -122,7 +122,7 @@ void WriteCommand(const Target* target, - const CompileFlags& flags, - std::vector& tool_outputs, - PathOutput& path_output, -- SourceFile::Type source_type, -+ SourceFileType source_type, - const char* tool_name, - EscapeOptions opts, - std::string* compile_commands) { -@@ -144,16 +144,16 @@ void WriteCommand(const Target* target, - } else if (range.type == &CSubstitutionCFlags) { - command_out << flags.cflags; - } else if (range.type == &CSubstitutionCFlagsC) { -- if (source_type == SourceFile::SOURCE_C) -+ if (source_type == SOURCE_C) - command_out << flags.cflags_c; - } else if (range.type == &CSubstitutionCFlagsCc) { -- if (source_type == SourceFile::SOURCE_CPP) -+ if (source_type == SOURCE_CPP) - command_out << flags.cflags_cc; - } else if (range.type == &CSubstitutionCFlagsObjC) { -- if (source_type == SourceFile::SOURCE_M) -+ if (source_type == SOURCE_M) - command_out << flags.cflags_objc; - } else if (range.type == &CSubstitutionCFlagsObjCc) { -- if (source_type == SourceFile::SOURCE_MM) -+ if (source_type == SOURCE_MM) - command_out << flags.cflags_objcc; - } else if (range.type == &SubstitutionLabel || - range.type == &SubstitutionLabelName || -@@ -222,11 +222,9 @@ void CompileCommandsWriter::RenderJSON(const BuildSett - for (const auto& source : target->sources()) { - // If this source is not a C/C++/ObjC/ObjC++ source (not header) file, - // continue as it does not belong in the compilation database. -- SourceFile::Type source_type = source.type(); -- if (source_type != SourceFile::SOURCE_CPP && -- source_type != SourceFile::SOURCE_C && -- source_type != SourceFile::SOURCE_M && -- source_type != SourceFile::SOURCE_MM) -+ SourceFileType source_type = GetSourceFileType(source); -+ if (source_type != SOURCE_CPP && source_type != SOURCE_C && -+ source_type != SOURCE_M && source_type != SOURCE_MM) - continue; - - const char* tool_name = Tool::kToolNone; -@@ -324,4 +322,4 @@ void CompileCommandsWriter::VisitDeps(const Target* ta - VisitDeps(pair.ptr, visited); - } - } --} -+} -\ No newline at end of file ---- tools/gn/tools/gn/general_tool.h.orig 2019-05-21 22:00:02 UTC -+++ tools/gn/tools/gn/general_tool.h -@@ -11,6 +11,7 @@ - #include "base/macros.h" - #include "tools/gn/label.h" - #include "tools/gn/label_ptr.h" -+#include "tools/gn/source_file_type.h" - #include "tools/gn/substitution_list.h" - #include "tools/gn/substitution_pattern.h" - #include "tools/gn/tool.h" ---- tools/gn/tools/gn/header_checker.cc.orig 2019-05-21 22:00:02 UTC -+++ tools/gn/tools/gn/header_checker.cc -@@ -18,6 +18,7 @@ - #include "tools/gn/err.h" - #include "tools/gn/filesystem_utils.h" - #include "tools/gn/scheduler.h" -+#include "tools/gn/source_file_type.h" - #include "tools/gn/target.h" - #include "tools/gn/trace.h" - #include "util/worker_pool.h" -@@ -151,10 +152,9 @@ void HeaderChecker::RunCheckOverFiles(const FileMap& f - - for (const auto& file : files) { - // Only check C-like source files (RC files also have includes). -- SourceFile::Type type = file.first.type(); -- if (type != SourceFile::SOURCE_CPP && type != SourceFile::SOURCE_H && -- type != SourceFile::SOURCE_C && type != SourceFile::SOURCE_M && -- type != SourceFile::SOURCE_MM && type != SourceFile::SOURCE_RC) -+ SourceFileType type = GetSourceFileType(file.first); -+ if (type != SOURCE_CPP && type != SOURCE_H && type != SOURCE_C && -+ type != SOURCE_M && type != SOURCE_MM && type != SOURCE_RC) - continue; - - if (!check_generated_) { ---- tools/gn/tools/gn/ninja_binary_target_writer.cc.orig 2019-05-21 22:00:02 UTC -+++ tools/gn/tools/gn/ninja_binary_target_writer.cc -@@ -23,23 +23,22 @@ - #include "tools/gn/ninja_utils.h" - #include "tools/gn/scheduler.h" - #include "tools/gn/settings.h" -+#include "tools/gn/source_file_type.h" - #include "tools/gn/string_utils.h" - #include "tools/gn/substitution_writer.h" - #include "tools/gn/target.h" - - bool NinjaBinaryTargetWriter::SourceFileTypeSet::CSourceUsed() { -- return Get(SourceFile::SOURCE_CPP) || Get(SourceFile::SOURCE_H) || -- Get(SourceFile::SOURCE_C) || Get(SourceFile::SOURCE_M) || -- Get(SourceFile::SOURCE_MM) || Get(SourceFile::SOURCE_RC) || -- Get(SourceFile::SOURCE_S); -+ return Get(SOURCE_CPP) || Get(SOURCE_H) || Get(SOURCE_C) || Get(SOURCE_M) || -+ Get(SOURCE_MM) || Get(SOURCE_RC) || Get(SOURCE_S); - } - - bool NinjaBinaryTargetWriter::SourceFileTypeSet::RustSourceUsed() { -- return Get(SourceFile::SOURCE_RS); -+ return Get(SOURCE_RS); - } - - bool NinjaBinaryTargetWriter::SourceFileTypeSet::GoSourceUsed() { -- return Get(SourceFile::SOURCE_GO); -+ return Get(SOURCE_GO); - } - - NinjaBinaryTargetWriter::NinjaBinaryTargetWriter(const Target* target, -@@ -50,6 +49,10 @@ NinjaBinaryTargetWriter::NinjaBinaryTargetWriter(const - NinjaBinaryTargetWriter::~NinjaBinaryTargetWriter() = default; - - void NinjaBinaryTargetWriter::Run() { -+ SourceFileTypeSet used_types; -+ for (const auto& source : target_->sources()) -+ used_types.Set(GetSourceFileType(source)); -+ - NinjaCBinaryTargetWriter writer(target_, out_); - writer.Run(); - } ---- tools/gn/tools/gn/ninja_binary_target_writer.h.orig 2019-05-21 22:00:02 UTC -+++ tools/gn/tools/gn/ninja_binary_target_writer.h -@@ -23,12 +23,11 @@ class NinjaBinaryTargetWriter : public NinjaTargetWrit - class SourceFileTypeSet { - public: - SourceFileTypeSet() { -- memset(flags_, 0, -- sizeof(bool) * static_cast(SourceFile::SOURCE_NUMTYPES)); -+ memset(flags_, 0, sizeof(bool) * static_cast(SOURCE_NUMTYPES)); - } - -- void Set(SourceFile::Type type) { flags_[static_cast(type)] = true; } -- bool Get(SourceFile::Type type) const { -+ void Set(SourceFileType type) { flags_[static_cast(type)] = true; } -+ bool Get(SourceFileType type) const { - return flags_[static_cast(type)]; - } - -@@ -37,7 +36,7 @@ class NinjaBinaryTargetWriter : public NinjaTargetWrit - bool GoSourceUsed(); - - private: -- bool flags_[static_cast(SourceFile::SOURCE_NUMTYPES)]; -+ bool flags_[static_cast(SOURCE_NUMTYPES)]; - }; - - NinjaBinaryTargetWriter(const Target* target, std::ostream& out); ---- tools/gn/tools/gn/ninja_c_binary_target_writer.cc.orig 2019-05-21 22:00:02 UTC -+++ tools/gn/tools/gn/ninja_c_binary_target_writer.cc -@@ -24,6 +24,7 @@ - #include "tools/gn/ninja_utils.h" - #include "tools/gn/scheduler.h" - #include "tools/gn/settings.h" -+#include "tools/gn/source_file_type.h" - #include "tools/gn/string_utils.h" - #include "tools/gn/substitution_writer.h" - #include "tools/gn/target.h" -@@ -66,27 +67,27 @@ void AddSourceSetObjectFiles(const Target* source_set, - if (source_set->GetOutputFilesForSource(source, &tool_name, &tool_outputs)) - obj_files->push_back(tool_outputs[0]); - -- used_types.Set(source.type()); -+ used_types.Set(GetSourceFileType(source)); - } - - // Add MSVC precompiled header object files. GCC .gch files are not object - // files so they are omitted. - if (source_set->config_values().has_precompiled_headers()) { -- if (used_types.Get(SourceFile::SOURCE_C)) { -+ if (used_types.Get(SOURCE_C)) { - const CTool* tool = source_set->toolchain()->GetToolAsC(CTool::kCToolCc); - if (tool && tool->precompiled_header_type() == CTool::PCH_MSVC) { - GetPCHOutputFiles(source_set, CTool::kCToolCc, &tool_outputs); - obj_files->Append(tool_outputs.begin(), tool_outputs.end()); - } - } -- if (used_types.Get(SourceFile::SOURCE_CPP)) { -+ if (used_types.Get(SOURCE_CPP)) { - const CTool* tool = source_set->toolchain()->GetToolAsC(CTool::kCToolCxx); - if (tool && tool->precompiled_header_type() == CTool::PCH_MSVC) { - GetPCHOutputFiles(source_set, CTool::kCToolCxx, &tool_outputs); - obj_files->Append(tool_outputs.begin(), tool_outputs.end()); - } - } -- if (used_types.Get(SourceFile::SOURCE_M)) { -+ if (used_types.Get(SOURCE_M)) { - const CTool* tool = - source_set->toolchain()->GetToolAsC(CTool::kCToolObjC); - if (tool && tool->precompiled_header_type() == CTool::PCH_MSVC) { -@@ -94,7 +95,7 @@ void AddSourceSetObjectFiles(const Target* source_set, - obj_files->Append(tool_outputs.begin(), tool_outputs.end()); - } - } -- if (used_types.Get(SourceFile::SOURCE_MM)) { -+ if (used_types.Get(SOURCE_MM)) { - const CTool* tool = - source_set->toolchain()->GetToolAsC(CTool::kCToolObjCxx); - if (tool && tool->precompiled_header_type() == CTool::PCH_MSVC) { -@@ -118,7 +119,7 @@ void NinjaCBinaryTargetWriter::Run() { - // Figure out what source types are needed. - SourceFileTypeSet used_types; - for (const auto& source : target_->sources()) -- used_types.Set(source.type()); -+ used_types.Set(GetSourceFileType(source)); - - WriteCompilerVars(used_types); - -@@ -234,34 +235,31 @@ void NinjaCBinaryTargetWriter::WriteCompilerVars( - target_->config_values().has_precompiled_headers(); - - EscapeOptions opts = GetFlagOptions(); -- if (used_types.Get(SourceFile::SOURCE_S) || -- used_types.Get(SourceFile::SOURCE_ASM)) { -+ if (used_types.Get(SOURCE_S) || used_types.Get(SOURCE_ASM)) { - WriteOneFlag(target_, &CSubstitutionAsmFlags, false, Tool::kToolNone, - &ConfigValues::asmflags, opts, path_output_, out_); - } -- if (used_types.Get(SourceFile::SOURCE_C) || -- used_types.Get(SourceFile::SOURCE_CPP) || -- used_types.Get(SourceFile::SOURCE_M) || -- used_types.Get(SourceFile::SOURCE_MM)) { -+ if (used_types.Get(SOURCE_C) || used_types.Get(SOURCE_CPP) || -+ used_types.Get(SOURCE_M) || used_types.Get(SOURCE_MM)) { - WriteOneFlag(target_, &CSubstitutionCFlags, false, Tool::kToolNone, - &ConfigValues::cflags, opts, path_output_, out_); - } -- if (used_types.Get(SourceFile::SOURCE_C)) { -+ if (used_types.Get(SOURCE_C)) { - WriteOneFlag(target_, &CSubstitutionCFlagsC, has_precompiled_headers, - CTool::kCToolCc, &ConfigValues::cflags_c, opts, path_output_, - out_); - } -- if (used_types.Get(SourceFile::SOURCE_CPP)) { -+ if (used_types.Get(SOURCE_CPP)) { - WriteOneFlag(target_, &CSubstitutionCFlagsCc, has_precompiled_headers, - CTool::kCToolCxx, &ConfigValues::cflags_cc, opts, path_output_, - out_); - } -- if (used_types.Get(SourceFile::SOURCE_M)) { -+ if (used_types.Get(SOURCE_M)) { - WriteOneFlag(target_, &CSubstitutionCFlagsObjC, has_precompiled_headers, - CTool::kCToolObjC, &ConfigValues::cflags_objc, opts, - path_output_, out_); - } -- if (used_types.Get(SourceFile::SOURCE_MM)) { -+ if (used_types.Get(SOURCE_MM)) { - WriteOneFlag(target_, &CSubstitutionCFlagsObjCc, has_precompiled_headers, - CTool::kCToolObjCxx, &ConfigValues::cflags_objcc, opts, - path_output_, out_); -@@ -321,14 +319,14 @@ void NinjaCBinaryTargetWriter::WritePCHCommands( - - const CTool* tool_c = target_->toolchain()->GetToolAsC(CTool::kCToolCc); - if (tool_c && tool_c->precompiled_header_type() != CTool::PCH_NONE && -- used_types.Get(SourceFile::SOURCE_C)) { -+ used_types.Get(SOURCE_C)) { - WritePCHCommand(&CSubstitutionCFlagsC, CTool::kCToolCc, - tool_c->precompiled_header_type(), input_dep, - order_only_deps, object_files, other_files); - } - const CTool* tool_cxx = target_->toolchain()->GetToolAsC(CTool::kCToolCxx); - if (tool_cxx && tool_cxx->precompiled_header_type() != CTool::PCH_NONE && -- used_types.Get(SourceFile::SOURCE_CPP)) { -+ used_types.Get(SOURCE_CPP)) { - WritePCHCommand(&CSubstitutionCFlagsCc, CTool::kCToolCxx, - tool_cxx->precompiled_header_type(), input_dep, - order_only_deps, object_files, other_files); -@@ -336,7 +334,7 @@ void NinjaCBinaryTargetWriter::WritePCHCommands( - - const CTool* tool_objc = target_->toolchain()->GetToolAsC(CTool::kCToolObjC); - if (tool_objc && tool_objc->precompiled_header_type() == CTool::PCH_GCC && -- used_types.Get(SourceFile::SOURCE_M)) { -+ used_types.Get(SOURCE_M)) { - WritePCHCommand(&CSubstitutionCFlagsObjC, CTool::kCToolObjC, - tool_objc->precompiled_header_type(), input_dep, - order_only_deps, object_files, other_files); -@@ -345,7 +343,7 @@ void NinjaCBinaryTargetWriter::WritePCHCommands( - const CTool* tool_objcxx = - target_->toolchain()->GetToolAsC(CTool::kCToolObjCxx); - if (tool_objcxx && tool_objcxx->precompiled_header_type() == CTool::PCH_GCC && -- used_types.Get(SourceFile::SOURCE_MM)) { -+ used_types.Get(SOURCE_MM)) { - WritePCHCommand(&CSubstitutionCFlagsObjCc, CTool::kCToolObjCxx, - tool_objcxx->precompiled_header_type(), input_dep, - order_only_deps, object_files, other_files); -@@ -478,7 +476,7 @@ void NinjaCBinaryTargetWriter::WriteSources( - deps.resize(0); - const char* tool_name = Tool::kToolNone; - if (!target_->GetOutputFilesForSource(source, &tool_name, &tool_outputs)) { -- if (source.type() == SourceFile::SOURCE_DEF) -+ if (GetSourceFileType(source) == SOURCE_DEF) - other_files->push_back(source); - continue; // No output for this source. - } -@@ -599,7 +597,7 @@ void NinjaCBinaryTargetWriter::WriteLinkerStuff( - const SourceFile* optional_def_file = nullptr; - if (!other_files.empty()) { - for (const SourceFile& src_file : other_files) { -- if (src_file.type() == SourceFile::SOURCE_DEF) { -+ if (GetSourceFileType(src_file) == SOURCE_DEF) { - optional_def_file = &src_file; - implicit_deps.push_back( - OutputFile(settings_->build_settings(), src_file)); ---- tools/gn/tools/gn/source_dir.cc.orig 2019-05-21 22:00:02 UTC -+++ tools/gn/tools/gn/source_dir.cc -@@ -98,10 +98,10 @@ SourceFile SourceDir::ResolveRelativeFile( - return ret; - - const std::string& input_string = p.string_value(); -- if (!ValidateResolveInput(true, p, input_string, err)) -+ if (!ValidateResolveInput(true, p, input_string, err)) { - return ret; -- -- ret.SetValue(ResolveRelative(input_string, value_, true, source_root)); -+ } -+ ret.value_ = ResolveRelative(input_string, value_, true, source_root); - return ret; - } - ---- tools/gn/tools/gn/source_file_type.cc.orig 2019-06-01 16:50:13 UTC -+++ tools/gn/tools/gn/source_file_type.cc -@@ -0,0 +1,37 @@ -+// 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 "tools/gn/source_file_type.h" -+ -+#include "tools/gn/filesystem_utils.h" -+#include "tools/gn/source_file.h" -+ -+SourceFileType GetSourceFileType(const SourceFile& file) { -+ base::StringPiece extension = FindExtension(&file.value()); -+ if (extension == "cc" || extension == "cpp" || extension == "cxx") -+ return SOURCE_CPP; -+ if (extension == "h" || extension == "hpp" || extension == "hxx" || -+ extension == "hh") -+ return SOURCE_H; -+ if (extension == "c") -+ return SOURCE_C; -+ if (extension == "m") -+ return SOURCE_M; -+ if (extension == "mm") -+ return SOURCE_MM; -+ if (extension == "rc") -+ return SOURCE_RC; -+ if (extension == "S" || extension == "s" || extension == "asm") -+ return SOURCE_S; -+ if (extension == "o" || extension == "obj") -+ return SOURCE_O; -+ if (extension == "def") -+ return SOURCE_DEF; -+ if (extension == "rs") -+ return SOURCE_RS; -+ if (extension == "go") -+ return SOURCE_GO; -+ -+ return SOURCE_UNKNOWN; -+} ---- tools/gn/tools/gn/source_file_type.h.orig 2019-06-01 16:50:13 UTC -+++ tools/gn/tools/gn/source_file_type.h -@@ -0,0 +1,34 @@ -+// 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. -+ -+#ifndef TOOLS_GN_SOURCE_FILE_TYPE_H_ -+#define TOOLS_GN_SOURCE_FILE_TYPE_H_ -+ -+class SourceFile; -+ -+// This should be sequential integers starting from 0 so they can be used as -+// array indices. -+enum SourceFileType { -+ SOURCE_UNKNOWN = 0, -+ SOURCE_ASM, -+ SOURCE_C, -+ SOURCE_CPP, -+ SOURCE_H, -+ SOURCE_M, -+ SOURCE_MM, -+ SOURCE_S, -+ SOURCE_RC, -+ SOURCE_O, // Object files can be inputs, too. Also counts .obj. -+ SOURCE_DEF, -+ -+ SOURCE_RS, -+ SOURCE_GO, -+ -+ // Must be last. -+ SOURCE_NUMTYPES, -+}; -+ -+SourceFileType GetSourceFileType(const SourceFile& file); -+ -+#endif // TOOLS_GN_SOURCE_FILE_TYPE_H_ ---- tools/gn/tools/gn/source_file.cc.orig 2019-06-01 16:50:13 UTC -+++ tools/gn/tools/gn/source_file.cc -@@ -21,45 +21,15 @@ void AssertValueSourceFileString(const std::string& s) - DCHECK(!EndsWithSlash(s)) << s; - } - --SourceFile::Type GetSourceFileType(const std::string& file) { -- base::StringPiece extension = FindExtension(&file); -- if (extension == "cc" || extension == "cpp" || extension == "cxx") -- return SourceFile::SOURCE_CPP; -- if (extension == "h" || extension == "hpp" || extension == "hxx" || -- extension == "hh" || extension == "inc") -- return SourceFile::SOURCE_H; -- if (extension == "c") -- return SourceFile::SOURCE_C; -- if (extension == "m") -- return SourceFile::SOURCE_M; -- if (extension == "mm") -- return SourceFile::SOURCE_MM; -- if (extension == "rc") -- return SourceFile::SOURCE_RC; -- if (extension == "S" || extension == "s" || extension == "asm") -- return SourceFile::SOURCE_S; -- if (extension == "o" || extension == "obj") -- return SourceFile::SOURCE_O; -- if (extension == "def") -- return SourceFile::SOURCE_DEF; -- if (extension == "rs") -- return SourceFile::SOURCE_RS; -- if (extension == "go") -- return SourceFile::SOURCE_GO; -- -- return SourceFile::SOURCE_UNKNOWN; --} -- - } // namespace - --SourceFile::SourceFile() : type_(SOURCE_UNKNOWN) {} -+SourceFile::SourceFile() = default; - - SourceFile::SourceFile(const base::StringPiece& p) - : value_(p.data(), p.size()) { - DCHECK(!value_.empty()); - AssertValueSourceFileString(value_); - NormalizePath(&value_); -- type_ = GetSourceFileType(value_); - } - - SourceFile::SourceFile(SwapIn, std::string* value) { -@@ -67,7 +37,6 @@ SourceFile::SourceFile(SwapIn, std::string* value) { - DCHECK(!value_.empty()); - AssertValueSourceFileString(value_); - NormalizePath(&value_); -- type_ = GetSourceFileType(value_); - } - - SourceFile::~SourceFile() = default; -@@ -92,9 +61,4 @@ SourceDir SourceFile::GetDir() const { - - base::FilePath SourceFile::Resolve(const base::FilePath& source_root) const { - return ResolvePath(value_, true, source_root); --} -- --void SourceFile::SetValue(const std::string& value) { -- value_ = value; -- type_ = GetSourceFileType(value_); - } ---- tools/gn/tools/gn/source_file.h.orig 2019-06-01 16:50:13 UTC -+++ tools/gn/tools/gn/source_file.h -@@ -74,15 +74,10 @@ class SourceFile { - return value_ < other.value_; - } - -- void swap(SourceFile& other) { -- value_.swap(other.value_); -- std::swap(type_, other.type_); -- } -+ void swap(SourceFile& other) { value_.swap(other.value_); } - - private: - friend class SourceDir; -- -- void SetValue(const std::string& value); - - std::string value_; - ---- tools/gn/tools/gn/target_generator.h.orig 2019-05-21 22:00:02 UTC -+++ tools/gn/tools/gn/target_generator.h -@@ -47,7 +47,7 @@ class TargetGenerator { - - const BuildSettings* GetBuildSettings() const; - -- virtual bool FillSources(); -+ bool FillSources(); - bool FillPublic(); - bool FillConfigs(); - bool FillOutputs(bool allow_substitutions); ---- tools/gn/tools/gn/target.cc.orig 2019-05-21 22:00:02 UTC -+++ tools/gn/tools/gn/target.cc -@@ -16,6 +16,7 @@ - #include "tools/gn/filesystem_utils.h" - #include "tools/gn/functions.h" - #include "tools/gn/scheduler.h" -+#include "tools/gn/source_file_type.h" - #include "tools/gn/substitution_writer.h" - #include "tools/gn/tool.h" - #include "tools/gn/toolchain.h" -@@ -486,10 +487,10 @@ bool Target::GetOutputFilesForSource(const SourceFile& - outputs->clear(); - *computed_tool_type = Tool::kToolNone; - -- SourceFile::Type file_type = source.type(); -- if (file_type == SourceFile::SOURCE_UNKNOWN) -+ SourceFileType file_type = GetSourceFileType(source); -+ if (file_type == SOURCE_UNKNOWN) - return false; -- if (file_type == SourceFile::SOURCE_O) { -+ if (file_type == SOURCE_O) { - // Object files just get passed to the output and not compiled. - outputs->push_back(OutputFile(settings()->build_settings(), source)); - return true; ---- tools/gn/tools/gn/tool.cc.orig 2019-05-21 22:00:02 UTC -+++ tools/gn/tools/gn/tool.cc -@@ -261,27 +261,27 @@ std::unique_ptr Tool::CreateTool(const std::stri - } - - // static --const char* Tool::GetToolTypeForSourceType(SourceFile::Type type) { -+const char* Tool::GetToolTypeForSourceType(SourceFileType type) { - switch (type) { -- case SourceFile::SOURCE_C: -+ case SOURCE_C: - return CTool::kCToolCc; -- case SourceFile::SOURCE_CPP: -+ case SOURCE_CPP: - return CTool::kCToolCxx; -- case SourceFile::SOURCE_M: -+ case SOURCE_M: - return CTool::kCToolObjC; -- case SourceFile::SOURCE_MM: -+ case SOURCE_MM: - return CTool::kCToolObjCxx; -- case SourceFile::SOURCE_ASM: -- case SourceFile::SOURCE_S: -+ case SOURCE_ASM: -+ case SOURCE_S: - return CTool::kCToolAsm; -- case SourceFile::SOURCE_RC: -+ case SOURCE_RC: - return CTool::kCToolRc; -- case SourceFile::SOURCE_UNKNOWN: -- case SourceFile::SOURCE_H: -- case SourceFile::SOURCE_O: -- case SourceFile::SOURCE_DEF: -- case SourceFile::SOURCE_GO: -- case SourceFile::SOURCE_RS: -+ case SOURCE_UNKNOWN: -+ case SOURCE_H: -+ case SOURCE_O: -+ case SOURCE_DEF: -+ case SOURCE_GO: -+ case SOURCE_RS: - return kToolNone; - default: - NOTREACHED(); ---- tools/gn/tools/gn/tool.h.orig 2019-05-21 22:00:02 UTC -+++ tools/gn/tools/gn/tool.h -@@ -12,7 +12,7 @@ - #include "tools/gn/label.h" - #include "tools/gn/label_ptr.h" - #include "tools/gn/scope.h" --#include "tools/gn/source_file.h" -+#include "tools/gn/source_file_type.h" - #include "tools/gn/substitution_list.h" - #include "tools/gn/substitution_pattern.h" - -@@ -171,7 +171,7 @@ class Tool { - Toolchain* toolchain, - Err* err); - -- static const char* GetToolTypeForSourceType(SourceFile::Type type); -+ static const char* GetToolTypeForSourceType(SourceFileType type); - static const char* GetToolTypeForTargetFinalOutput(const Target* target); - - protected: ---- tools/gn/tools/gn/toolchain.cc.orig 2019-05-21 22:00:02 UTC -+++ tools/gn/tools/gn/toolchain.cc -@@ -88,16 +88,16 @@ void Toolchain::ToolchainSetupComplete() { - setup_complete_ = true; - } - --const Tool* Toolchain::GetToolForSourceType(SourceFile::Type type) const { -+const Tool* Toolchain::GetToolForSourceType(SourceFileType type) const { - return GetTool(Tool::GetToolTypeForSourceType(type)); - } - --const CTool* Toolchain::GetToolForSourceTypeAsC(SourceFile::Type type) const { -+const CTool* Toolchain::GetToolForSourceTypeAsC(SourceFileType type) const { - return GetToolAsC(Tool::GetToolTypeForSourceType(type)); - } - - const GeneralTool* Toolchain::GetToolForSourceTypeAsGeneral( -- SourceFile::Type type) const { -+ SourceFileType type) const { - return GetToolAsGeneral(Tool::GetToolTypeForSourceType(type)); - } - ---- tools/gn/tools/gn/toolchain.h.orig 2019-05-21 22:00:02 UTC -+++ tools/gn/tools/gn/toolchain.h -@@ -12,6 +12,7 @@ - #include "tools/gn/item.h" - #include "tools/gn/label_ptr.h" - #include "tools/gn/scope.h" -+#include "tools/gn/source_file_type.h" - #include "tools/gn/substitution_type.h" - #include "tools/gn/tool.h" - #include "tools/gn/value.h" -@@ -87,9 +88,9 @@ class Toolchain : public Item { - } - - // Returns the tool for compiling the given source file type. -- const Tool* GetToolForSourceType(SourceFile::Type type) const; -- const CTool* GetToolForSourceTypeAsC(SourceFile::Type type) const; -- const GeneralTool* GetToolForSourceTypeAsGeneral(SourceFile::Type type) const; -+ const Tool* GetToolForSourceType(SourceFileType type) const; -+ const CTool* GetToolForSourceTypeAsC(SourceFileType type) const; -+ const GeneralTool* GetToolForSourceTypeAsGeneral(SourceFileType type) const; - - // Returns the tool that produces the final output for the given target type. - // This isn't necessarily the tool you would expect. For copy target, this ---- tools/gn/tools/gn/visual_studio_writer.cc.orig 2019-05-21 22:00:02 UTC -+++ tools/gn/tools/gn/visual_studio_writer.cc -@@ -24,6 +24,7 @@ - #include "tools/gn/label_pattern.h" - #include "tools/gn/parse_tree.h" - #include "tools/gn/path_output.h" -+#include "tools/gn/source_file_type.h" - #include "tools/gn/standard_out.h" - #include "tools/gn/target.h" - #include "tools/gn/variables.h" Property changes on: head/www/chromium/files/patch-fix-gn-74 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator.cc =================================================================== --- head/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator.cc (revision 504140) +++ head/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator.cc (nonexistent) @@ -1,11 +0,0 @@ ---- base/allocator/partition_allocator/page_allocator.cc.orig 2019-03-11 22:00:51 UTC -+++ base/allocator/partition_allocator/page_allocator.cc -@@ -115,7 +115,7 @@ void* AllocPages(void* address, - uintptr_t align_base_mask = ~align_offset_mask; - DCHECK(!(reinterpret_cast(address) & align_offset_mask)); - --#if defined(OS_LINUX) && defined(ARCH_CPU_64_BITS) -+#if (defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS) - // On 64 bit Linux, we may need to adjust the address space limit for - // guarded allocations. - if (length >= kMinimumGuardedMemorySize) { Property changes on: head/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/patch-services_device_device__service.h =================================================================== --- head/www/chromium/files/patch-services_device_device__service.h (revision 504140) +++ head/www/chromium/files/patch-services_device_device__service.h (nonexistent) @@ -1,11 +0,0 @@ ---- services/device/device_service.h.orig 2019-04-30 22:22:56 UTC -+++ services/device/device_service.h -@@ -200,7 +200,7 @@ class DeviceService : public service_manager::Service - #endif - - #if (defined(OS_LINUX) && defined(USE_UDEV)) || defined(OS_WIN) || \ -- defined(OS_MACOSX) -+ defined(OS_MACOSX) || defined(OS_BSD) - // Requests for the SerialPortManager interface must be bound to - // |serial_port_manager_| on |serial_port_manager_task_runner_| and it will - // be destroyed on that sequence. Property changes on: head/www/chromium/files/patch-services_device_device__service.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/patch-third__party_blink_renderer_platform_heap_stack__frame__depth.cc =================================================================== --- head/www/chromium/files/patch-third__party_blink_renderer_platform_heap_stack__frame__depth.cc (revision 504140) +++ head/www/chromium/files/patch-third__party_blink_renderer_platform_heap_stack__frame__depth.cc (nonexistent) @@ -1,14 +0,0 @@ ---- third_party/blink/renderer/platform/heap/stack_frame_depth.cc.orig 2019-03-11 22:01:04 UTC -+++ third_party/blink/renderer/platform/heap/stack_frame_depth.cc -@@ -15,6 +15,11 @@ - extern "C" void* __libc_stack_end; // NOLINT - #endif - -+#if defined(OS_FREEBSD) -+#include -+#include -+#endif -+ - namespace blink { - - static const char* g_avoid_optimization = nullptr; Property changes on: head/www/chromium/files/patch-third__party_blink_renderer_platform_heap_stack__frame__depth.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.h =================================================================== --- head/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.h (revision 504140) +++ head/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.h (nonexistent) @@ -1,36 +0,0 @@ ---- components/autofill/core/browser/autofill_experiments.h.orig 2019-03-11 22:00:56 UTC -+++ components/autofill/core/browser/autofill_experiments.h -@@ -23,13 +23,13 @@ class SyncService; - namespace autofill { - - // Parameterized Features (grouped with parameter name and options) --#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) - extern const base::Feature kAutofillDropdownLayoutExperiment; - extern const char kAutofillDropdownLayoutParameterName[]; - extern const char kAutofillDropdownLayoutParameterLeadingIcon[]; - extern const char kAutofillDropdownLayoutParameterTrailingIcon[]; - extern const char kAutofillDropdownLayoutParameterTwoLinesLeadingIcon[]; --#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) -+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) - - // Returns true if uploading credit cards to Wallet servers is enabled. This - // requires the appropriate flags and user settings to be true and the user to -@@ -59,7 +59,7 @@ bool OfferStoreUnmaskedCards(bool is_off_the_record); - // Returns whether the account of the active signed-in user should be used. - bool ShouldUseActiveSignedInAccount(); - --#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) - enum class ForcedPopupLayoutState { - kDefault, // No popup layout forced by experiment. - kLeadingIcon, // Experiment forces leading (left in LTR) icon layout. -@@ -73,7 +73,7 @@ enum class ForcedPopupLayoutState { - // if the experiment param matches kAutofillDropdownLayoutParameterLeadingIcon - // or kAutofillDropdownLayoutParameterTrailingIcon, respectively. - ForcedPopupLayoutState GetForcedPopupLayoutState(); --#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) -+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) - - } // namespace autofill - Property changes on: head/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/patch-content_browser_storage__partition__impl__map.cc =================================================================== --- head/www/chromium/files/patch-content_browser_storage__partition__impl__map.cc (revision 504140) +++ head/www/chromium/files/patch-content_browser_storage__partition__impl__map.cc (nonexistent) @@ -1,11 +0,0 @@ ---- content/browser/storage_partition_impl_map.cc.orig 2019-04-30 22:22:46 UTC -+++ content/browser/storage_partition_impl_map.cc -@@ -426,7 +426,7 @@ StoragePartitionImpl* StoragePartitionImplMap::Get( - bool create_request_context = true; - if (base::FeatureList::IsEnabled(network::features::kNetworkService)) { - // These ifdefs should match StoragePartitionImpl::GetURLRequestContext. --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - create_request_context = false; - #elif defined(OS_ANDROID) - create_request_context = Property changes on: head/www/chromium/files/patch-content_browser_storage__partition__impl__map.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/patch-content_browser_storage__partition__impl.cc =================================================================== --- head/www/chromium/files/patch-content_browser_storage__partition__impl.cc (revision 504140) +++ head/www/chromium/files/patch-content_browser_storage__partition__impl.cc (nonexistent) @@ -1,11 +0,0 @@ ---- content/browser/storage_partition_impl.cc.orig 2019-04-30 22:22:46 UTC -+++ content/browser/storage_partition_impl.cc -@@ -773,7 +773,7 @@ net::URLRequestContextGetter* StoragePartitionImpl::Ge - // TODO(jam): enable for all, still used on WebView. - // See copy of this ifdef in: - // StoragePartitionImplMap::Get --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - if (base::FeatureList::IsEnabled(network::features::kNetworkService)) - NOTREACHED(); - #endif Property changes on: head/www/chromium/files/patch-content_browser_storage__partition__impl.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/patch-base_files_memory__mapped__file__posix.cc =================================================================== --- head/www/chromium/files/patch-base_files_memory__mapped__file__posix.cc (revision 504140) +++ head/www/chromium/files/patch-base_files_memory__mapped__file__posix.cc (nonexistent) @@ -1,11 +0,0 @@ ---- base/files/memory_mapped_file_posix.cc.orig 2019-03-11 22:00:51 UTC -+++ base/files/memory_mapped_file_posix.cc -@@ -110,6 +110,8 @@ bool MemoryMappedFile::MapFileRegionToMemory( - // Only Android API>=21 supports the fallocate call. Older versions need - // to manually extend the file by writing zeros at block intervals. - do_manual_extension = true; -+#elif defined(OS_BSD) -+ do_manual_extension = true; - #elif defined(OS_MACOSX) - // MacOS doesn't support fallocate even though their new APFS filesystem - // does support sparse files. It does, however, have the functionality Property changes on: head/www/chromium/files/patch-base_files_memory__mapped__file__posix.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/patch-base_task_task__scheduler_scheduler__single__thread__task__runner__manager__unittest.cc =================================================================== --- head/www/chromium/files/patch-base_task_task__scheduler_scheduler__single__thread__task__runner__manager__unittest.cc (revision 504140) +++ head/www/chromium/files/patch-base_task_task__scheduler_scheduler__single__thread__task__runner__manager__unittest.cc (nonexistent) @@ -1,12 +0,0 @@ ---- base/task/task_scheduler/scheduler_single_thread_task_runner_manager_unittest.cc.orig 2019-03-11 22:00:51 UTC -+++ base/task/task_scheduler/scheduler_single_thread_task_runner_manager_unittest.cc -@@ -295,6 +295,9 @@ TEST_P(TaskSchedulerSingleThreadTaskRunnerManagerCommo - EXPECT_EQ(ThreadPriority::NORMAL, thread_priority_normal); - } - -+#if defined(OS_BSD) -+#define ThreadNamesSet DISABLED_ThreadNamesSet -+#endif - TEST_P(TaskSchedulerSingleThreadTaskRunnerManagerCommonTest, ThreadNamesSet) { - constexpr TaskTraits foo_traits = {TaskPriority::BEST_EFFORT, - TaskShutdownBehavior::BLOCK_SHUTDOWN}; Property changes on: head/www/chromium/files/patch-base_task_task__scheduler_scheduler__single__thread__task__runner__manager__unittest.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/patch-components_autofill__strings.grdp =================================================================== --- head/www/chromium/files/patch-components_autofill__strings.grdp (revision 504140) +++ head/www/chromium/files/patch-components_autofill__strings.grdp (nonexistent) @@ -1,11 +0,0 @@ ---- components/autofill_strings.grdp.orig 2019-04-30 22:22:41 UTC -+++ components/autofill_strings.grdp -@@ -217,7 +217,7 @@ - - Save card - -- -+ - - - Do you want to save this card to your Google Account? Property changes on: head/www/chromium/files/patch-components_autofill__strings.grdp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/chromium/files/extra-patch-clang =================================================================== --- head/www/chromium/files/extra-patch-clang (revision 504140) +++ head/www/chromium/files/extra-patch-clang (revision 504141) @@ -1,98 +1,87 @@ --- base/strings/safe_sprintf_unittest.cc.orig 2019-03-11 22:00:51 UTC +++ base/strings/safe_sprintf_unittest.cc @@ -730,6 +730,7 @@ TEST(SafeSPrintfTest, EmbeddedNul) { } TEST(SafeSPrintfTest, EmitNULL) { +/* Avoid compiler error: http://pastebin.com/1edWUE84 char buf[40]; #if defined(__GNUC__) #pragma GCC diagnostic push @@ -741,6 +742,7 @@ TEST(SafeSPrintfTest, EmitNULL) { EXPECT_EQ("0x0", std::string(buf)); EXPECT_EQ(6, SafeSPrintf(buf, "%s", NULL)); EXPECT_EQ("", std::string(buf)); +*/ #if defined(__GCC__) #pragma GCC diagnostic pop #endif --- base/threading/thread_local_storage_unittest.cc.orig 2019-03-11 22:00:51 UTC +++ base/threading/thread_local_storage_unittest.cc @@ -86,7 +86,7 @@ class ThreadLocalStorageRunner : public DelegateSimple void ThreadLocalStorageCleanup(void *value) { int *ptr = reinterpret_cast(value); // Destructors should never be called with a NULL. - ASSERT_NE(reinterpret_cast(NULL), ptr); + ASSERT_NE(static_cast(NULL), ptr); if (*ptr == kFinalTlsValue) return; // We've been called enough times. ASSERT_LT(kFinalTlsValue, *ptr); --- media/audio/audio_output_proxy_unittest.cc.orig 2019-03-11 22:00:59 UTC +++ media/audio/audio_output_proxy_unittest.cc @@ -410,7 +410,7 @@ class AudioOutputProxyTest : public testing::Test { // |stream| is closed at this point. Start() should reopen it again. EXPECT_CALL(manager(), MakeAudioOutputStream(_, _, _)) .Times(2) - .WillRepeatedly(Return(reinterpret_cast(NULL))); + .WillRepeatedly(Return(static_cast(NULL))); EXPECT_CALL(callback_, OnError()).Times(2); ---- third_party/libjingle_xmpp/task_runner/taskrunner.cc.orig 2019-03-11 22:01:15 UTC -+++ third_party/libjingle_xmpp/task_runner/taskrunner.cc -@@ -80,7 +80,7 @@ void TaskRunner::InternalRunTasks(bool in_destructor) - std::vector::iterator it; - it = std::remove(tasks_.begin(), - tasks_.end(), -- reinterpret_cast(NULL)); -+ static_cast(NULL)); - - tasks_.erase(it, tasks_.end()); - tasks_running_ = false; --- third_party/sfntly/src/cpp/src/sfntly/table/core/cmap_table.cc.orig 2019-03-11 22:08:03 UTC +++ third_party/sfntly/src/cpp/src/sfntly/table/core/cmap_table.cc @@ -439,7 +439,7 @@ CMapTable::CMapFormat0::Builder::Builder( } CMapTable::CMapFormat0::Builder::Builder(const CMapId& cmap_id) - : CMap::Builder(reinterpret_cast(NULL), + : CMap::Builder(static_cast(NULL), CMapFormat::kFormat0, cmap_id) { } @@ -563,7 +563,7 @@ CMapTable::CMapFormat2::Builder::Builder(WritableFontD : CMapTable::CMap::Builder(data ? down_cast( data->Slice(offset, data->ReadUShort( offset + Offset::kFormat0Length))) - : reinterpret_cast(NULL), + : static_cast(NULL), CMapFormat::kFormat2, cmap_id) { // TODO(arthurhsu): FIXIT: heavy lifting and leak, need fix. } @@ -574,7 +574,7 @@ CMapTable::CMapFormat2::Builder::Builder(ReadableFontD : CMapTable::CMap::Builder(data ? down_cast( data->Slice(offset, data->ReadUShort( offset + Offset::kFormat0Length))) - : reinterpret_cast(NULL), + : static_cast(NULL), CMapFormat::kFormat2, cmap_id) { // TODO(arthurhsu): FIXIT: heavy lifting and leak, need fix. } @@ -958,7 +958,7 @@ CMapTable::CMapFormat4::Builder::Builder(WritableFontD CMapTable::CMapFormat4::Builder::Builder(SegmentList* segments, std::vector* glyph_id_array, const CMapId& cmap_id) - : CMap::Builder(reinterpret_cast(NULL), + : CMap::Builder(static_cast(NULL), CMapFormat::kFormat4, cmap_id), segments_(segments->begin(), segments->end()), glyph_id_array_(glyph_id_array->begin(), glyph_id_array->end()) { @@ -966,7 +966,7 @@ CMapTable::CMapFormat4::Builder::Builder(SegmentList* } CMapTable::CMapFormat4::Builder::Builder(const CMapId& cmap_id) - : CMap::Builder(reinterpret_cast(NULL), + : CMap::Builder(static_cast(NULL), CMapFormat::kFormat4, cmap_id) { } Index: head/www/chromium/files/patch-BUILD.gn =================================================================== --- head/www/chromium/files/patch-BUILD.gn (revision 504140) +++ head/www/chromium/files/patch-BUILD.gn (revision 504141) @@ -1,87 +1,95 @@ ---- BUILD.gn.orig 2019-04-30 22:22:25 UTC +--- BUILD.gn.orig 2019-06-04 18:55:14 UTC +++ BUILD.gn -@@ -387,7 +387,7 @@ group("gn_all") { +@@ -385,7 +385,7 @@ group("gn_all") { ] } - if (is_linux || is_android) { + if ((is_linux && !is_bsd) || is_android) { deps += [ "//third_party/breakpad:breakpad_unittests", "//third_party/breakpad:core-2-minidump", -@@ -428,8 +428,6 @@ group("gn_all") { +@@ -426,8 +426,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", ] -@@ -486,10 +484,6 @@ group("gn_all") { +@@ -482,10 +480,6 @@ group("gn_all") { + "//chrome/test:load_library_perf_tests", + "//chrome/test:sync_performance_tests", "//chrome/test/chromedriver:chromedriver", - "//chrome/test/chromedriver:chromedriver_tests", - "//components/sync:run_sync_testserver", - "//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", -@@ -544,10 +538,6 @@ group("gn_all") { +@@ -540,10 +534,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) { -@@ -621,7 +611,7 @@ group("gn_all") { +@@ -618,7 +608,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)" ] } -@@ -878,7 +868,6 @@ if (is_chromeos) { +@@ -757,7 +747,6 @@ group("gn_all") { + "//chrome/browser/vr:vr_common_perftests", + "//chrome/browser/vr:vr_common_unittests", + "//chrome/browser/vr:vr_pixeltests", +- "//tools/perf/contrib/vr_benchmarks:vr_perf_tests", + ] + if (is_desktop_linux && use_ozone) { + deps += [ "//chrome/browser/vr/testapp:vr_testapp" ] +@@ -876,7 +865,6 @@ if (is_chromeos) { "//ppapi/examples/video_decode", "//sandbox/linux:chrome_sandbox", "//sandbox/linux:sandbox_linux_unittests", - "//third_party/breakpad:minidump_stackwalk($host_toolchain)", # Blocked on https://github.com/catapult-project/catapult/issues/2297 #"//third_party/catapult/telemetry:bitmaptools", -@@ -1029,7 +1018,7 @@ if (!is_ios) { +@@ -1029,7 +1017,7 @@ if (!is_ios) { ] } - if (!is_win && !is_android) { + if (!is_win && !is_android && !is_bsd) { data_deps += [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } -@@ -1038,7 +1027,7 @@ if (!is_ios) { +@@ -1038,7 +1026,7 @@ if (!is_ios) { data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } - if (is_linux) { + if (is_linux && !is_bsd) { data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } -@@ -1178,9 +1167,6 @@ group("chromium_builder_perf") { +@@ -1181,9 +1169,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 += [ Index: head/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc =================================================================== --- head/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc (revision 504140) +++ head/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc (revision 504141) @@ -1,11 +1,11 @@ ---- apps/ui/views/app_window_frame_view.cc.orig 2019-03-11 22:00:51 UTC +--- apps/ui/views/app_window_frame_view.cc.orig 2019-06-04 18:55:14 UTC +++ apps/ui/views/app_window_frame_view.cc -@@ -132,7 +132,7 @@ gfx::Rect AppWindowFrameView::GetBoundsForClientView() +@@ -125,7 +125,7 @@ gfx::Rect AppWindowFrameView::GetBoundsForClientView() gfx::Rect AppWindowFrameView::GetWindowBoundsForClientBounds( const gfx::Rect& client_bounds) const { gfx::Rect window_bounds = client_bounds; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) // Get the difference between the widget's client area bounds and window // bounds, and grow |window_bounds| by that amount. gfx::Insets native_frame_insets = Index: head/www/chromium/files/patch-base_BUILD.gn =================================================================== --- head/www/chromium/files/patch-base_BUILD.gn (revision 504140) +++ head/www/chromium/files/patch-base_BUILD.gn (revision 504141) @@ -1,67 +1,67 @@ ---- base/BUILD.gn.orig 2019-04-30 22:22:27 UTC +--- base/BUILD.gn.orig 2019-06-04 18:55:15 UTC +++ base/BUILD.gn -@@ -1188,7 +1188,7 @@ jumbo_component("base") { +@@ -1234,7 +1234,7 @@ jumbo_component("base") { # Needed for if using newer C++ library than sysroot, except if # building inside the cros_sdk environment - use host_toolchain as a # more robust check for this. - if (!use_sysroot && (is_android || (is_linux && !is_chromecast)) && + if (!use_sysroot && (is_android || (is_linux && !is_chromecast) && !is_clang) && host_toolchain != "//build/toolchain/cros:host") { libs += [ "atomic" ] } -@@ -1214,7 +1214,7 @@ jumbo_component("base") { +@@ -1260,7 +1260,7 @@ jumbo_component("base") { "allocator/allocator_shim_override_glibc_weak_symbols.h", ] deps += [ "//base/allocator:tcmalloc" ] - } else if (is_linux && use_allocator == "none") { + } else if ((is_linux && !is_bsd) && use_allocator == "none") { sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ] } else if (is_android && use_allocator == "none") { sources += [ -@@ -1764,6 +1764,33 @@ jumbo_component("base") { +@@ -1813,6 +1813,33 @@ jumbo_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_kqueue.cc", + "files/file_path_watcher_kqueue.h", + "files/file_path_watcher_stub.cc", + "process/memory_stubs.cc", + "process/process_handle_freebsd.cc", + "process/process_iterator_freebsd.cc", + "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) { set_sources_assignment_filter([]) -@@ -2840,6 +2867,12 @@ test("base_unittests") { +@@ -2910,6 +2937,12 @@ test("base_unittests") { ] set_sources_assignment_filter(sources_assignment_filter) } + + if (is_bsd) { + sources -= [ + "debug/proc_maps_linux_unittest.cc", + ] + } if (is_win) { deps += [ "//base:scoped_handle_test_dll" ] Index: head/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h =================================================================== --- head/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h (revision 504140) +++ head/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h (revision 504141) @@ -1,38 +1,11 @@ ---- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2019-04-30 22:22:27 UTC +--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2019-06-04 18:55:15 UTC +++ base/allocator/partition_allocator/page_allocator_internals_posix.h @@ -14,7 +14,7 @@ #if defined(OS_MACOSX) #include #endif -#if defined(OS_LINUX) +#if defined(OS_BSD) || defined(OS_LINUX) #include #include -@@ -48,7 +48,7 @@ int GetAccessFlags(PageAccessibilityConfiguration acce - } - } - --#if defined(OS_LINUX) && defined(ARCH_CPU_64_BITS) -+#if (defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS) - - // Multiple guarded memory regions may exceed the process address space limit. - // This function will raise or lower the limit by |amount|. -@@ -68,7 +68,7 @@ bool AdjustAddressSpaceLimit(int64_t amount) { - // schemes that reduce that to 4 GiB. - constexpr size_t kMinimumGuardedMemorySize = 1ULL << 32; // 4 GiB - --#endif // defined(OS_LINUX) && defined(ARCH_CPU_64_BITS) -+#endif // (defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS) - - void* SystemAllocPagesInternal(void* hint, - size_t length, -@@ -144,7 +144,7 @@ void SetSystemPagesAccessInternal( - void FreePagesInternal(void* address, size_t length) { - CHECK(!munmap(address, length)); - --#if defined(OS_LINUX) && defined(ARCH_CPU_64_BITS) -+#if (defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS) - // Restore the address space limit. - if (length >= kMinimumGuardedMemorySize) { - CHECK(AdjustAddressSpaceLimit(-base::checked_cast(length))); Index: head/www/chromium/files/patch-base_debug_debugger__posix.cc =================================================================== --- head/www/chromium/files/patch-base_debug_debugger__posix.cc (revision 504140) +++ head/www/chromium/files/patch-base_debug_debugger__posix.cc (revision 504141) @@ -1,56 +1,56 @@ ---- base/debug/debugger_posix.cc.orig 2019-03-11 22:00:51 UTC +--- base/debug/debugger_posix.cc.orig 2019-06-04 18:55:15 UTC +++ base/debug/debugger_posix.cc -@@ -86,7 +86,7 @@ bool BeingDebugged() { +@@ -87,7 +87,7 @@ bool BeingDebugged() { KERN_PROC, KERN_PROC_PID, getpid() -#if defined(OS_OPENBSD) +#if defined(OS_BSD) , sizeof(struct kinfo_proc), 0 #endif -@@ -94,33 +94,35 @@ bool BeingDebugged() { +@@ -95,33 +95,35 @@ bool BeingDebugged() { // Caution: struct kinfo_proc is marked __APPLE_API_UNSTABLE. The source and // binary interfaces may change. - struct kinfo_proc info; - size_t info_size = sizeof(info); + struct kinfo_proc *info; + size_t info_size; -#if defined(OS_OPENBSD) if (sysctl(mib, base::size(mib), NULL, &info_size, NULL, 0) < 0) return -1; + info = (struct kinfo_proc *)malloc(info_size); mib[5] = (info_size / sizeof(struct kinfo_proc)); -#endif - int sysctl_result = sysctl(mib, base::size(mib), &info, &info_size, NULL, 0); + int sysctl_result = sysctl(mib, base::size(mib), info, &info_size, NULL, 0); DCHECK_EQ(sysctl_result, 0); if (sysctl_result != 0) { is_set = true; being_debugged = false; - return being_debugged; + goto out; } // This process is being debugged if the P_TRACED flag is set. is_set = true; #if defined(OS_FREEBSD) - being_debugged = (info.ki_flag & P_TRACED) != 0; + being_debugged = (info->ki_flag & P_TRACED) != 0; #elif defined(OS_BSD) - being_debugged = (info.p_flag & P_TRACED) != 0; + being_debugged = (info->p_flag & P_TRACED) != 0; #else - being_debugged = (info.kp_proc.p_flag & P_TRACED) != 0; + being_debugged = (info->kp_proc.p_flag & P_TRACED) != 0; #endif + +out: + free(info); return being_debugged; } Index: head/www/chromium/files/patch-base_debug_elf__reader.cc =================================================================== --- head/www/chromium/files/patch-base_debug_elf__reader.cc (revision 504140) +++ head/www/chromium/files/patch-base_debug_elf__reader.cc (revision 504141) @@ -1,18 +1,18 @@ ---- base/debug/elf_reader.cc.orig 2019-04-30 22:22:28 UTC +--- base/debug/elf_reader.cc.orig 2019-06-04 18:55:15 UTC +++ base/debug/elf_reader.cc -@@ -82,6 +82,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base, - reinterpret_cast(elf_base + header.p_offset); +@@ -83,6 +83,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base, + reinterpret_cast(elf_base + header.p_vaddr); bool found = false; while (current_note < section_end) { +#if !defined(OS_BSD) if (current_note->n_type == NT_GNU_BUILD_ID) { const char* note_name = reinterpret_cast(current_note) + sizeof(Nhdr); -@@ -91,6 +92,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base, +@@ -92,6 +93,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base, break; } } +#endif current_note = reinterpret_cast( reinterpret_cast(current_note) + sizeof(Nhdr) + Index: head/www/chromium/files/patch-base_files_file__util.h =================================================================== --- head/www/chromium/files/patch-base_files_file__util.h (revision 504140) +++ head/www/chromium/files/patch-base_files_file__util.h (revision 504141) @@ -1,11 +1,11 @@ ---- base/files/file_util.h.orig 2019-04-30 22:22:28 UTC +--- base/files/file_util.h.orig 2019-06-04 18:55:15 UTC +++ base/files/file_util.h -@@ -449,7 +449,7 @@ BASE_EXPORT bool VerifyPathControlledByAdmin(const bas +@@ -467,7 +467,7 @@ BASE_EXPORT bool VerifyPathControlledByAdmin(const bas // the directory |path|, in the number of FilePath::CharType, or -1 on failure. BASE_EXPORT int GetMaximumPathComponentLength(const base::FilePath& path); -#if defined(OS_LINUX) || defined(OS_AIX) +#if defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) // Broad categories of file systems as returned by statfs() on Linux. enum FileSystemType { FILE_SYSTEM_UNKNOWN, // statfs failed. Index: head/www/chromium/files/patch-base_files_file__util__posix.cc =================================================================== --- head/www/chromium/files/patch-base_files_file__util__posix.cc (revision 504140) +++ head/www/chromium/files/patch-base_files_file__util__posix.cc (revision 504141) @@ -1,11 +1,11 @@ ---- base/files/file_util_posix.cc.orig 2019-03-17 21:31:57 UTC +--- base/files/file_util_posix.cc.orig 2019-06-04 18:55:15 UTC +++ base/files/file_util_posix.cc -@@ -407,7 +407,7 @@ bool CopyDirectoryExcl(const FilePath& from_path, - #endif // !defined(OS_NACL_NONSFI) +@@ -419,7 +419,7 @@ bool CreatePipe(ScopedFD* read_fd, ScopedFD* write_fd, + } bool CreateLocalNonBlockingPipe(int fds[2]) { -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) return pipe2(fds, O_CLOEXEC | O_NONBLOCK) == 0; #else int raw_fds[2]; Index: head/www/chromium/files/patch-base_process_kill.h =================================================================== --- head/www/chromium/files/patch-base_process_kill.h (revision 504140) +++ head/www/chromium/files/patch-base_process_kill.h (revision 504141) @@ -1,11 +1,16 @@ ---- base/process/kill.h.orig 2019-03-11 22:00:51 UTC +--- base/process/kill.h.orig 2019-06-04 18:55:15 UTC +++ base/process/kill.h -@@ -111,7 +111,7 @@ BASE_EXPORT TerminationStatus GetTerminationStatus(Pro +@@ -111,11 +111,11 @@ BASE_EXPORT TerminationStatus GetTerminationStatus(Pro BASE_EXPORT TerminationStatus GetKnownDeadTerminationStatus( ProcessHandle handle, int* exit_code); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // Spawns a thread to wait asynchronously for the child |process| to exit // and then reaps it. BASE_EXPORT void EnsureProcessGetsReaped(Process process); +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + #endif // defined(OS_POSIX) + + // Registers |process| to be asynchronously monitored for termination, forcibly Index: head/www/chromium/files/patch-base_process_kill__posix.cc =================================================================== --- head/www/chromium/files/patch-base_process_kill__posix.cc (revision 504140) +++ head/www/chromium/files/patch-base_process_kill__posix.cc (revision 504141) @@ -1,11 +1,20 @@ ---- base/process/kill_posix.cc.orig 2019-03-11 22:00:51 UTC +--- base/process/kill_posix.cc.orig 2019-06-04 18:55:15 UTC +++ base/process/kill_posix.cc @@ -168,7 +168,7 @@ void EnsureProcessTerminated(Process process) { 0, new BackgroundReaper(std::move(process), TimeDelta::FromSeconds(2))); } -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) void EnsureProcessGetsReaped(Process process) { DCHECK(!process.is_current()); +@@ -179,7 +179,7 @@ void EnsureProcessGetsReaped(Process process) { + PlatformThread::CreateNonJoinable( + 0, new BackgroundReaper(std::move(process), TimeDelta())); + } +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + #endif // !defined(OS_MACOSX) + #endif // !defined(OS_NACL_NONSFI) Index: head/www/chromium/files/patch-base_process_launch.h =================================================================== --- head/www/chromium/files/patch-base_process_launch.h (revision 504140) +++ head/www/chromium/files/patch-base_process_launch.h (revision 504141) @@ -1,20 +1,20 @@ ---- base/process/launch.h.orig 2019-04-30 22:22:28 UTC +--- base/process/launch.h.orig 2019-06-04 18:55:15 UTC +++ base/process/launch.h -@@ -179,7 +179,7 @@ struct BASE_EXPORT LaunchOptions { - FileHandleMappingVector fds_to_remap; - #endif // defined(OS_WIN) +@@ -181,7 +181,7 @@ struct BASE_EXPORT LaunchOptions { + bool clear_environment = false; + #endif // OS_WIN || OS_POSIX || OS_FUCHSIA -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // If 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 -@@ -192,7 +192,7 @@ struct BASE_EXPORT LaunchOptions { +@@ -194,7 +194,7 @@ struct BASE_EXPORT LaunchOptions { // Sets parent process death signal to SIGKILL. bool kill_on_parent_death = false; -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) #if defined(OS_MACOSX) && !defined(OS_IOS) // Mach ports that will be accessible to the child process. These are not Index: head/www/chromium/files/patch-base_process_launch__posix.cc =================================================================== --- head/www/chromium/files/patch-base_process_launch__posix.cc (revision 504140) +++ head/www/chromium/files/patch-base_process_launch__posix.cc (revision 504141) @@ -1,10 +1,10 @@ ---- base/process/launch_posix.cc.orig 2019-03-11 22:00:51 UTC +--- base/process/launch_posix.cc.orig 2019-06-04 18:55:15 UTC +++ base/process/launch_posix.cc -@@ -64,6 +64,7 @@ +@@ -65,6 +65,7 @@ #error "macOS should use launch_mac.cc" #endif +#pragma weak environ extern char** environ; namespace base { Index: head/www/chromium/files/patch-base_sampling__heap__profiler_sampling__heap__profiler.cc =================================================================== --- head/www/chromium/files/patch-base_sampling__heap__profiler_sampling__heap__profiler.cc (nonexistent) +++ head/www/chromium/files/patch-base_sampling__heap__profiler_sampling__heap__profiler.cc (revision 504141) @@ -0,0 +1,24 @@ +--- base/sampling_heap_profiler/sampling_heap_profiler.cc.orig 2019-06-04 18:55:15 UTC ++++ base/sampling_heap_profiler/sampling_heap_profiler.cc +@@ -30,6 +30,10 @@ + #include + #endif + ++#if defined(OS_BSD) ++#include ++#endif ++ + #if defined(OS_ANDROID) && BUILDFLAG(CAN_UNWIND_WITH_CFI_TABLE) && \ + defined(OFFICIAL_BUILD) + #include "base/trace_event/cfi_backtrace_android.h" +@@ -65,6 +69,10 @@ const char* GetAndLeakThreadName() { + #elif defined(OS_MACOSX) + int err = pthread_getname_np(pthread_self(), name, kBufferLen); + if (err == 0 && *name != '\0') ++ return strdup(name); ++#elif defined(OS_BSD) ++ pthread_get_name_np(pthread_self(), name, kBufferLen); ++ if (*name != '\0') + return strdup(name); + #endif // defined(OS_LINUX) || defined(OS_ANDROID) + Property changes on: head/www/chromium/files/patch-base_sampling__heap__profiler_sampling__heap__profiler.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-base_system_sys__info.h =================================================================== --- head/www/chromium/files/patch-base_system_sys__info.h (nonexistent) +++ head/www/chromium/files/patch-base_system_sys__info.h (revision 504141) @@ -0,0 +1,11 @@ +--- base/system/sys_info.h.orig 2019-06-04 18:55:15 UTC ++++ base/system/sys_info.h +@@ -192,7 +192,7 @@ class BASE_EXPORT SysInfo { + static bool IsLowEndDeviceImpl(); + static HardwareInfo GetHardwareInfoSync(); + +-#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_BSD) + static int64_t AmountOfAvailablePhysicalMemory( + const SystemMemoryInfoKB& meminfo); + #endif Property changes on: head/www/chromium/files/patch-base_system_sys__info.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-build_config_BUILD.gn =================================================================== --- head/www/chromium/files/patch-build_config_BUILD.gn (revision 504140) +++ head/www/chromium/files/patch-build_config_BUILD.gn (revision 504141) @@ -1,30 +1,30 @@ ---- build/config/BUILD.gn.orig 2019-04-30 22:22:28 UTC +--- build/config/BUILD.gn.orig 2019-06-04 18:55:15 UTC +++ build/config/BUILD.gn -@@ -162,7 +162,7 @@ config("debug") { +@@ -163,7 +163,7 @@ config("debug") { # builds, and we have to tell it to turn it off. defines += [ "_HAS_ITERATOR_DEBUGGING=0" ] } - } else if (is_linux && current_cpu == "x64" && enable_iterator_debugging) { + } else if ((is_linux || is_bsd) && current_cpu == "x64" && enable_iterator_debugging) { # Enable libstdc++ debugging facilities to help catch problems early, see # http://crbug.com/65151 . # TODO(phajdan.jr): Should we enable this for all of POSIX? -@@ -263,9 +263,7 @@ config("default_libs") { +@@ -264,9 +264,7 @@ config("default_libs") { ] } else if (is_linux) { libs = [ - "dl", "pthread", - "rt", ] } } -@@ -346,7 +344,7 @@ config("executable_config") { +@@ -354,7 +352,7 @@ config("executable_config") { "//build/config/ios:ios_dynamic_flags", "//build/config/ios:ios_executable_flags", ] - } else if (is_linux || is_android || current_os == "aix") { + } else if (is_linux || is_bsd || is_android || current_os == "aix") { configs += [ "//build/config/gcc:executable_config" ] if (is_chromecast) { configs += [ "//build/config/chromecast:executable_config" ] Index: head/www/chromium/files/patch-build_config_BUILDCONFIG.gn =================================================================== --- head/www/chromium/files/patch-build_config_BUILDCONFIG.gn (revision 504140) +++ head/www/chromium/files/patch-build_config_BUILDCONFIG.gn (revision 504141) @@ -1,48 +1,48 @@ ---- build/config/BUILDCONFIG.gn.orig 2019-03-11 22:00:52 UTC +--- build/config/BUILDCONFIG.gn.orig 2019-06-04 18:55:15 UTC +++ build/config/BUILDCONFIG.gn @@ -131,10 +131,10 @@ declare_args() { is_official_build = false # Whether we're a traditional desktop unix. - is_desktop_linux = current_os == "linux" + is_desktop_linux = current_os == "linux" || current_os == "freebsd" # Set to true when compiling with the Clang compiler. - is_clang = current_os != "linux" || + is_clang = current_os != "linux" || current_os == "freebsd" || (current_cpu != "s390x" && current_cpu != "s390" && current_cpu != "ppc64" && current_cpu != "ppc" && current_cpu != "mips" && current_cpu != "mips64") @@ -186,8 +186,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" @@ -224,7 +224,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" -@@ -291,10 +291,11 @@ is_android = current_os == "android" +@@ -288,10 +288,11 @@ is_android = current_os == "android" is_chromeos = current_os == "chromeos" is_fuchsia = current_os == "fuchsia" is_ios = current_os == "ios" -is_linux = current_os == "chromeos" || current_os == "linux" +is_linux = current_os == "chromeos" || current_os == "linux" || current_os == "freebsd" is_mac = current_os == "mac" is_nacl = current_os == "nacl" is_win = current_os == "win" || current_os == "winuwp" +is_bsd = current_os == "freebsd" is_posix = !is_win && !is_fuchsia Index: head/www/chromium/files/patch-build_config_compiler_BUILD.gn =================================================================== --- head/www/chromium/files/patch-build_config_compiler_BUILD.gn (revision 504140) +++ head/www/chromium/files/patch-build_config_compiler_BUILD.gn (revision 504141) @@ -1,83 +1,92 @@ ---- build/config/compiler/BUILD.gn.orig 2019-04-30 22:22:28 UTC +--- build/config/compiler/BUILD.gn.orig 2019-06-04 18:55:15 UTC +++ build/config/compiler/BUILD.gn @@ -54,7 +54,7 @@ declare_args() { # only two architectures that are currently checked in). Turn this off when # you are using a custom toolchain and need to control -B in cflags. linux_use_bundled_binutils = - linux_use_bundled_binutils_override && is_linux && + linux_use_bundled_binutils_override && (is_linux && !is_bsd) && (current_cpu == "x64" || current_cpu == "x86") binutils_path = rebase_path("//third_party/binutils/Linux_x64/Release/bin", root_build_dir) -@@ -279,7 +279,7 @@ config("compiler") { +@@ -269,7 +269,7 @@ config("compiler") { # Linker warnings. if (fatal_linker_warnings && !(is_chromeos && current_cpu == "arm") && !(is_android && use_order_profiling) && !is_mac && !is_ios && - current_os != "aix") { + current_os != "aix" && !is_bsd) { # TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580 # TODO(lizeb,pasko): Fix link errors when linking with order_profiling=1 # crbug.com/485542 -@@ -381,7 +381,7 @@ config("compiler") { +@@ -363,7 +363,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", -@@ -489,7 +489,7 @@ config("compiler") { +@@ -471,7 +471,7 @@ config("compiler") { } } - if (is_clang && !is_nacl && !use_xcode_clang) { + if (is_clang && !is_nacl && !use_xcode_clang && !is_bsd) { - cflags += [ - # TODO(hans): Remove this once Clang generates better optimized debug info - # by default. https://crbug.com/765793 -@@ -757,7 +757,7 @@ config("compiler_cpu_abi") { + cflags += [ "-fcrash-diagnostics-dir=" + + rebase_path("//tools/clang/crashreports", root_build_dir) ] + +@@ -740,7 +740,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" ] } -@@ -1507,7 +1507,7 @@ config("default_warnings") { +@@ -1174,7 +1174,7 @@ config("assembler_debug_dir") { + # TODO(thakis): Once openmax_dl no longer uses -fno-integrated-as, move + # this behind the -fdebug-compilation-dir cflags in the "compiler" config. + if (symbol_level != 0 && is_clang && strip_absolute_paths_from_debug_symbols) { +- 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,." ] + } +@@ -1490,7 +1490,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 += [ -@@ -1707,7 +1707,7 @@ config("thin_archive") { +@@ -1699,7 +1699,7 @@ config("thin_archive") { # Mac and iOS use the mac-specific "libtool" command, not ar, which doesn't # have a "thin archive" mode (it does accept -T, but it means truncating # archive names to 16 characters, which is not what we want). - if ((is_posix && !is_nacl && !is_mac && !is_ios) || is_fuchsia) { + if ((is_posix && !is_nacl && !is_mac && !is_ios && !is_bsd) || is_fuchsia) { arflags = [ "-T" ] } else if (is_win && use_lld) { arflags = [ "/llvmlibthin" ] -@@ -2291,7 +2291,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" ] - } +@@ -2286,7 +2286,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" ] } + if (use_debug_fission && !is_nacl && !is_android) { -@@ -2312,7 +2312,7 @@ config("symbols") { +@@ -2307,7 +2307,7 @@ config("symbols") { # DWARF info may be corrupt; offsets in a range list entry are in different # sections" there. Maybe just a bug in nacl_switch_32.S. if (!is_mac && !is_ios && !is_nacl && current_cpu != "x86" && - (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. Index: head/www/chromium/files/patch-build_config_features.gni =================================================================== --- head/www/chromium/files/patch-build_config_features.gni (revision 504140) +++ head/www/chromium/files/patch-build_config_features.gni (revision 504141) @@ -1,11 +1,11 @@ ---- build/config/features.gni.orig 2019-03-11 22:00:52 UTC +--- build/config/features.gni.orig 2019-06-04 18:55:15 UTC +++ build/config/features.gni -@@ -41,7 +41,7 @@ declare_args() { +@@ -45,7 +45,7 @@ declare_args() { } # libudev usage. This currently only affects the content layer. - use_udev = is_linux && !is_chromecast + use_udev = is_linux && !is_chromecast && !is_bsd use_dbus = is_linux && !is_chromecast Index: head/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni =================================================================== --- head/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni (revision 504140) +++ head/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni (revision 504141) @@ -1,45 +1,45 @@ ---- build/toolchain/gcc_toolchain.gni.orig 2019-04-30 22:22:28 UTC +--- build/toolchain/gcc_toolchain.gni.orig 2019-06-04 18:55:15 UTC +++ build/toolchain/gcc_toolchain.gni -@@ -44,6 +44,11 @@ analyzer_wrapper = - rebase_path("//build/toolchain/clang_static_analyzer_wrapper.py", - root_build_dir) + " --mode=clang" +@@ -36,6 +36,11 @@ if (is_linux && target_os == "android") { + enable_resource_whitelist_generation = false + } +declare_args() { + extra_cxxflags = "" + extra_ldflags = "" +} + # This template defines a toolchain for something that works like gcc # (including clang). # -@@ -636,13 +641,23 @@ template("clang_toolchain") { +@@ -617,13 +622,23 @@ template("clang_toolchain") { } 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" + if (is_bsd) { + prefix = "/usr/local/bin" + cc = "cc" + cxx = "c++" + ld = cxx + readelf = "readelf" + ar = "${prefix}/ar" + nm = "${toolprefix}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" + } forward_variables_from(invoker, [ Index: head/www/chromium/files/patch-build_toolchain_get__concurrent__links.py =================================================================== --- head/www/chromium/files/patch-build_toolchain_get__concurrent__links.py (revision 504140) +++ head/www/chromium/files/patch-build_toolchain_get__concurrent__links.py (revision 504141) @@ -1,17 +1,17 @@ ---- build/toolchain/get_concurrent_links.py.orig 2019-03-11 22:00:52 UTC +--- build/toolchain/get_concurrent_links.py.orig 2019-06-04 18:55:15 UTC +++ build/toolchain/get_concurrent_links.py -@@ -46,6 +46,14 @@ def _GetTotalMemoryInBytes(): +@@ -48,6 +48,14 @@ def _GetTotalMemoryInBytes(): return int(subprocess.check_output(['sysctl', '-n', 'hw.memsize'])) except Exception: return 0 + elif sys.platform.startswith('freebsd'): + try: + avail_bytes = int(subprocess.check_output(['sysctl', '-n', 'hw.physmem'])) + # With -fuse-lld it doesn't take a lot of ram, feel free to change that + # 1 * ... to needed amount + return max(1, avail_bytes / (1 * (2 ** 30))) # total / 4GB + except Exception: + return 1 # TODO(scottmg): Implement this for other platforms. return 0 Index: head/www/chromium/files/patch-cc_BUILD.gn =================================================================== --- head/www/chromium/files/patch-cc_BUILD.gn (revision 504140) +++ head/www/chromium/files/patch-cc_BUILD.gn (revision 504141) @@ -1,21 +1,21 @@ ---- cc/BUILD.gn.orig 2019-04-30 22:22:28 UTC +--- cc/BUILD.gn.orig 2019-06-04 18:55:15 UTC +++ cc/BUILD.gn -@@ -554,7 +554,7 @@ cc_test_static_library("test_support") { +@@ -562,7 +562,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", ] -@@ -753,9 +753,6 @@ cc_test("cc_unittests") { +@@ -762,9 +762,6 @@ cc_test("cc_unittests") { "//ui/gfx/geometry", "//ui/gl", "//ui/gl:test_support", - ] - data_deps = [ - "//third_party/mesa_headers", ] } Index: head/www/chromium/files/patch-cc_scheduler_compositor__frame__reporting__controller.cc =================================================================== --- head/www/chromium/files/patch-cc_scheduler_compositor__frame__reporting__controller.cc (nonexistent) +++ head/www/chromium/files/patch-cc_scheduler_compositor__frame__reporting__controller.cc (revision 504141) @@ -0,0 +1,11 @@ +--- cc/scheduler/compositor_frame_reporting_controller.cc.orig 2019-06-04 18:55:15 UTC ++++ cc/scheduler/compositor_frame_reporting_controller.cc +@@ -31,8 +31,6 @@ void CompositorFrameReportingController::WillBeginImpl + + void CompositorFrameReportingController::WillBeginMainFrame() { + DCHECK(reporters_[PipelineStage::kBeginImplFrame]); +- DCHECK_NE(reporters_[PipelineStage::kBeginMainFrame], +- reporters_[PipelineStage::kBeginImplFrame]); + reporters_[PipelineStage::kBeginImplFrame]->StartStage( + "SendBeginMainFrameToCommit"); + AdvanceReporterStage(PipelineStage::kBeginImplFrame, Property changes on: head/www/chromium/files/patch-cc_scheduler_compositor__frame__reporting__controller.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-cc_trees_property__tree.cc =================================================================== --- head/www/chromium/files/patch-cc_trees_property__tree.cc (revision 504140) +++ head/www/chromium/files/patch-cc_trees_property__tree.cc (revision 504141) @@ -1,20 +1,20 @@ ---- cc/trees/property_tree.cc.orig 2019-04-30 22:22:29 UTC +--- cc/trees/property_tree.cc.orig 2019-06-04 18:55:15 UTC +++ cc/trees/property_tree.cc -@@ -1329,13 +1329,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro +@@ -1334,13 +1334,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro gfx::Size clip_layer_bounds = container_bounds(scroll_node->id); - gfx::ScrollOffset max_offset( + gfx::ScrollOffset _max_offset( scaled_scroll_bounds.width() - clip_layer_bounds.width(), scaled_scroll_bounds.height() - clip_layer_bounds.height()); - max_offset.Scale(1 / scale_factor); - max_offset.SetToMax(gfx::ScrollOffset()); - return max_offset; + _max_offset.Scale(1 / scale_factor); + _max_offset.SetToMax(gfx::ScrollOffset()); + return _max_offset; } gfx::SizeF ScrollTree::scroll_bounds(int scroll_node_id) const { Index: head/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc =================================================================== --- head/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc (revision 504140) +++ head/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc (revision 504141) @@ -1,128 +1,128 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2019-04-30 22:22:30 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2019-06-04 18:55:16 UTC +++ chrome/app/chrome_main_delegate.cc -@@ -101,7 +101,7 @@ +@@ -100,7 +100,7 @@ #include "chrome/app/shutdown_signal_handlers_posix.h" #endif -#if BUILDFLAG(ENABLE_NACL) && defined(OS_LINUX) +#if BUILDFLAG(ENABLE_NACL) && defined(OS_LINUX) && !defined(OS_BSD) #include "components/nacl/common/nacl_paths.h" #include "components/nacl/zygote/nacl_fork_delegate_linux.h" #endif @@ -137,7 +137,7 @@ #include "v8/include/v8.h" #endif -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) #include "base/environment.h" #endif -@@ -238,7 +238,7 @@ bool UseHooks() { +@@ -240,7 +240,7 @@ bool UseHooks() { #endif // defined(OS_WIN) -#if defined(OS_LINUX) +#if defined(OS_LINUX) && !defined(OS_BSD) void AdjustLinuxOOMScore(const std::string& process_type) { // Browsers and zygotes should still be killable, but killed last. const int kZygoteScore = 0; -@@ -297,7 +297,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty +@@ -299,7 +299,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty if (score > -1) base::AdjustOOMScore(base::GetCurrentProcId(), score); } -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) && !defined(OS_BSD) // Returns true if this subprocess type needs the ResourceBundle initialized // and resources loaded. -@@ -342,7 +342,7 @@ bool HandleVersionSwitches(const base::CommandLine& co +@@ -344,7 +344,7 @@ bool HandleVersionSwitches(const base::CommandLine& co return false; } -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || 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) || -@@ -352,7 +352,7 @@ void HandleHelpSwitches(const base::CommandLine& comma +@@ -354,7 +354,7 @@ void HandleHelpSwitches(const base::CommandLine& comma PLOG(FATAL) << "execlp failed"; } } -#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) +#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) #if !defined(OS_MACOSX) && !defined(OS_ANDROID) void SIGTERMProfilingShutdown(int signal) { -@@ -406,7 +406,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -408,7 +408,7 @@ void InitializeUserDataDir(base::CommandLine* command_ std::string process_type = command_line->GetSwitchValueASCII(switches::kProcessType); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // 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. -@@ -418,7 +418,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -420,7 +420,7 @@ void InitializeUserDataDir(base::CommandLine* command_ user_data_dir = base::FilePath::FromUTF8Unsafe(user_data_dir_string); } } -#endif // OS_LINUX +#endif // OS_LINUX || OS_BSD #if defined(OS_MACOSX) policy::path_parser::CheckUserDataDirPolicy(&user_data_dir); #endif // OS_MAC -@@ -475,7 +475,7 @@ void InitLogging(const std::string& process_type) { +@@ -477,7 +477,7 @@ void InitLogging(const std::string& process_type) { void RecordMainStartupMetrics(base::TimeTicks exe_entry_point_ticks) { if (!exe_entry_point_ticks.is_null()) startup_metric_utils::RecordExeMainEntryPointTicks(exe_entry_point_ticks); -#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) +#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) // Record the startup process creation time on supported platforms. startup_metric_utils::RecordStartupProcessCreationTime( base::Process::Current().CreationTime()); -@@ -613,7 +613,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -619,7 +619,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi *exit_code = 0; return true; // Got a --version switch; exit with a success error code. } -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) // This will directly exit if the user asked for help. HandleHelpSwitches(command_line); #endif -@@ -637,7 +637,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -643,7 +643,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi #if defined(OS_CHROMEOS) chromeos::RegisterPathProvider(); #endif -#if BUILDFLAG(ENABLE_NACL) && defined(OS_LINUX) +#if BUILDFLAG(ENABLE_NACL) && defined(OS_LINUX) && !defined(OS_BSD) nacl::RegisterPathProvider(); #endif -@@ -953,7 +953,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -965,7 +965,7 @@ void ChromeMainDelegate::PreSandboxStartup() { InitializePDF(); #endif -#if defined(OS_POSIX) && !defined(OS_MACOSX) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != service_manager::switches::kZygoteProcess) { #if defined(OS_ANDROID) -@@ -968,7 +968,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -980,7 +980,7 @@ void ChromeMainDelegate::PreSandboxStartup() { breakpad::InitCrashReporter(process_type); #endif // defined(OS_ANDROID) } -#endif // defined(OS_POSIX) && !defined(OS_MACOSX) +#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) // After all the platform Breakpads have been initialized, store the command // line for crash reporting. -@@ -978,7 +978,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -990,7 +990,7 @@ void ChromeMainDelegate::PreSandboxStartup() { void ChromeMainDelegate::SandboxInitialized(const std::string& process_type) { // Note: If you are adding a new process type below, be sure to adjust the // AdjustLinuxOOMScore function too. -#if defined(OS_LINUX) +#if defined(OS_LINUX) && !defined(OS_BSD) AdjustLinuxOOMScore(process_type); #endif #if defined(OS_WIN) Index: head/www/chromium/files/patch-chrome_app_chromium__strings.grd =================================================================== --- head/www/chromium/files/patch-chrome_app_chromium__strings.grd (revision 504140) +++ head/www/chromium/files/patch-chrome_app_chromium__strings.grd (revision 504141) @@ -1,29 +1,29 @@ ---- chrome/app/chromium_strings.grd.orig 2019-04-30 22:22:30 UTC +--- chrome/app/chromium_strings.grd.orig 2019-06-04 18:55:16 UTC +++ chrome/app/chromium_strings.grd -@@ -690,7 +690,7 @@ Signing in anyway will merge Chromium information like +@@ -710,7 +710,7 @@ Signing in anyway will merge Chromium information like - + - + Your system administrator has configured Chromium to open an alternative browser to access $1example.com. -@@ -816,7 +816,7 @@ Signing in anyway will merge Chromium information like +@@ -839,7 +839,7 @@ Signing in anyway will merge Chromium information like - + 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. -@@ -1064,7 +1064,7 @@ Please check your email at $2 +@@ -1098,7 +1098,7 @@ Please check your email at $2 - + Restart Chromium to enable $1Flash Index: head/www/chromium/files/patch-chrome_app_generated__resources.grd =================================================================== --- head/www/chromium/files/patch-chrome_app_generated__resources.grd (revision 504140) +++ head/www/chromium/files/patch-chrome_app_generated__resources.grd (revision 504141) @@ -1,29 +1,29 @@ ---- chrome/app/generated_resources.grd.orig 2019-04-30 22:22:30 UTC +--- chrome/app/generated_resources.grd.orig 2019-06-04 18:55:16 UTC +++ chrome/app/generated_resources.grd -@@ -4737,7 +4737,7 @@ Keep your key file in a safe place. You will need it t +@@ -4793,7 +4793,7 @@ Keep your key file in a safe place. You will need it t - + Legacy Browser Support -@@ -6228,7 +6228,7 @@ the Bookmarks menu."> +@@ -6304,7 +6304,7 @@ the Bookmarks menu."> Google Pay - + Use system title bar and borders -@@ -7012,7 +7012,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -7127,7 +7127,7 @@ Please help our engineers fix this problem. Tell us wh Set as default - + Minimize Index: head/www/chromium/files/patch-chrome_app_google__chrome__strings.grd =================================================================== --- head/www/chromium/files/patch-chrome_app_google__chrome__strings.grd (revision 504140) +++ head/www/chromium/files/patch-chrome_app_google__chrome__strings.grd (revision 504141) @@ -1,29 +1,29 @@ ---- chrome/app/google_chrome_strings.grd.orig 2019-04-30 22:22:30 UTC +--- chrome/app/google_chrome_strings.grd.orig 2019-06-04 18:55:16 UTC +++ chrome/app/google_chrome_strings.grd -@@ -701,7 +701,7 @@ Signing in anyway will merge Chrome information like b +@@ -722,7 +722,7 @@ Signing in anyway will merge Chrome information like b - + - + Your system administrator has configured Google Chrome to open an alternative browser to access $1example.com. -@@ -827,7 +827,7 @@ Signing in anyway will merge Chrome information like b +@@ -851,7 +851,7 @@ Signing in anyway will merge Chrome information like b - + 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. -@@ -1082,7 +1082,7 @@ Please check your email at $2 +@@ -1117,7 +1117,7 @@ Please check your email at $2 - + Restart Chrome to enable $1Flash Index: head/www/chromium/files/patch-chrome_app_settings__strings.grdp =================================================================== --- head/www/chromium/files/patch-chrome_app_settings__strings.grdp (revision 504140) +++ head/www/chromium/files/patch-chrome_app_settings__strings.grdp (revision 504141) @@ -1,20 +1,20 @@ ---- chrome/app/settings_strings.grdp.orig 2019-04-30 22:22:32 UTC +--- chrome/app/settings_strings.grdp.orig 2019-06-04 18:55:16 UTC +++ chrome/app/settings_strings.grdp -@@ -628,7 +628,7 @@ +@@ -634,7 +634,7 @@ Themes - + GTK+ -@@ -642,7 +642,7 @@ +@@ -648,7 +648,7 @@ Use Classic - + Reset to default Index: head/www/chromium/files/patch-chrome_browser_about__flags.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_about__flags.cc (revision 504140) +++ head/www/chromium/files/patch-chrome_browser_about__flags.cc (revision 504141) @@ -1,118 +1,127 @@ ---- chrome/browser/about_flags.cc.orig 2019-04-30 22:22:32 UTC +--- chrome/browser/about_flags.cc.orig 2019-06-04 18:55:16 UTC +++ chrome/browser/about_flags.cc -@@ -1615,13 +1615,13 @@ const FeatureEntry kFeatureEntries[] = { - SINGLE_VALUE_TYPE( - spellcheck::switches::kEnableSpellingFeedbackFieldTrial)}, - #endif // ENABLE_SPELLCHECK +@@ -1533,13 +1533,13 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kCloudPrintXpsDescription, kOsWin, + SINGLE_VALUE_TYPE(switches::kEnableCloudPrintXps)}, + #endif // OS_WIN -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) {"enable-webgl2-compute-context", flag_descriptions::kWebGL2ComputeContextName, flag_descriptions::kWebGL2ComputeContextDescription, kOsWin | kOsLinux | kOsCrOS, SINGLE_VALUE_TYPE(switches::kEnableWebGL2ComputeContext)}, -#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) {"enable-webgl-draft-extensions", flag_descriptions::kWebglDraftExtensionsName, flag_descriptions::kWebglDraftExtensionsDescription, kOsAll, -@@ -2128,12 +2128,12 @@ const FeatureEntry kFeatureEntries[] = { +@@ -1741,7 +1741,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kEnableDataSaverLiteModeRebrandName, + flag_descriptions::kEnableDataSaverLiteModeRebrandDescription, kOsAll, + FEATURE_VALUE_TYPE(previews::features::kDataSaverLiteModeRebranding)}, +-#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, + SINGLE_VALUE_TYPE( +@@ -2007,12 +2007,12 @@ const FeatureEntry kFeatureEntries[] = { {"force-text-direction", flag_descriptions::kForceTextDirectionName, flag_descriptions::kForceTextDirectionDescription, kOsAll, MULTI_VALUE_TYPE(kForceTextDirectionChoices)}, -#if defined(OS_WIN) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) {"enable-input-ime-api", flag_descriptions::kEnableInputImeApiName, flag_descriptions::kEnableInputImeApiDescription, kOsWin | kOsLinux, ENABLE_DISABLE_VALUE_TYPE(switches::kEnableInputImeAPI, switches::kDisableInputImeAPI)}, -#endif // OS_WIN || OS_LINUX +#endif // OS_WIN || OS_LINUX || OS_BSD - {"enable-origin-trials", flag_descriptions::kOriginTrialsName, - flag_descriptions::kOriginTrialsDescription, kOsAll, - FEATURE_VALUE_TYPE(features::kOriginTrials)}, -@@ -2321,12 +2321,12 @@ const FeatureEntry kFeatureEntries[] = { + {"enable-brotli", flag_descriptions::kEnableBrotliName, + flag_descriptions::kEnableBrotliDescription, kOsAll, + FEATURE_VALUE_TYPE(features::kBrotliEncoding)}, +@@ -2132,12 +2132,12 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(chrome::android::kAndroidNightMode)}, #endif // BUILDFLAG(ENABLE_ANDROID_NIGHT_MODE) #endif // OS_ANDROID -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) {"passwords-migrate-linux-to-login-db", flag_descriptions::kPasswordsMigrateLinuxToLoginDBName, flag_descriptions::kPasswordsMigrateLinuxToLoginDBDescription, kOsLinux, FEATURE_VALUE_TYPE(password_manager::features::kMigrateLinuxToLoginDB)}, -#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) +#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) {"enable-experimental-accessibility-features", flag_descriptions::kExperimentalAccessibilityFeaturesName, flag_descriptions::kExperimentalAccessibilityFeaturesDescription, kOsCrOS, -@@ -2685,7 +2685,7 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kOmniboxRichEntitySuggestionsDescription, kOsAll, - FEATURE_VALUE_TYPE(omnibox::kOmniboxRichEntitySuggestions)}, +@@ -2520,7 +2520,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kOmniboxLocalEntitySuggestionsDescription, kOsDesktop, + FEATURE_VALUE_TYPE(omnibox::kOmniboxLocalEntitySuggestions)}, -#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) {"omnibox-experimental-keyword-mode", flag_descriptions::kOmniboxExperimentalKeywordModeName, flag_descriptions::kOmniboxExperimentalKeywordModeDescription, kOsDesktop, -@@ -2716,7 +2716,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2556,7 +2556,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kOmniboxDeduplicateDriveUrlsName, flag_descriptions::kOmniboxDeduplicateDriveUrlsDescription, kOsDesktop, FEATURE_VALUE_TYPE(omnibox::kDedupeGoogleDriveURLs)}, -#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) +#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) {"enable-speculative-service-worker-start-on-query-input", flag_descriptions::kSpeculativeServiceWorkerStartOnQueryInputName, -@@ -3040,7 +3040,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2857,7 +2857,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kClickToOpenPDFDescription, kOsAll, FEATURE_VALUE_TYPE(features::kClickToOpenPDFPlaceholder)}, -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) {"direct-manipulation-stylus", flag_descriptions::kDirectManipulationStylusName, flag_descriptions::kDirectManipulationStylusDescription, -@@ -3057,7 +3057,7 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kLinkManagedNoticeToChromeUIManagementURLDescription, - kOsWin | kOsMac | kOsLinux, - FEATURE_VALUE_TYPE(features::kLinkManagedNoticeToChromeUIManagementURL)}, +@@ -2868,7 +2868,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kShowManagedUiDescription, + kOsWin | kOsMac | kOsLinux | kOsCrOS, + FEATURE_VALUE_TYPE(features::kShowManagedUi)}, -#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) #if !defined(OS_ANDROID) {"doodles-on-local-ntp", flag_descriptions::kDoodlesOnLocalNtpName, -@@ -3940,7 +3940,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3731,7 +3731,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kForceEnableSystemAec)}, #endif // defined(OS_MACOSX) || defined(OS_CHROMEOS) -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) {"autofill-always-show-server-cards-in-sync-transport", flag_descriptions::kAutofillAlwaysShowServerCardsInSyncTransportName, flag_descriptions:: -@@ -3948,7 +3948,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3739,7 +3739,7 @@ const FeatureEntry kFeatureEntries[] = { kOsMac | kOsWin | kOsLinux, FEATURE_VALUE_TYPE( autofill::features::kAutofillAlwaysShowServerCardsInSyncTransport)}, -#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) #if BUILDFLAG(ENABLE_PRINT_PREVIEW) && defined(OS_MACOSX) {"enable-custom-mac-paper-sizes", -@@ -3993,13 +3993,13 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3785,13 +3785,13 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kCrostiniAppSearch)}, #endif // OS_CHROMEOS -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) {"autofill-settings-split-by-card-type", flag_descriptions::kAutofillSettingsSplitByCardTypeName, flag_descriptions::kAutofillSettingsSplitByCardTypeDescription, kOsMac | kOsWin | kOsLinux, FEATURE_VALUE_TYPE(autofill::features::kAutofillSettingsCardTypeSplit)}, -#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) #if !defined(OS_ANDROID) {"hardware-media-key-handling", Index: head/www/chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc (revision 504140) +++ head/www/chromium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc (revision 504141) @@ -1,11 +1,17 @@ ---- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig 2019-06-04 18:55:16 UTC +++ chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc -@@ -59,7 +59,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForSch +@@ -59,12 +59,12 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForSch return metrics::OmniboxInputType::QUERY; case ExternalProtocolHandler::UNKNOWN: { -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // Linux impl of GetApplicationNameForProtocol doesn't distinguish // between URL schemes with handers and those without. This will // make the default behaviour be search on Linux. + return metrics::OmniboxInputType::INVALID; +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + // If block state is unknown, check if there is an application registered + // for the url scheme. + GURL url(scheme + "://"); Index: head/www/chromium/files/patch-chrome_browser_browser__resources.grd =================================================================== --- head/www/chromium/files/patch-chrome_browser_browser__resources.grd (revision 504140) +++ head/www/chromium/files/patch-chrome_browser_browser__resources.grd (revision 504141) @@ -1,20 +1,20 @@ ---- chrome/browser/browser_resources.grd.orig 2019-04-30 22:22:32 UTC +--- chrome/browser/browser_resources.grd.orig 2019-06-04 18:55:16 UTC +++ chrome/browser/browser_resources.grd -@@ -81,7 +81,7 @@ +@@ -77,7 +77,7 @@ - + -@@ -689,7 +689,7 @@ +@@ -690,7 +690,7 @@ - + Index: head/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc (revision 504140) +++ head/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc (revision 504141) @@ -1,72 +1,75 @@ ---- chrome/browser/chrome_browser_main.cc.orig 2019-04-30 22:22:32 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2019-06-04 18:55:16 UTC +++ chrome/browser/chrome_browser_main.cc -@@ -219,7 +219,7 @@ +@@ -218,9 +218,9 @@ #include "components/arc/metrics/stability_metrics_manager.h" #endif // defined(OS_CHROMEOS) -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) #include "chrome/browser/first_run/upgrade_util_linux.h" - #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) +-#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#endif // (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) -@@ -259,7 +259,7 @@ + #if defined(OS_LINUX) + #include "components/crash/content/app/breakpad_linux.h" +@@ -258,7 +258,7 @@ #endif // defined(OS_WIN) #if defined(OS_WIN) || defined(OS_MACOSX) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + (defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)) #include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h" #endif -@@ -1049,7 +1049,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1047,7 +1047,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { AddFirstRunNewTabs(browser_creator_.get(), master_prefs_->new_tabs); } -#if defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) // 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 . -@@ -1058,14 +1058,14 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1056,14 +1056,14 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { &user_native_messaging_dir)); if (!base::PathExists(user_native_messaging_dir)) base::CreateDirectory(user_native_messaging_dir); -#endif // defined(OS_MACOSX) || defined(OS_LINUX) +#endif // defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) } #endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS) -#if defined(OS_LINUX) || defined(OS_OPENBSD) +#if defined(OS_LINUX) // Set the product channel for crash reports. breakpad::SetChannelCrashKey(chrome::GetChannelName()); -#endif // defined(OS_LINUX) || defined(OS_OPENBSD) +#endif // defined(OS_LINUX) #if defined(OS_MACOSX) // Get the Keychain API to register for distributed notifications on the main -@@ -1093,7 +1093,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1091,7 +1091,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { } #if defined(OS_WIN) || defined(OS_MACOSX) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + (defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)) metrics::DesktopSessionDurationTracker::Initialize(); #endif metrics::RendererUptimeTracker::Initialize(); -@@ -1266,6 +1266,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { +@@ -1253,6 +1253,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()); BrowserThread::PostAfterStartupTask( -@@ -1274,6 +1275,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { +@@ -1261,6 +1262,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(); Index: head/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc (revision 504140) +++ head/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc (revision 504141) @@ -1,27 +1,27 @@ ---- chrome/browser/chrome_browser_main_linux.cc.orig 2019-04-30 22:22:32 UTC +--- chrome/browser/chrome_browser_main_linux.cc.orig 2019-06-04 18:55:16 UTC +++ chrome/browser/chrome_browser_main_linux.cc -@@ -91,12 +91,14 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() { +@@ -90,12 +90,14 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() { void ChromeBrowserMainPartsLinux::PostProfileInit() { ChromeBrowserMainPartsPosix::PostProfileInit(); +#if !defined(OS_BSD) g_browser_process->metrics_service()->RecordBreakpadRegistration( breakpad::IsCrashReporterEnabled()); +#endif } void ChromeBrowserMainPartsLinux::PostMainMessageLoopStart() { -#if !defined(OS_CHROMEOS) +#if !defined(OS_CHROMEOS) && !defined(OS_BSD) - bluez::BluezDBusThreadManager::Initialize(); - bluez::BluezDBusManager::Initialize(); + bluez::BluezDBusManager::Initialize(nullptr /* system_bus */); #endif -@@ -105,7 +107,7 @@ void ChromeBrowserMainPartsLinux::PostMainMessageLoopS + +@@ -103,7 +105,7 @@ void ChromeBrowserMainPartsLinux::PostMainMessageLoopS } void ChromeBrowserMainPartsLinux::PostDestroyThreads() { -#if !defined(OS_CHROMEOS) +#if !defined(OS_CHROMEOS) && !defined(OS_BSD) bluez::BluezDBusManager::Shutdown(); bluez::BluezDBusThreadManager::Shutdown(); #endif Index: head/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc (revision 504140) +++ head/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc (revision 504141) @@ -1,11 +1,20 @@ ---- chrome/browser/chrome_browser_main_posix.cc.orig 2019-04-30 22:22:32 UTC +--- chrome/browser/chrome_browser_main_posix.cc.orig 2019-06-04 18:55:16 UTC +++ chrome/browser/chrome_browser_main_posix.cc -@@ -167,7 +167,7 @@ void ChromeBrowserMainPartsPosix::PostMainMessageLoopS +@@ -70,7 +70,7 @@ void ExitHandler::ExitWhenPossibleOnUIThread(int signa + // ExitHandler takes care of deleting itself. + new ExitHandler(); + } else { +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + switch (signal) { + case SIGINT: + case SIGHUP: +@@ -166,7 +166,7 @@ void ChromeBrowserMainPartsPosix::PostMainMessageLoopS void ChromeBrowserMainPartsPosix::ShowMissingLocaleMessageBox() { #if defined(OS_CHROMEOS) NOTREACHED(); // Should not ever happen on ChromeOS. -#elif defined(OS_MACOSX) +#elif defined(OS_MACOSX) || defined(OS_BSD) // Not called on Mac because we load the locale files differently. NOTREACHED(); #elif defined(USE_AURA) Index: head/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc (revision 504140) +++ head/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc (revision 504141) @@ -1,83 +1,83 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2019-04-30 22:22:32 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2019-06-04 18:55:16 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -411,7 +411,7 @@ +@@ -418,7 +418,7 @@ #include "components/user_manager/user_manager.h" #include "services/service_manager/public/mojom/interface_provider_spec.mojom.h" #include "services/ws/common/switches.h" -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) #include "chrome/browser/chrome_browser_main_linux.h" #elif defined(OS_ANDROID) #include "base/android/application_status_listener.h" -@@ -457,7 +457,7 @@ - #include "components/services/patch/public/interfaces/constants.mojom.h" - #endif +@@ -467,7 +467,7 @@ + #endif // !defined(OS_ANDROID) --#if defined(OS_WIN) || defined(OS_MACOSX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) #include "chrome/browser/browser_switcher/browser_switcher_navigation_throttle.h" #endif -@@ -474,7 +474,7 @@ + +@@ -493,7 +493,7 @@ #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h" #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h" #endif -@@ -1170,7 +1170,7 @@ content::BrowserMainParts* ChromeContentBrowserClient: +@@ -1197,7 +1197,7 @@ content::BrowserMainParts* ChromeContentBrowserClient: #elif defined(OS_CHROMEOS) - main_parts = new chromeos::ChromeBrowserMainPartsChromeos( - parameters, chrome_feature_list_creator_); + main_parts = + new chromeos::ChromeBrowserMainPartsChromeos(parameters, startup_data_); -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) - main_parts = - new ChromeBrowserMainPartsLinux(parameters, chrome_feature_list_creator_); + main_parts = new ChromeBrowserMainPartsLinux(parameters, startup_data_); #elif defined(OS_ANDROID) -@@ -1190,7 +1190,7 @@ content::BrowserMainParts* ChromeContentBrowserClient: + main_parts = new ChromeBrowserMainPartsAndroid(parameters, startup_data_); +@@ -1213,7 +1213,7 @@ content::BrowserMainParts* ChromeContentBrowserClient: // Construct additional browser parts. Stages are called in the order in // which they are added. #if defined(TOOLKIT_VIEWS) -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(USE_OZONE) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) && !defined(USE_OZONE) main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinux()); #else main_parts->AddParts(new ChromeBrowserMainExtraPartsViews()); -@@ -1994,7 +1994,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2034,7 +2034,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 -@@ -3529,7 +3529,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst +@@ -3614,7 +3614,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst } } -#if defined(OS_POSIX) && !defined(OS_MACOSX) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -4281,7 +4281,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati - handle)); +@@ -4389,7 +4389,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati } --#if defined(OS_WIN) || defined(OS_MACOSX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) std::unique_ptr browser_switcher_throttle = browser_switcher::BrowserSwitcherNavigationThrottle :: -@@ -5115,7 +5115,7 @@ std::unique_ptr + MaybeCreateThrottleFor(handle); +@@ -5228,7 +5228,7 @@ bool ChromeContentBrowserClient::HandleExternalProtoco + std::unique_ptr ChromeContentBrowserClient::CreateWindowForPictureInPicture( content::PictureInPictureWindowController* controller) { - #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ -- defined(OS_CHROMEOS) -+ defined(OS_CHROMEOS) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) // Note: content::OverlayWindow::Create() is defined by platform-specific // implementation in chrome/browser/ui/views. This layering hack, which goes - // through //content and ContentBrowserClient, allows us to work around the Index: head/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h =================================================================== --- head/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h (revision 504140) +++ head/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h (revision 504141) @@ -1,17 +1,17 @@ ---- chrome/browser/chrome_content_browser_client.h.orig 2019-04-30 22:22:32 UTC +--- chrome/browser/chrome_content_browser_client.h.orig 2019-06-04 18:55:16 UTC +++ chrome/browser/chrome_content_browser_client.h -@@ -368,12 +368,12 @@ class ChromeContentBrowserClient : public content::Con +@@ -376,12 +376,12 @@ class ChromeContentBrowserClient : public content::Con void OverridePageVisibilityState( content::RenderFrameHost* render_frame_host, content::PageVisibilityState* visibility_state) override; -#if defined(OS_POSIX) && !defined(OS_MACOSX) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) void GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, content::PosixFileDescriptorInfo* mappings) override; -#endif // defined(OS_POSIX) && !defined(OS_MACOSX) +#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) #if defined(OS_WIN) bool PreSpawnRenderer(sandbox::TargetPolicy* policy) override; base::string16 GetAppContainerSidForSandboxType( Index: head/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc (revision 504140) +++ head/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc (revision 504141) @@ -1,20 +1,20 @@ ---- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2019-04-30 22:22:33 UTC +--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2019-06-04 18:55:17 UTC +++ chrome/browser/download/chrome_download_manager_delegate.cc -@@ -1234,7 +1234,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1228,7 +1228,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe target_info->is_filetype_handled_safely) DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) if (item->GetOriginalMimeType() == "application/x-x509-user-cert") DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true); #endif -@@ -1254,7 +1254,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1248,7 +1248,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile( const base::FilePath& path) { -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) if (path.MatchesExtension(FILE_PATH_LITERAL(".pdf"))) { return !download_prefs_->ShouldOpenPdfInSystemReader(); } Index: head/www/chromium/files/patch-chrome_browser_download_download__prefs.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_download_download__prefs.cc (revision 504140) +++ head/www/chromium/files/patch-chrome_browser_download_download__prefs.cc (revision 504141) @@ -1,65 +1,65 @@ ---- chrome/browser/download/download_prefs.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/download/download_prefs.cc.orig 2019-06-04 18:55:17 UTC +++ chrome/browser/download/download_prefs.cc @@ -62,7 +62,7 @@ namespace { // Consider downloads 'dangerous' if they go to the home directory on Linux and // to the desktop on any platform. bool DownloadPathIsDangerous(const base::FilePath& download_path) { -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) base::FilePath home_dir = base::GetHomeDir(); if (download_path == home_dir) { return true; @@ -155,7 +155,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi GetDefaultDownloadDirectoryForProfile())); #endif // defined(OS_CHROMEOS) -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) should_open_pdf_in_system_reader_ = prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader); #endif -@@ -252,7 +252,7 @@ void DownloadPrefs::RegisterProfilePrefs( +@@ -257,7 +257,7 @@ void DownloadPrefs::RegisterProfilePrefs( default_download_path); registry->RegisterFilePathPref(prefs::kSaveFileDefaultDirectory, default_download_path); -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false); #endif #if defined(OS_ANDROID) @@ -354,7 +354,7 @@ bool DownloadPrefs::IsDownloadPathManaged() const { } bool DownloadPrefs::IsAutoOpenUsed() const { -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) if (ShouldOpenPdfInSystemReader()) return true; #endif @@ -368,7 +368,7 @@ bool DownloadPrefs::IsAutoOpenEnabledBasedOnExtension( return false; DCHECK(extension[0] == base::FilePath::kExtensionSeparator); extension.erase(0, 1); -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) if (base::FilePath::CompareEqualIgnoreCase(extension, FILE_PATH_LITERAL("pdf")) && ShouldOpenPdfInSystemReader()) @@ -405,7 +405,7 @@ void DownloadPrefs::DisableAutoOpenBasedOnExtension( SaveAutoOpenState(); } -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) { if (should_open_pdf_in_system_reader_ == should_open) return; @@ -426,7 +426,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons #endif void DownloadPrefs::ResetAutoOpen() { -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) SetShouldOpenPdfInSystemReader(false); #endif auto_open_.clear(); Index: head/www/chromium/files/patch-chrome_browser_download_download__prefs.h =================================================================== --- head/www/chromium/files/patch-chrome_browser_download_download__prefs.h (revision 504140) +++ head/www/chromium/files/patch-chrome_browser_download_download__prefs.h (revision 504141) @@ -1,20 +1,20 @@ ---- chrome/browser/download/download_prefs.h.orig 2019-04-30 22:22:33 UTC +--- chrome/browser/download/download_prefs.h.orig 2019-06-04 18:55:17 UTC +++ chrome/browser/download/download_prefs.h -@@ -104,7 +104,7 @@ class DownloadPrefs { +@@ -102,7 +102,7 @@ class DownloadPrefs { // Disables auto-open based on file extension. void DisableAutoOpenBasedOnExtension(const base::FilePath& file_name); -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) // Store the user preference to disk. If |should_open| is true, also disable // the built-in PDF plugin. If |should_open| is false, enable the PDF plugin. void SetShouldOpenPdfInSystemReader(bool should_open); -@@ -148,7 +148,7 @@ class DownloadPrefs { +@@ -150,7 +150,7 @@ class DownloadPrefs { AutoOpenCompareFunctor> AutoOpenSet; AutoOpenSet auto_open_; -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) bool should_open_pdf_in_system_reader_; #endif Index: head/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn =================================================================== --- head/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn (revision 504140) +++ head/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn (revision 504141) @@ -1,15 +1,15 @@ ---- chrome/browser/extensions/BUILD.gn.orig 2019-04-30 22:22:33 UTC +--- chrome/browser/extensions/BUILD.gn.orig 2019-06-04 18:55:17 UTC +++ chrome/browser/extensions/BUILD.gn -@@ -1116,6 +1116,12 @@ jumbo_static_library("extensions") { +@@ -1133,6 +1133,12 @@ jumbo_static_library("extensions") { deps += [ "//chrome/common:service_process_mojom" ] } + if (is_bsd) { + sources -= [ + "api/image_writer_private/removable_storage_provider_linux.cc", + ] + } + if (enable_service_discovery) { sources += [ "api/mdns/mdns_api.cc", Index: head/www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc (revision 504140) +++ head/www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc (revision 504141) @@ -1,14 +1,14 @@ ---- chrome/browser/extensions/activity_log/activity_log.cc.orig 2019-04-30 22:22:33 UTC +--- chrome/browser/extensions/activity_log/activity_log.cc.orig 2019-06-04 18:55:17 UTC +++ chrome/browser/extensions/activity_log/activity_log.cc @@ -53,7 +53,11 @@ + #include "extensions/browser/extensions_browser_client.h" #include "extensions/common/extension.h" #include "extensions/common/extension_messages.h" - #include "extensions/common/one_shot_event.h" +#if defined(OS_BSD) +#include +#else #include "third_party/re2/src/re2/re2.h" +#endif #include "url/gurl.h" namespace constants = activity_log_constants; Index: head/www/chromium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc (nonexistent) +++ head/www/chromium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc (revision 504141) @@ -0,0 +1,43 @@ +--- chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc.orig 2019-06-04 18:55:17 UTC ++++ chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc +@@ -29,7 +29,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 + +@@ -38,7 +38,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( +@@ -609,7 +609,7 @@ void WebrtcLoggingPrivateStartEventLoggingFunction::Fi + } + + bool WebrtcLoggingPrivateGetLogsDirectoryFunction::RunAsync() { +-#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 +@@ -633,11 +633,11 @@ bool WebrtcLoggingPrivateGetLogsDirectoryFunction::Run + &WebrtcLoggingPrivateGetLogsDirectoryFunction::FireErrorCallback, + this)); + return true; +-#else // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#else // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + SetError("Not supported on the current OS"); + SendResponse(false); + return false; +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + } + + void WebrtcLoggingPrivateGetLogsDirectoryFunction::FireCallback( Property changes on: head/www/chromium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-chrome_browser_extensions_bookmark__app__extension__util.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_extensions_bookmark__app__extension__util.cc (nonexistent) +++ head/www/chromium/files/patch-chrome_browser_extensions_bookmark__app__extension__util.cc (revision 504141) @@ -0,0 +1,11 @@ +--- chrome/browser/extensions/bookmark_app_extension_util.cc.orig 2019-06-04 18:55:17 UTC ++++ chrome/browser/extensions/bookmark_app_extension_util.cc +@@ -34,7 +34,7 @@ namespace { + + #if !defined(OS_CHROMEOS) + bool CanOsAddDesktopShortcuts() { +-#if defined(OS_LINUX) || defined(OS_WIN) ++#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) + return true; + #else + return false; Property changes on: head/www/chromium/files/patch-chrome_browser_extensions_bookmark__app__extension__util.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-chrome_browser_flag__descriptions.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_flag__descriptions.cc (revision 504140) +++ head/www/chromium/files/patch-chrome_browser_flag__descriptions.cc (revision 504141) @@ -1,44 +1,38 @@ ---- chrome/browser/flag_descriptions.cc.orig 2019-04-30 22:22:33 UTC +--- chrome/browser/flag_descriptions.cc.orig 2019-06-04 18:55:17 UTC +++ chrome/browser/flag_descriptions.cc -@@ -3524,21 +3524,21 @@ extern const char kAshNotificationStackingBarRedesignD +@@ -3465,29 +3465,29 @@ const char kInstallableInkDropDescription[] = // Random platform combinations ----------------------------------------------- -#if defined(OS_WIN) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) const char kEnableInputImeApiName[] = "Enable Input IME API"; const char kEnableInputImeApiDescription[] = "Enable the use of chrome.input.ime API."; -#endif // defined(OS_WIN) || defined(OS_LINUX) +#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) const char kWebGL2ComputeContextName[] = "WebGL 2.0 Compute"; const char kWebGL2ComputeContextDescription[] = "Enable the use of WebGL 2.0 Compute API."; -#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - - #if defined(OS_WIN) || defined(OS_MACOSX) - -@@ -3551,13 +3551,13 @@ const char kAutomaticTabDiscardingDescription[] = - - #endif // defined(OS_WIN) || defined(OS_MACOSX) -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) const char kDirectManipulationStylusName[] = "Direct Manipulation Stylus"; const char kDirectManipulationStylusDescription[] = "If enabled, Chrome will scroll web pages on stylus drag."; -#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) #if defined(OS_MACOSX) || defined(OS_CHROMEOS) Index: head/www/chromium/files/patch-chrome_browser_flag__descriptions.h =================================================================== --- head/www/chromium/files/patch-chrome_browser_flag__descriptions.h (revision 504140) +++ head/www/chromium/files/patch-chrome_browser_flag__descriptions.h (revision 504141) @@ -1,41 +1,35 @@ ---- chrome/browser/flag_descriptions.h.orig 2019-04-30 22:22:33 UTC +--- chrome/browser/flag_descriptions.h.orig 2019-06-04 18:55:17 UTC +++ chrome/browser/flag_descriptions.h -@@ -2100,19 +2100,19 @@ extern const char kAshNotificationStackingBarRedesignD +@@ -2094,26 +2094,26 @@ extern const char kInstallableInkDropDescription[]; // Random platform combinations ----------------------------------------------- -#if defined(OS_WIN) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) extern const char kEnableInputImeApiName[]; extern const char kEnableInputImeApiDescription[]; -#endif // defined(OS_WIN) || defined(OS_LINUX) +#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) extern const char kWebGL2ComputeContextName[]; extern const char kWebGL2ComputeContextDescription[]; -#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - - extern const char kExperimentalUiName[]; - extern const char kExperimentalUiDescription[]; -@@ -2124,12 +2124,12 @@ extern const char kAutomaticTabDiscardingDescription[] - - #endif // defined(OS_WIN) || defined(OS_MACOSX) -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) extern const char kDirectManipulationStylusName[]; extern const char kDirectManipulationStylusDescription[]; -#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) #if defined(OS_MACOSX) || defined(OS_CHROMEOS) Index: head/www/chromium/files/patch-chrome_browser_metrics_bluetooth__available__utility.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_metrics_bluetooth__available__utility.cc (revision 504140) +++ head/www/chromium/files/patch-chrome_browser_metrics_bluetooth__available__utility.cc (revision 504141) @@ -1,13 +1,13 @@ ---- chrome/browser/metrics/bluetooth_available_utility.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/metrics/bluetooth_available_utility.cc.orig 2019-06-04 18:55:17 UTC +++ chrome/browser/metrics/bluetooth_available_utility.cc -@@ -72,8 +72,10 @@ void ReportBluetoothAvailability() { - if (!device::BluetoothAdapterFactory::Get().IsBluetoothSupported()) - ReportAvailability(BLUETOOTH_NOT_SUPPORTED); +@@ -76,8 +76,10 @@ void ReportBluetoothAvailability() { + return; + } +#if !defined(OS_BSD) device::BluetoothAdapterFactory::Get().GetAdapter( base::BindOnce(&OnGetAdapter)); +#endif } } // namespace bluetooth_utility Index: head/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc (nonexistent) +++ head/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc (revision 504141) @@ -0,0 +1,11 @@ +--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2019-06-04 18:55:17 UTC ++++ chrome/browser/metrics/chrome_metrics_service_client.cc +@@ -898,7 +898,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve + } + #endif + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // This creates the DesktopProfileSessionDurationsServices if it didn't exist + // already. + metrics::DesktopProfileSessionDurationsServiceFactory::GetForBrowserContext( Property changes on: head/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc (nonexistent) +++ head/www/chromium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc (revision 504141) @@ -0,0 +1,20 @@ +--- chrome/browser/metrics/process_memory_metrics_emitter.cc.orig 2019-06-04 18:55:17 UTC ++++ chrome/browser/metrics/process_memory_metrics_emitter.cc +@@ -359,7 +359,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc + + builder->SetPrivateMemoryFootprint(pmd.os_dump().private_footprint_kb / 1024); + builder->SetSharedMemoryFootprint(pmd.os_dump().shared_footprint_kb / 1024); +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + builder->SetPrivateSwapFootprint(pmd.os_dump().private_footprint_swap_kb / + 1024); + #endif +@@ -382,7 +382,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc + MEMORY_METRICS_HISTOGRAM_MB( + std::string(UMA_PREFIX) + process_name + ".SharedMemoryFootprint", + pmd.os_dump().shared_footprint_kb / 1024); +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + MEMORY_METRICS_HISTOGRAM_MB( + std::string(UMA_PREFIX) + process_name + ".PrivateSwapFootprint", + pmd.os_dump().private_footprint_swap_kb / 1024); Property changes on: head/www/chromium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc (revision 504140) +++ head/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc (revision 504141) @@ -1,26 +1,65 @@ ---- chrome/browser/net/system_network_context_manager.cc.orig 2019-04-30 22:22:34 UTC +--- chrome/browser/net/system_network_context_manager.cc.orig 2019-06-04 18:55:17 UTC +++ chrome/browser/net/system_network_context_manager.cc -@@ -70,12 +70,12 @@ +@@ -72,12 +72,12 @@ #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" #endif // defined(OS_CHROMEOS) -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) #include "chrome/common/chrome_paths_internal.h" #include "chrome/common/chrome_switches.h" #include "chrome/grit/chromium_strings.h" #include "ui/base/l10n/l10n_util.h" -#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) +#endif // (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) namespace { -@@ -535,7 +535,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea +@@ -198,10 +198,10 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut + auth_dynamic_params->enable_negotiate_port = + local_state->GetBoolean(prefs::kEnableAuthNegotiatePort); + +-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) + auth_dynamic_params->delegate_by_kdc_policy = + local_state->GetBoolean(prefs::kAuthNegotiateDelegateByKdcPolicy); +-#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + #if defined(OS_POSIX) + auth_dynamic_params->ntlm_v2_enabled = +@@ -433,10 +433,10 @@ SystemNetworkContextManager::SystemNetworkContextManag + pref_change_registrar_.Add(prefs::kEnableAuthNegotiatePort, + auth_pref_callback); + +-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) + pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy, + auth_pref_callback); +-#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + #if defined(OS_POSIX) + pref_change_registrar_.Add(prefs::kNtlmV2Enabled, auth_pref_callback); +@@ -481,10 +481,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe + registry->RegisterStringPref(prefs::kAuthServerWhitelist, std::string()); + registry->RegisterStringPref(prefs::kAuthNegotiateDelegateWhitelist, + std::string()); +-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) + registry->RegisterBooleanPref(prefs::kAuthNegotiateDelegateByKdcPolicy, + false); +-#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + #if defined(OS_POSIX) + registry->RegisterBooleanPref( +@@ -532,7 +532,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea content::GetNetworkService()->ConfigureStubHostResolver( stub_resolver_enabled, std::move(dns_over_https_servers)); -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) const base::CommandLine& command_line = *base::CommandLine::ForCurrentProcess(); Index: head/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc (nonexistent) +++ head/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc (revision 504141) @@ -0,0 +1,20 @@ +--- chrome/browser/notifications/notification_display_service_impl.cc.orig 2019-06-04 18:55:17 UTC ++++ chrome/browser/notifications/notification_display_service_impl.cc +@@ -31,7 +31,7 @@ + #include "chrome/browser/notifications/notification_platform_bridge_message_center.h" + #endif + +-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) + #include "chrome/browser/send_tab_to_self/desktop_notification_handler.h" + #endif + +@@ -121,7 +121,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer + AddNotificationHandler(NotificationHandler::Type::WEB_PERSISTENT, + std::make_unique()); + +-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) + AddNotificationHandler( + NotificationHandler::Type::SEND_TAB_TO_SELF, + std::make_unique( Property changes on: head/www/chromium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc (revision 504140) +++ head/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc (revision 504141) @@ -1,14 +1,14 @@ ---- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2019-06-04 18:55:17 UTC +++ chrome/browser/password_manager/chrome_password_manager_client.cc -@@ -80,7 +80,11 @@ +@@ -81,7 +81,11 @@ #include "net/cert/cert_status_flags.h" #include "services/identity/public/cpp/identity_manager.h" #include "services/metrics/public/cpp/ukm_recorder.h" +#if defined(OS_BSD) +#include +#else #include "third_party/re2/src/re2/re2.h" +#endif #include "url/url_constants.h" - #if defined(SAFE_BROWSING_DB_LOCAL) + #if defined(FULL_SAFE_BROWSING) Index: head/www/chromium/files/patch-chrome_browser_password__manager_password__store__factory.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_password__manager_password__store__factory.cc (revision 504140) +++ head/www/chromium/files/patch-chrome_browser_password__manager_password__store__factory.cc (revision 504141) @@ -1,11 +1,11 @@ ---- chrome/browser/password_manager/password_store_factory.cc.orig 2019-04-30 22:22:34 UTC +--- chrome/browser/password_manager/password_store_factory.cc.orig 2019-06-04 18:55:17 UTC +++ chrome/browser/password_manager/password_store_factory.cc -@@ -301,7 +301,7 @@ PasswordStoreFactory::BuildServiceInstanceFor( - password_manager_util::RemoveUselessCredentials(ps, profile->GetPrefs(), 60, +@@ -302,7 +302,7 @@ PasswordStoreFactory::BuildServiceInstanceFor( network_context_getter); --#if defined(OS_WIN) || defined(OS_MACOSX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) std::unique_ptr notifier = std::make_unique( + profile); Index: head/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__history.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__history.cc (nonexistent) +++ head/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__history.cc (revision 504141) @@ -0,0 +1,38 @@ +--- chrome/browser/performance_monitor/process_metrics_history.cc.orig 2019-06-04 18:55:17 UTC ++++ chrome/browser/performance_monitor/process_metrics_history.cc +@@ -47,7 +47,7 @@ void ProcessMetricsHistory::SampleMetrics() { + #if defined(OS_WIN) + disk_usage_ = process_metrics_->GetDiskUsageBytesPerSecond(); + #endif +-#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) ++#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) + idle_wakeups_ = process_metrics_->GetIdleWakeupsPerSecond(); + #endif + #if defined(OS_MACOSX) +@@ -87,7 +87,7 @@ void ProcessMetricsHistory::RunPerformanceTriggers() { + kDiskUsageHistogramMin, kDiskUsageHistogramMax, + kDiskUsageHistogramBucketCount); + #endif +-#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) ++#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) + UMA_HISTOGRAM_COUNTS_10000( + "PerformanceMonitor.IdleWakeups.BrowserProcess", idle_wakeups_); + #endif +@@ -105,7 +105,7 @@ void ProcessMetricsHistory::RunPerformanceTriggers() { + UMA_HISTOGRAM_BOOLEAN("PerformanceMonitor.HighCPU.RendererProcess", + true); + } +-#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) ++#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) + UMA_HISTOGRAM_COUNTS_10000( + "PerformanceMonitor.IdleWakeups.RendererProcess", idle_wakeups_); + #endif +@@ -122,7 +122,7 @@ void ProcessMetricsHistory::RunPerformanceTriggers() { + kHistogramBucketCount); + if (cpu_usage_ > kHighCPUUtilizationThreshold) + UMA_HISTOGRAM_BOOLEAN("PerformanceMonitor.HighCPU.GPUProcess", true); +-#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) ++#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) + UMA_HISTOGRAM_COUNTS_10000("PerformanceMonitor.IdleWakeups.GPUProcess", + idle_wakeups_); + #endif Property changes on: head/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__history.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__history.h =================================================================== --- head/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__history.h (nonexistent) +++ head/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__history.h (revision 504141) @@ -0,0 +1,11 @@ +--- chrome/browser/performance_monitor/process_metrics_history.h.orig 2019-06-04 18:55:17 UTC ++++ chrome/browser/performance_monitor/process_metrics_history.h +@@ -72,7 +72,7 @@ class ProcessMetricsHistory { + uint64_t disk_usage_ = 0; + #endif + +-#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) ++#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) + int idle_wakeups_ = 0; + #endif + #if defined(OS_MACOSX) Property changes on: head/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__history.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-chrome_browser_platform__util.h =================================================================== --- head/www/chromium/files/patch-chrome_browser_platform__util.h (revision 504140) +++ head/www/chromium/files/patch-chrome_browser_platform__util.h (revision 504141) @@ -1,11 +1,11 @@ ---- chrome/browser/platform_util.h.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/platform_util.h.orig 2019-06-04 18:55:17 UTC +++ chrome/browser/platform_util.h -@@ -40,7 +40,7 @@ enum OpenOperationResult { +@@ -41,7 +41,7 @@ enum OpenOperationResult { enum OpenItemType { OPEN_FILE, OPEN_FOLDER, -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) SHOW_ITEM_IN_FOLDER #endif }; Index: head/www/chromium/files/patch-chrome_browser_plugins_plugin__info__host__impl.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_plugins_plugin__info__host__impl.cc (nonexistent) +++ head/www/chromium/files/patch-chrome_browser_plugins_plugin__info__host__impl.cc (revision 504141) @@ -0,0 +1,11 @@ +--- chrome/browser/plugins/plugin_info_host_impl.cc.orig 2019-06-04 18:55:17 UTC ++++ chrome/browser/plugins/plugin_info_host_impl.cc +@@ -411,7 +411,7 @@ void PluginInfoHostImpl::ComponentPluginLookupDone( + std::unique_ptr cus_plugin_info) { + if (cus_plugin_info) { + output->status = chrome::mojom::PluginStatus::kComponentUpdateRequired; +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + if (cus_plugin_info->version != base::Version("0")) { + output->status = chrome::mojom::PluginStatus::kRestartRequired; + } Property changes on: head/www/chromium/files/patch-chrome_browser_plugins_plugin__info__host__impl.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc (revision 504140) +++ head/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc (revision 504141) @@ -1,20 +1,20 @@ ---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2019-04-30 22:22:34 UTC +--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2019-06-04 18:55:17 UTC +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -107,7 +107,7 @@ +@@ -109,7 +109,7 @@ #include "chrome/browser/policy/browser_signin_policy_handler.h" #endif -#if defined(OS_WIN) || defined(OS_MACOSX) || \ +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" #endif -@@ -962,7 +962,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -994,7 +994,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = prefs::kAllowPopupsDuringPageUnload, base::Value::Type::BOOLEAN }, -#if defined(OS_WIN) || defined(OS_MACOSX) || \ +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) { key::kAlternativeBrowserPath, browser_switcher::prefs::kAlternativeBrowserPath, Index: head/www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc (revision 504140) +++ head/www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc (revision 504141) @@ -1,11 +1,11 @@ ---- chrome/browser/policy/policy_prefs_browsertest.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/policy/policy_prefs_browsertest.cc.orig 2019-06-04 18:55:17 UTC +++ chrome/browser/policy/policy_prefs_browsertest.cc -@@ -185,6 +185,8 @@ class PolicyTestCase { +@@ -183,6 +183,8 @@ class PolicyTestCase { const std::string os("chromeos"); #elif defined(OS_LINUX) const std::string os("linux"); +#elif defined(OS_FREEBSD) + const std::string os("freebsd"); #else #error "Unknown platform" #endif Index: head/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc (revision 504140) +++ head/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc (revision 504141) @@ -1,20 +1,20 @@ ---- chrome/browser/prefs/browser_prefs.cc.orig 2019-04-30 22:22:34 UTC +--- chrome/browser/prefs/browser_prefs.cc.orig 2019-06-04 18:55:17 UTC +++ chrome/browser/prefs/browser_prefs.cc -@@ -331,7 +331,7 @@ +@@ -332,7 +332,7 @@ #include "chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_prefs_manager.h" #endif -#if defined(OS_WIN) || defined(OS_MACOSX) || \ +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" #endif -@@ -802,7 +802,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync +@@ -849,7 +849,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync safe_browsing::PostCleanupSettingsResetter::RegisterProfilePrefs(registry); #endif -#if defined(OS_WIN) || defined(OS_MACOSX) || \ +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) browser_switcher::BrowserSwitcherPrefs::RegisterProfilePrefs(registry); #endif Index: head/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__whitelist.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__whitelist.cc (revision 504140) +++ head/www/chromium/files/patch-chrome_browser_prefs_pref__service__incognito__whitelist.cc (revision 504141) @@ -1,11 +1,11 @@ ---- chrome/browser/prefs/pref_service_incognito_whitelist.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/prefs/pref_service_incognito_whitelist.cc.orig 2019-06-04 18:55:17 UTC +++ chrome/browser/prefs/pref_service_incognito_whitelist.cc -@@ -164,7 +164,7 @@ const char* const kPersistentPrefNames[] = { +@@ -183,7 +183,7 @@ const char* const kPersistentPrefNames[] = { prefs::kShowFullscreenToolbar, #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) // Toggleing custom frames affects all open windows in the profile, hence // should be written to the regular profile when changed in incognito mode. prefs::kUseCustomChromeFrame, Index: head/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc (revision 504140) +++ head/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc (revision 504141) @@ -1,34 +1,34 @@ ---- chrome/browser/process_singleton_posix.cc.orig 2019-04-30 22:22:34 UTC +--- chrome/browser/process_singleton_posix.cc.orig 2019-06-04 18:55:17 UTC +++ chrome/browser/process_singleton_posix.cc -@@ -93,11 +93,11 @@ +@@ -94,11 +94,11 @@ #include "net/base/network_interfaces.h" #include "ui/base/l10n/l10n_util.h" -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) #include "chrome/browser/ui/process_singleton_dialog_linux.h" #endif -#if defined(TOOLKIT_VIEWS) && defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if defined(TOOLKIT_VIEWS) && (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) #include "ui/views/linux_ui/linux_ui.h" #endif -@@ -324,7 +324,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo +@@ -325,7 +325,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo if (g_disable_prompt) return g_user_opted_unlock_in_use_profile; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) base::string16 relaunch_button_text = l10n_util::GetStringUTF16( IDS_PROFILE_IN_USE_LINUX_RELAUNCH); return ShowProcessSingletonDialog(error, relaunch_button_text); -@@ -903,7 +903,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::Notif +@@ -901,7 +901,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::Notif SendRemoteProcessInteractionResultHistogram(REMOTE_PROCESS_SHUTTING_DOWN); return PROCESS_NONE; } else if (strncmp(buf, kACKToken, base::size(kACKToken) - 1) == 0) { -#if defined(TOOLKIT_VIEWS) && defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if defined(TOOLKIT_VIEWS) && (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) // Likely NULL in unit tests. views::LinuxUI* linux_ui = views::LinuxUI::instance(); if (linux_ui) Index: head/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc (revision 504140) +++ head/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc (revision 504141) @@ -1,11 +1,11 @@ ---- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2019-04-30 22:22:34 UTC +--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2019-06-04 18:55:17 UTC +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -325,7 +325,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -329,7 +329,7 @@ void ChromeBrowserMainExtraPartsProfiles:: #if !defined(OS_ANDROID) MediaGalleriesPreferencesFactory::GetInstance(); #endif -#if defined(OS_WIN) || defined(OS_MACOSX) || \ +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance(); #endif Index: head/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc (revision 504140) +++ head/www/chromium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc (revision 504141) @@ -1,29 +1,29 @@ ---- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig 2019-04-30 22:22:34 UTC +--- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig 2019-06-04 18:55:17 UTC +++ chrome/browser/renderer_context_menu/render_view_context_menu.cc -@@ -1500,7 +1500,7 @@ void RenderViewContextMenu::AppendEditableItems() { +@@ -1531,7 +1531,7 @@ void RenderViewContextMenu::AppendEditableItems() { // 'Undo' and 'Redo' for text input with no suggestions and no text selected. // We make an exception for OS X as context clicking will select the closest // word. In this case both items are always shown. -#if defined(OS_MACOSX) +#if defined(OS_MACOSX) || defined(OS_BSD) menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_UNDO, IDS_CONTENT_CONTEXT_UNDO); menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_REDO, -@@ -1542,7 +1542,7 @@ void RenderViewContextMenu::AppendLanguageSettings() { +@@ -1573,7 +1573,7 @@ void RenderViewContextMenu::AppendLanguageSettings() { if (!use_spelling) return; -#if defined(OS_MACOSX) +#if defined(OS_MACOSX) || defined(OS_BSD) menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_LANGUAGE_SETTINGS, IDS_CONTENT_CONTEXT_LANGUAGE_SETTINGS); #else -@@ -1816,7 +1816,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) +@@ -1851,7 +1851,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) case IDC_CHECK_SPELLING_WHILE_TYPING: return prefs->GetBoolean(spellcheck::prefs::kSpellCheckEnable); -#if !defined(OS_MACOSX) && defined(OS_POSIX) +#if !defined(OS_MACOSX) && !defined(OS_BSD) && defined(OS_POSIX) // TODO(suzhe): this should not be enabled for password fields. case IDC_INPUT_METHODS_MENU: return true; Index: head/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc (revision 504140) +++ head/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc (revision 504141) @@ -1,29 +1,29 @@ ---- chrome/browser/renderer_preferences_util.cc.orig 2019-04-30 22:22:34 UTC +--- chrome/browser/renderer_preferences_util.cc.orig 2019-06-04 18:55:17 UTC +++ chrome/browser/renderer_preferences_util.cc @@ -29,7 +29,7 @@ #include "ui/base/cocoa/defaults_utils.h" #endif -#if defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if defined(USE_AURA) && (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" #include "ui/views/linux_ui/linux_ui.h" @@ -129,7 +129,7 @@ void UpdateFromSystemSettings(blink::mojom::RendererPr prefs->caret_blink_interval = interval; #endif -#if defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if defined(USE_AURA) && (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) views::LinuxUI* linux_ui = views::LinuxUI::instance(); if (linux_ui) { if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) { @@ -148,7 +148,7 @@ void UpdateFromSystemSettings(blink::mojom::RendererPr } #endif -#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_WIN) +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_WIN) || defined(OS_BSD) content::UpdateFontRendererPreferencesFromSystemSettings(prefs); - content::UpdateFocusRingPreferencesFromSystemSettings(prefs); #endif + Index: head/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__handler__util.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__handler__util.cc (revision 504140) +++ head/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__handler__util.cc (revision 504141) @@ -1,15 +1,15 @@ ---- chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc.orig 2019-06-04 18:55:18 UTC +++ chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc @@ -8,7 +8,12 @@ - #include "base/hash.h" + #include "base/hash/hash.h" #include "base/logging.h" +//XXX(rene) needs shim headers? +#if defined(USE_SYSTEM_PROTOBUF) +#include +#else #include "third_party/protobuf/src/google/protobuf/message_lite.h" +#endif namespace safe_browsing { Index: head/www/chromium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc (nonexistent) +++ head/www/chromium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc (revision 504141) @@ -0,0 +1,20 @@ +--- chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc.orig 2019-06-07 20:47:39 UTC ++++ chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc +@@ -11,7 +11,7 @@ + #include "chrome/browser/profiles/profile.h" + #include "chrome/browser/send_tab_to_self/receiving_ui_handler.h" + +-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) + #include "chrome/browser/send_tab_to_self/desktop_notification_handler.h" + #endif + +@@ -32,7 +32,7 @@ ReceivingUiHandlerRegistry* ReceivingUiHandlerRegistry + // Instantiates all the handlers relevant to this platform. + void ReceivingUiHandlerRegistry::InstantiatePlatformSpecificHandlers( + Profile* profile) { +-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) + applicable_handlers_.push_back( + std::make_unique(profile)); + #elif defined(OS_ANDROID) Property changes on: head/www/chromium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-chrome_browser_ssl_captive__portal__blocking__page.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_ssl_captive__portal__blocking__page.cc (nonexistent) +++ head/www/chromium/files/patch-chrome_browser_ssl_captive__portal__blocking__page.cc (revision 504141) @@ -0,0 +1,11 @@ +--- chrome/browser/ssl/captive_portal_blocking_page.cc.orig 2019-06-04 18:55:18 UTC ++++ chrome/browser/ssl/captive_portal_blocking_page.cc +@@ -124,7 +124,7 @@ std::string CaptivePortalBlockingPage::GetWiFiSSID() c + wifi_service->GetConnectedNetworkSSID(&ssid, &error); + if (!error.empty()) + return std::string(); +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + ssid = net::GetWifiSSID(); + #elif defined(OS_ANDROID) + ssid = net::android::GetWifiSSID(); Property changes on: head/www/chromium/files/patch-chrome_browser_ssl_captive__portal__blocking__page.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-chrome_browser_ssl_ssl__error__controller__client.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_ssl_ssl__error__controller__client.cc (revision 504140) +++ head/www/chromium/files/patch-chrome_browser_ssl_ssl__error__controller__client.cc (revision 504141) @@ -1,20 +1,20 @@ ---- chrome/browser/ssl/ssl_error_controller_client.cc.orig 2019-04-30 22:22:36 UTC +--- chrome/browser/ssl/ssl_error_controller_client.cc.orig 2019-06-04 18:55:18 UTC +++ chrome/browser/ssl/ssl_error_controller_client.cc -@@ -78,7 +78,7 @@ void LaunchDateAndTimeSettingsImpl() { +@@ -79,7 +79,7 @@ void LaunchDateAndTimeSettingsImpl() { #if defined(OS_ANDROID) chrome::android::OpenDateAndTimeSettings(); -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) struct ClockCommand { const char* const pathname; const char* const argument; -@@ -222,7 +222,7 @@ void SSLErrorControllerClient::Proceed() { +@@ -221,7 +221,7 @@ void SSLErrorControllerClient::Proceed() { + } bool SSLErrorControllerClient::CanLaunchDateAndTimeSettings() { - #if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX) || \ -- defined(OS_WIN) -+ defined(OS_WIN) || defined(OS_BSD) +-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX) || \ ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) || \ + defined(OS_WIN) return true; #else - return false; Index: head/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc (revision 504140) +++ head/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc (revision 504141) @@ -1,20 +1,20 @@ ---- chrome/browser/sync/chrome_sync_client.cc.orig 2019-04-30 22:22:36 UTC +--- chrome/browser/sync/chrome_sync_client.cc.orig 2019-06-04 18:55:18 UTC +++ chrome/browser/sync/chrome_sync_client.cc -@@ -427,7 +427,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy +@@ -441,7 +441,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy } #endif // BUILDFLAG(ENABLE_APP_LIST) -#if defined(OS_LINUX) || defined(OS_WIN) +#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) // Dictionary sync is enabled by default. if (!disabled_types.Has(syncer::DICTIONARY)) { if (base::FeatureList::IsEnabled(switches::kSyncPseudoUSSDictionary)) { -@@ -443,7 +443,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy - base::CreateSingleThreadTaskRunnerWithTraits({BrowserThread::UI}))); +@@ -457,7 +457,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy + base::CreateSequencedTaskRunnerWithTraits({BrowserThread::UI}))); } } -#endif // defined(OS_LINUX) || defined(OS_WIN) +#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) #if defined(OS_CHROMEOS) if (arc::IsArcAllowedForProfile(profile_) && Index: head/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h =================================================================== --- head/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h (revision 504140) +++ head/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h (revision 504141) @@ -1,39 +1,48 @@ ---- chrome/browser/task_manager/sampling/task_group.h.orig 2019-04-30 22:22:36 UTC +--- chrome/browser/task_manager/sampling/task_group.h.orig 2019-06-04 18:55:18 UTC +++ chrome/browser/task_manager/sampling/task_group.h +@@ -36,7 +36,7 @@ constexpr int kUnsupportedVMRefreshFlags = + REFRESH_TYPE_WEBCACHE_STATS | REFRESH_TYPE_NETWORK_USAGE | + REFRESH_TYPE_NACL | REFRESH_TYPE_IDLE_WAKEUPS | REFRESH_TYPE_HANDLES | + REFRESH_TYPE_START_TIME | REFRESH_TYPE_CPU_TIME | REFRESH_TYPE_PRIORITY | +-#if defined(OS_LINUX) || defined(OS_MACOSX) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) + REFRESH_TYPE_FD_COUNT | + #endif + REFRESH_TYPE_HARD_FAULTS; @@ -119,9 +119,9 @@ class TaskGroup { int nacl_debug_stub_port() const { return nacl_debug_stub_port_; } #endif // BUILDFLAG(ENABLE_NACL) -#if defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) int open_fd_count() const { return open_fd_count_; } -#endif // defined(OS_LINUX) || defined(OS_MACOSX) +#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) int idle_wakeups_per_second() const { return idle_wakeups_per_second_; } - private: -@@ -134,9 +134,9 @@ class TaskGroup { + +@@ -135,9 +135,9 @@ class TaskGroup { void RefreshNaClDebugStubPort(int child_process_unique_id); void OnRefreshNaClDebugStubPortDone(int port); #endif -#if defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) void OnOpenFdCountRefreshDone(int open_fd_count); -#endif // defined(OS_LINUX) || defined(OS_MACOSX) +#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) void OnCpuRefreshDone(double cpu_usage); void OnSwappedMemRefreshDone(int64_t swapped_mem_bytes); -@@ -205,10 +205,10 @@ class TaskGroup { +@@ -206,10 +206,10 @@ class TaskGroup { #if BUILDFLAG(ENABLE_NACL) int nacl_debug_stub_port_; #endif // BUILDFLAG(ENABLE_NACL) -#if defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) // The number of file descriptors currently open by the process. int open_fd_count_; -#endif // defined(OS_LINUX) || defined(OS_MACOSX) +#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) int idle_wakeups_per_second_; bool gpu_memory_has_duplicates_; bool is_backgrounded_; Index: head/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc (revision 504140) +++ head/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc (revision 504141) @@ -1,72 +1,72 @@ ---- chrome/browser/task_manager/sampling/task_group_sampler.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/task_manager/sampling/task_group_sampler.cc.orig 2019-06-04 18:55:18 UTC +++ chrome/browser/task_manager/sampling/task_group_sampler.cc -@@ -42,9 +42,9 @@ TaskGroupSampler::TaskGroupSampler( +@@ -43,9 +43,9 @@ TaskGroupSampler::TaskGroupSampler( const OnCpuRefreshCallback& on_cpu_refresh, const OnSwappedMemRefreshCallback& on_swapped_mem_refresh, const OnIdleWakeupsCallback& on_idle_wakeups, -#if defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) const OnOpenFdCountCallback& on_open_fd_count, -#endif // defined(OS_LINUX) || defined(OS_MACOSX) +#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) const OnProcessPriorityCallback& on_process_priority) : process_(std::move(process)), process_metrics_(CreateProcessMetrics(process_.Handle())), -@@ -52,9 +52,9 @@ TaskGroupSampler::TaskGroupSampler( +@@ -53,9 +53,9 @@ TaskGroupSampler::TaskGroupSampler( on_cpu_refresh_callback_(on_cpu_refresh), on_swapped_mem_refresh_callback_(on_swapped_mem_refresh), on_idle_wakeups_callback_(on_idle_wakeups), -#if defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) on_open_fd_count_callback_(on_open_fd_count), -#endif // defined(OS_LINUX) || defined(OS_MACOSX) +#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) on_process_priority_callback_(on_process_priority) { DCHECK(blocking_pool_runner.get()); -@@ -85,7 +85,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) +@@ -86,7 +86,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) on_swapped_mem_refresh_callback_); } -#if defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_IDLE_WAKEUPS, refresh_flags)) { base::PostTaskAndReplyWithResult( -@@ -94,9 +94,9 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) +@@ -95,9 +95,9 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) base::Bind(&TaskGroupSampler::RefreshIdleWakeupsPerSecond, this), on_idle_wakeups_callback_); } -#endif // defined(OS_MACOSX) || defined(OS_LINUX) +#endif // defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) -#if defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_FD_COUNT, refresh_flags)) { base::PostTaskAndReplyWithResult( -@@ -105,7 +105,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) +@@ -106,7 +106,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) base::Bind(&TaskGroupSampler::RefreshOpenFdCount, this), on_open_fd_count_callback_); } -#endif // defined(OS_LINUX) || defined(OS_MACOSX) +#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_PRIORITY, refresh_flags)) { -@@ -144,13 +144,13 @@ int TaskGroupSampler::RefreshIdleWakeupsPerSecond() { +@@ -151,13 +151,13 @@ int TaskGroupSampler::RefreshIdleWakeupsPerSecond() { return process_metrics_->GetIdleWakeupsPerSecond(); } -#if defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) int TaskGroupSampler::RefreshOpenFdCount() { DCHECK(worker_pool_sequenced_checker_.CalledOnValidSequence()); return process_metrics_->GetOpenFdCount(); } -#endif // defined(OS_LINUX) || defined(OS_MACOSX) +#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) bool TaskGroupSampler::RefreshProcessPriority() { DCHECK(worker_pool_sequenced_checker_.CalledOnValidSequence()); Index: head/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h =================================================================== --- head/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h (revision 504140) +++ head/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h (revision 504141) @@ -1,50 +1,50 @@ ---- chrome/browser/task_manager/sampling/task_group_sampler.h.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/task_manager/sampling/task_group_sampler.h.orig 2019-06-04 18:55:18 UTC +++ chrome/browser/task_manager/sampling/task_group_sampler.h @@ -32,9 +32,9 @@ class TaskGroupSampler : public base::RefCountedThread using OnCpuRefreshCallback = base::Callback; using OnSwappedMemRefreshCallback = base::Callback; using OnIdleWakeupsCallback = base::Callback; -#if defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) using OnOpenFdCountCallback = base::Callback; -#endif // defined(OS_LINUX) || defined(OS_MACOSX) +#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) using OnProcessPriorityCallback = base::Callback; TaskGroupSampler( @@ -43,9 +43,9 @@ class TaskGroupSampler : public base::RefCountedThread const OnCpuRefreshCallback& on_cpu_refresh, const OnSwappedMemRefreshCallback& on_memory_refresh, const OnIdleWakeupsCallback& on_idle_wakeups, -#if defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) const OnOpenFdCountCallback& on_open_fd_count, -#endif // defined(OS_LINUX) || defined(OS_MACOSX) +#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) const OnProcessPriorityCallback& on_process_priority); // Refreshes the expensive process' stats (CPU usage, memory usage, and idle @@ -60,9 +60,9 @@ class TaskGroupSampler : public base::RefCountedThread double RefreshCpuUsage(); int64_t RefreshSwappedMem(); int RefreshIdleWakeupsPerSecond(); -#if defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) int RefreshOpenFdCount(); -#endif // defined(OS_LINUX) || defined(OS_MACOSX) +#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) bool RefreshProcessPriority(); // The process that holds the handle that we own so that we can use it for -@@ -80,9 +80,9 @@ class TaskGroupSampler : public base::RefCountedThread +@@ -84,9 +84,9 @@ class TaskGroupSampler : public base::RefCountedThread const OnCpuRefreshCallback on_cpu_refresh_callback_; const OnSwappedMemRefreshCallback on_swapped_mem_refresh_callback_; const OnIdleWakeupsCallback on_idle_wakeups_callback_; -#if defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) const OnOpenFdCountCallback on_open_fd_count_callback_; -#endif // defined(OS_LINUX) || defined(OS_MACOSX) +#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) const OnProcessPriorityCallback on_process_priority_callback_; // To assert we're running on the correct thread. Index: head/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc (revision 504140) +++ head/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc (revision 504141) @@ -1,16 +1,16 @@ ---- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2019-04-30 22:22:36 UTC +--- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2019-06-04 18:55:18 UTC +++ chrome/browser/task_manager/sampling/task_manager_impl.cc -@@ -208,11 +208,11 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id, +@@ -210,11 +210,11 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id, } int TaskManagerImpl::GetOpenFdCount(TaskId task_id) const { -#if defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) return GetTaskGroupByTaskId(task_id)->open_fd_count(); #else return -1; -#endif // defined(OS_LINUX) || defined(OS_MACOSX) +#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) } bool TaskManagerImpl::IsTaskOnBackgroundedProcess(TaskId task_id) const { Index: head/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc (revision 504140) +++ head/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc (revision 504141) @@ -1,38 +1,38 @@ ---- chrome/browser/ui/browser_command_controller.cc.orig 2019-04-30 22:22:36 UTC +--- chrome/browser/ui/browser_command_controller.cc.orig 2019-06-04 18:55:18 UTC +++ chrome/browser/ui/browser_command_controller.cc -@@ -82,7 +82,7 @@ +@@ -80,7 +80,7 @@ #include "chrome/browser/ui/browser_commands_chromeos.h" #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" #endif -@@ -220,7 +220,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( +@@ -216,7 +216,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( #endif } -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) // If this key was registered by the user as a content editing hotkey, then // it is not reserved. ui::TextEditKeyBindingsDelegateAuraLinux* delegate = -@@ -434,7 +434,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -426,7 +426,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo break; #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) case IDC_MINIMIZE_WINDOW: browser_->window()->Minimize(); break; -@@ -879,7 +879,7 @@ void BrowserCommandController::InitCommandState() { +@@ -863,7 +863,7 @@ void BrowserCommandController::InitCommandState() { command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_2, true); command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_3, true); #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) command_updater_.UpdateCommandEnabled(IDC_MINIMIZE_WINDOW, true); command_updater_.UpdateCommandEnabled(IDC_MAXIMIZE_WINDOW, true); command_updater_.UpdateCommandEnabled(IDC_RESTORE_WINDOW, true); Index: head/www/chromium/files/patch-chrome_browser_ui_browser__window.h =================================================================== --- head/www/chromium/files/patch-chrome_browser_ui_browser__window.h (revision 504140) +++ head/www/chromium/files/patch-chrome_browser_ui_browser__window.h (revision 504141) @@ -1,11 +1,11 @@ ---- chrome/browser/ui/browser_window.h.orig 2019-04-30 22:22:36 UTC +--- chrome/browser/ui/browser_window.h.orig 2019-06-04 18:55:18 UTC +++ chrome/browser/ui/browser_window.h -@@ -426,7 +426,7 @@ class BrowserWindow : public ui::BaseWindow { +@@ -435,7 +435,7 @@ class BrowserWindow : public ui::BaseWindow { bool is_source_keyboard) = 0; #if defined(OS_CHROMEOS) || defined(OS_MACOSX) || defined(OS_WIN) || \ - defined(OS_LINUX) + defined(OS_LINUX) || defined(OS_BSD) virtual void ShowHatsBubbleFromAppMenuButton() = 0; #endif Index: head/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc (revision 504140) +++ head/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc (revision 504141) @@ -1,11 +1,11 @@ ---- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2019-06-04 18:55:18 UTC +++ chrome/browser/ui/startup/bad_flags_prompt.cc -@@ -84,7 +84,7 @@ static const char* kBadFlags[] = { +@@ -88,7 +88,7 @@ static const char* kBadFlags[] = { extensions::switches::kExtensionsOnChromeURLs, #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) // Speech dispatcher is buggy, it can crash and it can make Chrome freeze. // http://crbug.com/327295 switches::kEnableSpeechDispatcher, Index: head/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc (revision 504140) +++ head/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc (revision 504141) @@ -1,22 +1,22 @@ ---- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2019-04-30 22:22:36 UTC +--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2019-06-04 18:55:18 UTC +++ chrome/browser/ui/startup/startup_browser_creator.cc -@@ -79,7 +79,7 @@ +@@ -82,7 +82,7 @@ #include "chrome/browser/ui/user_manager.h" #endif -#if defined(TOOLKIT_VIEWS) && defined(OS_LINUX) +#if defined(TOOLKIT_VIEWS) && (defined(OS_LINUX) || defined(OS_BSD)) #include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck #endif -@@ -634,8 +634,10 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -652,8 +652,10 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( } #endif // OS_CHROMEOS +#if 0 /* XXX */ #if defined(TOOLKIT_VIEWS) && defined(USE_X11) ui::TouchFactory::SetTouchDeviceListFromCommandLine(); +#endif #endif #if defined(OS_MACOSX) Index: head/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc (revision 504140) +++ head/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc (revision 504141) @@ -1,25 +1,25 @@ ---- chrome/browser/ui/tab_helpers.cc.orig 2019-04-30 22:22:36 UTC +--- chrome/browser/ui/tab_helpers.cc.orig 2019-06-04 18:55:18 UTC +++ chrome/browser/ui/tab_helpers.cc -@@ -117,7 +117,7 @@ +@@ -118,7 +118,7 @@ #include "components/zoom/zoom_controller.h" #endif // defined(OS_ANDROID) -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) #include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h" #include "chrome/browser/ui/hats/hats_helper.h" #endif @@ -307,11 +307,11 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con #endif #if defined(OS_WIN) || defined(OS_MACOSX) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) metrics::DesktopSessionDurationObserver::CreateForWebContents(web_contents); #endif -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) if (base::FeatureList::IsEnabled( features::kHappinessTrackingSurveysForDesktop)) { HatsHelper::CreateForWebContents(web_contents); Index: head/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc (revision 504140) +++ head/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc (revision 504141) @@ -1,50 +1,50 @@ ---- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2019-04-30 22:22:36 UTC +--- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2019-06-04 18:55:18 UTC +++ chrome/browser/ui/task_manager/task_manager_table_model.cc -@@ -439,13 +439,13 @@ base::string16 TaskManagerTableModel::GetText(int row, +@@ -451,13 +451,13 @@ base::string16 TaskManagerTableModel::GetText(int row, ? stringifier_->backgrounded_string() : stringifier_->foregrounded_string(); -#if defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: { const int fd_count = observed_task_manager()->GetOpenFdCount(tasks_[row]); return fd_count >= 0 ? base::FormatNumber(fd_count) : stringifier_->n_a_string(); } -#endif // defined(OS_LINUX) || defined(OS_MACOSX) +#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) case IDS_TASK_MANAGER_KEEPALIVE_COUNT_COLUMN: { return stringifier_->GetKeepaliveCountText( -@@ -605,7 +605,7 @@ int TaskManagerTableModel::CompareValues(int row1, +@@ -617,7 +617,7 @@ int TaskManagerTableModel::CompareValues(int row1, return BooleanCompare(is_proc1_bg, is_proc2_bg); } -#if defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: { const int proc1_fd_count = observed_task_manager()->GetOpenFdCount(tasks_[row1]); -@@ -613,7 +613,7 @@ int TaskManagerTableModel::CompareValues(int row1, +@@ -625,7 +625,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_MACOSX) +#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) default: NOTREACHED(); -@@ -779,11 +779,11 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col +@@ -791,11 +791,11 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col type = REFRESH_TYPE_KEEPALIVE_COUNT; break; -#if defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: type = REFRESH_TYPE_FD_COUNT; break; -#endif // defined(OS_LINUX) || defined(OS_MACOSX) +#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) default: NOTREACHED(); Index: head/www/chromium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc (revision 504140) +++ head/www/chromium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc (revision 504141) @@ -1,11 +1,11 @@ ---- chrome/browser/ui/toolbar/app_menu_model.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/ui/toolbar/app_menu_model.cc.orig 2019-06-04 18:55:18 UTC +++ chrome/browser/ui/toolbar/app_menu_model.cc -@@ -671,7 +671,7 @@ bool AppMenuModel::IsCommandIdVisible(int command_id) +@@ -670,7 +670,7 @@ bool AppMenuModel::IsCommandIdVisible(int command_id) return app_menu_icon_controller_->GetTypeAndSeverity().type == AppMenuIconController::IconType::UPGRADE_NOTIFICATION; } -#if !defined(OS_LINUX) || defined(USE_AURA) +#if (!defined(OS_LINUX) && !defined(OS_BSD)) || defined(USE_AURA) case IDC_BOOKMARK_PAGE: return !chrome::ShouldRemoveBookmarkThisPageUI(browser_->profile()); case IDC_BOOKMARK_ALL_TABS: Index: head/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc (revision 504140) +++ head/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc (revision 504141) @@ -1,46 +1,46 @@ ---- chrome/browser/ui/views/accelerator_table.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/ui/views/accelerator_table.cc.orig 2019-06-04 18:55:18 UTC +++ chrome/browser/ui/views/accelerator_table.cc @@ -50,7 +50,7 @@ const AcceleratorMapping kAcceleratorMap[] = { {ui::VKEY_S, ui::EF_PLATFORM_ACCELERATOR, IDC_SAVE_PAGE}, {ui::VKEY_9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB}, {ui::VKEY_NUMPAD9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB}, -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) {ui::VKEY_9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB}, {ui::VKEY_NUMPAD9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB}, {ui::VKEY_NEXT, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, IDC_MOVE_TAB_NEXT}, @@ -80,7 +80,7 @@ const AcceleratorMapping kAcceleratorMap[] = { {ui::VKEY_NUMPAD7, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_6}, {ui::VKEY_8, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_7}, {ui::VKEY_NUMPAD8, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_7}, -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) {ui::VKEY_1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0}, {ui::VKEY_NUMPAD1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0}, {ui::VKEY_2, ui::EF_ALT_DOWN, IDC_SELECT_TAB_1}, @@ -98,7 +98,7 @@ const AcceleratorMapping kAcceleratorMap[] = { {ui::VKEY_8, ui::EF_ALT_DOWN, IDC_SELECT_TAB_7}, {ui::VKEY_NUMPAD8, ui::EF_ALT_DOWN, IDC_SELECT_TAB_7}, {ui::VKEY_BROWSER_FAVORITES, ui::EF_NONE, IDC_SHOW_BOOKMARK_BAR}, -#endif // OS_LINUX && !OS_CHROMEOS +#endif // (OS_LINUX || OS_BSD) && !OS_CHROMEOS {ui::VKEY_B, ui::EF_SHIFT_DOWN | ui::EF_PLATFORM_ACCELERATOR, IDC_SHOW_BOOKMARK_BAR}, {ui::VKEY_OEM_MINUS, ui::EF_PLATFORM_ACCELERATOR, IDC_ZOOM_MINUS}, -@@ -122,14 +122,14 @@ const AcceleratorMapping kAcceleratorMap[] = { - {ui::VKEY_F11, ui::EF_NONE, IDC_FULLSCREEN}, +@@ -124,14 +124,14 @@ const AcceleratorMapping kAcceleratorMap[] = { + IDC_SHOW_AVATAR_MENU}, // Platform-specific key maps. -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) {ui::VKEY_BROWSER_BACK, ui::EF_NONE, IDC_BACK}, {ui::VKEY_BROWSER_FORWARD, ui::EF_NONE, IDC_FORWARD}, {ui::VKEY_BROWSER_HOME, ui::EF_NONE, IDC_HOME}, {ui::VKEY_BROWSER_REFRESH, ui::EF_NONE, IDC_RELOAD}, {ui::VKEY_BROWSER_REFRESH, ui::EF_CONTROL_DOWN, IDC_RELOAD_BYPASSING_CACHE}, {ui::VKEY_BROWSER_REFRESH, ui::EF_SHIFT_DOWN, IDC_RELOAD_BYPASSING_CACHE}, -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) #if defined(OS_CHROMEOS) // On Chrome OS, VKEY_BROWSER_SEARCH is handled in Ash. Index: head/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc (revision 504140) +++ head/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc (revision 504141) @@ -1,38 +1,38 @@ ---- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig 2019-04-30 22:22:36 UTC +--- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig 2019-06-04 18:55:18 UTC +++ chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc @@ -33,7 +33,7 @@ #include "ui/wm/core/wm_state.h" #endif // defined(USE_AURA) -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) #include #include #include @@ -43,7 +43,7 @@ #include "chrome/grit/generated_resources.h" #include "content/public/common/content_switches.h" #include "ui/base/l10n/l10n_util.h" -#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) +#endif // (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) ChromeBrowserMainExtraPartsViews::ChromeBrowserMainExtraPartsViews() {} -@@ -91,7 +91,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( +@@ -89,7 +89,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( + g_browser_process->system_network_context_manager()->GetContext()); } - #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) // On the Linux desktop, we want to prevent the user from logging in as root, // so that we don't destroy the profile. Now that we have some minimal ui // initialized, check to see if we're running as root and bail if we are. -@@ -122,7 +122,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( +@@ -120,7 +120,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( base::RunLoop().RunUntilIdle(); exit(EXIT_FAILURE); -#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) +#endif // (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) } void ChromeBrowserMainExtraPartsViews::PostBrowserStart() { Index: head/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h =================================================================== --- head/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h (revision 504140) +++ head/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h (revision 504141) @@ -1,11 +1,11 @@ ---- chrome/browser/ui/views/chrome_views_delegate.h.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/ui/views/chrome_views_delegate.h.orig 2019-06-04 18:55:18 UTC +++ chrome/browser/ui/views/chrome_views_delegate.h @@ -44,7 +44,7 @@ class ChromeViewsDelegate : public views::ViewsDelegat HICON GetSmallWindowIcon() const override; int GetAppbarAutohideEdges(HMONITOR monitor, - const base::Closure& callback) override; + base::OnceClosure callback) override; -#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#elif (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) ++#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) gfx::ImageSkia* GetDefaultWindowIcon() const override; bool WindowManagerProvidesTitleBar(bool maximized) override; #endif Index: head/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc (revision 504140) +++ head/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc (revision 504141) @@ -1,29 +1,29 @@ ---- chrome/browser/ui/views/frame/browser_frame.cc.orig 2019-04-30 22:22:36 UTC +--- chrome/browser/ui/views/frame/browser_frame.cc.orig 2019-06-04 18:55:18 UTC +++ chrome/browser/ui/views/frame/browser_frame.cc -@@ -38,7 +38,7 @@ +@@ -39,7 +39,7 @@ #include "components/user_manager/user_manager.h" #endif -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) #include "chrome/browser/ui/views/frame/browser_command_handler_linux.h" #endif -@@ -49,7 +49,7 @@ +@@ -50,7 +50,7 @@ namespace { bool IsUsingGtkTheme(Profile* profile) { -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) return ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme(); #else return false; -@@ -105,7 +105,7 @@ void BrowserFrame::InitBrowserFrame() { +@@ -111,7 +111,7 @@ void BrowserFrame::InitBrowserFrame() { non_client_view()->set_context_menu_controller(this); } -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) browser_command_handler_.reset(new BrowserCommandHandlerLinux(browser_view_)); #endif } Index: head/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc (revision 504140) +++ head/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc (revision 504141) @@ -1,11 +1,11 @@ ---- chrome/browser/ui/views/frame/browser_view.cc.orig 2019-04-30 22:22:36 UTC +--- chrome/browser/ui/views/frame/browser_view.cc.orig 2019-06-04 18:55:18 UTC +++ chrome/browser/ui/views/frame/browser_view.cc -@@ -1504,7 +1504,7 @@ void BrowserView::UserChangedTheme(BrowserThemeChangeT +@@ -1502,7 +1502,7 @@ void BrowserView::UserChangedTheme(BrowserThemeChangeT // light to dark mode. const bool should_use_native_frame = frame_->ShouldUseNativeFrame(); bool must_regenerate_frame; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || 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; Index: head/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc (revision 504140) +++ head/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc (revision 504141) @@ -1,29 +1,29 @@ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2019-04-30 22:22:36 UTC +--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2019-06-04 18:55:18 UTC +++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc @@ -47,7 +47,7 @@ #include "ui/views/window/vector_icons/vector_icons.h" #include "ui/views/window/window_shape.h" -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) #include "ui/views/controls/menu/menu_runner.h" #endif -@@ -352,7 +352,7 @@ void OpaqueBrowserFrameView::ButtonPressed(views::Butt - void OpaqueBrowserFrameView::OnMenuButtonClicked(views::MenuButton* source, +@@ -353,7 +353,7 @@ void OpaqueBrowserFrameView::ButtonPressed(views::Butt + void OpaqueBrowserFrameView::OnMenuButtonClicked(views::Button* source, const gfx::Point& point, const ui::Event* event) { -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) views::MenuRunner menu_runner(frame()->GetSystemMenuModel(), views::MenuRunner::HAS_MNEMONICS); menu_runner.RunMenuAt(browser_view()->GetWidget(), window_icon_, -@@ -476,7 +476,7 @@ bool OpaqueBrowserFrameView::EverHasVisibleBackgroundT +@@ -479,7 +479,7 @@ bool OpaqueBrowserFrameView::EverHasVisibleBackgroundT OpaqueBrowserFrameView::FrameButtonStyle OpaqueBrowserFrameView::GetFrameButtonStyle() const { -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) return FrameButtonStyle::kMdButton; #else return FrameButtonStyle::kImageButton; Index: head/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc (revision 504140) +++ head/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc (revision 504141) @@ -1,20 +1,29 @@ ---- chrome/browser/ui/views/frame/system_menu_model_delegate.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/ui/views/frame/system_menu_model_delegate.cc.orig 2019-06-04 18:55:18 UTC +++ chrome/browser/ui/views/frame/system_menu_model_delegate.cc @@ -15,7 +15,7 @@ #include "components/sessions/core/tab_restore_service.h" #include "ui/base/l10n/l10n_util.h" -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) #include "chrome/common/pref_names.h" #include "components/prefs/pref_service.h" #endif @@ -30,7 +30,7 @@ SystemMenuModelDelegate::SystemMenuModelDelegate( SystemMenuModelDelegate::~SystemMenuModelDelegate() {} bool SystemMenuModelDelegate::IsCommandIdChecked(int command_id) const { -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) if (command_id == IDC_USE_SYSTEM_TITLE_BAR) { PrefService* prefs = browser_->profile()->GetPrefs(); return !prefs->GetBoolean(prefs::kUseCustomChromeFrame); +@@ -44,7 +44,7 @@ bool SystemMenuModelDelegate::IsCommandIdEnabled(int c + } + + bool SystemMenuModelDelegate::IsCommandIdVisible(int command_id) const { +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + bool is_maximized = browser_->window()->IsMaximized(); + switch (command_id) { + case IDC_MAXIMIZE_WINDOW: Index: head/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc (revision 504140) +++ head/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc (revision 504141) @@ -1,11 +1,11 @@ ---- chrome/browser/ui/views/hung_renderer_view.cc.orig 2019-03-17 19:17:01 UTC +--- chrome/browser/ui/views/hung_renderer_view.cc.orig 2019-06-04 18:55:18 UTC +++ chrome/browser/ui/views/hung_renderer_view.cc -@@ -389,7 +389,7 @@ bool HungRendererDialogView::Cancel() { +@@ -390,7 +390,7 @@ bool HungRendererDialogView::Cancel() { content::RenderProcessHost* rph = hung_pages_table_model_->GetRenderWidgetHost()->GetProcess(); if (rph) { -#if defined(OS_LINUX) +#if defined(OS_LINUX) || 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(); Index: head/www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc (revision 504140) +++ head/www/chromium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc (revision 504141) @@ -1,11 +1,11 @@ ---- chrome/browser/ui/views/tabs/new_tab_button.cc.orig 2019-04-30 22:22:37 UTC +--- chrome/browser/ui/views/tabs/new_tab_button.cc.orig 2019-06-04 18:55:18 UTC +++ chrome/browser/ui/views/tabs/new_tab_button.cc -@@ -64,7 +64,7 @@ const gfx::Size NewTabButton::kButtonSize{28, 28}; +@@ -65,7 +65,7 @@ const gfx::Size NewTabButton::kButtonSize{28, 28}; NewTabButton::NewTabButton(TabStrip* tab_strip, views::ButtonListener* listener) : views::ImageButton(listener), tab_strip_(tab_strip) { set_animate_on_state_change(true); -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) set_triggerable_event_flags(triggerable_event_flags() | ui::EF_MIDDLE_MOUSE_BUTTON); #endif Index: head/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc (revision 504140) +++ head/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc (revision 504141) @@ -1,29 +1,29 @@ ---- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2019-04-30 22:22:37 UTC +--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2019-06-04 18:55:18 UTC +++ chrome/browser/ui/views/tabs/tab_drag_controller.cc -@@ -396,7 +396,7 @@ void TabDragController::Init(TabStrip* source_tabstrip +@@ -436,7 +436,7 @@ void TabDragController::Init(TabStrip* source_tabstrip // synchronous on desktop Linux, so use that. // - Chrome OS // Releasing capture on Ash cancels gestures so avoid it. -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) can_release_capture_ = false; #endif start_point_in_screen_ = gfx::Point(source_tab_offset, mouse_offset.y()); -@@ -822,7 +822,7 @@ TabDragController::DragBrowserToNewTabStrip(TabStrip* +@@ -868,7 +868,7 @@ TabDragController::DragBrowserToNewTabStrip(TabStrip* else target_tabstrip->GetWidget()->SetCapture(attached_tabstrip_); -#if !defined(OS_LINUX) || defined(OS_CHROMEOS) +#if (!defined(OS_LINUX) || defined(OS_CHROMEOS)) && !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. -@@ -1997,7 +1997,7 @@ TabDragController::Liveness TabDragController::GetLoca +@@ -2044,7 +2044,7 @@ TabDragController::Liveness TabDragController::GetLoca exclude.insert(dragged_window); } } -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || 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 Index: head/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc (revision 504140) +++ head/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc (revision 504141) @@ -1,49 +1,55 @@ ---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2019-04-30 22:22:37 UTC +--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2019-06-04 18:55:18 UTC +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -198,11 +198,11 @@ +@@ -202,11 +202,11 @@ #include "chrome/browser/ui/webui/welcome/welcome_win10_ui.h" #endif -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) #include "chrome/browser/ui/webui/discards/discards_ui.h" #endif -#if defined(OS_LINUX) || defined(OS_ANDROID) +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) #include "chrome/browser/ui/webui/sandbox_internals_ui.h" #endif -@@ -320,7 +320,7 @@ bool IsAboutUI(const GURL& url) { +@@ -322,7 +322,7 @@ bool IsAboutUI(const GURL& url) { #if !defined(OS_ANDROID) || url.host_piece() == chrome::kChromeUITermsHost #endif -#if defined(OS_LINUX) || defined(OS_OPENBSD) +#if defined(OS_LINUX) || defined(OS_BSD) || url.host_piece() == chrome::kChromeUILinuxProxyConfigHost #endif #if defined(OS_CHROMEOS) -@@ -605,7 +605,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -619,7 +619,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we if (url.host_piece() == chrome::kChromeUINaClHost) return &NewWebUI; #endif -#if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA) +#if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA) || defined(OS_BSD) if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost) return &NewWebUI; #endif -@@ -650,12 +650,12 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -664,17 +664,17 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we return &NewWebUI; } #endif -#if defined(OS_LINUX) || defined(OS_ANDROID) +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) if (url.host_piece() == chrome::kChromeUISandboxHost) { return &NewWebUI; } #endif -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) if (url.host_piece() == chrome::kChromeUIDiscardsHost) return &NewWebUI; + #endif + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + if (url.host_piece() == chrome::kChromeUIBrowserSwitchHost) + return &NewWebUI; #endif Index: head/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc =================================================================== --- head/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc (nonexistent) +++ head/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc (revision 504141) @@ -0,0 +1,20 @@ +--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2019-06-04 18:55:18 UTC ++++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc +@@ -566,7 +566,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht + {"enterCustomWebAddress", IDS_SETTINGS_ENTER_CUSTOM_WEB_ADDRESS}, + {"homeButtonDisabled", IDS_SETTINGS_HOME_BUTTON_DISABLED}, + {"themes", IDS_SETTINGS_THEMES}, +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + {"systemTheme", IDS_SETTINGS_SYSTEM_THEME}, + {"useSystemTheme", IDS_SETTINGS_USE_SYSTEM_THEME}, + {"classicTheme", IDS_SETTINGS_CLASSIC_THEME}, +@@ -584,7 +584,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht + {"openWallpaperApp", IDS_SETTINGS_OPEN_WALLPAPER_APP}, + {"setWallpaper", IDS_SETTINGS_SET_WALLPAPER}, + #endif +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS}, + #endif + #if defined(OS_MACOSX) Property changes on: head/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-chrome_common_BUILD.gn =================================================================== --- head/www/chromium/files/patch-chrome_common_BUILD.gn (revision 504140) +++ head/www/chromium/files/patch-chrome_common_BUILD.gn (revision 504141) @@ -1,13 +1,13 @@ ---- chrome/common/BUILD.gn.orig 2019-04-30 22:22:37 UTC +--- chrome/common/BUILD.gn.orig 2019-06-04 18:55:18 UTC +++ chrome/common/BUILD.gn -@@ -298,6 +298,10 @@ static_library("common") { +@@ -306,6 +306,10 @@ static_library("common") { public_deps += [ "//ppapi/shared_impl" ] } + if (is_bsd) { + sources -= [ "component_flash_hint_file_linux.cc" ] + } + if (enable_extensions) { sources += [ "cast_messages.cc", Index: head/www/chromium/files/patch-chrome_common_chrome__features.cc =================================================================== --- head/www/chromium/files/patch-chrome_common_chrome__features.cc (revision 504140) +++ head/www/chromium/files/patch-chrome_common_chrome__features.cc (revision 504141) @@ -1,36 +1,36 @@ ---- chrome/common/chrome_features.cc.orig 2019-04-30 22:22:37 UTC +--- chrome/common/chrome_features.cc.orig 2019-06-04 18:55:18 UTC +++ chrome/common/chrome_features.cc -@@ -96,13 +96,13 @@ const base::Feature kAutomaticTabDiscarding{"Automatic - base::FEATURE_ENABLED_BY_DEFAULT}; - #endif // defined(OS_WIN) || defined(OS_MACOSX) +@@ -92,13 +92,13 @@ const base::Feature kAutoFetchOnNetErrorPage{"AutoFetc + base::FEATURE_DISABLED_BY_DEFAULT}; + #endif // defined(OS_ANDROID) -#if defined(OS_WIN) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) // Enables the Restart background mode optimization. When all Chrome UI is // closed and it goes in the background, allows to restart the browser to // discard memory. const base::Feature kBackgroundModeAllowRestart{ "BackgroundModeAllowRestart", base::FEATURE_DISABLED_BY_DEFAULT}; -#endif // defined(OS_WIN) || defined(OS_LINUX) +#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) // Enables or disables whether permission prompts are automatically blocked // after the user has explicitly dismissed them too many times. -@@ -152,7 +152,7 @@ const base::Feature kThirdPartyModulesBlocking{ +@@ -144,7 +144,7 @@ const base::Feature kThirdPartyModulesBlocking{ "ThirdPartyModulesBlocking", base::FEATURE_DISABLED_BY_DEFAULT}; #endif -#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) || defined(OS_BSD) // Enables the dual certificate verification trial feature. // https://crbug.com/649026 const base::Feature kCertDualVerificationTrialFeature{ -@@ -216,7 +216,7 @@ const base::Feature kUsageTimeLimitPolicy{"UsageTimeLi +@@ -204,7 +204,7 @@ const base::Feature kUsageTimeLimitPolicy{"UsageTimeLi + // Enables or disables windowing related features for desktop PWAs. const base::Feature kDesktopPWAWindowing { "DesktopPWAWindowing", - #if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX) || \ -- defined(OS_MACOSX) -+ defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX) || \ ++#if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_MACOSX) base::FEATURE_ENABLED_BY_DEFAULT #else - base::FEATURE_DISABLED_BY_DEFAULT Index: head/www/chromium/files/patch-chrome_common_chrome__features.h =================================================================== --- head/www/chromium/files/patch-chrome_common_chrome__features.h (revision 504140) +++ head/www/chromium/files/patch-chrome_common_chrome__features.h (revision 504141) @@ -1,24 +1,24 @@ ---- chrome/common/chrome_features.h.orig 2019-04-30 22:22:37 UTC +--- chrome/common/chrome_features.h.orig 2019-06-04 18:55:18 UTC +++ chrome/common/chrome_features.h -@@ -66,10 +66,10 @@ COMPONENT_EXPORT(CHROME_FEATURES) - extern const base::Feature kAutomaticTabDiscarding; - #endif // defined(OS_WIN) || defined(OS_MACOSX) +@@ -60,10 +60,10 @@ COMPONENT_EXPORT(CHROME_FEATURES) + extern const base::Feature kAutoFetchOnNetErrorPage; + #endif -#if defined(OS_WIN) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kBackgroundModeAllowRestart; -#endif // defined(OS_WIN) || defined(OS_LINUX) +#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kBlockPromptsIfDismissedOften; -@@ -89,7 +89,7 @@ extern const base::Feature kBrowserHangFixesExperiment +@@ -79,7 +79,7 @@ extern const base::Feature kBrowserHangFixesExperiment COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kBundledConnectionHelpFeature; -#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) || defined(OS_BSD) COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kCertDualVerificationTrialFeature; #endif Index: head/www/chromium/files/patch-chrome_common_chrome__paths.cc =================================================================== --- head/www/chromium/files/patch-chrome_common_chrome__paths.cc (revision 504140) +++ head/www/chromium/files/patch-chrome_common_chrome__paths.cc (revision 504141) @@ -1,114 +1,113 @@ ---- chrome/common/chrome_paths.cc.orig 2019-04-30 22:22:37 UTC +--- chrome/common/chrome_paths.cc.orig 2019-06-04 18:55:18 UTC +++ chrome/common/chrome_paths.cc @@ -52,21 +52,21 @@ const base::FilePath::CharType kPepperFlashSystemBaseD FILE_PATH_LITERAL("Internet Plug-Ins/PepperFlashPlayer"); #endif -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // The path to the external extension .json files. // /usr/share seems like a good choice, see: http://www.pathname.com/fhs/ const base::FilePath::CharType kFilepathSinglePrefExtensions[] = #if defined(GOOGLE_CHROME_BUILD) FILE_PATH_LITERAL("/usr/share/google-chrome/extensions"); #else - FILE_PATH_LITERAL("/usr/share/chromium/extensions"); + FILE_PATH_LITERAL("/usr/local/share/chromium/extensions"); #endif // defined(GOOGLE_CHROME_BUILD) // The path to the hint file that tells the pepper plugin loader // where it can find the latest component updated flash. const base::FilePath::CharType kComponentUpdatedFlashHint[] = FILE_PATH_LITERAL("latest-component-updated-flash"); -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) #if defined(OS_CHROMEOS) const base::FilePath::CharType kChromeOSComponentFlash[] = FILE_PATH_LITERAL( @@ -197,7 +197,7 @@ bool PathProvider(int key, base::FilePath* result) { return false; break; case chrome::DIR_DEFAULT_DOWNLOADS_SAFE: -#if defined(OS_WIN) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) if (!GetUserDownloadsDirectorySafe(&cur)) return false; break; -@@ -459,10 +459,12 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -459,17 +459,19 @@ bool PathProvider(int key, base::FilePath* result) { if (!base::PathExists(cur)) // We don't want to create this return false; break; -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) +#if defined(OS_POSIX) && !defined(OS_MACOSX) case chrome::DIR_POLICY_FILES: { #if defined(GOOGLE_CHROME_BUILD) cur = base::FilePath(FILE_PATH_LITERAL("/etc/opt/chrome/policies")); +#elif defined(OS_BSD) + cur = base::FilePath(FILE_PATH_LITERAL("/usr/local/etc/chrome/policies")); #else cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies")); #endif -@@ -470,7 +472,7 @@ bool PathProvider(int key, base::FilePath* result) { + break; } #endif - #if defined(OS_CHROMEOS) || (defined(OS_LINUX) && defined(CHROMIUM_BUILD)) || \ -- defined(OS_MACOSX) -+ defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && defined(CHROMIUM_BUILD)) || \ ++#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && defined(CHROMIUM_BUILD)) || defined(OS_BSD) || \ + defined(OS_MACOSX) case chrome::DIR_USER_EXTERNAL_EXTENSIONS: { if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) - return false; @@ -478,7 +480,7 @@ bool PathProvider(int key, base::FilePath* result) { break; } #endif -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: { cur = base::FilePath(kFilepathSinglePrefExtensions); break; @@ -513,7 +515,7 @@ bool PathProvider(int key, base::FilePath* result) { #endif break; -#if defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) case chrome::DIR_NATIVE_MESSAGING: #if defined(OS_MACOSX) #if defined(GOOGLE_CHROME_BUILD) @@ -527,6 +529,9 @@ bool PathProvider(int key, base::FilePath* result) { #if defined(GOOGLE_CHROME_BUILD) cur = base::FilePath(FILE_PATH_LITERAL( "/etc/opt/chrome/native-messaging-hosts")); +#elif defined(OS_BSD) + cur = base::FilePath(FILE_PATH_LITERAL( + "/usr/local/etc/chrome/native-messaging-hosts")); #else cur = base::FilePath(FILE_PATH_LITERAL( "/etc/chromium/native-messaging-hosts")); @@ -539,7 +544,7 @@ bool PathProvider(int key, base::FilePath* result) { return false; cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts")); break; -#endif // defined(OS_LINUX) || defined(OS_MACOSX) +#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) #if !defined(OS_ANDROID) case chrome::DIR_GLOBAL_GCM_STORE: if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) @@ -547,7 +552,7 @@ bool PathProvider(int key, base::FilePath* result) { cur = cur.Append(kGCMStoreDirname); break; #endif // !defined(OS_ANDROID) -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) case chrome::FILE_COMPONENT_FLASH_HINT: if (!base::PathService::Get( chrome::DIR_COMPONENT_UPDATED_PEPPER_FLASH_PLUGIN, &cur)) { @@ -555,7 +560,7 @@ bool PathProvider(int key, base::FilePath* result) { } cur = cur.Append(kComponentUpdatedFlashHint); break; -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) #if defined(OS_CHROMEOS) case chrome::FILE_CHROME_OS_COMPONENT_FLASH: cur = base::FilePath(kChromeOSComponentFlash); Index: head/www/chromium/files/patch-chrome_common_chrome__paths__internal.h =================================================================== --- head/www/chromium/files/patch-chrome_common_chrome__paths__internal.h (revision 504140) +++ head/www/chromium/files/patch-chrome_common_chrome__paths__internal.h (revision 504141) @@ -1,11 +1,11 @@ ---- chrome/common/chrome_paths_internal.h.orig 2019-03-11 22:00:54 UTC +--- chrome/common/chrome_paths_internal.h.orig 2019-06-04 18:55:18 UTC +++ chrome/common/chrome_paths_internal.h -@@ -45,7 +45,7 @@ void GetUserCacheDirectory(const base::FilePath& profi +@@ -47,7 +47,7 @@ void GetUserCacheDirectory(const base::FilePath& profi // Get the path to the user's documents directory. bool GetUserDocumentsDirectory(base::FilePath* result); -#if defined(OS_WIN) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) // Gets the path to a safe default download directory for a user. bool GetUserDownloadsDirectorySafe(base::FilePath* result); #endif Index: head/www/chromium/files/patch-chrome_common_chrome__switches.cc =================================================================== --- head/www/chromium/files/patch-chrome_common_chrome__switches.cc (revision 504140) +++ head/www/chromium/files/patch-chrome_common_chrome__switches.cc (revision 504141) @@ -1,17 +1,17 @@ ---- chrome/common/chrome_switches.cc.orig 2019-04-30 22:22:37 UTC +--- chrome/common/chrome_switches.cc.orig 2019-06-04 18:55:18 UTC +++ chrome/common/chrome_switches.cc -@@ -905,12 +905,12 @@ const char kAllowNaClFileHandleAPI[] = "allow-n +@@ -878,12 +878,12 @@ const char kAllowNaClFileHandleAPI[] = "allow-n const char kAllowNaClSocketAPI[] = "allow-nacl-socket-api"; #endif -#if defined(OS_WIN) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) const char kDisableInputImeAPI[] = "disable-input-ime-api"; const char kEnableInputImeAPI[] = "enable-input-ime-api"; #endif -#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) const char kEnableNewAppMenuIcon[] = "enable-new-app-menu-icon"; #endif Index: head/www/chromium/files/patch-chrome_common_chrome__switches.h =================================================================== --- head/www/chromium/files/patch-chrome_common_chrome__switches.h (revision 504140) +++ head/www/chromium/files/patch-chrome_common_chrome__switches.h (revision 504141) @@ -1,17 +1,17 @@ ---- chrome/common/chrome_switches.h.orig 2019-04-30 22:22:37 UTC +--- chrome/common/chrome_switches.h.orig 2019-06-04 18:55:18 UTC +++ chrome/common/chrome_switches.h -@@ -279,12 +279,12 @@ extern const char kAllowNaClFileHandleAPI[]; +@@ -269,12 +269,12 @@ extern const char kAllowNaClFileHandleAPI[]; extern const char kAllowNaClSocketAPI[]; #endif -#if defined(OS_WIN) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) extern const char kDisableInputImeAPI[]; extern const char kEnableInputImeAPI[]; #endif -#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) extern const char kEnableNewAppMenuIcon[]; #endif Index: head/www/chromium/files/patch-chrome_common_extensions_api_api__sources.gni =================================================================== --- head/www/chromium/files/patch-chrome_common_extensions_api_api__sources.gni (revision 504140) +++ head/www/chromium/files/patch-chrome_common_extensions_api_api__sources.gni (revision 504141) @@ -1,11 +1,11 @@ ---- chrome/common/extensions/api/api_sources.gni.orig 2019-03-11 22:00:54 UTC +--- chrome/common/extensions/api/api_sources.gni.orig 2019-06-04 18:55:18 UTC +++ chrome/common/extensions/api/api_sources.gni -@@ -109,7 +109,7 @@ if (is_chromeos) { +@@ -108,7 +108,7 @@ if (is_chromeos) { "wallpaper.json", "wallpaper_private.json", ] -} else if (is_linux || is_win) { +} else if (is_linux || is_bsd || is_win) { schema_sources_ += [ "input_ime.json" ] } Index: head/www/chromium/files/patch-chrome_common_pref__names.cc =================================================================== --- head/www/chromium/files/patch-chrome_common_pref__names.cc (revision 504140) +++ head/www/chromium/files/patch-chrome_common_pref__names.cc (revision 504141) @@ -1,29 +1,44 @@ ---- chrome/common/pref_names.cc.orig 2019-04-30 22:22:38 UTC +--- chrome/common/pref_names.cc.orig 2019-06-04 18:55:19 UTC +++ chrome/common/pref_names.cc -@@ -946,7 +946,7 @@ const char kForceYouTubeRestrict[] = "settings.force_y +@@ -953,7 +953,7 @@ const char kForceYouTubeRestrict[] = "settings.force_y // only using an account that belongs to one of the domains from this pref. const char kAllowedDomainsForApps[] = "settings.allowed_domains_for_apps"; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) // Linux specific preference on whether we should match the system theme. const char kUsesSystemTheme[] = "extensions.theme.use_system"; #endif -@@ -1043,7 +1043,7 @@ const char kShowUpdatePromotionInfoBar[] = +@@ -1047,7 +1047,7 @@ const char kShowUpdatePromotionInfoBar[] = "browser.show_update_promotion_info_bar"; #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) // 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"; -@@ -1430,7 +1430,7 @@ const char kDownloadDefaultDirectory[] = "download.def +@@ -1434,7 +1434,7 @@ const char kDownloadDefaultDirectory[] = "download.def // upgrade a unsafe location to a safe location. const char kDownloadDirUpgraded[] = "download.directory_upgrade"; -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) const char kOpenPdfDownloadInSystemReader[] = "download.open_pdf_in_system_reader"; #endif +@@ -1716,12 +1716,12 @@ const char kAuthAndroidNegotiateAccountType[] = + // domain sub-content requests. + const char kAllowCrossOriginAuthPrompt[] = "auth.allow_cross_origin_prompt"; + +-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) + // Boolean that specifies whether OK-AS-DELEGATE flag from KDC is respected + // along with kAuthNegotiateDelegateWhitelist. + const char kAuthNegotiateDelegateByKdcPolicy[] = + "auth.negotiate_delegate_by_kdc_policy"; +-#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + #if defined(OS_POSIX) + // Boolean that specifies whether NTLMv2 is enabled. Index: head/www/chromium/files/patch-chrome_common_pref__names.h =================================================================== --- head/www/chromium/files/patch-chrome_common_pref__names.h (revision 504140) +++ head/www/chromium/files/patch-chrome_common_pref__names.h (revision 504141) @@ -1,29 +1,41 @@ ---- chrome/common/pref_names.h.orig 2019-04-30 22:22:38 UTC +--- chrome/common/pref_names.h.orig 2019-06-04 18:55:19 UTC +++ chrome/common/pref_names.h -@@ -301,7 +301,7 @@ extern const char kHistoryMenuPromoShown[]; +@@ -302,7 +302,7 @@ extern const char kHistoryMenuPromoShown[]; extern const char kForceGoogleSafeSearch[]; extern const char kForceYouTubeRestrict[]; extern const char kAllowedDomainsForApps[]; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) extern const char kUsesSystemTheme[]; #endif extern const char kCurrentThemePackFilename[]; -@@ -334,7 +334,7 @@ extern const char kDefaultBrowserSettingEnabled[]; +@@ -332,7 +332,7 @@ extern const char kDefaultBrowserSettingEnabled[]; #if defined(OS_MACOSX) extern const char kShowUpdatePromotionInfoBar[]; #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) extern const char kUseCustomChromeFrame[]; #endif #if BUILDFLAG(ENABLE_PLUGINS) -@@ -490,7 +490,7 @@ extern const char kAppWindowPlacement[]; +@@ -488,7 +488,7 @@ extern const char kAppWindowPlacement[]; extern const char kDownloadDefaultDirectory[]; extern const char kDownloadExtensionsToOpen[]; extern const char kDownloadDirUpgraded[]; -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) extern const char kOpenPdfDownloadInSystemReader[]; #endif #if defined(OS_ANDROID) +@@ -692,9 +692,9 @@ extern const char kGSSAPILibraryName[]; + extern const char kAuthAndroidNegotiateAccountType[]; + extern const char kAllowCrossOriginAuthPrompt[]; + +-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) + extern const char kAuthNegotiateDelegateByKdcPolicy[]; +-#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + #if defined(OS_POSIX) + extern const char kNtlmV2Enabled[]; Index: head/www/chromium/files/patch-chrome_common_webui__url__constants.cc =================================================================== --- head/www/chromium/files/patch-chrome_common_webui__url__constants.cc (revision 504140) +++ head/www/chromium/files/patch-chrome_common_webui__url__constants.cc (revision 504141) @@ -1,48 +1,48 @@ ---- chrome/common/webui_url_constants.cc.orig 2019-04-30 22:22:38 UTC +--- chrome/common/webui_url_constants.cc.orig 2019-06-04 18:55:19 UTC +++ chrome/common/webui_url_constants.cc -@@ -243,7 +243,7 @@ const char kChromeUIMetroFlowURL[] = "chrome://make-me +@@ -251,7 +251,7 @@ const char kChromeUIMetroFlowURL[] = "chrome://make-me const char kChromeUICastHost[] = "cast"; #endif -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) const char kChromeUIDiscardsHost[] = "discards"; const char kChromeUIDiscardsURL[] = "chrome://discards/"; const char kChromeUIHatsHost[] = "hats"; -@@ -254,17 +254,17 @@ const char kChromeUIHatsURL[] = "chrome://hats/"; +@@ -262,17 +262,17 @@ const char kChromeUIHatsURL[] = "chrome://hats/"; const char kChromeUILinuxProxyConfigHost[] = "linux-proxy-config"; #endif -#if defined(OS_LINUX) || defined(OS_ANDROID) +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) const char kChromeUISandboxHost[] = "sandbox"; #endif --#if defined(OS_WIN) || defined(OS_MACOSX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) const char kChromeUIBrowserSwitchHost[] = "browser-switch"; const char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/"; #endif -#if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA) +#if ((defined(OS_BSD) || defined(OS_LINUX)) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA) const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog"; #endif -@@ -418,13 +418,13 @@ const char* const kChromeHostURLs[] = { +@@ -463,13 +463,13 @@ const char* const kChromeHostURLs[] = { kChromeUIInternetDetailDialogHost, kChromeUIAssistantOptInHost, #endif -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) kChromeUIDiscardsHost, #endif #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) kChromeUILinuxProxyConfigHost, #endif -#if defined(OS_LINUX) || defined(OS_ANDROID) +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) kChromeUISandboxHost, #endif #if defined(OS_WIN) Index: head/www/chromium/files/patch-chrome_common_webui__url__constants.h =================================================================== --- head/www/chromium/files/patch-chrome_common_webui__url__constants.h (revision 504140) +++ head/www/chromium/files/patch-chrome_common_webui__url__constants.h (revision 504141) @@ -1,32 +1,32 @@ ---- chrome/common/webui_url_constants.h.orig 2019-04-30 22:22:38 UTC +--- chrome/common/webui_url_constants.h.orig 2019-06-04 18:55:19 UTC +++ chrome/common/webui_url_constants.h -@@ -238,7 +238,7 @@ extern const char kChromeUIMetroFlowURL[]; +@@ -246,7 +246,7 @@ extern const char kChromeUIMetroFlowURL[]; extern const char kChromeUICastHost[]; #endif -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) extern const char kChromeUIDiscardsHost[]; extern const char kChromeUIDiscardsURL[]; extern const char kChromeUIHatsHost[]; -@@ -250,17 +250,17 @@ extern const char kChromeUIHatsURL[]; +@@ -258,17 +258,17 @@ extern const char kChromeUIHatsURL[]; extern const char kChromeUILinuxProxyConfigHost[]; #endif -#if defined(OS_LINUX) || defined(OS_ANDROID) +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) extern const char kChromeUISandboxHost[]; #endif --#if defined(OS_WIN) || defined(OS_MACOSX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) extern const char kChromeUIBrowserSwitchHost[]; extern const char kChromeUIBrowserSwitchURL[]; #endif -#if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA) +#if ((defined(OS_BSD) || defined(OS_LINUX)) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA) extern const char kChromeUITabModalConfirmDialogHost[]; #endif Index: head/www/chromium/files/patch-chrome_renderer_chrome__content__renderer__client.cc =================================================================== --- head/www/chromium/files/patch-chrome_renderer_chrome__content__renderer__client.cc (revision 504140) +++ head/www/chromium/files/patch-chrome_renderer_chrome__content__renderer__client.cc (revision 504141) @@ -1,11 +1,11 @@ ---- chrome/renderer/chrome_content_renderer_client.cc.orig 2019-04-30 22:22:38 UTC +--- chrome/renderer/chrome_content_renderer_client.cc.orig 2019-06-04 18:55:19 UTC +++ chrome/renderer/chrome_content_renderer_client.cc -@@ -1035,7 +1035,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( +@@ -986,7 +986,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( } case chrome::mojom::PluginStatus::kRestartRequired: { -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) placeholder = create_blocked_plugin( IDR_BLOCKED_PLUGIN_HTML, l10n_util::GetStringFUTF16(IDS_PLUGIN_RESTART_REQUIRED, Index: head/www/chromium/files/patch-chrome_test_BUILD.gn =================================================================== --- head/www/chromium/files/patch-chrome_test_BUILD.gn (revision 504140) +++ head/www/chromium/files/patch-chrome_test_BUILD.gn (revision 504141) @@ -1,11 +1,11 @@ ---- chrome/test/BUILD.gn.orig 2019-04-30 22:22:38 UTC +--- chrome/test/BUILD.gn.orig 2019-06-04 18:55:19 UTC +++ chrome/test/BUILD.gn -@@ -5318,7 +5318,7 @@ test("chrome_app_unittests") { +@@ -5399,7 +5399,7 @@ test("chrome_app_unittests") { "//components/crash/core/common", "//components/flags_ui:switches", ] - if (!is_fuchsia) { + if (!is_fuchsia && !is_bsd) { # TODO(crbug.com/753619): Enable crash reporting on Fuchsia. deps += [ "//third_party/breakpad:client" ] } Index: head/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc =================================================================== --- head/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc (revision 504140) +++ head/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc (revision 504141) @@ -1,22 +1,22 @@ ---- chrome/test/base/in_process_browser_test.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/test/base/in_process_browser_test.cc.orig 2019-06-04 18:55:19 UTC +++ chrome/test/base/in_process_browser_test.cc @@ -74,6 +74,10 @@ #include "chrome/test/base/scoped_bundle_swizzler_mac.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" -@@ -102,7 +106,7 @@ +@@ -106,7 +110,7 @@ #include "ui/events/test/event_generator.h" #endif // defined(OS_CHROMEOS) -#if !defined(OS_CHROMEOS) && defined(OS_LINUX) +#if !defined(OS_CHROMEOS) && (defined(OS_LINUX) || defined(OS_BSD)) #include "ui/views/test/test_desktop_screen_x11.h" #endif Index: head/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc =================================================================== --- head/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc (revision 504140) +++ head/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc (revision 504141) @@ -1,38 +1,38 @@ ---- chromecast/browser/cast_browser_main_parts.cc.orig 2019-04-30 22:22:40 UTC +--- chromecast/browser/cast_browser_main_parts.cc.orig 2019-06-04 18:55:20 UTC +++ chromecast/browser/cast_browser_main_parts.cc @@ -67,7 +67,7 @@ - #include "ui/compositor/compositor_switches.h" + #include "ui/base/ui_base_switches.h" #include "ui/gl/gl_switches.h" -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) #include #include #include -@@ -245,7 +245,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { +@@ -263,7 +263,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { {cc::switches::kDisableThreadedAnimation, ""}, #endif // defined(OS_ANDROID) #endif // BUILDFLAG(IS_CAST_AUDIO_ONLY) -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) #if defined(ARCH_CPU_X86_FAMILY) // This is needed for now to enable the x11 Ozone platform to work with // current Linux/NVidia OpenGL drivers. -@@ -255,7 +255,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { +@@ -273,7 +273,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { {switches::kEnableHardwareOverlays, "cast"}, #endif #endif -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || 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. -@@ -394,7 +394,7 @@ void CastBrowserMainParts::PostMainMessageLoopStart() +@@ -412,7 +412,7 @@ void CastBrowserMainParts::PostMainMessageLoopStart() } void CastBrowserMainParts::ToolkitInitialized() { -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // Without this call, the FontConfig library gets implicitly initialized // on the first call to FontConfig. Since it's not safe to initialize it // concurrently from multiple threads, we explicitly initialize it here Index: head/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc =================================================================== --- head/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc (revision 504140) +++ head/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc (revision 504141) @@ -1,11 +1,11 @@ ---- chromecast/browser/cast_content_browser_client.cc.orig 2019-04-30 22:22:40 UTC +--- chromecast/browser/cast_content_browser_client.cc.orig 2019-06-04 18:55:20 UTC +++ chromecast/browser/cast_content_browser_client.cc -@@ -559,7 +559,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS +@@ -575,7 +575,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS switches::kAudioOutputChannels)); } } else if (process_type == switches::kGpuProcess) { -#if defined(OS_LINUX) +#if defined(OS_LINUX) || 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. Index: head/www/chromium/files/patch-chromecast_browser_metrics_BUILD.gn =================================================================== --- head/www/chromium/files/patch-chromecast_browser_metrics_BUILD.gn (revision 504140) +++ head/www/chromium/files/patch-chromecast_browser_metrics_BUILD.gn (revision 504141) @@ -1,11 +1,11 @@ ---- chromecast/browser/metrics/BUILD.gn.orig 2019-04-30 22:22:40 UTC +--- chromecast/browser/metrics/BUILD.gn.orig 2019-06-04 18:55:20 UTC +++ chromecast/browser/metrics/BUILD.gn -@@ -27,7 +27,7 @@ cast_source_set("metrics") { - "//content/public/common", +@@ -31,7 +31,7 @@ cast_source_set("metrics") { + "//third_party/metrics_proto", ] - if (is_linux) { + if (is_linux || is_bsd) { sources += [ "external_metrics.cc", "external_metrics.h", Index: head/www/chromium/files/patch-chromecast_browser_metrics_cast__metrics__service__client.cc =================================================================== --- head/www/chromium/files/patch-chromecast_browser_metrics_cast__metrics__service__client.cc (revision 504140) +++ head/www/chromium/files/patch-chromecast_browser_metrics_cast__metrics__service__client.cc (revision 504141) @@ -1,102 +1,102 @@ ---- chromecast/browser/metrics/cast_metrics_service_client.cc.orig 2019-04-30 22:22:40 UTC +--- chromecast/browser/metrics/cast_metrics_service_client.cc.orig 2019-06-04 18:55:20 UTC +++ chromecast/browser/metrics/cast_metrics_service_client.cc -@@ -40,9 +40,9 @@ +@@ -38,9 +38,9 @@ #include "content/public/common/content_switches.h" #include "services/network/public/cpp/shared_url_loader_factory.h" -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) #include "chromecast/browser/metrics/external_metrics.h" -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) #if defined(OS_ANDROID) #include "chromecast/base/android/dumpstate_writer.h" -@@ -62,10 +62,10 @@ const char kMetricsOldClientID[] = "user_experience_me +@@ -60,10 +60,10 @@ const char kMetricsOldClientID[] = "user_experience_me const char kClientIdName[] = "Client ID"; #else -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) const char kExternalUmaEventsRelativePath[] = "metrics/uma-events"; const char kPlatformUmaEventsPath[] = "/data/share/chrome/metrics/uma-events"; -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) const struct ChannelMap { const char* chromecast_channel; @@ -280,19 +280,19 @@ CastMetricsServiceClient::CastMetricsServiceClient( - scoped_refptr url_loader_factory) - : pref_service_(pref_service), + : delegate_(delegate), + pref_service_(pref_service), client_info_loaded_(false), -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) external_metrics_(nullptr), platform_metrics_(nullptr), -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) task_runner_(base::ThreadTaskRunnerHandle::Get()), url_loader_factory_(url_loader_factory) { } CastMetricsServiceClient::~CastMetricsServiceClient() { -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) DCHECK(!external_metrics_); DCHECK(!platform_metrics_); -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) } void CastMetricsServiceClient::OnApplicationNotIdle() { @@ -300,13 +300,13 @@ void CastMetricsServiceClient::OnApplicationNotIdle() } void CastMetricsServiceClient::ProcessExternalEvents(const base::Closure& cb) { -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) external_metrics_->ProcessExternalEvents( base::Bind(&ExternalMetrics::ProcessExternalEvents, base::Unretained(platform_metrics_), cb)); #else cb.Run(); -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) } void CastMetricsServiceClient::SetForceClientId( @@ -371,7 +371,7 @@ void CastMetricsServiceClient::Initialize() { if (IsReportingEnabled()) metrics_service_->Start(); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // Start external metrics collection, which feeds data from external // processes into the main external metrics. external_metrics_ = new ExternalMetrics( @@ -381,7 +381,7 @@ void CastMetricsServiceClient::Initialize() { platform_metrics_ = new ExternalMetrics(stability_provider, kPlatformUmaEventsPath); platform_metrics_->Start(); -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) } void CastMetricsServiceClient::Finalize() { @@ -390,14 +390,14 @@ void CastMetricsServiceClient::Finalize() { metrics_service_->RecordCompletedSessionEnd(); #endif // !defined(OS_ANDROID) -#if defined(OS_LINUX) +#if defined(OS_LINUX) || 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) +#endif // defined(OS_LINUX) || defined(OS_BSD) metrics_service_->Stop(); } Index: head/www/chromium/files/patch-chromecast_browser_metrics_cast__metrics__service__client.h =================================================================== --- head/www/chromium/files/patch-chromecast_browser_metrics_cast__metrics__service__client.h (revision 504140) +++ head/www/chromium/files/patch-chromecast_browser_metrics_cast__metrics__service__client.h (revision 504141) @@ -1,15 +1,15 @@ ---- chromecast/browser/metrics/cast_metrics_service_client.h.orig 2019-04-30 22:22:40 UTC +--- chromecast/browser/metrics/cast_metrics_service_client.h.orig 2019-06-04 18:55:20 UTC +++ chromecast/browser/metrics/cast_metrics_service_client.h -@@ -98,10 +98,10 @@ class CastMetricsServiceClient : public ::metrics::Met +@@ -111,10 +111,10 @@ class CastMetricsServiceClient : public ::metrics::Met std::string force_client_id_; bool client_info_loaded_; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) ExternalMetrics* external_metrics_; ExternalMetrics* platform_metrics_; -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) const scoped_refptr task_runner_; std::unique_ptr<::metrics::MetricsStateManager> metrics_state_manager_; std::unique_ptr<::metrics::MetricsService> metrics_service_; Index: head/www/chromium/files/patch-chromecast_media_cma_backend_media__pipeline__backend__for__mixer.cc =================================================================== --- head/www/chromium/files/patch-chromecast_media_cma_backend_media__pipeline__backend__for__mixer.cc (revision 504140) +++ head/www/chromium/files/patch-chromecast_media_cma_backend_media__pipeline__backend__for__mixer.cc (revision 504141) @@ -1,23 +1,23 @@ ---- chromecast/media/cma/backend/media_pipeline_backend_for_mixer.cc.orig 2019-04-30 22:22:40 UTC +--- chromecast/media/cma/backend/media_pipeline_backend_for_mixer.cc.orig 2019-06-04 18:55:21 UTC +++ chromecast/media/cma/backend/media_pipeline_backend_for_mixer.cc @@ -16,9 +16,9 @@ #include "chromecast/media/cma/backend/av_sync.h" #include "chromecast/media/cma/backend/video_decoder_for_mixer.h" -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) #include "chromecast/media/cma/backend/audio_buildflags.h" -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) #if defined(OS_FUCHSIA) #include -@@ -228,7 +228,7 @@ MediaPipelineBackendForMixer::GetTaskRunner() const { +@@ -239,7 +239,7 @@ MediaPipelineBackendForMixer::GetTaskRunner() const { return static_cast(params_.task_runner)->runner(); } -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) int64_t MediaPipelineBackendForMixer::MonotonicClockNow() const { timespec now = {0, 0}; #if BUILDFLAG(MEDIA_CLOCK_MONOTONIC_RAW) Index: head/www/chromium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc =================================================================== --- head/www/chromium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc (revision 504140) +++ head/www/chromium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc (revision 504141) @@ -1,14 +1,14 @@ ---- components/autofill/content/renderer/password_form_conversion_utils.cc.orig 2019-03-11 22:00:56 UTC +--- components/autofill/content/renderer/password_form_conversion_utils.cc.orig 2019-06-04 18:55:21 UTC +++ components/autofill/content/renderer/password_form_conversion_utils.cc -@@ -37,7 +37,11 @@ +@@ -36,7 +36,11 @@ #include "third_party/blink/public/web/web_form_control_element.h" #include "third_party/blink/public/web/web_input_element.h" #include "third_party/blink/public/web/web_local_frame.h" +#if defined(OS_BSD) +#include +#else #include "third_party/re2/src/re2/re2.h" +#endif #include "url/gurl.h" using blink::WebFormControlElement; Index: head/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.cc =================================================================== --- head/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.cc (revision 504140) +++ head/www/chromium/files/patch-components_autofill_core_browser_autofill__experiments.cc (revision 504141) @@ -1,46 +1,11 @@ ---- components/autofill/core/browser/autofill_experiments.cc.orig 2019-04-30 22:22:41 UTC +--- components/autofill/core/browser/autofill_experiments.cc.orig 2019-06-04 18:55:21 UTC +++ components/autofill/core/browser/autofill_experiments.cc -@@ -29,7 +29,7 @@ - - namespace autofill { - --#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) - const base::Feature kAutofillDropdownLayoutExperiment{ - "AutofillDropdownLayout", base::FEATURE_DISABLED_BY_DEFAULT}; - const char kAutofillDropdownLayoutParameterName[] = "variant"; -@@ -37,7 +37,7 @@ const char kAutofillDropdownLayoutParameterLeadingIcon - const char kAutofillDropdownLayoutParameterTrailingIcon[] = "trailing-icon"; - const char kAutofillDropdownLayoutParameterTwoLinesLeadingIcon[] = - "two-lines-leading-icon"; --#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) -+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) - - bool IsCreditCardUploadEnabled(const PrefService* pref_service, - const syncer::SyncService* sync_service, -@@ -144,7 +144,7 @@ bool IsAutofillNoLocalSaveOnUploadSuccessExperimentEna +@@ -227,7 +227,7 @@ bool IsAutofillNoLocalSaveOnUploadSuccessExperimentEna } bool OfferStoreUnmaskedCards(bool is_off_the_record) { -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) // The checkbox can be forced on with a flag, but by default we don't store // on Linux due to lack of system keychain integration. See crbug.com/162735 return base::CommandLine::ForCurrentProcess()->HasSwitch( -@@ -182,7 +182,7 @@ bool ShouldUseActiveSignedInAccount() { - features::kAutofillGetPaymentsIdentityFromSync); - } - --#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) - ForcedPopupLayoutState GetForcedPopupLayoutState() { - if (!base::FeatureList::IsEnabled( - autofill::kAutofillDropdownLayoutExperiment)) -@@ -206,6 +206,6 @@ ForcedPopupLayoutState GetForcedPopupLayoutState() { - NOTREACHED(); - return ForcedPopupLayoutState::kDefault; - } --#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) -+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) - - } // namespace autofill Index: head/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc =================================================================== --- head/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc (nonexistent) +++ head/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc (revision 504141) @@ -0,0 +1,15 @@ +--- components/autofill/core/browser/personal_data_manager.cc.orig 2019-06-04 18:55:21 UTC ++++ components/autofill/core/browser/personal_data_manager.cc +@@ -1949,10 +1949,10 @@ bool PersonalDataManager::IsServerCard(const CreditCar + + bool PersonalDataManager::ShouldShowCardsFromAccountOption() const { + // The feature is only for Linux, Windows and Mac. +-#if (!defined(OS_LINUX) && !defined(OS_WIN) && !defined(OS_MACOSX)) || \ ++#if (!defined(OS_LINUX) && !defined(OS_WIN) && !defined(OS_MACOSX) && !defined(OS_BSD)) || \ + defined(OS_CHROMEOS) + return false; +-#endif // (!defined(OS_LINUX) && !defined(OS_WIN) && !defined(OS_MACOSX)) || ++#endif // (!defined(OS_LINUX) && !defined(OS_WIN) && !defined(OS_MACOSX) && !defined(OS_BSD)) || + // defined(OS_CHROMEOS) + + // This option should only be shown for users that have not enabled the Sync Property changes on: head/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-components_metrics_metrics__log.cc =================================================================== --- head/www/chromium/files/patch-components_metrics_metrics__log.cc (revision 504140) +++ head/www/chromium/files/patch-components_metrics_metrics__log.cc (revision 504141) @@ -1,11 +1,11 @@ ---- components/metrics/metrics_log.cc.orig 2019-03-17 18:40:58 UTC +--- components/metrics/metrics_log.cc.orig 2019-06-04 18:55:21 UTC +++ components/metrics/metrics_log.cc -@@ -198,7 +198,7 @@ void MetricsLog::RecordCoreSystemProfile(MetricsServic +@@ -197,7 +197,7 @@ void MetricsLog::RecordCoreSystemProfile(MetricsServic // OperatingSystemVersion refers to the ChromeOS release version. #if defined(OS_CHROMEOS) os->set_kernel_version(base::SysInfo::KernelVersion()); -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) // Linux operating system version is copied over into kernel version to be // consistent. os->set_kernel_version(base::SysInfo::OperatingSystemVersion()); Index: head/www/chromium/files/patch-components_policy_resources_policy__templates.json =================================================================== --- head/www/chromium/files/patch-components_policy_resources_policy__templates.json (revision 504140) +++ head/www/chromium/files/patch-components_policy_resources_policy__templates.json (revision 504141) @@ -1,83 +1,83 @@ ---- components/policy/resources/policy_templates.json.orig 2019-04-30 22:22:43 UTC +--- components/policy/resources/policy_templates.json.orig 2019-06-04 18:55:21 UTC +++ components/policy/resources/policy_templates.json @@ -984,7 +984,7 @@ 'name': 'HomepageLocation', 'type': 'string', 'schema': { 'type': 'string' }, - '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, @@ -1013,7 +1013,7 @@ 'name': 'HomepageIsNewTabPage', '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, @@ -1039,7 +1039,7 @@ 'name': 'NewTabPageLocation', 'type': 'string', 'schema': { 'type': 'string' }, - 'supported_on': ['chrome.*:58-', 'chrome_os:58-'], + 'supported_on': ['chrome.*:58-', 'chrome_os:58-', 'chrome.freebsd:9-'], 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, @@ -1732,7 +1732,7 @@ 'name': 'RemoteAccessHostMatchUsername', 'type': 'main', 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome.linux:25-', 'chrome.mac:25-', 'chrome_os:42-'], + 'supported_on': ['chrome.linux:25-', 'chrome.mac:25-', 'chrome_os:42-', 'chrome.freebsd:25-'], 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -3338,7 +3338,7 @@ +@@ -3369,7 +3369,7 @@ 'name': 'GSSAPILibraryName', '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, -@@ -3390,7 +3390,7 @@ +@@ -3421,7 +3421,7 @@ 'name': 'NtlmV2Enabled', '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, -@@ -6448,7 +6448,7 @@ +@@ -6537,7 +6537,7 @@ 'name': 'RequireOnlineRevocationChecksForLocalAnchors', '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, -@@ -7578,7 +7578,7 @@ +@@ -7667,7 +7667,7 @@ 'name': 'BackgroundModeEnabled', '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, -@@ -8094,7 +8094,7 @@ +@@ -8183,7 +8183,7 @@ 'name': 'FullscreenAllowed', '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, Index: head/www/chromium/files/patch-content_browser_BUILD.gn =================================================================== --- head/www/chromium/files/patch-content_browser_BUILD.gn (revision 504140) +++ head/www/chromium/files/patch-content_browser_BUILD.gn (revision 504141) @@ -1,14 +1,14 @@ ---- content/browser/BUILD.gn.orig 2019-04-30 22:22:45 UTC +--- content/browser/BUILD.gn.orig 2019-06-04 18:55:22 UTC +++ content/browser/BUILD.gn -@@ -1959,11 +1959,6 @@ jumbo_source_set("browser") { +@@ -1982,11 +1982,6 @@ jumbo_source_set("browser") { "tracing/cros_tracing_agent.h", ] deps += [ "//chromeos/resources" ] - } else { - sources += [ - "memory/memory_monitor_linux.cc", - "memory/memory_monitor_linux.h", - ] } if (is_chromeos || is_android || is_chromecast) { Index: head/www/chromium/files/patch-content_browser_browser__main__loop.cc =================================================================== --- head/www/chromium/files/patch-content_browser_browser__main__loop.cc (revision 504140) +++ head/www/chromium/files/patch-content_browser_browser__main__loop.cc (revision 504141) @@ -1,46 +1,46 @@ ---- content/browser/browser_main_loop.cc.orig 2019-03-11 22:00:57 UTC +--- content/browser/browser_main_loop.cc.orig 2019-06-04 18:55:22 UTC +++ content/browser/browser_main_loop.cc -@@ -250,6 +250,13 @@ +@@ -251,6 +251,13 @@ #include "mojo/public/cpp/bindings/lib/test_random_mojo_delays.h" #endif +#if defined(OS_BSD) +#include "content/browser/sandbox_host_linux.h" +#include "services/service_manager/zygote/common/common_sandbox_support_linux.h" +#include "content/public/common/common_sandbox_support_linux.h" +#include "services/service_manager/sandbox/sandbox.h" +#endif + // One of the linux specific headers defines this as a macro. #ifdef DestroyAll #undef DestroyAll -@@ -585,6 +592,11 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -593,6 +600,11 @@ int BrowserMainLoop::EarlyInitialization() { // by now since a thread to start the ServiceManager has been created // before the browser main loop starts. DCHECK(SandboxHostLinux::GetInstance()->IsInitialized()); +#elif defined(OS_BSD) + SandboxHostLinux::GetInstance()->Init(); + base::FileHandleMappingVector fds_to_map; + const int sfd = SandboxHostLinux::GetInstance()->GetChildSocket(); + fds_to_map.push_back(std::make_pair(sfd, service_manager::GetSandboxFD())); #endif #if defined(USE_X11) -@@ -629,7 +641,7 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -636,7 +648,7 @@ int BrowserMainLoop::EarlyInitialization() { + } #endif // defined(OS_ANDROID) || defined(OS_CHROMEOS) - #if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -- defined(OS_ANDROID) -+ defined(OS_ANDROID) || defined(OS_BSD) +-#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ ++#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ + 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. - -@@ -639,7 +651,7 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -646,7 +658,7 @@ int BrowserMainLoop::EarlyInitialization() { + // users can easily hit this limit with many open tabs. Bump up the limit to // an arbitrarily high number. See https://crbug.com/539567 base::IncreaseFdLimitTo(8192); - #endif // defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_CHROMEOS) || -- // defined(OS_ANDROID) -+ // defined(OS_ANDROID) || defined(OS_BSD) +-#endif // defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_CHROMEOS) || ++#endif // defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || + // defined(OS_ANDROID) #if defined(OS_WIN) - net::EnsureWinsockInit(); Index: head/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc =================================================================== --- head/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc (revision 504140) +++ head/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc (revision 504141) @@ -1,11 +1,11 @@ ---- content/browser/gpu/gpu_process_host.cc.orig 2019-05-04 09:09:15 UTC +--- content/browser/gpu/gpu_process_host.cc.orig 2019-06-04 18:55:23 UTC +++ content/browser/gpu/gpu_process_host.cc -@@ -1071,7 +1071,7 @@ bool GpuProcessHost::LaunchGpuProcess() { +@@ -1082,7 +1082,7 @@ bool GpuProcessHost::LaunchGpuProcess() { std::unique_ptr cmd_line = std::make_unique(base::CommandLine::NO_PROGRAM); #else -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) int child_flags = gpu_launcher.empty() ? ChildProcessHost::CHILD_ALLOW_SELF : ChildProcessHost::CHILD_NORMAL; #else Index: head/www/chromium/files/patch-content_browser_media_media__internals.cc =================================================================== --- head/www/chromium/files/patch-content_browser_media_media__internals.cc (revision 504140) +++ head/www/chromium/files/patch-content_browser_media_media__internals.cc (revision 504141) @@ -1,11 +1,11 @@ ---- content/browser/media/media_internals.cc.orig 2019-04-30 22:22:46 UTC +--- content/browser/media/media_internals.cc.orig 2019-06-04 18:55:23 UTC +++ content/browser/media/media_internals.cc -@@ -766,7 +766,7 @@ void MediaInternals::UpdateVideoCaptureDeviceCapabilit +@@ -785,7 +785,7 @@ void MediaInternals::UpdateVideoCaptureDeviceCapabilit + device_dict->SetString("id", descriptor.device_id); device_dict->SetString("name", descriptor.GetNameAndModel()); device_dict->Set("formats", std::move(format_list)); - #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ -- defined(OS_ANDROID) -+ defined(OS_ANDROID) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_ANDROID) device_dict->SetString("captureApi", descriptor.GetCaptureApiTypeString()); #endif - video_capture_capabilities_cached_data_.Append(std::move(device_dict)); Index: head/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc =================================================================== --- head/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc (revision 504140) +++ head/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc (revision 504141) @@ -1,29 +1,38 @@ ---- content/browser/renderer_host/render_process_host_impl.cc.orig 2019-05-04 09:04:28 UTC +--- content/browser/renderer_host/render_process_host_impl.cc.orig 2019-06-04 18:55:23 UTC +++ content/browser/renderer_host/render_process_host_impl.cc @@ -231,7 +231,7 @@ #include "content/browser/compositor/image_transport_factory.h" #endif -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) #include #include #endif -@@ -1214,7 +1214,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = +@@ -1211,7 +1211,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = // to indicate failure and std::numeric_limits::max() to indicate // unlimited. size_t GetPlatformProcessLimit() { -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) struct rlimit limit; if (getrlimit(RLIMIT_NPROC, &limit) != 0) return kUnknownPlatformProcessLimit; -@@ -1643,7 +1643,7 @@ bool RenderProcessHostImpl::Init() { +@@ -1222,7 +1222,7 @@ size_t GetPlatformProcessLimit() { + #else + // TODO(https://crbug.com/104689): Implement on other platforms. + return kUnknownPlatformProcessLimit; +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + } + #endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS) + +@@ -1636,7 +1636,7 @@ bool RenderProcessHostImpl::Init() { renderer_prefix = browser_command_line.GetSwitchValueNative(switches::kRendererCmdPrefix); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) int flags = renderer_prefix.empty() ? ChildProcessHost::CHILD_ALLOW_SELF : ChildProcessHost::CHILD_NORMAL; #else Index: head/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h =================================================================== --- head/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h (revision 504140) +++ head/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h (revision 504141) @@ -1,15 +1,15 @@ ---- content/browser/renderer_host/render_process_host_impl.h.orig 2019-04-30 22:22:46 UTC +--- content/browser/renderer_host/render_process_host_impl.h.orig 2019-06-04 18:55:23 UTC +++ content/browser/renderer_host/render_process_host_impl.h -@@ -406,10 +406,10 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -401,10 +401,10 @@ class CONTENT_EXPORT RenderProcessHostImpl is_for_guests_only_ = is_for_guests_only; } -#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) +#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) // Launch the zygote early in the browser startup. static void EarlyZygoteLaunch(); -#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) +#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) RendererAudioOutputStreamFactoryContext* GetRendererAudioOutputStreamFactoryContext() override; Index: head/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc =================================================================== --- head/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc (revision 504140) +++ head/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc (revision 504141) @@ -1,11 +1,11 @@ ---- content/browser/renderer_host/render_view_host_impl.cc.orig 2019-04-30 22:22:46 UTC +--- content/browser/renderer_host/render_view_host_impl.cc.orig 2019-06-04 18:55:23 UTC +++ content/browser/renderer_host/render_view_host_impl.cc -@@ -162,7 +162,7 @@ void GetPlatformSpecificPrefs(blink::mojom::RendererPr +@@ -163,7 +163,7 @@ void GetPlatformSpecificPrefs(blink::mojom::RendererPr display::win::ScreenWin::GetSystemMetricsInDIP(SM_CYVSCROLL); prefs->arrow_bitmap_width_horizontal_scroll_bar_in_dips = display::win::ScreenWin::GetSystemMetricsInDIP(SM_CXHSCROLL); -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) prefs->system_font_family_name = gfx::Font().GetFontName(); #endif } Index: head/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc =================================================================== --- head/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc (revision 504140) +++ head/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc (revision 504141) @@ -1,29 +1,29 @@ ---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2019-04-30 22:22:46 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2019-06-04 18:55:23 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.cc -@@ -123,7 +123,7 @@ +@@ -124,7 +124,7 @@ #include "content/browser/accessibility/browser_accessibility_auralinux.h" #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) #include "ui/base/ime/linux/text_edit_command_auralinux.h" #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" #endif -@@ -2221,7 +2221,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { +@@ -2287,7 +2287,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { } bool RenderWidgetHostViewAura::NeedsMouseCapture() { -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) return NeedsInputGrab(); #endif return false; -@@ -2419,7 +2419,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit +@@ -2485,7 +2485,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit if (!target_host) return; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) ui::TextEditKeyBindingsDelegateAuraLinux* keybinding_delegate = ui::GetTextEditKeyBindingsDelegate(); std::vector commands; Index: head/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc =================================================================== --- head/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc (revision 504140) +++ head/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc (revision 504141) @@ -1,11 +1,11 @@ ---- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig 2019-03-11 22:00:58 UTC +--- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig 2019-06-04 18:55:23 UTC +++ content/browser/renderer_host/render_widget_host_view_event_handler.cc -@@ -608,7 +608,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand +@@ -609,7 +609,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand if (event->type() == ui::ET_MOUSE_EXITED) { if (mouse_locked || selection_popup) return false; -#if defined(OS_WIN) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) // 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. Index: head/www/chromium/files/patch-content_browser_service__manager_service__manager__context.cc =================================================================== --- head/www/chromium/files/patch-content_browser_service__manager_service__manager__context.cc (revision 504140) +++ head/www/chromium/files/patch-content_browser_service__manager_service__manager__context.cc (revision 504141) @@ -1,35 +1,35 @@ ---- content/browser/service_manager/service_manager_context.cc.orig 2019-04-30 22:22:46 UTC +--- content/browser/service_manager/service_manager_context.cc.orig 2019-06-04 18:55:23 UTC +++ content/browser/service_manager/service_manager_context.cc @@ -99,7 +99,7 @@ #include "jni/ContentNfcDelegate_jni.h" #endif -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) #include "components/services/font/font_service_app.h" #include "components/services/font/public/interfaces/constants.mojom.h" #endif -@@ -387,12 +387,12 @@ void CreateInProcessAudioService( +@@ -378,12 +378,12 @@ void CreateInProcessAudioService( BrowserMainLoop::GetAudioManager(), std::move(request))); } -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) std::unique_ptr CreateFontService( service_manager::mojom::ServiceRequest request) { return std::make_unique(std::move(request)); } -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) std::unique_ptr CreateResourceCoordinatorService( service_manager::mojom::ServiceRequest request) { -@@ -614,7 +614,7 @@ ServiceManagerContext::ServiceManagerContext( +@@ -605,7 +605,7 @@ ServiceManagerContext::ServiceManagerContext( base::BindRepeating(&CreateVideoCaptureService)); } -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) RegisterInProcessService( packaged_services_connection_.get(), font_service::mojom::kServiceName, base::CreateSequencedTaskRunnerWithTraits( Index: head/www/chromium/files/patch-content_browser_utility__process__host.cc =================================================================== --- head/www/chromium/files/patch-content_browser_utility__process__host.cc (revision 504140) +++ head/www/chromium/files/patch-content_browser_utility__process__host.cc (revision 504141) @@ -1,11 +1,11 @@ ---- content/browser/utility_process_host.cc.orig 2019-05-04 09:00:43 UTC +--- content/browser/utility_process_host.cc.orig 2019-06-04 18:55:23 UTC +++ content/browser/utility_process_host.cc -@@ -209,7 +209,7 @@ UtilityProcessHost::UtilityProcessHost( +@@ -213,7 +213,7 @@ UtilityProcessHost::UtilityProcessHost( : client_(client), client_task_runner_(client_task_runner), sandbox_type_(service_manager::SANDBOX_TYPE_UTILITY), -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) child_flags_(ChildProcessHost::CHILD_ALLOW_SELF), #else child_flags_(ChildProcessHost::CHILD_NORMAL), Index: head/www/chromium/files/patch-content_browser_webui_shared__resources__data__source.cc =================================================================== --- head/www/chromium/files/patch-content_browser_webui_shared__resources__data__source.cc (revision 504140) +++ head/www/chromium/files/patch-content_browser_webui_shared__resources__data__source.cc (revision 504141) @@ -1,14 +1,14 @@ ---- content/browser/webui/shared_resources_data_source.cc.orig 2019-04-30 22:22:47 UTC +--- content/browser/webui/shared_resources_data_source.cc.orig 2019-06-04 18:55:23 UTC +++ content/browser/webui/shared_resources_data_source.cc -@@ -102,9 +102,9 @@ const std::map CreateMojoResourceIdT +@@ -101,9 +101,9 @@ const std::map CreateMojoResourceIdT {IDR_MOJO_BIG_BUFFER_MOJOM_LITE_JS, "js/big_buffer.mojom-lite.js"}, {IDR_MOJO_FILE_MOJOM_LITE_JS, "js/file.mojom-lite.js"}, {IDR_MOJO_STRING16_MOJOM_LITE_JS, "js/string16.mojom-lite.js"}, -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) {IDR_MOJO_TIME_MOJOM_LITE_JS, "js/time.mojom-lite.js"}, -#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) }; } Index: head/www/chromium/files/patch-content_common_BUILD.gn =================================================================== --- head/www/chromium/files/patch-content_common_BUILD.gn (revision 504140) +++ head/www/chromium/files/patch-content_common_BUILD.gn (revision 504141) @@ -1,15 +1,15 @@ ---- content/common/BUILD.gn.orig 2019-04-30 22:22:47 UTC +--- content/common/BUILD.gn.orig 2019-06-04 18:55:23 UTC +++ content/common/BUILD.gn -@@ -377,6 +377,12 @@ source_set("common") { +@@ -375,6 +375,12 @@ source_set("common") { libs += [ "android" ] } + if (is_bsd) { + sources -= [ + "sandbox_init_linux.cc", + ] + } + if (is_debug && !is_component_build && enable_plugins) { # Content depends on the PPAPI message logging stuff; if this isn't here, # some unit test binaries won't compile. This only worked in release mode Index: head/www/chromium/files/patch-content_gpu_BUILD.gn =================================================================== --- head/www/chromium/files/patch-content_gpu_BUILD.gn (revision 504140) +++ head/www/chromium/files/patch-content_gpu_BUILD.gn (revision 504141) @@ -1,11 +1,11 @@ ---- content/gpu/BUILD.gn.orig 2019-03-11 22:00:58 UTC +--- content/gpu/BUILD.gn.orig 2019-06-04 18:55:23 UTC +++ content/gpu/BUILD.gn -@@ -133,7 +133,7 @@ target(link_target_type, "gpu_sources") { +@@ -124,7 +124,7 @@ target(link_target_type, "gpu_sources") { # Use DRI on desktop Linux builds. if (current_cpu != "s390x" && current_cpu != "ppc64" && is_desktop_linux && - (!is_chromecast || is_cast_desktop_build)) { + (!is_chromecast || is_cast_desktop_build) && !is_bsd) { configs += [ "//build/config/linux/dri" ] } } Index: head/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h =================================================================== --- head/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h (revision 504140) +++ head/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h (revision 504141) @@ -1,25 +1,25 @@ ---- content/ppapi_plugin/ppapi_blink_platform_impl.h.orig 2019-03-11 22:00:58 UTC +--- content/ppapi_plugin/ppapi_blink_platform_impl.h.orig 2019-06-04 18:55:23 UTC +++ content/ppapi_plugin/ppapi_blink_platform_impl.h @@ -13,7 +13,7 @@ #include "build/build_config.h" #include "content/child/blink_platform_impl.h" -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) #include "components/services/font/public/cpp/font_loader.h" #include "third_party/skia/include/core/SkRefCnt.h" #endif -@@ -42,11 +42,11 @@ class PpapiBlinkPlatformImpl : public BlinkPlatformImp +@@ -41,11 +41,11 @@ class PpapiBlinkPlatformImpl : public BlinkPlatformImp bool sync_dir) override; private: -#if defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) std::unique_ptr sandbox_support_; #endif -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) sk_sp font_loader_; #endif Index: head/www/chromium/files/patch-content_public_app_content__packaged__services__manifest.cc =================================================================== --- head/www/chromium/files/patch-content_public_app_content__packaged__services__manifest.cc (revision 504140) +++ head/www/chromium/files/patch-content_public_app_content__packaged__services__manifest.cc (revision 504141) @@ -1,20 +1,20 @@ ---- content/public/app/content_packaged_services_manifest.cc.orig 2019-04-30 22:22:47 UTC +--- content/public/app/content_packaged_services_manifest.cc.orig 2019-06-04 18:55:23 UTC +++ content/public/app/content_packaged_services_manifest.cc @@ -23,7 +23,7 @@ #include "services/video_capture/public/cpp/manifest.h" #include "services/viz/public/cpp/manifest.h" -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) #include "components/services/font/public/cpp/manifest.h" // nogncheck #endif -@@ -67,7 +67,7 @@ const service_manager::Manifest& GetContentPackagedSer +@@ -63,7 +63,7 @@ const service_manager::Manifest& GetContentPackagedSer .PackageService(tracing::GetManifest()) .PackageService(video_capture::GetManifest()) .PackageService(viz::GetManifest()) -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) .PackageService(font_service::GetManifest()) #endif #if defined(OS_CHROMEOS) Index: head/www/chromium/files/patch-content_public_common_child__process__host.h =================================================================== --- head/www/chromium/files/patch-content_public_common_child__process__host.h (revision 504140) +++ head/www/chromium/files/patch-content_public_common_child__process__host.h (revision 504141) @@ -1,20 +1,20 @@ ---- content/public/common/child_process_host.h.orig 2019-03-11 22:00:58 UTC +--- content/public/common/child_process_host.h.orig 2019-06-04 18:55:23 UTC +++ content/public/common/child_process_host.h -@@ -47,7 +47,7 @@ class CONTENT_EXPORT ChildProcessHost : public IPC::Se +@@ -51,7 +51,7 @@ class CONTENT_EXPORT ChildProcessHost : public IPC::Se // No special behavior requested. CHILD_NORMAL = 0, -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // Indicates that the child execed after forking may be execced from // /proc/self/exe rather than using the "real" app path. This prevents // autoupdate from confusing us if it changes the file out from under us. -@@ -56,7 +56,7 @@ class CONTENT_EXPORT ChildProcessHost : public IPC::Se +@@ -60,7 +60,7 @@ class CONTENT_EXPORT ChildProcessHost : public IPC::Se // gdb). In this case, you'd use GetChildPath to get the real executable // file name, and then prepend the GDB command to the command line. CHILD_ALLOW_SELF = 1 << 0, -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) }; // Returns the pathname to be used for a child process. If a subprocess Index: head/www/chromium/files/patch-content_public_common_common__param__traits__macros.h =================================================================== --- head/www/chromium/files/patch-content_public_common_common__param__traits__macros.h (revision 504140) +++ head/www/chromium/files/patch-content_public_common_common__param__traits__macros.h (revision 504141) @@ -1,11 +1,11 @@ ---- content/public/common/common_param_traits_macros.h.orig 2019-04-30 22:22:47 UTC +--- content/public/common/common_param_traits_macros.h.orig 2019-06-04 18:55:23 UTC +++ content/public/common/common_param_traits_macros.h -@@ -330,7 +330,7 @@ IPC_STRUCT_TRAITS_BEGIN(blink::mojom::RendererPreferen +@@ -331,7 +331,7 @@ IPC_STRUCT_TRAITS_BEGIN(blink::mojom::RendererPreferen IPC_STRUCT_TRAITS_MEMBER(disable_client_blocked_error_page) IPC_STRUCT_TRAITS_MEMBER(plugin_fullscreen_allowed) IPC_STRUCT_TRAITS_MEMBER(network_contry_iso) -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) IPC_STRUCT_TRAITS_MEMBER(system_font_family_name) #endif #if defined(OS_WIN) Index: head/www/chromium/files/patch-content_public_common_content__features.cc =================================================================== --- head/www/chromium/files/patch-content_public_common_content__features.cc (revision 504140) +++ head/www/chromium/files/patch-content_public_common_content__features.cc (revision 504141) @@ -1,20 +1,20 @@ ---- content/public/common/content_features.cc.orig 2019-04-30 22:22:47 UTC +--- content/public/common/content_features.cc.orig 2019-06-04 18:55:23 UTC +++ content/public/common/content_features.cc -@@ -541,7 +541,7 @@ const base::Feature kWebAssemblyThreads { +@@ -559,7 +559,7 @@ const base::Feature kWebAssemblyThreads { }; // Enable WebAssembly trap handler. -#if (defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX)) && \ +#if (defined(OS_BSD) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX)) && \ defined(ARCH_CPU_X86_64) const base::Feature kWebAssemblyTrapHandler{"WebAssemblyTrapHandler", base::FEATURE_ENABLED_BY_DEFAULT}; -@@ -576,7 +576,7 @@ const base::Feature kWebAuthBle{"WebAuthenticationBle" +@@ -594,7 +594,7 @@ const base::Feature kWebAuthBle{"WebAuthenticationBle" // https://w3c.github.io/webauthn const base::Feature kWebAuthCable { "WebAuthenticationCable", -#if !defined(OS_CHROMEOS) && defined(OS_LINUX) +#if (!defined(OS_CHROMEOS) && defined(OS_LINUX)) || defined(OS_BSD) base::FEATURE_DISABLED_BY_DEFAULT #else base::FEATURE_ENABLED_BY_DEFAULT Index: head/www/chromium/files/patch-content_public_common_content__switches.cc =================================================================== --- head/www/chromium/files/patch-content_public_common_content__switches.cc (revision 504140) +++ head/www/chromium/files/patch-content_public_common_content__switches.cc (revision 504141) @@ -1,11 +1,11 @@ ---- content/public/common/content_switches.cc.orig 2019-04-30 22:22:47 UTC +--- content/public/common/content_switches.cc.orig 2019-06-04 18:55:23 UTC +++ content/public/common/content_switches.cc -@@ -974,7 +974,7 @@ const char kDisableAudioSupportForDesktopShare[] = +@@ -959,7 +959,7 @@ const char kEnableAutomation[] = "enable-automation"; const char kDisablePanelFitting[] = "disable-panel-fitting"; #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_FREEBSD) // 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. Index: head/www/chromium/files/patch-content_public_common_content__switches.h =================================================================== --- head/www/chromium/files/patch-content_public_common_content__switches.h (revision 504140) +++ head/www/chromium/files/patch-content_public_common_content__switches.h (revision 504141) @@ -1,11 +1,11 @@ ---- content/public/common/content_switches.h.orig 2019-04-30 22:22:47 UTC +--- content/public/common/content_switches.h.orig 2019-06-04 18:55:23 UTC +++ content/public/common/content_switches.h -@@ -272,7 +272,7 @@ CONTENT_EXPORT extern const char kEnableOSKOverscroll[ +@@ -268,7 +268,7 @@ CONTENT_EXPORT extern const char kEnableOSKOverscroll[ CONTENT_EXPORT extern const char kDisablePanelFitting[]; #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_FREEBSD) CONTENT_EXPORT extern const char kEnableSpeechDispatcher[]; #endif Index: head/www/chromium/files/patch-content_renderer_media_audio_audio__device__factory.cc =================================================================== --- head/www/chromium/files/patch-content_renderer_media_audio_audio__device__factory.cc (revision 504140) +++ head/www/chromium/files/patch-content_renderer_media_audio_audio__device__factory.cc (revision 504141) @@ -1,11 +1,11 @@ ---- content/renderer/media/audio/audio_device_factory.cc.orig 2019-04-30 22:22:47 UTC +--- content/renderer/media/audio/audio_device_factory.cc.orig 2019-06-04 18:55:23 UTC +++ content/renderer/media/audio/audio_device_factory.cc -@@ -34,7 +34,7 @@ AudioDeviceFactory* AudioDeviceFactory::factory_ = nul - +@@ -35,7 +35,7 @@ AudioDeviceFactory* AudioDeviceFactory::factory_ = nul namespace { --#if defined(OS_WIN) || defined(OS_MACOSX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) // Due to driver deadlock issues on Windows (http://crbug/422522) there is a // chance device authorization response is never received from the browser side. + // In this case we will time out, to avoid renderer hang forever waiting for Index: head/www/chromium/files/patch-content_renderer_media_stream_processed__local__audio__source.cc =================================================================== --- head/www/chromium/files/patch-content_renderer_media_stream_processed__local__audio__source.cc (revision 504140) +++ head/www/chromium/files/patch-content_renderer_media_stream_processed__local__audio__source.cc (revision 504141) @@ -1,20 +1,20 @@ ---- content/renderer/media/stream/processed_local_audio_source.cc.orig 2019-04-30 22:22:47 UTC +--- content/renderer/media/stream/processed_local_audio_source.cc.orig 2019-06-04 18:55:23 UTC +++ content/renderer/media/stream/processed_local_audio_source.cc -@@ -35,7 +35,7 @@ void* const kProcessedLocalAudioSourceIdentifier = - const_cast(&kProcessedLocalAudioSourceIdentifier); +@@ -80,7 +80,7 @@ void LogAudioProcesingProperties( + } // namespace - bool ApmInAudioServiceEnabled() { + bool IsApmInAudioServiceEnabled() { -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) return base::FeatureList::IsEnabled(features::kWebRtcApmInAudioService); #else return false; -@@ -402,7 +402,7 @@ void ProcessedLocalAudioSource::CaptureUsingProcessor( +@@ -406,7 +406,7 @@ void ProcessedLocalAudioSource::CaptureUsingProcessor( bool key_pressed) { #if defined(OS_WIN) || defined(OS_MACOSX) DCHECK_LE(volume, 1.0); -#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_OPENBSD) +#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) // We have a special situation on Linux where the microphone volume can be // "higher than maximum". The input volume slider in the sound preference // allows the user to set a scaling that is higher than 100%. It means that Index: head/www/chromium/files/patch-content_renderer_render__process__impl.cc =================================================================== --- head/www/chromium/files/patch-content_renderer_render__process__impl.cc (revision 504140) +++ head/www/chromium/files/patch-content_renderer_render__process__impl.cc (revision 504141) @@ -1,11 +1,11 @@ ---- content/renderer/render_process_impl.cc.orig 2019-05-04 08:57:40 UTC +--- content/renderer/render_process_impl.cc.orig 2019-06-04 18:55:23 UTC +++ content/renderer/render_process_impl.cc -@@ -163,7 +163,7 @@ RenderProcessImpl::RenderProcessImpl( +@@ -161,7 +161,7 @@ RenderProcessImpl::RenderProcessImpl( SetV8FlagIfNotFeature(features::kWebAssemblyTrapHandler, "--no-wasm-trap-handler"); -#if defined(OS_LINUX) && defined(ARCH_CPU_X86_64) +#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(ARCH_CPU_X86_64) if (base::FeatureList::IsEnabled(features::kWebAssemblyTrapHandler)) { bool use_v8_signal_handler = false; base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); Index: head/www/chromium/files/patch-content_renderer_render__thread__impl.cc =================================================================== --- head/www/chromium/files/patch-content_renderer_render__thread__impl.cc (revision 504140) +++ head/www/chromium/files/patch-content_renderer_render__thread__impl.cc (revision 504141) @@ -1,56 +1,51 @@ ---- content/renderer/render_thread_impl.cc.orig 2019-04-30 22:22:47 UTC +--- content/renderer/render_thread_impl.cc.orig 2019-06-04 18:55:23 UTC +++ content/renderer/render_thread_impl.cc @@ -191,12 +191,21 @@ #include "mojo/public/cpp/bindings/message_dumper.h" #endif +#if !defined(OS_BSD) #if defined(OS_MACOSX) #include #else #include #endif +#endif +#if defined(OS_BSD) +#include +#include +#include +#include +#endif + using base::ThreadRestrictions; using blink::WebDocument; using blink::WebFrame; @@ -917,7 +926,7 @@ void RenderThreadImpl::Init() { DCHECK(parsed_num_raster_threads) << string_value; DCHECK_GT(num_raster_threads, 0); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) categorized_worker_pool_->SetBackgroundingCallback( main_thread_scheduler_->DefaultTaskRunner(), base::BindOnce( @@ -958,7 +967,7 @@ void RenderThreadImpl::Init() { GetConnector()->BindInterface(mojom::kBrowserServiceName, mojo::MakeRequest(&storage_partition_service_)); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) render_message_filter()->SetThreadPriority( ChildProcess::current()->io_thread_id(), base::ThreadPriority::DISPLAY); #endif -@@ -1329,11 +1338,11 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: - gpu::kGpuFeatureStatusEnabled); - const bool enable_gpu_memory_buffers = - !is_gpu_compositing_disabled_ && --#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_WIN) -+#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) +@@ -1332,7 +1341,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: !cmd_line->HasSwitch(switches::kDisableGpuMemoryBufferVideoFrames); #else cmd_line->HasSwitch(switches::kEnableGpuMemoryBufferVideoFrames); -#endif // defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_WIN) +#endif // defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) const bool enable_media_stream_gpu_memory_buffers = enable_gpu_memory_buffers && base::FeatureList::IsEnabled( Index: head/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc =================================================================== --- head/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc (revision 504140) +++ head/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc (revision 504141) @@ -1,56 +1,56 @@ ---- content/renderer/renderer_blink_platform_impl.cc.orig 2019-04-30 22:22:47 UTC +--- content/renderer/renderer_blink_platform_impl.cc.orig 2019-06-04 18:55:23 UTC +++ content/renderer/renderer_blink_platform_impl.cc -@@ -111,7 +111,7 @@ +@@ -113,7 +113,7 @@ #if defined(OS_MACOSX) #include "content/child/child_process_sandbox_support_impl_mac.h" -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) #include "content/child/child_process_sandbox_support_impl_linux.h" #endif -@@ -204,7 +204,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -206,7 +206,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( ->Clone(); thread_safe_sender_ = RenderThreadImpl::current()->thread_safe_sender(); blob_registry_.reset(new WebBlobRegistryImpl(thread_safe_sender_.get())); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) font_loader_ = sk_make_sp(connector_.get()); SkFontConfigInterface::SetGlobal(font_loader_); #endif -@@ -213,7 +213,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -215,7 +215,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( connector_ = service_manager::Connector::Create(&request); } -#if defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) if (g_sandbox_enabled && sandboxEnabled()) { #if defined(OS_MACOSX) sandbox_support_.reset(new WebSandboxSupportMac(connector_.get())); -@@ -241,7 +241,7 @@ RendererBlinkPlatformImpl::~RendererBlinkPlatformImpl( +@@ -243,7 +243,7 @@ RendererBlinkPlatformImpl::~RendererBlinkPlatformImpl( } void RendererBlinkPlatformImpl::Shutdown() { -#if defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) // SandboxSupport contains a map of OutOfProcessFont objects, which hold // WebStrings and WebVectors, which become invalidated when blink is shut // down. Hence, we need to clear that map now, just before blink::shutdown() -@@ -322,7 +322,7 @@ RendererBlinkPlatformImpl::CreateNetworkURLLoaderFacto +@@ -324,7 +324,7 @@ RendererBlinkPlatformImpl::CreateNetworkURLLoaderFacto void RendererBlinkPlatformImpl::SetDisplayThreadPriority( base::PlatformThreadId thread_id) { -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) if (RenderThreadImpl* render_thread = RenderThreadImpl::current()) { render_thread->render_message_filter()->SetThreadPriority( thread_id, base::ThreadPriority::DISPLAY); -@@ -335,7 +335,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop +@@ -337,7 +337,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop } blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() { -#if defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) return sandbox_support_.get(); #else // These platforms do not require sandbox support. Index: head/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h =================================================================== --- head/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h (revision 504140) +++ head/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h (revision 504141) @@ -1,29 +1,29 @@ ---- content/renderer/renderer_blink_platform_impl.h.orig 2019-04-30 22:22:47 UTC +--- content/renderer/renderer_blink_platform_impl.h.orig 2019-06-04 18:55:23 UTC +++ content/renderer/renderer_blink_platform_impl.h @@ -30,7 +30,7 @@ #include "third_party/blink/public/mojom/loader/code_cache.mojom.h" - #include "third_party/blink/public/platform/modules/webdatabase/web_database.mojom.h" + #include "third_party/blink/public/mojom/webdatabase/web_database.mojom.h" -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) #include "components/services/font/public/cpp/font_loader.h" // nogncheck #include "third_party/skia/include/core/SkRefCnt.h" // nogncheck #endif -@@ -267,7 +267,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -273,7 +273,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi std::unique_ptr connector_; scoped_refptr io_runner_; -#if defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) std::unique_ptr sandbox_support_; #endif -@@ -302,7 +302,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi - blink::mojom::CodeCacheHostPtrInfo code_cache_host_info_; - scoped_refptr code_cache_host_; +@@ -311,7 +311,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi + std::unique_ptr + web_transmission_encoding_info_handler_; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) sk_sp font_loader_; #endif Index: head/www/chromium/files/patch-content_shell_BUILD.gn =================================================================== --- head/www/chromium/files/patch-content_shell_BUILD.gn (revision 504140) +++ head/www/chromium/files/patch-content_shell_BUILD.gn (revision 504141) @@ -1,11 +1,11 @@ ---- content/shell/BUILD.gn.orig 2019-04-30 22:22:47 UTC +--- content/shell/BUILD.gn.orig 2019-06-04 18:55:23 UTC +++ content/shell/BUILD.gn -@@ -934,7 +934,7 @@ group("content_shell_crash_test") { +@@ -947,7 +947,7 @@ group("content_shell_crash_test") { if (is_win) { data_deps += [ "//build/win:copy_cdb_to_output" ] } - if (is_posix && !is_android) { + if (is_posix && !is_android && !is_bsd) { data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)", "//third_party/breakpad:minidump_stackwalk($host_toolchain)", Index: head/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc =================================================================== --- head/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc (revision 504140) +++ head/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc (revision 504141) @@ -1,20 +1,20 @@ ---- content/shell/browser/shell_browser_context.cc.orig 2019-03-11 22:00:58 UTC +--- content/shell/browser/shell_browser_context.cc.orig 2019-06-04 18:55:23 UTC +++ content/shell/browser/shell_browser_context.cc -@@ -28,7 +28,7 @@ +@@ -30,7 +30,7 @@ #if defined(OS_WIN) #include "base/base_paths_win.h" -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) #include "base/nix/xdg_util.h" #elif defined(OS_MACOSX) #include "base/base_paths_mac.h" -@@ -103,7 +103,7 @@ void ShellBrowserContext::InitWhileIOAllowed() { +@@ -108,7 +108,7 @@ void ShellBrowserContext::InitWhileIOAllowed() { #if defined(OS_WIN) CHECK(base::PathService::Get(base::DIR_LOCAL_APP_DATA, &path_)); path_ = path_.Append(std::wstring(L"content_shell")); -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) std::unique_ptr env(base::Environment::Create()); base::FilePath config_dir( base::nix::GetXDGDirectory(env.get(), Index: head/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc =================================================================== --- head/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc (revision 504140) +++ head/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc (revision 504141) @@ -1,20 +1,20 @@ ---- content/shell/browser/shell_browser_main_parts.cc.orig 2019-03-11 22:00:58 UTC +--- content/shell/browser/shell_browser_main_parts.cc.orig 2019-06-04 18:55:23 UTC +++ content/shell/browser/shell_browser_main_parts.cc @@ -48,7 +48,7 @@ #if defined(USE_AURA) && defined(USE_X11) #include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck #endif -#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX) -+#if !defined(OS_CHROMEOS) && defined(USE_AURA) && (defined(OS_BSD) || defined(OS_LINUX)) - #include "ui/base/ime/input_method_initializer.h" ++#if !defined(OS_CHROMEOS) && defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD)) + #include "ui/base/ime/init/input_method_initializer.h" #endif #if defined(OS_CHROMEOS) @@ -126,7 +126,7 @@ int ShellBrowserMainParts::PreEarlyInitialization() { #if defined(USE_X11) ui::SetDefaultX11ErrorHandlers(); #endif -#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX) +#if !defined(OS_CHROMEOS) && defined(USE_AURA) && (defined(OS_BSD) || defined(OS_LINUX)) ui::InitializeInputMethodForTesting(); #endif #if defined(OS_ANDROID) Index: head/www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__main__parts.cc =================================================================== --- head/www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__main__parts.cc (revision 504140) +++ head/www/chromium/files/patch-content_shell_browser_web__test_web__test__browser__main__parts.cc (revision 504141) @@ -1,11 +1,11 @@ ---- content/shell/browser/web_test/web_test_browser_main_parts.cc.orig 2019-04-30 22:22:48 UTC +--- content/shell/browser/web_test/web_test_browser_main_parts.cc.orig 2019-06-04 18:55:23 UTC +++ content/shell/browser/web_test/web_test_browser_main_parts.cc @@ -42,7 +42,7 @@ #if defined(USE_AURA) && defined(USE_X11) #include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck #endif -#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX) +#if !defined(OS_CHROMEOS) && defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD)) - #include "ui/base/ime/input_method_initializer.h" + #include "ui/base/ime/init/input_method_initializer.h" #endif Index: head/www/chromium/files/patch-content_shell_test__runner_test__runner.cc =================================================================== --- head/www/chromium/files/patch-content_shell_test__runner_test__runner.cc (revision 504140) +++ head/www/chromium/files/patch-content_shell_test__runner_test__runner.cc (revision 504141) @@ -1,29 +1,29 @@ ---- content/shell/test_runner/test_runner.cc.orig 2019-04-30 22:22:48 UTC +--- content/shell/test_runner/test_runner.cc.orig 2019-06-04 18:55:23 UTC +++ content/shell/test_runner/test_runner.cc -@@ -65,7 +65,7 @@ +@@ -66,7 +66,7 @@ #include "ui/gfx/geometry/size.h" #include "ui/gfx/skia_util.h" -#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD) #include "third_party/blink/public/platform/web_font_render_style.h" #endif -@@ -1544,7 +1544,7 @@ void TestRunner::Reset() { +@@ -1546,7 +1546,7 @@ void TestRunner::Reset() { drag_image_.reset(); blink::WebSecurityPolicy::ClearOriginAccessList(); -#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD) blink::WebFontRenderStyle::SetSubpixelPositioning(false); #endif -@@ -2087,7 +2087,7 @@ void TestRunner::AddOriginAccessAllowListEntry( +@@ -2075,7 +2075,7 @@ void TestRunner::AddOriginAccessAllowListEntry( } void TestRunner::SetTextSubpixelPositioning(bool value) { -#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD) // Since FontConfig doesn't provide a variable to control subpixel // positioning, we'll fall back to setting it globally for all fonts. blink::WebFontRenderStyle::SetSubpixelPositioning(value); Index: head/www/chromium/files/patch-device_bluetooth_BUILD.gn =================================================================== --- head/www/chromium/files/patch-device_bluetooth_BUILD.gn (revision 504140) +++ head/www/chromium/files/patch-device_bluetooth_BUILD.gn (revision 504141) @@ -1,11 +1,11 @@ ---- device/bluetooth/BUILD.gn.orig 2019-03-11 22:00:58 UTC +--- device/bluetooth/BUILD.gn.orig 2019-06-04 18:55:23 UTC +++ device/bluetooth/BUILD.gn -@@ -277,7 +277,7 @@ component("bluetooth") { +@@ -274,7 +274,7 @@ component("bluetooth") { ] } - if (is_chromeos || is_linux) { + if (is_chromeos || (is_linux && !is_bsd)) { if (use_dbus) { sources += [ "bluez/bluetooth_adapter_bluez.cc", Index: head/www/chromium/files/patch-device_gamepad_gamepad__provider.cc =================================================================== --- head/www/chromium/files/patch-device_gamepad_gamepad__provider.cc (revision 504140) +++ head/www/chromium/files/patch-device_gamepad_gamepad__provider.cc (revision 504141) @@ -1,11 +1,11 @@ ---- device/gamepad/gamepad_provider.cc.orig 2019-03-11 22:00:58 UTC +--- device/gamepad/gamepad_provider.cc.orig 2019-06-04 18:55:24 UTC +++ device/gamepad/gamepad_provider.cc -@@ -164,7 +164,7 @@ void GamepadProvider::Initialize(std::unique_ptrAddDevicesChangedObserver(this); +@@ -167,7 +167,7 @@ void GamepadProvider::Initialize(std::unique_ptrcontext(), hotplug_handle_); +#endif // !defined(OS_FREEBSD) } void UsbServiceImpl::GetDevices(const GetDevicesCallback& callback) { -@@ -289,6 +291,7 @@ void UsbServiceImpl::OnUsbContext(scoped_refptrcontext(), static_cast(LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED | -@@ -301,6 +304,7 @@ void UsbServiceImpl::OnUsbContext(scoped_refptrOnDisconnect(); } +#if !defined(OS_FREEBSD) // static int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb_context* context, libusb_device* device_raw, -@@ -530,6 +535,7 @@ int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb +@@ -531,6 +536,7 @@ int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb return 0; } +#endif // !defined(OS_FREEBSD) void UsbServiceImpl::OnPlatformDeviceAdded( ScopedLibusbDeviceRef platform_device) { Index: head/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc =================================================================== --- head/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc (revision 504140) +++ head/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc (revision 504141) @@ -1,34 +1,34 @@ ---- extensions/browser/api/messaging/message_service.cc.orig 2019-04-30 22:22:49 UTC +--- extensions/browser/api/messaging/message_service.cc.orig 2019-06-04 18:55:24 UTC +++ extensions/browser/api/messaging/message_service.cc -@@ -60,7 +60,7 @@ namespace { +@@ -61,7 +61,7 @@ namespace { const char kReceivingEndDoesntExistError[] = "Could not establish connection. Receiving end does not exist."; -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) const char kMissingPermissionError[] = "Access to native messaging requires nativeMessaging permission."; const char kProhibitedByPoliciesError[] = -@@ -374,7 +374,7 @@ void MessageService::OpenChannelToNativeApp( +@@ -383,7 +383,7 @@ void MessageService::OpenChannelToNativeApp( if (!opener_port->IsValidPort()) return; -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) bool has_permission = extension->permissions_data()->HasAPIPermission( APIPermission::kNativeMessaging); if (!has_permission) { -@@ -420,11 +420,11 @@ void MessageService::OpenChannelToNativeApp( +@@ -433,11 +433,11 @@ void MessageService::OpenChannelToNativeApp( channel->opener->IncrementLazyKeepaliveCount(); AddChannel(std::move(channel), receiver_port_id); -#else // !(defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)) +#else // !(defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)) const char kNativeMessagingNotSupportedError[] = "Native Messaging is not supported on this platform."; opener_port->DispatchOnDisconnect(kNativeMessagingNotSupportedError); -#endif // !(defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)) +#endif // !(defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)) } - void MessageService::OpenChannelToTab(int source_process_id, + void MessageService::OpenChannelToTab(const ChannelEndpoint& source, Index: head/www/chromium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc =================================================================== --- head/www/chromium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc (revision 504140) +++ head/www/chromium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc (revision 504141) @@ -1,36 +1,53 @@ ---- google_apis/gcm/engine/heartbeat_manager.cc.orig 2019-05-04 08:44:56 UTC +--- google_apis/gcm/engine/heartbeat_manager.cc.orig 2019-06-04 18:55:24 UTC +++ google_apis/gcm/engine/heartbeat_manager.cc @@ -32,13 +32,13 @@ const int kMinClientHeartbeatIntervalMs = 1000 * 30; // Minimum time spent sleeping before we force a new heartbeat. const int kMinSuspendTimeMs = 1000 * 10; // 10 seconds. -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) // The period at which to check if the heartbeat time has passed. Used to // protect against platforms where the timer is delayed by the system being // suspended. Only needed on linux because the other OSes provide a standard // way to be notified of system suspend and resume events. const int kHeartbeatMissedCheckMs = 1000 * 60 * 5; // 5 minutes. -#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) +#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) } // namespace @@ -188,7 +188,7 @@ void HeartbeatManager::RestartTimer() { base::Bind(&HeartbeatManager::OnHeartbeatTriggered, weak_ptr_factory_.GetWeakPtr())); -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) // Windows, Mac, Android, iOS, and Chrome OS all provide a way to be notified // when the system is suspending or resuming. The only one that does not is // Linux so we need to poll to check for missed heartbeats. @@ -197,7 +197,7 @@ void HeartbeatManager::RestartTimer() { base::BindOnce(&HeartbeatManager::CheckForMissedHeartbeat, weak_ptr_factory_.GetWeakPtr()), base::TimeDelta::FromMilliseconds(kHeartbeatMissedCheckMs)); -#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) +#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) } void HeartbeatManager::CheckForMissedHeartbeat() { +@@ -213,14 +213,14 @@ void HeartbeatManager::CheckForMissedHeartbeat() { + return; + } + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // Otherwise check again later. + base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( + FROM_HERE, + base::BindOnce(&HeartbeatManager::CheckForMissedHeartbeat, + weak_ptr_factory_.GetWeakPtr()), + base::TimeDelta::FromMilliseconds(kHeartbeatMissedCheckMs)); +-#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + } + + void HeartbeatManager::UpdateHeartbeatInterval() { Index: head/www/chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc =================================================================== --- head/www/chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc (revision 504140) +++ head/www/chromium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc (revision 504141) @@ -1,11 +1,11 @@ ---- gpu/command_buffer/common/gpu_memory_buffer_support.cc.orig 2019-03-11 22:00:59 UTC +--- gpu/command_buffer/common/gpu_memory_buffer_support.cc.orig 2019-06-04 18:55:24 UTC +++ gpu/command_buffer/common/gpu_memory_buffer_support.cc @@ -89,7 +89,7 @@ bool IsImageSizeValidForGpuMemoryBufferFormat(const gf uint32_t GetPlatformSpecificTextureTarget() { #if defined(OS_MACOSX) return GL_TEXTURE_RECTANGLE_ARB; -#elif defined(OS_ANDROID) || defined(OS_LINUX) +#elif defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) return GL_TEXTURE_EXTERNAL_OES; - #elif defined(OS_WIN) + #elif defined(OS_WIN) || defined(OS_FUCHSIA) return GL_TEXTURE_2D; Index: head/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc =================================================================== --- head/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc (nonexistent) +++ head/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc (revision 504141) @@ -0,0 +1,29 @@ +--- gpu/command_buffer/service/external_vk_image_backing.cc.orig 2019-06-04 18:55:24 UTC ++++ gpu/command_buffer/service/external_vk_image_backing.cc +@@ -18,7 +18,7 @@ + #include "gpu/vulkan/fuchsia/vulkan_fuchsia_ext.h" + #endif + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #define GL_HANDLE_TYPE_OPAQUE_FD_EXT 0x9586 + #endif + +@@ -140,7 +140,7 @@ ExternalVkImageBacking::ProduceGLTexture(SharedImageMa + #if defined(OS_FUCHSIA) + NOTIMPLEMENTED_LOG_ONCE(); + return nullptr; +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + if (!texture_) { + VkMemoryGetFdInfoKHR get_fd_info; + get_fd_info.sType = VK_STRUCTURE_TYPE_MEMORY_GET_FD_INFO_KHR; +@@ -202,7 +202,7 @@ ExternalVkImageBacking::ProduceGLTexture(SharedImageMa + } + return std::make_unique( + manager, this, tracker, texture_, texture_->service_id()); +-#else // !defined(OS_LINUX) && !defined(OS_FUCHSIA) ++#else // !defined(OS_LINUX) && !defined(OS_FUCHSIA) && !defined(OS_BSD) + #error Unsupported OS + #endif + } Property changes on: head/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__gl__representation.cc =================================================================== --- head/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__gl__representation.cc (nonexistent) +++ head/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__gl__representation.cc (revision 504141) @@ -0,0 +1,20 @@ +--- gpu/command_buffer/service/external_vk_image_gl_representation.cc.orig 2019-06-04 18:55:24 UTC ++++ gpu/command_buffer/service/external_vk_image_gl_representation.cc +@@ -128,7 +128,7 @@ GLuint ExternalVkImageGlRepresentation::ImportVkSemaph + #if defined(OS_FUCHSIA) + NOTIMPLEMENTED_LOG_ONCE(); + return 0; +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + if (handle.vk_handle_type() != + VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT) { + DLOG(ERROR) << "Importing semaphore handle of unexpected type:" +@@ -143,7 +143,7 @@ GLuint ExternalVkImageGlRepresentation::ImportVkSemaph + fd.release()); + + return gl_semaphore; +-#else // !defined(OS_FUCHSIA) && !defined(OS_LINUX) ++#else // !defined(OS_FUCHSIA) && !defined(OS_LINUX) && !defined(OS_BSD) + #error Unsupported OS + #endif + } Property changes on: head/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__gl__representation.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc =================================================================== --- head/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc (revision 504140) +++ head/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc (revision 504141) @@ -1,20 +1,20 @@ ---- gpu/command_buffer/tests/gl_test_utils.cc.orig 2019-03-17 17:06:00 UTC +--- gpu/command_buffer/tests/gl_test_utils.cc.orig 2019-06-04 18:55:24 UTC +++ gpu/command_buffer/tests/gl_test_utils.cc -@@ -22,7 +22,7 @@ - #include "ui/gfx/geometry/size.h" +@@ -23,7 +23,7 @@ + #include "ui/gl/gl_version_info.h" #include "ui/gl/init/gl_factory.h" -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) #include "ui/gl/gl_image_native_pixmap.h" #endif -@@ -425,7 +425,7 @@ void GpuCommandBufferTestEGL::RestoreGLDefault() { +@@ -429,7 +429,7 @@ void GpuCommandBufferTestEGL::RestoreGLDefault() { window_system_binding_info_ = gl::GLWindowSystemBindingInfo(); } -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) scoped_refptr GpuCommandBufferTestEGL::CreateGLImageNativePixmap(gfx::BufferFormat format, gfx::Size size, Index: head/www/chromium/files/patch-gpu_config_gpu__control__list.cc =================================================================== --- head/www/chromium/files/patch-gpu_config_gpu__control__list.cc (revision 504140) +++ head/www/chromium/files/patch-gpu_config_gpu__control__list.cc (revision 504141) @@ -1,32 +1,32 @@ ---- gpu/config/gpu_control_list.cc.orig 2019-03-11 22:00:59 UTC +--- gpu/config/gpu_control_list.cc.orig 2019-06-04 18:55:24 UTC +++ gpu/config/gpu_control_list.cc @@ -16,7 +16,11 @@ #include "base/values.h" #include "build/build_config.h" #include "gpu/config/gpu_util.h" +#if defined(OS_BSD) +#include +#else #include "third_party/re2/src/re2/re2.h" +#endif // defined(OS_BSD) namespace gpu { namespace { @@ -213,7 +217,7 @@ bool GpuControlList::More::GLVersionInfoMismatch( GpuControlList::GLType GpuControlList::More::GetDefaultGLType() { #if defined(OS_CHROMEOS) return kGLTypeGL; -#elif defined(OS_LINUX) || defined(OS_OPENBSD) +#elif defined(OS_LINUX) || defined(OS_BSD) return kGLTypeGL; #elif defined(OS_MACOSX) return kGLTypeGL; -@@ -699,7 +703,7 @@ GpuControlList::OsType GpuControlList::GetOsType() { +@@ -700,7 +704,7 @@ GpuControlList::OsType GpuControlList::GetOsType() { return kOsAndroid; #elif defined(OS_FUCHSIA) return kOsFuchsia; -#elif defined(OS_LINUX) || defined(OS_OPENBSD) +#elif defined(OS_LINUX) || defined(OS_BSD) return kOsLinux; #elif defined(OS_MACOSX) return kOsMacosx; Index: head/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc =================================================================== --- head/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc (revision 504140) +++ head/www/chromium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc (revision 504141) @@ -1,47 +1,56 @@ ---- gpu/ipc/common/gpu_memory_buffer_support.cc.orig 2019-03-11 22:00:59 UTC +--- gpu/ipc/common/gpu_memory_buffer_support.cc.orig 2019-06-04 18:55:24 UTC +++ gpu/ipc/common/gpu_memory_buffer_support.cc @@ -12,7 +12,7 @@ #include "gpu/ipc/common/gpu_memory_buffer_impl_io_surface.h" #endif -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - #include "gpu/ipc/common/gpu_memory_buffer_impl_native_pixmap.h" #include "ui/gfx/client_native_pixmap_factory.h" #include "ui/gfx/linux/client_native_pixmap_factory_dmabuf.h" -@@ -37,7 +37,7 @@ namespace gpu { + #endif +@@ -22,7 +22,7 @@ + #include "ui/ozone/public/ozone_platform.h" + #endif + +-#if defined(USE_OZONE) || defined(OS_LINUX) ++#if defined(USE_OZONE) || defined(OS_LINUX) || defined(OS_BSD) + #include "gpu/ipc/common/gpu_memory_buffer_impl_native_pixmap.h" + #endif + +@@ -40,7 +40,7 @@ namespace gpu { GpuMemoryBufferSupport::GpuMemoryBufferSupport() { #if defined(USE_OZONE) client_native_pixmap_factory_ = ui::CreateClientNativePixmapFactoryOzone(); -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) client_native_pixmap_factory_.reset( gfx::CreateClientNativePixmapFactoryDmabuf()); #endif -@@ -51,7 +51,7 @@ GpuMemoryBufferSupport::GetNativeGpuMemoryBufferType() +@@ -54,7 +54,7 @@ GpuMemoryBufferSupport::GetNativeGpuMemoryBufferType() return gfx::IO_SURFACE_BUFFER; #elif defined(OS_ANDROID) return gfx::ANDROID_HARDWARE_BUFFER; --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif defined(OS_LINUX) || defined(USE_OZONE) ++#elif defined(OS_LINUX) || defined(USE_OZONE) || defined(OS_BSD) return gfx::NATIVE_PIXMAP; #elif defined(OS_WIN) return gfx::DXGI_SHARED_HANDLE; -@@ -109,7 +109,7 @@ bool GpuMemoryBufferSupport::IsNativeGpuMemoryBufferCo +@@ -111,7 +111,7 @@ bool GpuMemoryBufferSupport::IsNativeGpuMemoryBufferCo #elif defined(USE_OZONE) return ui::OzonePlatform::EnsureInstance()->IsNativePixmapConfigSupported( format, usage); -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) return false; // TODO(julian.isorce): Add linux support. #elif defined(OS_WIN) switch (usage) { -@@ -166,7 +166,7 @@ GpuMemoryBufferSupport::CreateGpuMemoryBufferImplFromH +@@ -167,7 +167,7 @@ GpuMemoryBufferSupport::CreateGpuMemoryBufferImplFromH return GpuMemoryBufferImplIOSurface::CreateFromHandle( std::move(handle), size, format, usage, std::move(callback)); #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(USE_OZONE) ++#if defined(OS_LINUX) || defined(USE_OZONE) || defined(OS_BSD) case gfx::NATIVE_PIXMAP: return GpuMemoryBufferImplNativePixmap::CreateFromHandle( client_native_pixmap_factory(), std::move(handle), size, format, Index: head/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc =================================================================== --- head/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc (revision 504140) +++ head/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc (revision 504141) @@ -1,29 +1,83 @@ ---- gpu/ipc/service/gpu_init.cc.orig 2019-04-30 22:22:49 UTC +--- gpu/ipc/service/gpu_init.cc.orig 2019-06-04 18:55:24 UTC +++ gpu/ipc/service/gpu_init.cc @@ -88,7 +88,7 @@ void InitializeDirectCompositionOverlaySupport(GPUInfo } #endif // defined(OS_WIN) -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(IS_CHROMECAST) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(IS_CHROMECAST)) || defined(OS_BSD) bool CanAccessNvidiaDeviceFile() { bool res = true; base::ScopedBlockingCall scoped_blocking_call(FROM_HERE, +@@ -99,7 +99,7 @@ bool CanAccessNvidiaDeviceFile() { + } + return res; + } +-#endif // OS_LINUX && !OS_CHROMEOS && !IS_CHROMECAST ++#endif // (OS_LINUX && !OS_CHROMEOS && !IS_CHROMECAST) || OS_BSD + + } // namespace + @@ -131,7 +131,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL // crash during feature collection. gpu::SetKeysForCrashLogging(gpu_info_); -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) if (gpu_info_.gpu.vendor_id == 0x10de && // NVIDIA gpu_info_.gpu.driver_vendor == "NVIDIA" && !CanAccessNvidiaDeviceFile()) return false; @@ -201,7 +201,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL sandbox_helper_->PreSandboxStartup(); bool attempted_startsandbox = false; -#if defined(OS_LINUX) +#if defined(OS_LINUX) && !defined(OS_BSD) // On Chrome OS ARM Mali, GPU driver userspace creates threads when // initializing a GL context, so start the sandbox early. // TODO(zmo): Need to collect OS version before this. +@@ -210,7 +210,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL + watchdog_thread_.get(), &gpu_info_, gpu_preferences_); + attempted_startsandbox = true; + } +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) && !defined(OS_BSD) + + base::TimeTicks before_initialize_one_off = base::TimeTicks::Now(); + +@@ -307,7 +307,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL + InitializeDirectCompositionOverlaySupport(&gpu_info_); + #endif + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || 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. +@@ -329,7 +329,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL + } + } + } +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + if (use_swiftshader) { + AdjustInfoToSwiftShader(); +@@ -489,7 +489,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c + InitializeDirectCompositionOverlaySupport(&gpu_info_); + #endif + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || 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. +@@ -509,7 +509,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c + } + } + } +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + if (use_swiftshader) { + AdjustInfoToSwiftShader(); Index: head/www/chromium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc =================================================================== --- head/www/chromium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc (revision 504140) +++ head/www/chromium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc (revision 504141) @@ -1,20 +1,20 @@ ---- gpu/ipc/service/gpu_memory_buffer_factory.cc.orig 2019-03-11 22:00:59 UTC +--- gpu/ipc/service/gpu_memory_buffer_factory.cc.orig 2019-06-04 18:55:24 UTC +++ gpu/ipc/service/gpu_memory_buffer_factory.cc @@ -12,7 +12,7 @@ #include "gpu/ipc/service/gpu_memory_buffer_factory_io_surface.h" #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_FUCHSIA) ++#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) #include "gpu/ipc/service/gpu_memory_buffer_factory_native_pixmap.h" #endif @@ -33,7 +33,7 @@ GpuMemoryBufferFactory::CreateNativeType() { return base::WrapUnique(new GpuMemoryBufferFactoryIOSurface); #elif defined(OS_ANDROID) return base::WrapUnique(new GpuMemoryBufferFactoryAndroidHardwareBuffer); --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif defined(OS_LINUX) || defined(OS_FUCHSIA) ++#elif defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) return base::WrapUnique(new GpuMemoryBufferFactoryNativePixmap); #elif defined(OS_WIN) return base::WrapUnique(new GpuMemoryBufferFactoryDXGI); Index: head/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc =================================================================== --- head/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc (revision 504140) +++ head/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc (revision 504141) @@ -1,73 +1,73 @@ ---- gpu/ipc/service/gpu_watchdog_thread.cc.orig 2019-03-11 22:00:59 UTC +--- gpu/ipc/service/gpu_watchdog_thread.cc.orig 2019-06-04 18:55:24 UTC +++ gpu/ipc/service/gpu_watchdog_thread.cc -@@ -51,8 +51,10 @@ const int kGpuTimeout = 10000; +@@ -54,8 +54,10 @@ const int kGpuTimeout = 10000; #endif #if defined(USE_X11) +#if !defined(OS_BSD) const base::FilePath::CharType kTtyFilePath[] = FILE_PATH_LITERAL("/sys/class/tty/tty0/active"); +#endif const unsigned char text[20] = "check"; #endif -@@ -75,8 +77,10 @@ GpuWatchdogThread::GpuWatchdogThread() +@@ -78,8 +80,10 @@ GpuWatchdogThread::GpuWatchdogThread() display_(nullptr), window_(0), atom_(x11::None), +#if !defined(OS_BSD) host_tty_(-1), #endif +#endif weak_factory_(this) { base::subtle::NoBarrier_Store(&awaiting_acknowledge_, false); -@@ -91,7 +95,9 @@ GpuWatchdogThread::GpuWatchdogThread() +@@ -94,7 +98,9 @@ GpuWatchdogThread::GpuWatchdogThread() #endif #if defined(USE_X11) +#if !defined(OS_BSD) tty_file_ = base::OpenFile(base::FilePath(kTtyFilePath), "r"); +#endif SetupXServer(); #endif base::MessageLoopCurrent::Get()->AddTaskObserver(&task_observer_); -@@ -238,8 +244,10 @@ GpuWatchdogThread::~GpuWatchdogThread() { +@@ -242,8 +248,10 @@ GpuWatchdogThread::~GpuWatchdogThread() { power_monitor->RemoveObserver(this); #if defined(USE_X11) +#if !defined(OS_BSD) if (tty_file_) fclose(tty_file_); +#endif if (display_) { DCHECK(window_); XDestroyWindow(display_, window_); -@@ -463,7 +471,7 @@ void GpuWatchdogThread::DeliberatelyTerminateToRecover +@@ -467,7 +475,7 @@ void GpuWatchdogThread::DeliberatelyTerminateToRecover return; #endif -#if defined(USE_X11) +#if defined(USE_X11) && !defined(OS_BSD) // Don't crash if we're not on the TTY of our host X11 server. int active_tty = GetActiveTTY(); if (host_tty_ != -1 && active_tty != -1 && host_tty_ != active_tty) { -@@ -526,7 +534,9 @@ void GpuWatchdogThread::SetupXServer() { +@@ -554,7 +562,9 @@ void GpuWatchdogThread::SetupXServer() { CopyFromParent, InputOutput, CopyFromParent, 0, nullptr); atom_ = XInternAtom(display_, "CHECK", x11::False); } +#if !defined(OS_BSD) host_tty_ = GetActiveTTY(); +#endif } void GpuWatchdogThread::SetupXChangeProp() { -@@ -627,7 +637,7 @@ base::ThreadTicks GpuWatchdogThread::GetWatchedThreadT +@@ -657,7 +667,7 @@ base::ThreadTicks GpuWatchdogThread::GetWatchedThreadT } #endif -#if defined(USE_X11) +#if defined(USE_X11) && !defined(OS_BSD) int GpuWatchdogThread::GetActiveTTY() const { char tty_string[8] = {0}; if (tty_file_ && !fseek(tty_file_, 0, SEEK_SET) && Index: head/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h =================================================================== --- head/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h (revision 504140) +++ head/www/chromium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h (revision 504141) @@ -1,13 +1,13 @@ ---- gpu/ipc/service/gpu_watchdog_thread.h.orig 2019-03-11 22:00:59 UTC +--- gpu/ipc/service/gpu_watchdog_thread.h.orig 2019-06-04 18:55:24 UTC +++ gpu/ipc/service/gpu_watchdog_thread.h -@@ -191,8 +191,10 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThread : publi +@@ -195,8 +195,10 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThread : publi XDisplay* display_; gfx::AcceleratedWidget window_; XAtom atom_; +#if !defined(OS_BSD) FILE* tty_file_; int host_tty_; +#endif #endif base::RepeatingClosure alternative_terminate_for_testing_; Index: head/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc =================================================================== --- head/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc (revision 504140) +++ head/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.cc (revision 504141) @@ -1,20 +1,20 @@ ---- gpu/vulkan/vulkan_function_pointers.cc.orig 2019-04-30 22:22:49 UTC +--- gpu/vulkan/vulkan_function_pointers.cc.orig 2019-06-04 18:55:24 UTC +++ gpu/vulkan/vulkan_function_pointers.cc -@@ -310,7 +310,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer +@@ -305,7 +305,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer #endif -#if defined(OS_LINUX) || defined(OS_ANDROID) +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) vkGetSemaphoreFdKHRFn = reinterpret_cast( vkGetDeviceProcAddrFn(vk_device, "vkGetSemaphoreFdKHR")); @@ -319,7 +319,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer #endif -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) vkGetMemoryFdKHRFn = reinterpret_cast( vkGetDeviceProcAddrFn(vk_device, "vkGetMemoryFdKHR")); Index: head/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h =================================================================== --- head/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h (revision 504140) +++ head/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h (revision 504141) @@ -1,32 +1,35 @@ ---- gpu/vulkan/vulkan_function_pointers.h.orig 2019-05-04 12:16:20 UTC +--- gpu/vulkan/vulkan_function_pointers.h.orig 2019-06-04 18:55:24 UTC +++ gpu/vulkan/vulkan_function_pointers.h -@@ -114,12 +114,12 @@ struct VulkanFunctionPointers { +@@ -131,13 +131,13 @@ struct VulkanFunctionPointers { #endif // Device functions shared between Linux and Android. -#if defined(OS_LINUX) || defined(OS_ANDROID) +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) PFN_vkGetSemaphoreFdKHR vkGetSemaphoreFdKHRFn = nullptr; + PFN_vkImportSemaphoreFdKHR vkImportSemaphoreFdKHRFn = nullptr; #endif // Linux-only device functions. -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) PFN_vkGetMemoryFdKHR vkGetMemoryFdKHRFn = nullptr; #endif -@@ -245,12 +245,12 @@ struct VulkanFunctionPointers { - gpu::GetVulkanFunctionPointers()->vkImportSemaphoreFdKHRFn +@@ -286,14 +286,14 @@ struct VulkanFunctionPointers { + ->vkGetAndroidHardwareBufferPropertiesANDROIDFn #endif -#if defined(OS_LINUX) || defined(OS_ANDROID) +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) #define vkGetSemaphoreFdKHR \ gpu::GetVulkanFunctionPointers()->vkGetSemaphoreFdKHRFn + #define vkImportSemaphoreFdKHR \ + gpu::GetVulkanFunctionPointers()->vkImportSemaphoreFdKHRFn #endif -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) #define vkGetMemoryFdKHR gpu::GetVulkanFunctionPointers()->vkGetMemoryFdKHRFn #endif Index: head/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h =================================================================== --- head/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h (revision 504140) +++ head/www/chromium/files/patch-headless_lib_browser_headless__content__browser__client.h (revision 504141) @@ -1,11 +1,11 @@ ---- headless/lib/browser/headless_content_browser_client.h.orig 2019-03-11 22:00:59 UTC +--- headless/lib/browser/headless_content_browser_client.h.orig 2019-06-04 18:55:24 UTC +++ headless/lib/browser/headless_content_browser_client.h -@@ -34,7 +34,7 @@ class HeadlessContentBrowserClient : public content::C +@@ -35,7 +35,7 @@ class HeadlessContentBrowserClient : public content::C ::storage::OptionalQuotaSettingsCallback callback) override; content::GeneratedCodeCacheSettings GetGeneratedCodeCacheSettings( content::BrowserContext* context) override; -#if defined(OS_POSIX) && !defined(OS_MACOSX) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) void GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, Index: head/www/chromium/files/patch-ipc_ipc__channel__common.cc =================================================================== --- head/www/chromium/files/patch-ipc_ipc__channel__common.cc (revision 504140) +++ head/www/chromium/files/patch-ipc_ipc__channel__common.cc (revision 504141) @@ -1,11 +1,20 @@ ---- ipc/ipc_channel_common.cc.orig 2019-03-11 22:00:59 UTC +--- ipc/ipc_channel_common.cc.orig 2019-06-04 18:55:25 UTC +++ ipc/ipc_channel_common.cc @@ -9,7 +9,7 @@ namespace IPC { -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) namespace { int g_global_pid = 0; +@@ -25,7 +25,7 @@ int Channel::GetGlobalPid() { + return g_global_pid; + } + +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + // static + std::unique_ptr Channel::CreateClient( Index: head/www/chromium/files/patch-ipc_ipc__channel__mojo.cc =================================================================== --- head/www/chromium/files/patch-ipc_ipc__channel__mojo.cc (revision 504140) +++ head/www/chromium/files/patch-ipc_ipc__channel__mojo.cc (revision 504141) @@ -1,11 +1,15 @@ ---- ipc/ipc_channel_mojo.cc.orig 2019-03-11 22:00:59 UTC +--- ipc/ipc_channel_mojo.cc.orig 2019-06-04 18:55:25 UTC +++ ipc/ipc_channel_mojo.cc -@@ -64,7 +64,7 @@ class MojoChannelFactory : public ChannelFactory { +@@ -64,10 +64,10 @@ class MojoChannelFactory : public ChannelFactory { }; base::ProcessId GetSelfPID() { -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) if (int global_pid = Channel::GetGlobalPid()) return global_pid; - #endif // OS_LINUX +-#endif // OS_LINUX ++#endif // OS_LINUX || OS_BSD + #if defined(OS_NACL) + return -1; + #else Index: head/www/chromium/files/patch-ipc_ipc__message__utils.cc =================================================================== --- head/www/chromium/files/patch-ipc_ipc__message__utils.cc (revision 504140) +++ head/www/chromium/files/patch-ipc_ipc__message__utils.cc (revision 504141) @@ -1,11 +1,11 @@ ---- ipc/ipc_message_utils.cc.orig 2019-03-11 22:00:59 UTC +--- ipc/ipc_message_utils.cc.orig 2019-06-04 18:55:25 UTC +++ ipc/ipc_message_utils.cc -@@ -349,7 +349,7 @@ void ParamTraits::Log(const param_type& +@@ -356,7 +356,7 @@ void ParamTraits::Log(const param_type& + l->append(base::NumberToString(p)); } - #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_FUCHSIA) || \ -- (defined(OS_ANDROID) && defined(ARCH_CPU_64_BITS)) -+ defined(OS_BSD) || (defined(OS_ANDROID) && defined(ARCH_CPU_64_BITS)) +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_FUCHSIA) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) || \ + (defined(OS_ANDROID) && defined(ARCH_CPU_64_BITS)) void ParamTraits::Log(const param_type& p, std::string* l) { l->append(base::NumberToString(p)); - } Index: head/www/chromium/files/patch-ipc_ipc__message__utils.h =================================================================== --- head/www/chromium/files/patch-ipc_ipc__message__utils.h (revision 504140) +++ head/www/chromium/files/patch-ipc_ipc__message__utils.h (revision 504141) @@ -1,11 +1,11 @@ ---- ipc/ipc_message_utils.h.orig 2019-03-11 22:00:59 UTC +--- ipc/ipc_message_utils.h.orig 2019-06-04 18:55:25 UTC +++ ipc/ipc_message_utils.h @@ -204,7 +204,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_FUCHSIA) || \ -- (defined(OS_ANDROID) && defined(ARCH_CPU_64_BITS)) -+ defined(OS_BSD) || (defined(OS_ANDROID) && defined(ARCH_CPU_64_BITS)) +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_FUCHSIA) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) || \ + (defined(OS_ANDROID) && defined(ARCH_CPU_64_BITS)) template <> struct ParamTraits { - typedef long param_type; Index: head/www/chromium/files/patch-media_audio_BUILD.gn =================================================================== --- head/www/chromium/files/patch-media_audio_BUILD.gn (revision 504140) +++ head/www/chromium/files/patch-media_audio_BUILD.gn (revision 504141) @@ -1,22 +1,22 @@ ---- media/audio/BUILD.gn.orig 2019-04-30 22:22:52 UTC +--- media/audio/BUILD.gn.orig 2019-06-04 18:55:25 UTC +++ media/audio/BUILD.gn -@@ -240,8 +240,18 @@ source_set("audio") { +@@ -236,8 +236,18 @@ source_set("audio") { deps += [ "//media/base/android:media_jni_headers" ] } - if (is_linux) { + if (is_linux && !use_sndio) { sources += [ "linux/audio_manager_linux.cc" ] + } + if (use_sndio) { + libs += [ "sndio" ] + sources += [ + "openbsd/audio_manager_openbsd.cc", + "sndio/sndio_input.cc", + "sndio/sndio_input.h", + "sndio/sndio_output.cc", + "sndio/sndio_output.h" + ] } if (use_alsa) { Index: head/www/chromium/files/patch-media_base_video__frame.cc =================================================================== --- head/www/chromium/files/patch-media_base_video__frame.cc (revision 504140) +++ head/www/chromium/files/patch-media_base_video__frame.cc (revision 504141) @@ -1,47 +1,47 @@ ---- media/base/video_frame.cc.orig 2019-04-30 22:22:52 UTC +--- media/base/video_frame.cc.orig 2019-06-04 18:55:25 UTC +++ media/base/video_frame.cc @@ -53,7 +53,7 @@ static std::string StorageTypeToString( return "OWNED_MEMORY"; case VideoFrame::STORAGE_SHMEM: return "SHMEM"; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) case VideoFrame::STORAGE_DMABUFS: return "DMABUFS"; #endif @@ -68,7 +68,7 @@ static std::string StorageTypeToString( // static bool VideoFrame::IsStorageTypeMappable(VideoFrame::StorageType storage_type) { return -#if defined(OS_LINUX) +#if defined(OS_LINUX) || 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 && -@@ -461,7 +461,7 @@ scoped_refptr VideoFrame::WrapExternalYuva +@@ -495,7 +495,7 @@ scoped_refptr VideoFrame::WrapExternalYuva return frame; } -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // static scoped_refptr VideoFrame::WrapExternalDmabufs( const VideoFrameLayout& layout, -@@ -592,7 +592,7 @@ scoped_refptr VideoFrame::WrapVideoFrame( +@@ -626,7 +626,7 @@ scoped_refptr VideoFrame::WrapVideoFrame( } } -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // If there are any |dmabuf_fds_| plugged in, we should duplicate them. if (frame->storage_type() == STORAGE_DMABUFS) { wrapping_frame->dmabuf_fds_ = DuplicateFDs(frame->dmabuf_fds_); -@@ -916,7 +916,7 @@ size_t VideoFrame::shared_memory_offset() const { +@@ -950,7 +950,7 @@ size_t VideoFrame::shared_memory_offset() const { return shared_memory_offset_; } -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) const std::vector& VideoFrame::DmabufFds() const { DCHECK_EQ(storage_type_, STORAGE_DMABUFS); Index: head/www/chromium/files/patch-media_base_video__frame.h =================================================================== --- head/www/chromium/files/patch-media_base_video__frame.h (revision 504140) +++ head/www/chromium/files/patch-media_base_video__frame.h (revision 504141) @@ -1,38 +1,38 @@ ---- media/base/video_frame.h.orig 2019-04-30 22:22:52 UTC +--- media/base/video_frame.h.orig 2019-06-04 18:55:25 UTC +++ media/base/video_frame.h -@@ -71,7 +71,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -72,7 +72,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, // Pixels are backed by Shared Memory. -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // TODO(mcasas): Consider turning this type into STORAGE_NATIVE // based on the idea of using this same enum value for both DMA // buffers on Linux and CVPixelBuffers on Mac (which currently use -@@ -245,7 +245,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -266,7 +266,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte uint8_t* a_data, base::TimeDelta timestamp); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || 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 -@@ -437,7 +437,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -458,7 +458,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte // Returns the offset into the shared memory where the frame data begins. size_t shared_memory_offset() const; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || 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 -@@ -631,7 +631,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -652,7 +652,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte // memory. size_t shared_memory_offset_; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // Dmabufs for the frame, used when storage is STORAGE_DMABUFS. Size is either // equal or less than the number of planes of the frame. If it is less, then // the memory area represented by the last FD contains the remaining planes. Index: head/www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc =================================================================== --- head/www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc (revision 504140) +++ head/www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc (revision 504141) @@ -1,11 +1,11 @@ ---- media/capture/video/fake_video_capture_device_factory.cc.orig 2019-03-11 22:00:59 UTC +--- media/capture/video/fake_video_capture_device_factory.cc.orig 2019-06-04 18:55:25 UTC +++ media/capture/video/fake_video_capture_device_factory.cc -@@ -204,7 +204,7 @@ void FakeVideoCaptureDeviceFactory::GetDeviceDescripto +@@ -202,7 +202,7 @@ void FakeVideoCaptureDeviceFactory::GetDeviceDescripto for (const auto& entry : devices_config_) { device_descriptors->emplace_back( base::StringPrintf("fake_device_%d", entry_index), entry.device_id, -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) VideoCaptureApi::LINUX_V4L2_SINGLE_PLANE #elif defined(OS_MACOSX) VideoCaptureApi::MACOSX_AVFOUNDATION Index: head/www/chromium/files/patch-media_capture_video_mock__gpu__memory__buffer__manager.cc =================================================================== --- head/www/chromium/files/patch-media_capture_video_mock__gpu__memory__buffer__manager.cc (revision 504140) +++ head/www/chromium/files/patch-media_capture_video_mock__gpu__memory__buffer__manager.cc (revision 504141) @@ -1,11 +1,11 @@ ---- media/capture/video/mock_gpu_memory_buffer_manager.cc.orig 2019-04-30 22:22:52 UTC +--- media/capture/video/mock_gpu_memory_buffer_manager.cc.orig 2019-06-04 18:55:25 UTC +++ media/capture/video/mock_gpu_memory_buffer_manager.cc -@@ -106,7 +106,7 @@ class FakeGpuMemoryBuffer : public gfx::GpuMemoryBuffe +@@ -115,7 +115,7 @@ class FakeGpuMemoryBuffer : public gfx::GpuMemoryBuffe gfx::GpuMemoryBufferHandle handle; handle.type = gfx::NATIVE_PIXMAP; handle.id = handle_.id; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) handle.native_pixmap_handle = gfx::CloneHandleForIPC(handle_.native_pixmap_handle); #endif Index: head/www/chromium/files/patch-media_capture_video_shared__memory__handle__provider.cc =================================================================== --- head/www/chromium/files/patch-media_capture_video_shared__memory__handle__provider.cc (revision 504140) +++ head/www/chromium/files/patch-media_capture_video_shared__memory__handle__provider.cc (revision 504141) @@ -1,11 +1,20 @@ ---- media/capture/video/shared_memory_handle_provider.cc.orig 2019-03-11 22:00:59 UTC +--- media/capture/video/shared_memory_handle_provider.cc.orig 2019-06-04 18:55:25 UTC +++ media/capture/video/shared_memory_handle_provider.cc @@ -63,7 +63,7 @@ bool SharedMemoryHandleProvider::InitFromMojoHandle( return true; } -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) bool SharedMemoryHandleProvider::InitAsReadOnlyFromRawFileDescriptor( mojo::ScopedHandle fd_handle, uint32_t memory_size_in_bytes) { +@@ -80,7 +80,7 @@ bool SharedMemoryHandleProvider::InitAsReadOnlyFromRaw + shared_memory_.emplace(memory_handle, read_only_flag_); + return true; + } +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + mojo::ScopedSharedBufferHandle + SharedMemoryHandleProvider::GetHandleForInterProcessTransit(bool read_only) { Index: head/www/chromium/files/patch-media_capture_video_shared__memory__handle__provider.h =================================================================== --- head/www/chromium/files/patch-media_capture_video_shared__memory__handle__provider.h (revision 504140) +++ head/www/chromium/files/patch-media_capture_video_shared__memory__handle__provider.h (revision 504141) @@ -1,11 +1,15 @@ ---- media/capture/video/shared_memory_handle_provider.h.orig 2019-03-11 22:00:59 UTC +--- media/capture/video/shared_memory_handle_provider.h.orig 2019-06-04 18:55:25 UTC +++ media/capture/video/shared_memory_handle_provider.h -@@ -38,7 +38,7 @@ class CAPTURE_EXPORT SharedMemoryHandleProvider +@@ -38,10 +38,10 @@ class CAPTURE_EXPORT SharedMemoryHandleProvider // This requires platforms where base::SharedMemoryHandle is backed by a // file descriptor. -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) bool InitAsReadOnlyFromRawFileDescriptor(mojo::ScopedHandle fd_handle, uint32_t memory_size_in_bytes); - #endif // defined(OS_LINUX) +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + uint32_t GetMemorySizeInBytes(); + Index: head/www/chromium/files/patch-media_capture_video_video__capture__buffer__pool__impl.cc =================================================================== --- head/www/chromium/files/patch-media_capture_video_video__capture__buffer__pool__impl.cc (nonexistent) +++ head/www/chromium/files/patch-media_capture_video_video__capture__buffer__pool__impl.cc (revision 504141) @@ -0,0 +1,11 @@ +--- media/capture/video/video_capture_buffer_pool_impl.cc.orig 2019-06-04 18:55:25 UTC ++++ media/capture/video/video_capture_buffer_pool_impl.cc +@@ -58,7 +58,7 @@ VideoCaptureBufferPoolImpl::CreateSharedMemoryViaRawFi + int buffer_id) { + // This requires platforms where base::SharedMemoryHandle is backed by a + // file descriptor. +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + base::AutoLock lock(lock_); + + VideoCaptureBufferTracker* tracker = GetTracker(buffer_id); Property changes on: head/www/chromium/files/patch-media_capture_video_video__capture__buffer__pool__impl.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc =================================================================== --- head/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc (revision 504140) +++ head/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc (revision 504141) @@ -1,11 +1,11 @@ ---- media/capture/video/video_capture_device_client.cc.orig 2019-04-30 22:22:52 UTC +--- media/capture/video/video_capture_device_client.cc.orig 2019-06-04 18:55:25 UTC +++ media/capture/video/video_capture_device_client.cc -@@ -237,7 +237,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData( +@@ -238,7 +238,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData( // see http://linuxtv.org/downloads/v4l-dvb-apis/packed-rgb.html. // Windows RGB24 defines blue at lowest byte, // see https://msdn.microsoft.com/en-us/library/windows/desktop/dd407253 -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - origin_colorspace = libyuv::FOURCC_RAW; + fourcc_format = libyuv::FOURCC_RAW; #elif defined(OS_WIN) - origin_colorspace = libyuv::FOURCC_24BG; + fourcc_format = libyuv::FOURCC_24BG; Index: head/www/chromium/files/patch-media_gpu_linux_platform__video__frame__utils.cc =================================================================== --- head/www/chromium/files/patch-media_gpu_linux_platform__video__frame__utils.cc (nonexistent) +++ head/www/chromium/files/patch-media_gpu_linux_platform__video__frame__utils.cc (revision 504141) @@ -0,0 +1,20 @@ +--- media/gpu/linux/platform_video_frame_utils.cc.orig 2019-06-04 18:55:25 UTC ++++ media/gpu/linux/platform_video_frame_utils.cc +@@ -103,7 +103,7 @@ gfx::GpuMemoryBufferHandle CreateGpuMemoryBufferHandle + DCHECK(video_frame); + + gfx::GpuMemoryBufferHandle handle; +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + handle.type = gfx::NATIVE_PIXMAP; + + std::vector duped_fds = +@@ -124,7 +124,7 @@ gfx::GpuMemoryBufferHandle CreateGpuMemoryBufferHandle + } + #else + NOTREACHED(); +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + return handle; + } + Property changes on: head/www/chromium/files/patch-media_gpu_linux_platform__video__frame__utils.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-media_gpu_vaapi_vaapi__dmabuf__video__frame__mapper.cc =================================================================== --- head/www/chromium/files/patch-media_gpu_vaapi_vaapi__dmabuf__video__frame__mapper.cc (nonexistent) +++ head/www/chromium/files/patch-media_gpu_vaapi_vaapi__dmabuf__video__frame__mapper.cc (revision 504141) @@ -0,0 +1,20 @@ +--- media/gpu/vaapi/vaapi_dmabuf_video_frame_mapper.cc.orig 2019-06-04 18:55:25 UTC ++++ media/gpu/vaapi/vaapi_dmabuf_video_frame_mapper.cc +@@ -15,7 +15,7 @@ + #include "media/gpu/vaapi/vaapi_wrapper.h" + #include "media/video/picture.h" + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "media/gpu/linux/platform_video_frame_utils.h" + #endif + +@@ -124,7 +124,7 @@ scoped_refptr VaapiDmaBufVideoFrameMapper: + } + + gfx::GpuMemoryBufferHandle gmb_handle; +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + gmb_handle = CreateGpuMemoryBufferHandle(video_frame.get()); + #endif + if (gmb_handle.is_null()) { Property changes on: head/www/chromium/files/patch-media_gpu_vaapi_vaapi__dmabuf__video__frame__mapper.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-media_gpu_vaapi_vaapi__video__encode__accelerator.cc =================================================================== --- head/www/chromium/files/patch-media_gpu_vaapi_vaapi__video__encode__accelerator.cc (nonexistent) +++ head/www/chromium/files/patch-media_gpu_vaapi_vaapi__video__encode__accelerator.cc (revision 504141) @@ -0,0 +1,20 @@ +--- media/gpu/vaapi/vaapi_video_encode_accelerator.cc.orig 2019-06-04 18:55:25 UTC ++++ media/gpu/vaapi/vaapi_video_encode_accelerator.cc +@@ -41,7 +41,7 @@ + #include "media/gpu/vp8_reference_frame_vector.h" + #include "media/gpu/vp9_reference_frame_vector.h" + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "media/gpu/linux/platform_video_frame_utils.h" + #endif + +@@ -555,7 +555,7 @@ scoped_refptr VaapiVideoEncodeAccelera + vaapi_wrapper_, MakeGLContextCurrentCallback(), BindGLImageCallback(), + PictureBuffer(kDummyPictureBufferId, frame->coded_size())); + gfx::GpuMemoryBufferHandle gmb_handle; +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + gmb_handle = CreateGpuMemoryBufferHandle(frame.get()); + #endif + if (gmb_handle.is_null()) { Property changes on: head/www/chromium/files/patch-media_gpu_vaapi_vaapi__video__encode__accelerator.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-media_gpu_video__frame__mapper__factory.cc =================================================================== --- head/www/chromium/files/patch-media_gpu_video__frame__mapper__factory.cc (nonexistent) +++ head/www/chromium/files/patch-media_gpu_video__frame__mapper__factory.cc (revision 504141) @@ -0,0 +1,49 @@ +--- media/gpu/video_frame_mapper_factory.cc.orig 2019-06-04 18:55:25 UTC ++++ media/gpu/video_frame_mapper_factory.cc +@@ -7,36 +7,36 @@ + #include "build/build_config.h" + #include "media/gpu/buildflags.h" + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "media/gpu/linux/generic_dmabuf_video_frame_mapper.h" +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + +-#if BUILDFLAG(USE_VAAPI) && defined(OS_LINUX) ++#if BUILDFLAG(USE_VAAPI) && (defined(OS_LINUX) || defined(OS_BSD)) + #include "media/gpu/vaapi/vaapi_dmabuf_video_frame_mapper.h" +-#endif // BUILDFLAG(USE_VAAPI) && defined(OS_LINUX) ++#endif // BUILDFLAG(USE_VAAPI) && (defined(OS_LINUX) || defined(OS_BSD)) + + namespace media { + + // static + std::unique_ptr VideoFrameMapperFactory::CreateMapper() { +-#if BUILDFLAG(USE_VAAPI) && defined(OS_LINUX) ++#if BUILDFLAG(USE_VAAPI) && (defined(OS_LINUX) || defined(OS_BSD)) + return CreateMapper(false); + #else + return CreateMapper(true); +-#endif // BUILDFLAG(USE_VAAPI) && defined(OS_LINUX) ++#endif // BUILDFLAG(USE_VAAPI) && (defined(OS_LINUX) || defined(OS_BSD)) + } + + // static + std::unique_ptr VideoFrameMapperFactory::CreateMapper( + bool linear_buffer_mapper) { +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + if (linear_buffer_mapper) + return std::make_unique(); +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + +-#if BUILDFLAG(USE_VAAPI) && defined(OS_LINUX) ++#if BUILDFLAG(USE_VAAPI) && (defined(OS_LINUX) || defined(OS_BSD)) + return VaapiDmaBufVideoFrameMapper::Create(); +-#endif // BUILDFLAG(USE_VAAPI) && defined(OS_LINUX) ++#endif // BUILDFLAG(USE_VAAPI) && (defined(OS_LINUX) || defined(OS_BSD)) + + return nullptr; + } Property changes on: head/www/chromium/files/patch-media_gpu_video__frame__mapper__factory.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-media_media__options.gni =================================================================== --- head/www/chromium/files/patch-media_media__options.gni (revision 504140) +++ head/www/chromium/files/patch-media_media__options.gni (revision 504141) @@ -1,12 +1,12 @@ ---- media/media_options.gni.orig 2019-04-30 22:22:52 UTC +--- media/media_options.gni.orig 2019-06-04 18:55:25 UTC +++ media/media_options.gni -@@ -121,6 +121,9 @@ declare_args() { +@@ -111,6 +111,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 && Index: head/www/chromium/files/patch-media_mojo_services_gpu__mojo__media__client.cc =================================================================== --- head/www/chromium/files/patch-media_mojo_services_gpu__mojo__media__client.cc (revision 504140) +++ head/www/chromium/files/patch-media_mojo_services_gpu__mojo__media__client.cc (revision 504141) @@ -1,20 +1,20 @@ ---- media/mojo/services/gpu_mojo_media_client.cc.orig 2019-04-30 22:22:52 UTC +--- media/mojo/services/gpu_mojo_media_client.cc.orig 2019-06-04 18:55:25 UTC +++ media/mojo/services/gpu_mojo_media_client.cc @@ -55,7 +55,7 @@ namespace media { namespace { #if defined(OS_ANDROID) || defined(OS_CHROMEOS) || defined(OS_MACOSX) || \ - defined(OS_WIN) || defined(OS_LINUX) + defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) gpu::CommandBufferStub* GetCommandBufferStub( base::WeakPtr media_gpu_channel_manager, base::UnguessableToken channel_token, -@@ -188,7 +188,7 @@ std::unique_ptr GpuMojoMediaClient::Crea +@@ -199,7 +199,7 @@ std::unique_ptr GpuMojoMediaClient::Crea std::make_unique(gpu_task_runner_, std::move(get_stub_cb))); #elif defined(OS_CHROMEOS) || defined(OS_MACOSX) || defined(OS_WIN) || \ - defined(OS_LINUX) + defined(OS_LINUX) || defined(OS_BSD) - std::unique_ptr vda_video_decoder = VdaVideoDecoder::Create( - task_runner, gpu_task_runner_, media_log->Clone(), target_color_space, - gpu_preferences_, gpu_workarounds_, + video_decoder = VdaVideoDecoder::Create( + task_runner, gpu_task_runner_, media_log->Clone(), target_color_space, + gpu_preferences_, gpu_workarounds_, Index: head/www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd =================================================================== --- head/www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd (revision 504140) +++ head/www/chromium/files/patch-mojo_public_js_mojo__bindings__resources.grd (revision 504141) @@ -1,11 +1,11 @@ ---- mojo/public/js/mojo_bindings_resources.grd.orig 2019-04-30 22:22:53 UTC +--- mojo/public/js/mojo_bindings_resources.grd.orig 2019-06-04 18:55:26 UTC +++ mojo/public/js/mojo_bindings_resources.grd -@@ -38,7 +38,7 @@ +@@ -41,7 +41,7 @@ use_base_dir="false" type="BINDATA" compress="gzip" /> - + rta_type == IFLA_WIRELESS && msg->ifi_change == 0) - return true; - } - return false; -} - -// Retrieves address from NETLINK address message. -// Sets |really_deprecated| for IPv6 addresses with preferred lifetimes of 0. -bool GetAddress(const struct nlmsghdr* header, - IPAddress* out, - bool* really_deprecated) { - if (really_deprecated) - *really_deprecated = false; - const struct ifaddrmsg* msg = - reinterpret_cast(NLMSG_DATA(header)); - size_t address_length = 0; - switch (msg->ifa_family) { - case AF_INET: - address_length = IPAddress::kIPv4AddressSize; - break; - case AF_INET6: - address_length = IPAddress::kIPv6AddressSize; - break; - default: - // Unknown family. - return false; - } - // Use IFA_ADDRESS unless IFA_LOCAL is present. This behavior here is based on - // getaddrinfo in glibc (check_pf.c). Judging from kernel implementation of - // NETLINK, IPv4 addresses have only the IFA_ADDRESS attribute, while IPv6 - // have the IFA_LOCAL attribute. - uint8_t* address = NULL; - uint8_t* local = NULL; - size_t length = IFA_PAYLOAD(header); - for (const struct rtattr* attr = - reinterpret_cast(IFA_RTA(msg)); - RTA_OK(attr, length); - attr = RTA_NEXT(attr, length)) { - switch (attr->rta_type) { - case IFA_ADDRESS: - DCHECK_GE(RTA_PAYLOAD(attr), address_length); - address = reinterpret_cast(RTA_DATA(attr)); - break; - case IFA_LOCAL: - DCHECK_GE(RTA_PAYLOAD(attr), address_length); - local = reinterpret_cast(RTA_DATA(attr)); - break; - case IFA_CACHEINFO: { - const struct ifa_cacheinfo *cache_info = - reinterpret_cast(RTA_DATA(attr)); - if (really_deprecated) - *really_deprecated = (cache_info->ifa_prefered == 0); - } break; - default: - break; - } - } - if (local) - address = local; - if (!address) - return false; - *out = IPAddress(address, address_length); - return true; -} - -} // namespace - // static char* AddressTrackerLinux::GetInterfaceName(int interface_index, char* buf) { - memset(buf, 0, IFNAMSIZ); - base::ScopedFD ioctl_socket = GetSocketForIoctl(); - if (!ioctl_socket.is_valid()) - return buf; - - struct ifreq ifr = {}; - ifr.ifr_ifindex = interface_index; - - if (ioctl(ioctl_socket.get(), SIOCGIFNAME, &ifr) == 0) - strncpy(buf, ifr.ifr_name, IFNAMSIZ - 1); - return buf; + NOTIMPLEMENTED(); + return NULL; } AddressTrackerLinux::AddressTrackerLinux() -@@ -151,6 +65,7 @@ AddressTrackerLinux::~AddressTrackerLinux() { - } +@@ -147,6 +61,7 @@ AddressTrackerLinux::AddressTrackerLinux( + AddressTrackerLinux::~AddressTrackerLinux() = default; void AddressTrackerLinux::Init() { +#if !defined(OS_FREEBSD) netlink_fd_.reset(socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE)); if (!netlink_fd_.is_valid()) { PLOG(ERROR) << "Could not create NETLINK socket"; -@@ -239,6 +154,10 @@ void AddressTrackerLinux::Init() { - return; - } - } -+#else // !OS_FREEBSD -+ NOTIMPLEMENTED(); -+ AbortAndForceOnline(); -+#endif // !OS_FREEBSD +@@ -242,6 +157,7 @@ void AddressTrackerLinux::AbortAndForceOnline() { + connection_type_initialized_cv_.Broadcast(); } - void AddressTrackerLinux::AbortAndForceOnline() { -@@ -250,25 +169,6 @@ void AddressTrackerLinux::AbortAndForceOnline() { - connection_type_initialized_cv_.Broadcast(); ++#if !defined(OS_BSD) + AddressTrackerLinux::AddressMap AddressTrackerLinux::GetAddressMap() const { + AddressTrackerAutoLock lock(*this, address_map_lock_); + return address_map_; +@@ -260,6 +176,7 @@ bool AddressTrackerLinux::IsInterfaceIgnored(int inter + const char* interface_name = get_interface_name_(interface_index, buf); + return ignored_interfaces_.find(interface_name) != ignored_interfaces_.end(); } ++#endif // !OS_BSD --AddressTrackerLinux::AddressMap AddressTrackerLinux::GetAddressMap() const { -- AddressTrackerAutoLock lock(*this, address_map_lock_); -- return address_map_; --} -- --std::unordered_set AddressTrackerLinux::GetOnlineLinks() const { -- AddressTrackerAutoLock lock(*this, online_links_lock_); -- return online_links_; --} -- --bool AddressTrackerLinux::IsInterfaceIgnored(int interface_index) const { -- if (ignored_interfaces_.empty()) -- return false; -- -- char buf[IFNAMSIZ] = {0}; -- const char* interface_name = get_interface_name_(interface_index, buf); -- return ignored_interfaces_.find(interface_name) != ignored_interfaces_.end(); --} -- NetworkChangeNotifier::ConnectionType AddressTrackerLinux::GetCurrentConnectionType() { - // http://crbug.com/125097 -@@ -326,102 +226,7 @@ void AddressTrackerLinux::HandleMessage(char* buffer, +@@ -318,6 +235,7 @@ void AddressTrackerLinux::HandleMessage(char* buffer, bool* address_changed, bool* link_changed, bool* tunnel_changed) { -- DCHECK(buffer); -- for (struct nlmsghdr* header = reinterpret_cast(buffer); -- NLMSG_OK(header, length); -- header = NLMSG_NEXT(header, length)) { -- switch (header->nlmsg_type) { -- case NLMSG_DONE: -- return; -- case NLMSG_ERROR: { -- const struct nlmsgerr* msg = -- reinterpret_cast(NLMSG_DATA(header)); -- LOG(ERROR) << "Unexpected netlink error " << msg->error << "."; -- } return; -- case RTM_NEWADDR: { -- IPAddress address; -- bool really_deprecated; -- struct ifaddrmsg* msg = -- reinterpret_cast(NLMSG_DATA(header)); -- if (IsInterfaceIgnored(msg->ifa_index)) -- break; -- if (GetAddress(header, &address, &really_deprecated)) { -- AddressTrackerAutoLock lock(*this, address_map_lock_); -- // Routers may frequently (every few seconds) output the IPv6 ULA -- // prefix which can cause the linux kernel to frequently output two -- // back-to-back messages, one without the deprecated flag and one with -- // the deprecated flag but both with preferred lifetimes of 0. Avoid -- // interpretting this as an actual change by canonicalizing the two -- // messages by setting the deprecated flag based on the preferred -- // lifetime also. http://crbug.com/268042 -- if (really_deprecated) -- msg->ifa_flags |= IFA_F_DEPRECATED; -- // Only indicate change if the address is new or ifaddrmsg info has -- // changed. -- auto it = address_map_.find(address); -- if (it == address_map_.end()) { -- address_map_.insert(it, std::make_pair(address, *msg)); -- *address_changed = true; -- } else if (memcmp(&it->second, msg, sizeof(*msg))) { -- it->second = *msg; -- *address_changed = true; -- } -- } -- } break; -- case RTM_DELADDR: { -- IPAddress address; -- const struct ifaddrmsg* msg = -- reinterpret_cast(NLMSG_DATA(header)); -- if (IsInterfaceIgnored(msg->ifa_index)) -- break; -- if (GetAddress(header, &address, NULL)) { -- AddressTrackerAutoLock lock(*this, address_map_lock_); -- if (address_map_.erase(address)) -- *address_changed = true; -- } -- } break; -- case RTM_NEWLINK: { -- const struct ifinfomsg* msg = -- reinterpret_cast(NLMSG_DATA(header)); -- if (IsInterfaceIgnored(msg->ifi_index)) -- break; -- if (IgnoreWirelessChange(header, msg)) { -- VLOG(2) << "Ignoring RTM_NEWLINK message"; -- break; -- } -- if (!(msg->ifi_flags & IFF_LOOPBACK) && (msg->ifi_flags & IFF_UP) && -- (msg->ifi_flags & IFF_LOWER_UP) && (msg->ifi_flags & IFF_RUNNING)) { -- AddressTrackerAutoLock lock(*this, online_links_lock_); -- if (online_links_.insert(msg->ifi_index).second) { -- *link_changed = true; -- if (IsTunnelInterface(msg->ifi_index)) -- *tunnel_changed = true; -- } -- } else { -- AddressTrackerAutoLock lock(*this, online_links_lock_); -- if (online_links_.erase(msg->ifi_index)) { -- *link_changed = true; -- if (IsTunnelInterface(msg->ifi_index)) -- *tunnel_changed = true; -- } -- } -- } break; -- case RTM_DELLINK: { -- const struct ifinfomsg* msg = -- reinterpret_cast(NLMSG_DATA(header)); -- if (IsInterfaceIgnored(msg->ifi_index)) -- break; -- AddressTrackerAutoLock lock(*this, online_links_lock_); -- if (online_links_.erase(msg->ifi_index)) { -- *link_changed = true; -- if (IsTunnelInterface(msg->ifi_index)) -- *tunnel_changed = true; -- } -- } break; -- default: -- break; -- } -- } ++#if !defined(OS_FREEBSD) + DCHECK(buffer); + for (struct nlmsghdr* header = reinterpret_cast(buffer); + NLMSG_OK(header, length); +@@ -414,6 +332,10 @@ void AddressTrackerLinux::HandleMessage(char* buffer, + break; + } + } ++#else // !OS_FREEBSD + NOTIMPLEMENTED(); ++ AbortAndForceOnline(); ++#endif // !OS_FREEBSD } - void AddressTrackerLinux::OnFileCanReadWithoutBlocking(int fd) { -@@ -452,31 +257,7 @@ bool AddressTrackerLinux::IsTunnelInterfaceName(const + void AddressTrackerLinux::OnFileCanReadWithoutBlocking() { +@@ -441,31 +363,7 @@ bool AddressTrackerLinux::IsTunnelInterfaceName(const } void AddressTrackerLinux::UpdateCurrentConnectionType() { - AddressTrackerLinux::AddressMap address_map = GetAddressMap(); - std::unordered_set online_links = GetOnlineLinks(); - - // Strip out tunnel interfaces from online_links - for (auto it = online_links.cbegin(); it != online_links.cend();) { - if (IsTunnelInterface(*it)) { - it = online_links.erase(it); - } else { - ++it; - } - } - - NetworkInterfaceList networks; - NetworkChangeNotifier::ConnectionType type = - NetworkChangeNotifier::CONNECTION_NONE; - if (GetNetworkListImpl(&networks, 0, online_links, address_map, - get_interface_name_)) { - type = NetworkChangeNotifier::ConnectionTypeFromInterfaceList(networks); - } else { - type = online_links.empty() ? NetworkChangeNotifier::CONNECTION_NONE - : NetworkChangeNotifier::CONNECTION_UNKNOWN; - } - - AddressTrackerAutoLock lock(*this, connection_type_lock_); - current_connection_type_ = type; + NOTIMPLEMENTED(); } int AddressTrackerLinux::GetThreadsWaitingForConnectionTypeInitForTesting() Index: head/www/chromium/files/patch-net_base_network__change__notifier.cc =================================================================== --- head/www/chromium/files/patch-net_base_network__change__notifier.cc (revision 504140) +++ head/www/chromium/files/patch-net_base_network__change__notifier.cc (revision 504141) @@ -1,10 +1,10 @@ ---- net/base/network_change_notifier.cc.orig 2019-03-11 22:01:00 UTC +--- net/base/network_change_notifier.cc.orig 2019-06-04 18:55:26 UTC +++ net/base/network_change_notifier.cc -@@ -221,7 +221,6 @@ NetworkChangeNotifier* NetworkChangeNotifier::Create() +@@ -215,7 +215,6 @@ NetworkChangeNotifier* NetworkChangeNotifier::Create() #elif defined(OS_FUCHSIA) return new NetworkChangeNotifierFuchsia(0 /* required_features */); #else - NOTIMPLEMENTED(); return NULL; #endif } Index: head/www/chromium/files/patch-net_dns_dns__config__service__posix__unittest.cc =================================================================== --- head/www/chromium/files/patch-net_dns_dns__config__service__posix__unittest.cc (revision 504140) +++ head/www/chromium/files/patch-net_dns_dns__config__service__posix__unittest.cc (revision 504141) @@ -1,47 +1,47 @@ ---- net/dns/dns_config_service_posix_unittest.cc.orig 2019-04-30 22:22:54 UTC +--- net/dns/dns_config_service_posix_unittest.cc.orig 2019-06-04 18:55:27 UTC +++ net/dns/dns_config_service_posix_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include - #include #include "base/cancelable_callback.h" -@@ -47,7 +45,7 @@ const char* const kNameserversIPv4[] = { +@@ -50,7 +48,7 @@ const char* const kNameserversIPv4[] = { "1.0.0.1", }; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) const char* const kNameserversIPv6[] = { NULL, "2001:DB8:0::42", -@@ -83,7 +81,7 @@ void InitializeResState(res_state res) { +@@ -86,7 +84,7 @@ void InitializeResState(res_state res) { ++res->nscount; } -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // Install IPv6 addresses, replacing the corresponding IPv4 addresses. unsigned nscount6 = 0; for (unsigned i = 0; i < base::size(kNameserversIPv6) && i < MAXNS; ++i) { -@@ -104,7 +102,7 @@ void InitializeResState(res_state res) { +@@ -107,7 +105,7 @@ void InitializeResState(res_state res) { } void CloseResState(res_state res) { -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) for (int i = 0; i < res->nscount; ++i) { if (res->_u._ext.nsaddrs[i] != NULL) free(res->_u._ext.nsaddrs[i]); -@@ -129,7 +127,7 @@ void InitializeExpectedConfig(DnsConfig* config) { +@@ -132,7 +130,7 @@ void InitializeExpectedConfig(DnsConfig* config) { config->nameservers.push_back(IPEndPoint(ip, NS_DEFAULTPORT + i)); } -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) for (unsigned i = 0; i < base::size(kNameserversIPv6) && i < MAXNS; ++i) { if (!kNameserversIPv6[i]) continue; Index: head/www/chromium/files/patch-net_proxy__resolution_proxy__resolution__service.cc =================================================================== --- head/www/chromium/files/patch-net_proxy__resolution_proxy__resolution__service.cc (revision 504140) +++ head/www/chromium/files/patch-net_proxy__resolution_proxy__resolution__service.cc (revision 504141) @@ -1,29 +1,29 @@ ---- net/proxy_resolution/proxy_resolution_service.cc.orig 2019-04-30 22:22:54 UTC +--- net/proxy_resolution/proxy_resolution_service.cc.orig 2019-06-04 18:55:27 UTC +++ net/proxy_resolution/proxy_resolution_service.cc @@ -48,7 +48,7 @@ #elif defined(OS_MACOSX) #include "net/proxy_resolution/proxy_config_service_mac.h" #include "net/proxy_resolution/proxy_resolver_mac.h" -#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) +#elif (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) #include "net/proxy_resolution/proxy_config_service_linux.h" #elif defined(OS_ANDROID) #include "net/proxy_resolution/proxy_config_service_android.h" @@ -62,7 +62,7 @@ namespace net { namespace { #if defined(OS_WIN) || defined(OS_IOS) || defined(OS_MACOSX) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + ((defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)) constexpr net::NetworkTrafficAnnotationTag kSystemProxyConfigTrafficAnnotation = net::DefineNetworkTrafficAnnotation("proxy_config_system", R"( semantics { -@@ -1578,7 +1578,7 @@ ProxyResolutionService::CreateSystemProxyConfigService +@@ -1588,7 +1588,7 @@ ProxyResolutionService::CreateSystemProxyConfigService << "profile_io_data.cc::CreateProxyConfigService and this should " << "be used only for examples."; return std::make_unique(); -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) std::unique_ptr linux_config_service( new ProxyConfigServiceLinux()); Index: head/www/chromium/files/patch-net_quic_platform_impl_quic__ip__address__impl.cc =================================================================== --- head/www/chromium/files/patch-net_quic_platform_impl_quic__ip__address__impl.cc (nonexistent) +++ head/www/chromium/files/patch-net_quic_platform_impl_quic__ip__address__impl.cc (revision 504141) @@ -0,0 +1,10 @@ +--- net/quic/platform/impl/quic_ip_address_impl.cc.orig 2019-06-04 18:55:27 UTC ++++ net/quic/platform/impl/quic_ip_address_impl.cc +@@ -13,6 +13,7 @@ + #include + #elif defined(OS_POSIX) || defined(OS_FUCHSIA) + #include ++#include + #endif + + using std::string; Property changes on: head/www/chromium/files/patch-net_quic_platform_impl_quic__ip__address__impl.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-net_socket_udp__socket__posix.cc =================================================================== --- head/www/chromium/files/patch-net_socket_udp__socket__posix.cc (revision 504140) +++ head/www/chromium/files/patch-net_socket_udp__socket__posix.cc (revision 504141) @@ -1,114 +1,108 @@ ---- net/socket/udp_socket_posix.cc.orig 2019-04-30 22:22:55 UTC +--- net/socket/udp_socket_posix.cc.orig 2019-06-04 18:55:27 UTC +++ net/socket/udp_socket_posix.cc @@ -69,7 +69,7 @@ const int kActivityMonitorMinimumSamplesForThroughputE const base::TimeDelta kActivityMonitorMsThreshold = base::TimeDelta::FromMilliseconds(100); -#if defined(OS_MACOSX) +#if defined(OS_MACOSX) || defined(OS_BSD) // When enabling multicast using setsockopt(IP_MULTICAST_IF) MacOS // requires passing IPv4 address instead of interface index. This function // resolves IPv4 address by interface index. The |address| is returned in @@ -98,7 +98,7 @@ int GetIPv4AddressFromIndex(int socket, uint32_t index return OK; } -#endif // OS_MACOSX +#endif // OS_MACOSX || OS_BSD #if defined(OS_MACOSX) && !defined(OS_IOS) @@ -645,13 +645,13 @@ int UDPSocketPosix::SetDoNotFragment() { } void UDPSocketPosix::SetMsgConfirm(bool confirm) { -#if !defined(OS_MACOSX) && !defined(OS_IOS) +#if !defined(OS_MACOSX) && !defined(OS_IOS) && !defined(OS_BSD) if (confirm) { sendto_flags_ |= MSG_CONFIRM; } else { sendto_flags_ &= ~MSG_CONFIRM; } -#endif // !defined(OS_MACOSX) && !defined(OS_IOS) +#endif // !defined(OS_MACOSX) && !defined(OS_IOS) && !defined(OS_BSD) } int UDPSocketPosix::AllowAddressReuse() { @@ -666,17 +666,20 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) { DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); int value = broadcast ? 1 : 0; int rv; -#if defined(OS_MACOSX) +#if defined(OS_MACOSX) || defined(OS_BSD) // SO_REUSEPORT on OSX permits multiple processes to each receive // UDP multicast or broadcast datagrams destined for the bound // port. // This is only being set on OSX because its behavior is platform dependent // and we are playing it safe by only setting it on platforms where things // break. + rv = setsockopt(socket_, SOL_SOCKET, SO_REUSEADDR, &value, sizeof(value)); + if (rv != 0) + return MapSystemError(errno); rv = setsockopt(socket_, SOL_SOCKET, SO_REUSEPORT, &value, sizeof(value)); if (rv != 0) return MapSystemError(errno); -#endif // defined(OS_MACOSX) +#endif // defined(OS_MACOSX) || defined(OS_BSD) rv = setsockopt(socket_, SOL_SOCKET, SO_BROADCAST, &value, sizeof(value)); return rv == 0 ? OK : MapSystemError(errno); -@@ -945,19 +948,23 @@ int UDPSocketPosix::SetMulticastOptions() { - return OK; - #endif - +@@ -938,7 +941,7 @@ int UDPSocketPosix::SetMulticastOptions() { + if (multicast_interface_ != 0) { + switch (addr_family_) { + case AF_INET: { -#if defined(OS_MACOSX) +#if defined(OS_MACOSX) || defined(OS_BSD) ip_mreq mreq = {}; int error = GetIPv4AddressFromIndex(socket_, multicast_interface_, &mreq.imr_interface.s_addr); - if (error != OK) - return error; --#else // defined(OS_MACOSX) -+#else // defined(OS_MACOSX) || defined(OS_BSD) - ip_mreqn mreq = {}; - mreq.imr_ifindex = multicast_interface_; +@@ -950,7 +953,11 @@ int UDPSocketPosix::SetMulticastOptions() { mreq.imr_address.s_addr = htonl(INADDR_ANY); --#endif // !defined(OS_MACOSX) -+#endif // !defined(OS_MACOSX) || defined(OS_BSD) + #endif // !defined(OS_MACOSX) int rv = setsockopt(socket_, IPPROTO_IP, IP_MULTICAST_IF, +#if defined(OS_BSD) -+ reinterpret_cast(&mreq.imr_interface.s_addr), sizeof(mreq.imr_interface.s_addr)); ++ reinterpret_cast(&mreq.imr_interface.s_addr), sizeof(mreq.imr_interface.s_addr)); +#else reinterpret_cast(&mreq), sizeof(mreq)); +#endif if (rv) return MapSystemError(errno); break; -@@ -1019,7 +1026,7 @@ int UDPSocketPosix::JoinGroup(const IPAddress& group_a +@@ -1012,7 +1019,7 @@ int UDPSocketPosix::JoinGroup(const IPAddress& group_a if (addr_family_ != AF_INET) return ERR_ADDRESS_INVALID; -#if defined(OS_MACOSX) +#if defined(OS_MACOSX) || defined(OS_BSD) ip_mreq mreq = {}; int error = GetIPv4AddressFromIndex(socket_, multicast_interface_, &mreq.imr_interface.s_addr); -@@ -1067,9 +1074,18 @@ int UDPSocketPosix::LeaveGroup(const IPAddress& group_ +@@ -1060,9 +1067,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, Index: head/www/chromium/files/patch-net_socket_udp__socket__posix.h =================================================================== --- head/www/chromium/files/patch-net_socket_udp__socket__posix.h (nonexistent) +++ head/www/chromium/files/patch-net_socket_udp__socket__posix.h (revision 504141) @@ -0,0 +1,11 @@ +--- net/socket/udp_socket_posix.h.orig 2019-06-07 19:57:25 UTC ++++ net/socket/udp_socket_posix.h +@@ -33,7 +33,7 @@ + + #if defined(__ANDROID__) && defined(__aarch64__) + #define HAVE_SENDMMSG 1 +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + #define HAVE_SENDMMSG 1 + #else + #define HAVE_SENDMMSG 0 Property changes on: head/www/chromium/files/patch-net_socket_udp__socket__posix.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-net_socket_unix__domain__client__socket__posix.cc =================================================================== --- head/www/chromium/files/patch-net_socket_unix__domain__client__socket__posix.cc (nonexistent) +++ head/www/chromium/files/patch-net_socket_unix__domain__client__socket__posix.cc (revision 504141) @@ -0,0 +1,11 @@ +--- net/socket/unix_domain_client_socket_posix.cc.orig 2019-06-07 19:59:03 UTC ++++ net/socket/unix_domain_client_socket_posix.cc +@@ -56,7 +56,7 @@ bool UnixDomainClientSocket::FillAddress(const std::st + return true; + } + +-#if defined(OS_ANDROID) || defined(OS_LINUX) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) + // 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 Property changes on: head/www/chromium/files/patch-net_socket_unix__domain__client__socket__posix.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-net_url__request_url__request__context__builder.cc =================================================================== --- head/www/chromium/files/patch-net_url__request_url__request__context__builder.cc (revision 504140) +++ head/www/chromium/files/patch-net_url__request_url__request__context__builder.cc (revision 504141) @@ -1,20 +1,20 @@ ---- net/url_request/url_request_context_builder.cc.orig 2019-04-30 22:22:55 UTC +--- net/url_request/url_request_context_builder.cc.orig 2019-06-04 18:55:27 UTC +++ net/url_request/url_request_context_builder.cc -@@ -497,7 +497,7 @@ std::unique_ptr URLRequestContextBu +@@ -533,7 +533,7 @@ std::unique_ptr URLRequestContextBu } if (!proxy_resolution_service_) { -#if !defined(OS_LINUX) && !defined(OS_ANDROID) +#if !defined(OS_LINUX) && !defined(OS_ANDROID) && !defined(OS_BSD) // TODO(willchan): Switch to using this code when // ProxyResolutionService::CreateSystemProxyConfigService()'s signature // doesn't suck. -@@ -506,7 +506,7 @@ std::unique_ptr URLRequestContextBu +@@ -542,7 +542,7 @@ std::unique_ptr URLRequestContextBu ProxyResolutionService::CreateSystemProxyConfigService( base::ThreadTaskRunnerHandle::Get().get()); } -#endif // !defined(OS_LINUX) && !defined(OS_ANDROID) +#endif // !defined(OS_LINUX) && !defined(OS_ANDROID) && !defined(OS_BSD) proxy_resolution_service_ = CreateProxyResolutionService( std::move(proxy_config_service_), context.get(), context->host_resolver(), context->network_delegate(), Index: head/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc =================================================================== --- head/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc (revision 504140) +++ head/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc (revision 504141) @@ -1,74 +1,74 @@ ---- pdf/pdfium/pdfium_engine.cc.orig 2019-04-30 22:22:55 UTC +--- pdf/pdfium/pdfium_engine.cc.orig 2019-06-04 18:55:27 UTC +++ pdf/pdfium/pdfium_engine.cc @@ -134,7 +134,7 @@ constexpr base::TimeDelta kMaxInitialProgressivePaintT PDFiumEngine* g_engine_for_fontmapper = nullptr; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) PP_Instance g_last_instance_id; @@ -414,7 +414,7 @@ void Release(FPDF_SYSFONTINFO* sysfontinfo) { fontinfo_with_metrics->default_sysfontinfo->Release( fontinfo_with_metrics->default_sysfontinfo); } -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) PDFiumEngine::CreateDocumentLoaderFunction g_create_document_loader_for_testing = nullptr; @@ -664,7 +664,7 @@ bool InitializeSDK() { config.m_v8EmbedderSlot = gin::kEmbedderPDFium; FPDF_InitLibraryWithConfig(&config); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // Font loading doesn't work in the renderer sandbox in Linux. FPDF_SetSystemFontInfo(&g_font_info); #else @@ -689,7 +689,7 @@ bool InitializeSDK() { void ShutdownSDK() { FPDF_DestroyLibrary(); -#if !defined(OS_LINUX) +#if !defined(OS_LINUX) && !defined(OS_BSD) delete g_font_info; #endif TearDownV8(); @@ -713,7 +713,7 @@ PDFiumEngine::PDFiumEngine(PDFEngine::Client* client, IFSDK_PAUSE::user = nullptr; IFSDK_PAUSE::NeedToPauseNow = Pause_NeedToPauseNow; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // PreviewModeClient does not know its pp::Instance. pp::Instance* instance = client_->GetPluginInstance(); if (instance) @@ -1177,7 +1177,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesAsRasterPdf( KillFormFocus(); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) g_last_instance_id = client_->GetPluginInstance()->pp_instance(); #endif -@@ -2974,7 +2974,7 @@ bool PDFiumEngine::ContinuePaint(int progressive_index +@@ -2978,7 +2978,7 @@ bool PDFiumEngine::ContinuePaint(int progressive_index DCHECK(image_data); last_progressive_start_time_ = base::Time::Now(); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) g_last_instance_id = client_->GetPluginInstance()->pp_instance(); #endif -@@ -3449,7 +3449,7 @@ void PDFiumEngine::SetCurrentPage(int index) { +@@ -3453,7 +3453,7 @@ void PDFiumEngine::SetCurrentPage(int index) { FORM_DoPageAAction(old_page, form(), FPDFPAGE_AACTION_CLOSE); } most_visible_page_ = index; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) g_last_instance_id = client_->GetPluginInstance()->pp_instance(); #endif if (most_visible_page_ != -1 && called_do_document_action_) { Index: head/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc =================================================================== --- head/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc (revision 504140) +++ head/www/chromium/files/patch-services_device_geolocation_location__arbitrator.cc (revision 504141) @@ -1,11 +1,11 @@ ---- services/device/geolocation/location_arbitrator.cc.orig 2019-04-30 22:22:56 UTC +--- services/device/geolocation/location_arbitrator.cc.orig 2019-06-04 18:55:28 UTC +++ services/device/geolocation/location_arbitrator.cc -@@ -157,7 +157,7 @@ LocationArbitrator::NewNetworkLocationProvider( +@@ -156,7 +156,7 @@ LocationArbitrator::NewNetworkLocationProvider( + std::unique_ptr LocationArbitrator::NewSystemLocationProvider() { - #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ -- defined(OS_FUCHSIA) -+ defined(OS_FUCHSIA) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_FUCHSIA) return nullptr; #else - return device::NewSystemLocationProvider(); Index: head/www/chromium/files/patch-services_device_hid_BUILD.gn =================================================================== --- head/www/chromium/files/patch-services_device_hid_BUILD.gn (revision 504140) +++ head/www/chromium/files/patch-services_device_hid_BUILD.gn (revision 504141) @@ -1,22 +1,22 @@ ---- services/device/hid/BUILD.gn.orig 2019-03-11 22:01:01 UTC +--- services/device/hid/BUILD.gn.orig 2019-06-04 18:55:28 UTC +++ services/device/hid/BUILD.gn @@ -51,6 +51,19 @@ source_set("hid") { deps += [ "//device/udev_linux" ] } + if (is_bsd) { + sources -= [ + "hid_connection_linux.cc", + "hid_connection_linux.h", + ] + sources += [ + "hid_connection_freebsd.cc", + "hid_connection_freebsd.h", + "hid_service_freebsd.cc", + "hid_service_freebsd.h", + ] + } + if (is_chromeos) { - deps += [ "//chromeos/dbus" ] + deps += [ "//chromeos/dbus/permission_broker" ] } Index: head/www/chromium/files/patch-services_network_BUILD.gn =================================================================== --- head/www/chromium/files/patch-services_network_BUILD.gn (revision 504140) +++ head/www/chromium/files/patch-services_network_BUILD.gn (revision 504141) @@ -1,10 +1,10 @@ ---- services/network/BUILD.gn.orig 2019-04-30 22:22:56 UTC +--- services/network/BUILD.gn.orig 2019-06-04 18:55:28 UTC +++ services/network/BUILD.gn -@@ -249,7 +249,6 @@ jumbo_component("network_service") { +@@ -247,7 +247,6 @@ jumbo_component("network_service") { if (is_linux) { deps += [ - "//sandbox/linux:sandbox_services", "//services/service_manager/sandbox:sandbox", ] } Index: head/www/chromium/files/patch-services_network_network__context.cc =================================================================== --- head/www/chromium/files/patch-services_network_network__context.cc (revision 504140) +++ head/www/chromium/files/patch-services_network_network__context.cc (revision 504141) @@ -1,38 +1,38 @@ ---- services/network/network_context.cc.orig 2019-04-30 22:22:56 UTC +--- services/network/network_context.cc.orig 2019-06-04 18:55:28 UTC +++ services/network/network_context.cc -@@ -133,7 +133,7 @@ +@@ -132,7 +132,7 @@ #endif // defined(USE_NSS_CERTS) #if defined(OS_ANDROID) || defined(OS_FUCHSIA) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) + ((defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) #include "net/cert/cert_net_fetcher.h" #include "net/cert_net/cert_net_fetcher_impl.h" #endif @@ -618,7 +618,7 @@ NetworkContext::~NetworkContext() { #endif #if defined(OS_ANDROID) || defined(OS_FUCHSIA) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) + ((defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) net::ShutdownGlobalCertNetFetcher(); #endif } -@@ -1747,7 +1747,7 @@ URLRequestContextOwner NetworkContext::ApplyContextPar +@@ -1764,7 +1764,7 @@ URLRequestContextOwner NetworkContext::ApplyContextPar net::CookieCryptoDelegate* crypto_delegate = nullptr; if (params_->enable_encrypted_cookies) { -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(IS_CHROMECAST) +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) && !defined(IS_CHROMECAST) DCHECK(network_service_->os_crypt_config_set()) << "NetworkService::SetCryptConfig must be called before creating a " "NetworkContext with encrypted cookies."; -@@ -2069,7 +2069,7 @@ URLRequestContextOwner NetworkContext::ApplyContextPar +@@ -2090,7 +2090,7 @@ URLRequestContextOwner NetworkContext::ApplyContextPar net::SetURLRequestContextForNSSHttpIO(result.url_request_context.get()); #endif #if defined(OS_ANDROID) || defined(OS_FUCHSIA) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) + ((defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) net::SetGlobalCertNetFetcher( net::CreateCertNetFetcher(result.url_request_context.get())); #endif Index: head/www/chromium/files/patch-services_network_network__service.cc =================================================================== --- head/www/chromium/files/patch-services_network_network__service.cc (revision 504140) +++ head/www/chromium/files/patch-services_network_network__service.cc (revision 504141) @@ -1,20 +1,20 @@ ---- services/network/network_service.cc.orig 2019-04-30 22:22:56 UTC +--- services/network/network_service.cc.orig 2019-06-04 18:55:28 UTC +++ services/network/network_service.cc -@@ -61,7 +61,7 @@ +@@ -62,7 +62,7 @@ #include "third_party/boringssl/src/include/openssl/cpu.h" #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(IS_CHROMECAST) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(IS_CHROMECAST)) || defined(OS_BSD) #include "components/os_crypt/key_storage_config_linux.h" #endif -@@ -620,7 +620,7 @@ void NetworkService::OnCertDBChanged() { +@@ -596,7 +596,7 @@ void NetworkService::OnCertDBChanged() { net::CertDatabase::GetInstance()->NotifyObserversCertDBChanged(); } -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) void NetworkService::SetCryptConfig(mojom::CryptConfigPtr crypt_config) { #if !defined(IS_CHROMECAST) DCHECK(!os_crypt_config_set_); Index: head/www/chromium/files/patch-services_network_network__service.h =================================================================== --- head/www/chromium/files/patch-services_network_network__service.h (revision 504140) +++ head/www/chromium/files/patch-services_network_network__service.h (revision 504141) @@ -1,11 +1,11 @@ ---- services/network/network_service.h.orig 2019-04-30 22:22:56 UTC +--- services/network/network_service.h.orig 2019-06-04 18:55:28 UTC +++ services/network/network_service.h -@@ -187,7 +187,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService +@@ -182,7 +182,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService #endif // !BUILDFLAG(IS_CT_SUPPORTED) void UpdateCRLSet(base::span crl_set) override; void OnCertDBChanged() override; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) void SetCryptConfig(mojom::CryptConfigPtr crypt_config) override; #endif #if defined(OS_MACOSX) && !defined(OS_IOS) Index: head/www/chromium/files/patch-services_service__manager_embedder_main.cc =================================================================== --- head/www/chromium/files/patch-services_service__manager_embedder_main.cc (revision 504140) +++ head/www/chromium/files/patch-services_service__manager_embedder_main.cc (revision 504141) @@ -1,11 +1,11 @@ ---- services/service_manager/embedder/main.cc.orig 2019-04-30 22:22:56 UTC +--- services/service_manager/embedder/main.cc.orig 2019-06-04 18:55:28 UTC +++ services/service_manager/embedder/main.cc -@@ -275,7 +275,7 @@ int Main(const MainParams& params) { +@@ -264,7 +264,7 @@ int Main(const MainParams& params) { #endif base::EnableTerminationOnOutOfMemory(); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // The various desktop environments set this environment variable that // allows the dbus client library to connect directly to the bus. When this // variable is not set (test environments like xvfb-run), the dbus client Index: head/www/chromium/files/patch-services_service__manager_zygote_zygote__linux.cc =================================================================== --- head/www/chromium/files/patch-services_service__manager_zygote_zygote__linux.cc (revision 504140) +++ head/www/chromium/files/patch-services_service__manager_zygote_zygote__linux.cc (revision 504141) @@ -1,15 +1,15 @@ ---- services/service_manager/zygote/zygote_linux.cc.orig 2019-03-11 22:01:02 UTC +--- services/service_manager/zygote/zygote_linux.cc.orig 2019-06-04 18:55:28 UTC +++ services/service_manager/zygote/zygote_linux.cc @@ -1,6 +1,7 @@ // Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#if 0 #include "services/service_manager/zygote/zygote_linux.h" -@@ -664,3 +665,4 @@ bool Zygote::HandleGetSandboxStatus(int fd, base::Pick +@@ -657,3 +658,4 @@ bool Zygote::HandleGetSandboxStatus(int fd, base::Pick } } // namespace service_manager +#endif Index: head/www/chromium/files/patch-third__party_angle_BUILD.gn =================================================================== --- head/www/chromium/files/patch-third__party_angle_BUILD.gn (revision 504140) +++ head/www/chromium/files/patch-third__party_angle_BUILD.gn (revision 504141) @@ -1,21 +1,21 @@ ---- third_party/angle/BUILD.gn.orig 2019-04-30 22:25:51 UTC +--- third_party/angle/BUILD.gn.orig 2019-06-04 18:57:56 UTC +++ third_party/angle/BUILD.gn -@@ -327,6 +327,7 @@ angle_static_library("angle_gpu_info_util") { +@@ -319,6 +319,7 @@ angle_static_library("angle_gpu_info_util") { "X11", "Xi", "Xext", + "GL", ] } } -@@ -938,10 +939,6 @@ foreach(is_shared_library, +@@ -916,10 +917,6 @@ foreach(is_shared_library, libs = [] if (is_linux) { sources += util_linux_sources - libs += [ - "rt", - "dl", - ] } if (is_mac) { Index: head/www/chromium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc =================================================================== --- head/www/chromium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc (revision 504140) +++ head/www/chromium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc (revision 504141) @@ -1,11 +1,11 @@ ---- third_party/blink/renderer/core/html/forms/internal_popup_menu.cc.orig 2019-03-11 22:01:03 UTC +--- third_party/blink/renderer/core/html/forms/internal_popup_menu.cc.orig 2019-06-04 18:55:29 UTC +++ third_party/blink/renderer/core/html/forms/internal_popup_menu.cc -@@ -127,7 +127,7 @@ class InternalPopupMenu::ItemIterationContext { +@@ -120,7 +120,7 @@ class InternalPopupMenu::ItemIterationContext { is_in_group_(false), buffer_(buffer) { DCHECK(buffer_); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // On other platforms, the